rpm/libvirt
SHA256
1
0
Fork 0
forked from pool/libvirt
Code Pull Requests Activity

Accepting request 438412 from home:jfehlig:branches:Virtualization

Browse Source 
- Update to libvirt 2.4.0
  - Many incremental improvements and bug fixes, see
    http://libvirt.org/news.html

OBS-URL: https://build.opensuse.org/request/show/438412
OBS-URL: https://build.opensuse.org/package/show/Virtualization/libvirt?expand=0&rev=569
This commit is contained in:
James Fehlig 2016-11-02 21:55:27 +00:00 committed by Git OBS Bridge
parent 47e5144d9d
commit f2577f99c5
29 changed files with 163 additions and 156 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
apparmor-fixes.patch
View File

@ -1,7 +1,7 @@
Index: libvirt-2.3.0/examples/apparmor/libvirt-qemu Index: libvirt-2.4.0/examples/apparmor/libvirt-qemu
=================================================================== ===================================================================
--- libvirt-2.3.0.orig/examples/apparmor/libvirt-qemu --- libvirt-2.4.0.orig/examples/apparmor/libvirt-qemu
+++ libvirt-2.3.0/examples/apparmor/libvirt-qemu +++ libvirt-2.4.0/examples/apparmor/libvirt-qemu
@@ -143,6 +143,9 @@ @@ -143,6 +143,9 @@
# for restore # for restore
/bin/bash rmix, /bin/bash rmix,

6
apparmor-no-mount.patch
View File

@ -1,7 +1,7 @@
Index: libvirt-2.3.0/examples/apparmor/libvirt-lxc Index: libvirt-2.4.0/examples/apparmor/libvirt-lxc
=================================================================== ===================================================================
--- libvirt-2.3.0.orig/examples/apparmor/libvirt-lxc --- libvirt-2.4.0.orig/examples/apparmor/libvirt-lxc
+++ libvirt-2.3.0/examples/apparmor/libvirt-lxc +++ libvirt-2.4.0/examples/apparmor/libvirt-lxc
@@ -2,39 +2,15 @@ @@ -2,39 +2,15 @@
#include <abstractions/base> #include <abstractions/base>

8
blockcopy-check-dst-identical-device.patch
View File

@ -11,11 +11,11 @@ Signed-off-by: Chunyan Liu <cyliu@suse.com>
src/qemu/qemu_driver.c | 7 +++++++ src/qemu/qemu_driver.c | 7 +++++++
1 file changed, 7 insertions(+) 1 file changed, 7 insertions(+)
Index: libvirt-2.3.0/src/qemu/qemu_driver.c Index: libvirt-2.4.0/src/qemu/qemu_driver.c
=================================================================== ===================================================================
--- libvirt-2.3.0.orig/src/qemu/qemu_driver.c --- libvirt-2.4.0.orig/src/qemu/qemu_driver.c
+++ libvirt-2.3.0/src/qemu/qemu_driver.c +++ libvirt-2.4.0/src/qemu/qemu_driver.c
@@ -16622,6 +16622,15 @@ qemuDomainBlockCopyCommon(virDomainObjPt @@ -16650,6 +16650,15 @@ qemuDomainBlockCopyCommon(virDomainObjPt
_("non-file destination not supported yet")); _("non-file destination not supported yet"));
goto endjob; goto endjob;
} }

3
libvirt-2.3.0.tar.xz
View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:e430e69b27d3f6c97255e638617b59b179618d531d81ac7dfe0783a1c1eeafd1
size 13224384

6
libvirt-2.3.0.tar.xz.asc
View File

@ -1,6 +0,0 @@
-----BEGIN PGP SIGNATURE-----
iEYEABECAAYFAlfz22MACgkQRga4pd6VvB+odwCdHUMccQTnLQfnwqcRCY+T2m5t
9rkAn2EsUm3CmPF+M0PX3+5GMdnjJW8X
=tiI+
-----END PGP SIGNATURE-----

3
libvirt-2.4.0.tar.xz Normal file
View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:b727c5f43ed3d7337ec2c2f2031ebd4207507978f68d00ad13d4f0f84aad6224
size 13237652

6
libvirt-2.4.0.tar.xz.asc Normal file
View File

@ -0,0 +1,6 @@
-----BEGIN PGP SIGNATURE-----
iEYEABECAAYFAlgY/h8ACgkQRga4pd6VvB/frACfe7j1WXBSmST4QBhZcn3tqMKC
/6oAnjEquHVIMalD/Z5KmZHIeJ8qfsCp
=y5ZG
-----END PGP SIGNATURE-----

18
libvirt-guests-init-script.patch
View File

@ -1,9 +1,9 @@
Adjust libvirt-guests init files to conform to SUSE standards Adjust libvirt-guests init files to conform to SUSE standards
Index: libvirt-2.3.0/tools/libvirt-guests.init.in Index: libvirt-2.4.0/tools/libvirt-guests.init.in
=================================================================== ===================================================================
--- libvirt-2.3.0.orig/tools/libvirt-guests.init.in --- libvirt-2.4.0.orig/tools/libvirt-guests.init.in
+++ libvirt-2.3.0/tools/libvirt-guests.init.in +++ libvirt-2.4.0/tools/libvirt-guests.init.in
@@ -4,27 +4,27 @@ @@ -4,27 +4,27 @@
# http://refspecs.linuxfoundation.org/LSB_5.0.0/LSB-Core-generic/LSB-Core-generic/initscrcomconv.html # http://refspecs.linuxfoundation.org/LSB_5.0.0/LSB-Core-generic/LSB-Core-generic/initscrcomconv.html
# #
@ -45,10 +45,10 @@ Index: libvirt-2.3.0/tools/libvirt-guests.init.in
# #
exec @libexecdir@/libvirt-guests.sh "$@" exec @libexecdir@/libvirt-guests.sh "$@"
Index: libvirt-2.3.0/tools/libvirt-guests.sh.in Index: libvirt-2.4.0/tools/libvirt-guests.sh.in
=================================================================== ===================================================================
--- libvirt-2.3.0.orig/tools/libvirt-guests.sh.in --- libvirt-2.4.0.orig/tools/libvirt-guests.sh.in
+++ libvirt-2.3.0/tools/libvirt-guests.sh.in +++ libvirt-2.4.0/tools/libvirt-guests.sh.in
@@ -16,14 +16,13 @@ @@ -16,14 +16,13 @@
# License along with this library. If not, see # License along with this library. If not, see
# <http://www.gnu.org/licenses/>. # <http://www.gnu.org/licenses/>.
@ -208,10 +208,10 @@ Index: libvirt-2.3.0/tools/libvirt-guests.sh.in
esac esac
-exit $RETVAL -exit $RETVAL
+rc_exit +rc_exit
Index: libvirt-2.3.0/tools/libvirt-guests.sysconf Index: libvirt-2.4.0/tools/libvirt-guests.sysconf
=================================================================== ===================================================================
--- libvirt-2.3.0.orig/tools/libvirt-guests.sysconf --- libvirt-2.4.0.orig/tools/libvirt-guests.sysconf
+++ libvirt-2.3.0/tools/libvirt-guests.sysconf +++ libvirt-2.4.0/tools/libvirt-guests.sysconf
@@ -1,19 +1,29 @@ @@ -1,19 +1,29 @@
+## Path: System/Virtualization/libvirt-guests +## Path: System/Virtualization/libvirt-guests
+ +

12
libvirt-power8-models.patch
View File

@ -2,10 +2,10 @@ Add POWER8 v2.0 and v2.1 to cpu map XML
From: <ro@suse.de> From: <ro@suse.de>
Index: libvirt-2.3.0/src/cpu/cpu_map.xml Index: libvirt-2.4.0/src/cpu/cpu_map.xml
=================================================================== ===================================================================
--- libvirt-2.3.0.orig/src/cpu/cpu_map.xml --- libvirt-2.4.0.orig/src/cpu/cpu_map.xml
+++ libvirt-2.3.0/src/cpu/cpu_map.xml +++ libvirt-2.4.0/src/cpu/cpu_map.xml
@@ -1542,6 +1542,16 @@ @@ -1542,6 +1542,16 @@
<pvr value='0x004d0000' mask='0xffff0000'/> <pvr value='0x004d0000' mask='0xffff0000'/>
</model> </model>
@ -23,10 +23,10 @@ Index: libvirt-2.3.0/src/cpu/cpu_map.xml
<!-- Freescale-based CPU models --> <!-- Freescale-based CPU models -->
<model name='POWERPC_e5500'> <model name='POWERPC_e5500'>
<vendor name='Freescale'/> <vendor name='Freescale'/>
Index: libvirt-2.3.0/tests/domaincapsschemadata/qemu_2.6.0.ppc64le.xml Index: libvirt-2.4.0/tests/domaincapsschemadata/qemu_2.6.0.ppc64le.xml
=================================================================== ===================================================================
--- libvirt-2.3.0.orig/tests/domaincapsschemadata/qemu_2.6.0.ppc64le.xml --- libvirt-2.4.0.orig/tests/domaincapsschemadata/qemu_2.6.0.ppc64le.xml
+++ libvirt-2.3.0/tests/domaincapsschemadata/qemu_2.6.0.ppc64le.xml +++ libvirt-2.4.0/tests/domaincapsschemadata/qemu_2.6.0.ppc64le.xml
@@ -26,6 +26,7 @@ @@ -26,6 +26,7 @@
<mode name='custom' supported='yes'> <mode name='custom' supported='yes'>
<model usable='unknown'>POWER8</model> <model usable='unknown'>POWER8</model>

34
libvirt-suse-netcontrol.patch
View File

@ -1,7 +1,7 @@
Index: libvirt-2.3.0/configure.ac Index: libvirt-2.4.0/configure.ac
=================================================================== ===================================================================
--- libvirt-2.3.0.orig/configure.ac --- libvirt-2.4.0.orig/configure.ac
+++ libvirt-2.3.0/configure.ac +++ libvirt-2.4.0/configure.ac
@@ -248,6 +248,7 @@ LIBVIRT_CHECK_FUSE @@ -248,6 +248,7 @@ LIBVIRT_CHECK_FUSE
LIBVIRT_CHECK_GLUSTER LIBVIRT_CHECK_GLUSTER
LIBVIRT_CHECK_HAL LIBVIRT_CHECK_HAL
@ -34,10 +34,10 @@ Index: libvirt-2.3.0/configure.ac
LIBVIRT_RESULT_NUMACTL LIBVIRT_RESULT_NUMACTL
LIBVIRT_RESULT_OPENWSMAN LIBVIRT_RESULT_OPENWSMAN
LIBVIRT_RESULT_PCIACCESS LIBVIRT_RESULT_PCIACCESS
Index: libvirt-2.3.0/src/Makefile.am Index: libvirt-2.4.0/src/Makefile.am
=================================================================== ===================================================================
--- libvirt-2.3.0.orig/src/Makefile.am --- libvirt-2.4.0.orig/src/Makefile.am
+++ libvirt-2.3.0/src/Makefile.am +++ libvirt-2.4.0/src/Makefile.am
@@ -952,6 +952,10 @@ if WITH_NETCF @@ -952,6 +952,10 @@ if WITH_NETCF
INTERFACE_DRIVER_SOURCES += \ INTERFACE_DRIVER_SOURCES += \
interface/interface_backend_netcf.c interface/interface_backend_netcf.c
@ -60,10 +60,10 @@ Index: libvirt-2.3.0/src/Makefile.am
if WITH_UDEV if WITH_UDEV
libvirt_driver_interface_la_CFLAGS += $(UDEV_CFLAGS) libvirt_driver_interface_la_CFLAGS += $(UDEV_CFLAGS)
libvirt_driver_interface_la_LIBADD += $(UDEV_LIBS) libvirt_driver_interface_la_LIBADD += $(UDEV_LIBS)
Index: libvirt-2.3.0/tools/virsh.c Index: libvirt-2.4.0/tools/virsh.c
=================================================================== ===================================================================
--- libvirt-2.3.0.orig/tools/virsh.c --- libvirt-2.4.0.orig/tools/virsh.c
+++ libvirt-2.3.0/tools/virsh.c +++ libvirt-2.4.0/tools/virsh.c
@@ -602,6 +602,8 @@ virshShowVersion(vshControl *ctl ATTRIBU @@ -602,6 +602,8 @@ virshShowVersion(vshControl *ctl ATTRIBU
vshPrint(ctl, " Interface"); vshPrint(ctl, " Interface");
# if defined(WITH_NETCF) # if defined(WITH_NETCF)
@ -73,10 +73,10 @@ Index: libvirt-2.3.0/tools/virsh.c
# elif defined(WITH_UDEV) # elif defined(WITH_UDEV)
vshPrint(ctl, " udev"); vshPrint(ctl, " udev");
# endif # endif
Index: libvirt-2.3.0/src/interface/interface_backend_netcf.c Index: libvirt-2.4.0/src/interface/interface_backend_netcf.c
=================================================================== ===================================================================
--- libvirt-2.3.0.orig/src/interface/interface_backend_netcf.c --- libvirt-2.4.0.orig/src/interface/interface_backend_netcf.c
+++ libvirt-2.3.0/src/interface/interface_backend_netcf.c +++ libvirt-2.4.0/src/interface/interface_backend_netcf.c
@@ -23,7 +23,12 @@ @@ -23,7 +23,12 @@
#include <config.h> #include <config.h>
@ -160,10 +160,10 @@ Index: libvirt-2.3.0/src/interface/interface_backend_netcf.c
if (virSetSharedInterfaceDriver(&interfaceDriver) < 0) if (virSetSharedInterfaceDriver(&interfaceDriver) < 0)
return -1; return -1;
if (virRegisterStateDriver(&interfaceStateDriver) < 0) if (virRegisterStateDriver(&interfaceStateDriver) < 0)
Index: libvirt-2.3.0/src/interface/interface_driver.c Index: libvirt-2.4.0/src/interface/interface_driver.c
=================================================================== ===================================================================
--- libvirt-2.3.0.orig/src/interface/interface_driver.c --- libvirt-2.4.0.orig/src/interface/interface_driver.c
+++ libvirt-2.3.0/src/interface/interface_driver.c +++ libvirt-2.4.0/src/interface/interface_driver.c
@@ -30,8 +30,15 @@ interfaceRegister(void) @@ -30,8 +30,15 @@ interfaceRegister(void)
if (netcfIfaceRegister() == 0) if (netcfIfaceRegister() == 0)
return 0; return 0;
@ -181,10 +181,10 @@ Index: libvirt-2.3.0/src/interface/interface_driver.c
if (udevIfaceRegister() == 0) if (udevIfaceRegister() == 0)
return 0; return 0;
#endif /* WITH_UDEV */ #endif /* WITH_UDEV */
Index: libvirt-2.3.0/m4/virt-netcontrol.m4 Index: libvirt-2.4.0/m4/virt-netcontrol.m4
=================================================================== ===================================================================
--- /dev/null --- /dev/null
+++ libvirt-2.3.0/m4/virt-netcontrol.m4 +++ libvirt-2.4.0/m4/virt-netcontrol.m4
@@ -0,0 +1,35 @@ @@ -0,0 +1,35 @@
+dnl The libnetcontrol library +dnl The libnetcontrol library
+dnl +dnl

7
libvirt.changes
View File

@ -1,3 +1,10 @@
-------------------------------------------------------------------
Wed Nov 2 16:44:57 UTC 2016 - jfehlig@suse.com
- Update to libvirt 2.4.0
- Many incremental improvements and bug fixes, see
http://libvirt.org/news.html
------------------------------------------------------------------- -------------------------------------------------------------------
Wed Oct 5 13:58:27 UTC 2016 - jfehlig@suse.com Wed Oct 5 13:58:27 UTC 2016 - jfehlig@suse.com

2
libvirt.spec
View File

@ -174,7 +174,7 @@
Name: libvirt Name: libvirt
Url: http://libvirt.org/ Url: http://libvirt.org/
Version: 2.3.0 Version: 2.4.0
Release: 0 Release: 0
Summary: Library providing a simple virtualization API Summary: Library providing a simple virtualization API
License: LGPL-2.1+ License: LGPL-2.1+

18
libvirtd-defaults.patch
View File

@ -1,7 +1,7 @@
Index: libvirt-2.3.0/daemon/libvirtd.conf Index: libvirt-2.4.0/daemon/libvirtd.conf
=================================================================== ===================================================================
--- libvirt-2.3.0.orig/daemon/libvirtd.conf --- libvirt-2.4.0.orig/daemon/libvirtd.conf
+++ libvirt-2.3.0/daemon/libvirtd.conf +++ libvirt-2.4.0/daemon/libvirtd.conf
@@ -18,8 +18,8 @@ @@ -18,8 +18,8 @@
# It is necessary to setup a CA and issue server certificates before # It is necessary to setup a CA and issue server certificates before
# using this capability. # using this capability.
@ -13,10 +13,10 @@ Index: libvirt-2.3.0/daemon/libvirtd.conf
# Listen for unencrypted TCP connections on the public TCP/IP port. # Listen for unencrypted TCP connections on the public TCP/IP port.
# NB, must pass the --listen flag to the libvirtd process for this to # NB, must pass the --listen flag to the libvirtd process for this to
Index: libvirt-2.3.0/daemon/libvirtd-config.c Index: libvirt-2.4.0/daemon/libvirtd-config.c
=================================================================== ===================================================================
--- libvirt-2.3.0.orig/daemon/libvirtd-config.c --- libvirt-2.4.0.orig/daemon/libvirtd-config.c
+++ libvirt-2.3.0/daemon/libvirtd-config.c +++ libvirt-2.4.0/daemon/libvirtd-config.c
@@ -109,7 +109,7 @@ daemonConfigNew(bool privileged ATTRIBUT @@ -109,7 +109,7 @@ daemonConfigNew(bool privileged ATTRIBUT
if (VIR_ALLOC(data) < 0) if (VIR_ALLOC(data) < 0)
return NULL; return NULL;
@ -26,10 +26,10 @@ Index: libvirt-2.3.0/daemon/libvirtd-config.c
data->listen_tcp = 0; data->listen_tcp = 0;
if (VIR_STRDUP(data->tls_port, LIBVIRTD_TLS_PORT) < 0 || if (VIR_STRDUP(data->tls_port, LIBVIRTD_TLS_PORT) < 0 ||
Index: libvirt-2.3.0/daemon/test_libvirtd.aug.in Index: libvirt-2.4.0/daemon/test_libvirtd.aug.in
=================================================================== ===================================================================
--- libvirt-2.3.0.orig/daemon/test_libvirtd.aug.in --- libvirt-2.4.0.orig/daemon/test_libvirtd.aug.in
+++ libvirt-2.3.0/daemon/test_libvirtd.aug.in +++ libvirt-2.4.0/daemon/test_libvirtd.aug.in
@@ -2,7 +2,7 @@ module Test_libvirtd = @@ -2,7 +2,7 @@ module Test_libvirtd =
::CONFIG:: ::CONFIG::

6
libvirtd-init-script.patch
View File

@ -1,9 +1,9 @@
Adjust libvirtd sysconfig file to conform to SUSE standards Adjust libvirtd sysconfig file to conform to SUSE standards
Index: libvirt-2.3.0/daemon/libvirtd.sysconf Index: libvirt-2.4.0/daemon/libvirtd.sysconf
=================================================================== ===================================================================
--- libvirt-2.3.0.orig/daemon/libvirtd.sysconf --- libvirt-2.4.0.orig/daemon/libvirtd.sysconf
+++ libvirt-2.3.0/daemon/libvirtd.sysconf +++ libvirt-2.4.0/daemon/libvirtd.sysconf
@@ -1,16 +1,25 @@ @@ -1,16 +1,25 @@
+## Path: System/Virtualization/libvirt +## Path: System/Virtualization/libvirt
+ +

6
libxl-dom-reset.patch
View File

@ -8,10 +8,10 @@ Date: Mon Jun 23 15:51:20 2014 -0600
option, but domainReset can be implemented in the libxl driver by option, but domainReset can be implemented in the libxl driver by
forcibly destroying the domain and starting it again. forcibly destroying the domain and starting it again.
Index: libvirt-2.3.0/src/libxl/libxl_driver.c Index: libvirt-2.4.0/src/libxl/libxl_driver.c
=================================================================== ===================================================================
--- libvirt-2.3.0.orig/src/libxl/libxl_driver.c --- libvirt-2.4.0.orig/src/libxl/libxl_driver.c
+++ libvirt-2.3.0/src/libxl/libxl_driver.c +++ libvirt-2.4.0/src/libxl/libxl_driver.c
@@ -1384,6 +1384,61 @@ libxlDomainReboot(virDomainPtr dom, unsi @@ -1384,6 +1384,61 @@ libxlDomainReboot(virDomainPtr dom, unsi
} }

6
libxl-qemu-emulator-caps.patch
View File

@ -8,10 +8,10 @@ as the default <emulator>, instead of the qemu-xen one.
See FATE#320638 for details. See FATE#320638 for details.
Index: libvirt-2.3.0/src/libxl/libxl_capabilities.c Index: libvirt-2.4.0/src/libxl/libxl_capabilities.c
=================================================================== ===================================================================
--- libvirt-2.3.0.orig/src/libxl/libxl_capabilities.c --- libvirt-2.4.0.orig/src/libxl/libxl_capabilities.c
+++ libvirt-2.3.0/src/libxl/libxl_capabilities.c +++ libvirt-2.4.0/src/libxl/libxl_capabilities.c
@@ -38,6 +38,7 @@ @@ -38,6 +38,7 @@
#include "libxl_capabilities.h" #include "libxl_capabilities.h"
#include "cpu/cpu_x86.h" #include "cpu/cpu_x86.h"

6
libxl-set-cach-mode.patch
View File

@ -3,10 +3,10 @@ https://bugzilla.novell.com/show_bug.cgi?id=879425
src/libxl/libxl_conf.c | 25 +++++++++++++++++++++++++ src/libxl/libxl_conf.c | 25 +++++++++++++++++++++++++
1 file changed, 25 insertions(+) 1 file changed, 25 insertions(+)
Index: libvirt-2.3.0/src/libxl/libxl_conf.c Index: libvirt-2.4.0/src/libxl/libxl_conf.c
=================================================================== ===================================================================
--- libvirt-2.3.0.orig/src/libxl/libxl_conf.c --- libvirt-2.4.0.orig/src/libxl/libxl_conf.c
+++ libvirt-2.3.0/src/libxl/libxl_conf.c +++ libvirt-2.4.0/src/libxl/libxl_conf.c
@@ -584,6 +584,30 @@ libxlDiskSetDiscard(libxl_device_disk *x @@ -584,6 +584,30 @@ libxlDiskSetDiscard(libxl_device_disk *x
#endif #endif
} }

60
libxl-set-migration-constraints.patch
View File

@ -16,10 +16,10 @@ Signed-off-by: Jim Fehlig <jfehlig@suse.com>
tools/virsh.pod | 8 ++++++++ tools/virsh.pod | 8 ++++++++
6 files changed, 125 insertions(+), 6 deletions(-) 6 files changed, 125 insertions(+), 6 deletions(-)
Index: libvirt-2.3.0/include/libvirt/libvirt-domain.h Index: libvirt-2.4.0/include/libvirt/libvirt-domain.h
=================================================================== ===================================================================
--- libvirt-2.3.0.orig/include/libvirt/libvirt-domain.h --- libvirt-2.4.0.orig/include/libvirt/libvirt-domain.h
+++ libvirt-2.3.0/include/libvirt/libvirt-domain.h +++ libvirt-2.4.0/include/libvirt/libvirt-domain.h
@@ -889,6 +889,31 @@ typedef enum { @@ -889,6 +889,31 @@ typedef enum {
*/ */
# define VIR_MIGRATE_PARAM_AUTO_CONVERGE_INCREMENT "auto_converge.increment" # define VIR_MIGRATE_PARAM_AUTO_CONVERGE_INCREMENT "auto_converge.increment"
@ -52,10 +52,10 @@ Index: libvirt-2.3.0/include/libvirt/libvirt-domain.h
/* Domain migration. */ /* Domain migration. */
virDomainPtr virDomainMigrate (virDomainPtr domain, virConnectPtr dconn, virDomainPtr virDomainMigrate (virDomainPtr domain, virConnectPtr dconn,
unsigned long flags, const char *dname, unsigned long flags, const char *dname,
Index: libvirt-2.3.0/src/libxl/libxl_driver.c Index: libvirt-2.4.0/src/libxl/libxl_driver.c
=================================================================== ===================================================================
--- libvirt-2.3.0.orig/src/libxl/libxl_driver.c --- libvirt-2.4.0.orig/src/libxl/libxl_driver.c
+++ libvirt-2.3.0/src/libxl/libxl_driver.c +++ libvirt-2.4.0/src/libxl/libxl_driver.c
@@ -6044,6 +6044,9 @@ libxlDomainMigratePerform3Params(virDoma @@ -6044,6 +6044,9 @@ libxlDomainMigratePerform3Params(virDoma
const char *dname = NULL; const char *dname = NULL;
const char *uri = NULL; const char *uri = NULL;
@ -99,10 +99,10 @@ Index: libvirt-2.3.0/src/libxl/libxl_driver.c
goto cleanup; goto cleanup;
} }
Index: libvirt-2.3.0/src/libxl/libxl_migration.c Index: libvirt-2.4.0/src/libxl/libxl_migration.c
=================================================================== ===================================================================
--- libvirt-2.3.0.orig/src/libxl/libxl_migration.c --- libvirt-2.4.0.orig/src/libxl/libxl_migration.c
+++ libvirt-2.3.0/src/libxl/libxl_migration.c +++ libvirt-2.4.0/src/libxl/libxl_migration.c
@@ -358,18 +358,39 @@ libxlMigrateReceive(virNetSocketPtr sock @@ -358,18 +358,39 @@ libxlMigrateReceive(virNetSocketPtr sock
static int static int
libxlDoMigrateSend(libxlDriverPrivatePtr driver, libxlDoMigrateSend(libxlDriverPrivatePtr driver,
@ -145,7 +145,7 @@ Index: libvirt-2.3.0/src/libxl/libxl_migration.c
if (ret != 0) { if (ret != 0) {
virReportError(VIR_ERR_INTERNAL_ERROR, "%s", virReportError(VIR_ERR_INTERNAL_ERROR, "%s",
_("Failed to send migration data to destination host")); _("Failed to send migration data to destination host"));
@@ -723,7 +744,7 @@ libxlDoMigrateP2P(libxlDriverPrivatePtr @@ -727,7 +748,7 @@ libxlDoMigrateP2P(libxlDriverPrivatePtr
const char *dconnuri ATTRIBUTE_UNUSED, const char *dconnuri ATTRIBUTE_UNUSED,
const char *dname, const char *dname,
const char *uri, const char *uri,
@ -154,7 +154,7 @@ Index: libvirt-2.3.0/src/libxl/libxl_migration.c
{ {
virDomainPtr ddomain = NULL; virDomainPtr ddomain = NULL;
virTypedParameterPtr params = NULL; virTypedParameterPtr params = NULL;
@@ -760,7 +781,7 @@ libxlDoMigrateP2P(libxlDriverPrivatePtr @@ -764,7 +785,7 @@ libxlDoMigrateP2P(libxlDriverPrivatePtr
/* We don't require the destination to have P2P support /* We don't require the destination to have P2P support
* as it looks to be normal migration from the receiver perpective. * as it looks to be normal migration from the receiver perpective.
*/ */
@ -163,7 +163,7 @@ Index: libvirt-2.3.0/src/libxl/libxl_migration.c
VIR_DEBUG("Prepare3"); VIR_DEBUG("Prepare3");
virObjectUnlock(vm); virObjectUnlock(vm);
@@ -785,7 +806,7 @@ libxlDoMigrateP2P(libxlDriverPrivatePtr @@ -789,7 +810,7 @@ libxlDoMigrateP2P(libxlDriverPrivatePtr
VIR_DEBUG("Perform3 uri=%s", NULLSTR(uri_out)); VIR_DEBUG("Perform3 uri=%s", NULLSTR(uri_out));
ret = libxlDomainMigrationPerform(driver, vm, NULL, NULL, ret = libxlDomainMigrationPerform(driver, vm, NULL, NULL,
@ -172,7 +172,7 @@ Index: libvirt-2.3.0/src/libxl/libxl_migration.c
if (ret < 0) if (ret < 0)
orig_err = virSaveLastError(); orig_err = virSaveLastError();
@@ -817,7 +838,7 @@ libxlDoMigrateP2P(libxlDriverPrivatePtr @@ -821,7 +842,7 @@ libxlDoMigrateP2P(libxlDriverPrivatePtr
orig_err = virSaveLastError(); orig_err = virSaveLastError();
VIR_DEBUG("Confirm3 cancelled=%d vm=%p", cancelled, vm); VIR_DEBUG("Confirm3 cancelled=%d vm=%p", cancelled, vm);
@ -181,7 +181,7 @@ Index: libvirt-2.3.0/src/libxl/libxl_migration.c
if (ret < 0) if (ret < 0)
VIR_WARN("Guest %s probably left in 'paused' state on source", VIR_WARN("Guest %s probably left in 'paused' state on source",
@@ -866,7 +887,7 @@ libxlDomainMigrationPerformP2P(libxlDriv @@ -870,7 +891,7 @@ libxlDomainMigrationPerformP2P(libxlDriv
const char *dconnuri, const char *dconnuri,
const char *uri_str ATTRIBUTE_UNUSED, const char *uri_str ATTRIBUTE_UNUSED,
const char *dname, const char *dname,
@ -190,7 +190,7 @@ Index: libvirt-2.3.0/src/libxl/libxl_migration.c
{ {
int ret = -1; int ret = -1;
bool useParams; bool useParams;
@@ -901,7 +922,7 @@ libxlDomainMigrationPerformP2P(libxlDriv @@ -905,7 +926,7 @@ libxlDomainMigrationPerformP2P(libxlDriv
} }
ret = libxlDoMigrateP2P(driver, vm, sconn, xmlin, dconn, dconnuri, ret = libxlDoMigrateP2P(driver, vm, sconn, xmlin, dconn, dconnuri,
@ -199,7 +199,7 @@ Index: libvirt-2.3.0/src/libxl/libxl_migration.c
cleanup: cleanup:
orig_err = virSaveLastError(); orig_err = virSaveLastError();
@@ -923,7 +944,7 @@ libxlDomainMigrationPerform(libxlDriverP @@ -927,7 +948,7 @@ libxlDomainMigrationPerform(libxlDriverP
const char *dconnuri ATTRIBUTE_UNUSED, const char *dconnuri ATTRIBUTE_UNUSED,
const char *uri_str, const char *uri_str,
const char *dname ATTRIBUTE_UNUSED, const char *dname ATTRIBUTE_UNUSED,
@ -208,7 +208,7 @@ Index: libvirt-2.3.0/src/libxl/libxl_migration.c
{ {
libxlDomainObjPrivatePtr priv = vm->privateData; libxlDomainObjPrivatePtr priv = vm->privateData;
char *hostname = NULL; char *hostname = NULL;
@@ -963,7 +984,7 @@ libxlDomainMigrationPerform(libxlDriverP @@ -967,7 +988,7 @@ libxlDomainMigrationPerform(libxlDriverP
/* suspend vm and send saved data to dst through socket fd */ /* suspend vm and send saved data to dst through socket fd */
virObjectUnlock(vm); virObjectUnlock(vm);
@ -217,10 +217,10 @@ Index: libvirt-2.3.0/src/libxl/libxl_migration.c
virObjectLock(vm); virObjectLock(vm);
cleanup: cleanup:
Index: libvirt-2.3.0/src/libxl/libxl_migration.h Index: libvirt-2.4.0/src/libxl/libxl_migration.h
=================================================================== ===================================================================
--- libvirt-2.3.0.orig/src/libxl/libxl_migration.h --- libvirt-2.4.0.orig/src/libxl/libxl_migration.h
+++ libvirt-2.3.0/src/libxl/libxl_migration.h +++ libvirt-2.4.0/src/libxl/libxl_migration.h
@@ -38,6 +38,10 @@ @@ -38,6 +38,10 @@
VIR_MIGRATE_PARAM_URI, VIR_TYPED_PARAM_STRING, \ VIR_MIGRATE_PARAM_URI, VIR_TYPED_PARAM_STRING, \
VIR_MIGRATE_PARAM_DEST_NAME, VIR_TYPED_PARAM_STRING, \ VIR_MIGRATE_PARAM_DEST_NAME, VIR_TYPED_PARAM_STRING, \
@ -265,11 +265,11 @@ Index: libvirt-2.3.0/src/libxl/libxl_migration.h
virDomainPtr virDomainPtr
libxlDomainMigrationFinish(virConnectPtr dconn, libxlDomainMigrationFinish(virConnectPtr dconn,
Index: libvirt-2.3.0/tools/virsh-domain.c Index: libvirt-2.4.0/tools/virsh-domain.c
=================================================================== ===================================================================
--- libvirt-2.3.0.orig/tools/virsh-domain.c --- libvirt-2.4.0.orig/tools/virsh-domain.c
+++ libvirt-2.3.0/tools/virsh-domain.c +++ libvirt-2.4.0/tools/virsh-domain.c
@@ -9980,6 +9980,22 @@ static const vshCmdOptDef opts_migrate[] @@ -10104,6 +10104,22 @@ static const vshCmdOptDef opts_migrate[]
.type = VSH_OT_INT, .type = VSH_OT_INT,
.help = N_("CPU throttling rate increment for auto-convergence") .help = N_("CPU throttling rate increment for auto-convergence")
}, },
@ -292,7 +292,7 @@ Index: libvirt-2.3.0/tools/virsh-domain.c
{.name = NULL} {.name = NULL}
}; };
@@ -10003,6 +10019,7 @@ doMigrate(void *opaque) @@ -10127,6 +10143,7 @@ doMigrate(void *opaque)
unsigned long long ullOpt = 0; unsigned long long ullOpt = 0;
int rv; int rv;
virConnectPtr dconn = data->dconn; virConnectPtr dconn = data->dconn;
@ -300,7 +300,7 @@ Index: libvirt-2.3.0/tools/virsh-domain.c
sigemptyset(&sigmask); sigemptyset(&sigmask);
sigaddset(&sigmask, SIGINT); sigaddset(&sigmask, SIGINT);
@@ -10122,6 +10139,27 @@ doMigrate(void *opaque) @@ -10246,6 +10263,27 @@ doMigrate(void *opaque)
goto save_error; goto save_error;
} }
@ -328,11 +328,11 @@ Index: libvirt-2.3.0/tools/virsh-domain.c
if (vshCommandOptStringReq(ctl, cmd, "xml", &opt) < 0) if (vshCommandOptStringReq(ctl, cmd, "xml", &opt) < 0)
goto out; goto out;
if (opt) { if (opt) {
Index: libvirt-2.3.0/tools/virsh.pod Index: libvirt-2.4.0/tools/virsh.pod
=================================================================== ===================================================================
--- libvirt-2.3.0.orig/tools/virsh.pod --- libvirt-2.4.0.orig/tools/virsh.pod
+++ libvirt-2.3.0/tools/virsh.pod +++ libvirt-2.4.0/tools/virsh.pod
@@ -1668,6 +1668,14 @@ compression. I<--comp-mt-threads> and I< @@ -1699,6 +1699,14 @@ compression. I<--comp-mt-threads> and I<
of compress threads on source and the number of decompress threads on target of compress threads on source and the number of decompress threads on target
respectively. I<--comp-xbzrle-cache> sets size of page cache in bytes. respectively. I<--comp-xbzrle-cache> sets size of page cache in bytes.

6
libxl-support-block-script.patch
View File

@ -7,10 +7,10 @@ and npiv.
For more details, see bsc#954872 and FATE#319810 For more details, see bsc#954872 and FATE#319810
Index: libvirt-2.3.0/src/libxl/libxl_conf.c Index: libvirt-2.4.0/src/libxl/libxl_conf.c
=================================================================== ===================================================================
--- libvirt-2.3.0.orig/src/libxl/libxl_conf.c --- libvirt-2.4.0.orig/src/libxl/libxl_conf.c
+++ libvirt-2.3.0/src/libxl/libxl_conf.c +++ libvirt-2.4.0/src/libxl/libxl_conf.c
@@ -584,6 +584,25 @@ libxlDiskSetDiscard(libxl_device_disk *x @@ -584,6 +584,25 @@ libxlDiskSetDiscard(libxl_device_disk *x
#endif #endif
} }

22
lxc-wait-after-eth-del.patch
View File

@ -13,10 +13,10 @@ device with the same name that is being created.
src/lxc/lxc_process.c | 1 + src/lxc/lxc_process.c | 1 +
3 files changed, 4 insertions(+) 3 files changed, 4 insertions(+)
Index: libvirt-2.3.0/src/lxc/lxc_controller.c Index: libvirt-2.4.0/src/lxc/lxc_controller.c
=================================================================== ===================================================================
--- libvirt-2.3.0.orig/src/lxc/lxc_controller.c --- libvirt-2.4.0.orig/src/lxc/lxc_controller.c
+++ libvirt-2.3.0/src/lxc/lxc_controller.c +++ libvirt-2.4.0/src/lxc/lxc_controller.c
@@ -2009,6 +2009,7 @@ static int virLXCControllerDeleteInterfa @@ -2009,6 +2009,7 @@ static int virLXCControllerDeleteInterfa
if (virNetDevVethDelete(ctrl->veths[i]) < 0) if (virNetDevVethDelete(ctrl->veths[i]) < 0)
ret = -1; ret = -1;
@ -25,11 +25,11 @@ Index: libvirt-2.3.0/src/lxc/lxc_controller.c
return ret; return ret;
} }
Index: libvirt-2.3.0/src/lxc/lxc_driver.c Index: libvirt-2.4.0/src/lxc/lxc_driver.c
=================================================================== ===================================================================
--- libvirt-2.3.0.orig/src/lxc/lxc_driver.c --- libvirt-2.4.0.orig/src/lxc/lxc_driver.c
+++ libvirt-2.3.0/src/lxc/lxc_driver.c +++ libvirt-2.4.0/src/lxc/lxc_driver.c
@@ -4025,6 +4025,7 @@ lxcDomainAttachDeviceNetLive(virConnectP @@ -4031,6 +4031,7 @@ lxcDomainAttachDeviceNetLive(virConnectP
case VIR_DOMAIN_NET_TYPE_NETWORK: case VIR_DOMAIN_NET_TYPE_NETWORK:
case VIR_DOMAIN_NET_TYPE_ETHERNET: case VIR_DOMAIN_NET_TYPE_ETHERNET:
ignore_value(virNetDevVethDelete(veth)); ignore_value(virNetDevVethDelete(veth));
@ -37,7 +37,7 @@ Index: libvirt-2.3.0/src/lxc/lxc_driver.c
break; break;
case VIR_DOMAIN_NET_TYPE_DIRECT: case VIR_DOMAIN_NET_TYPE_DIRECT:
@@ -4454,6 +4455,7 @@ lxcDomainDetachDeviceNetLive(virDomainOb @@ -4465,6 +4466,7 @@ lxcDomainDetachDeviceNetLive(virDomainOb
virDomainAuditNet(vm, detach, NULL, "detach", false); virDomainAuditNet(vm, detach, NULL, "detach", false);
goto cleanup; goto cleanup;
} }
@ -45,10 +45,10 @@ Index: libvirt-2.3.0/src/lxc/lxc_driver.c
break; break;
/* It'd be nice to support this, but with macvlan /* It'd be nice to support this, but with macvlan
Index: libvirt-2.3.0/src/lxc/lxc_process.c Index: libvirt-2.4.0/src/lxc/lxc_process.c
=================================================================== ===================================================================
--- libvirt-2.3.0.orig/src/lxc/lxc_process.c --- libvirt-2.4.0.orig/src/lxc/lxc_process.c
+++ libvirt-2.3.0/src/lxc/lxc_process.c +++ libvirt-2.4.0/src/lxc/lxc_process.c
@@ -221,6 +221,7 @@ static void virLXCProcessCleanup(virLXCD @@ -221,6 +221,7 @@ static void virLXCProcessCleanup(virLXCD
} }
networkReleaseActualDevice(vm->def, iface); networkReleaseActualDevice(vm->def, iface);

6
ppc64le-canonical-name.patch
View File

@ -2,10 +2,10 @@ Canonicalize hostarch name ppc64le to ppc64
See bnc#894956 See bnc#894956
Index: libvirt-2.3.0/src/util/virarch.c Index: libvirt-2.4.0/src/util/virarch.c
=================================================================== ===================================================================
--- libvirt-2.3.0.orig/src/util/virarch.c --- libvirt-2.4.0.orig/src/util/virarch.c
+++ libvirt-2.3.0/src/util/virarch.c +++ libvirt-2.4.0/src/util/virarch.c
@@ -169,6 +169,8 @@ virArch virArchFromHost(void) @@ -169,6 +169,8 @@ virArch virArchFromHost(void)
arch = VIR_ARCH_I686; arch = VIR_ARCH_I686;
} else if (STREQ(ut.machine, "amd64")) { } else if (STREQ(ut.machine, "amd64")) {

6
qemu-apparmor-screenshot.patch
View File

@ -1,7 +1,7 @@
Index: libvirt-2.3.0/examples/apparmor/libvirt-qemu Index: libvirt-2.4.0/examples/apparmor/libvirt-qemu
=================================================================== ===================================================================
--- libvirt-2.3.0.orig/examples/apparmor/libvirt-qemu --- libvirt-2.4.0.orig/examples/apparmor/libvirt-qemu
+++ libvirt-2.3.0/examples/apparmor/libvirt-qemu +++ libvirt-2.4.0/examples/apparmor/libvirt-qemu
@@ -151,3 +151,6 @@ @@ -151,3 +151,6 @@
/etc/udev/udev.conf r, /etc/udev/udev.conf r,
/sys/bus/ r, /sys/bus/ r,

12
support-managed-pci-xen-driver.patch
View File

@ -8,10 +8,10 @@ Subject: [PATCH] support managed pci devices in xen driver
src/xenxs/xen_xm.c | 28 +++++++++++++++++++++++++++- src/xenxs/xen_xm.c | 28 +++++++++++++++++++++++++++-
2 files changed, 35 insertions(+), 15 deletions(-) 2 files changed, 35 insertions(+), 15 deletions(-)
Index: libvirt-2.3.0/src/xenconfig/xen_common.c Index: libvirt-2.4.0/src/xenconfig/xen_common.c
=================================================================== ===================================================================
--- libvirt-2.3.0.orig/src/xenconfig/xen_common.c --- libvirt-2.4.0.orig/src/xenconfig/xen_common.c
+++ libvirt-2.3.0/src/xenconfig/xen_common.c +++ libvirt-2.4.0/src/xenconfig/xen_common.c
@@ -394,6 +394,8 @@ xenParsePCI(virConfPtr conf, virDomainDe @@ -394,6 +394,8 @@ xenParsePCI(virConfPtr conf, virDomainDe
{ {
virConfValuePtr list = virConfGetValue(conf, "pci"); virConfValuePtr list = virConfGetValue(conf, "pci");
@ -66,10 +66,10 @@ Index: libvirt-2.3.0/src/xenconfig/xen_common.c
hostdev->source.subsys.type = VIR_DOMAIN_HOSTDEV_SUBSYS_TYPE_PCI; hostdev->source.subsys.type = VIR_DOMAIN_HOSTDEV_SUBSYS_TYPE_PCI;
hostdev->source.subsys.u.pci.addr.domain = domainID; hostdev->source.subsys.u.pci.addr.domain = domainID;
hostdev->source.subsys.u.pci.addr.bus = busID; hostdev->source.subsys.u.pci.addr.bus = busID;
Index: libvirt-2.3.0/src/xenconfig/xen_sxpr.c Index: libvirt-2.4.0/src/xenconfig/xen_sxpr.c
=================================================================== ===================================================================
--- libvirt-2.3.0.orig/src/xenconfig/xen_sxpr.c --- libvirt-2.4.0.orig/src/xenconfig/xen_sxpr.c
+++ libvirt-2.3.0/src/xenconfig/xen_sxpr.c +++ libvirt-2.4.0/src/xenconfig/xen_sxpr.c
@@ -1062,6 +1062,7 @@ xenParseSxprPCI(virDomainDefPtr def, @@ -1062,6 +1062,7 @@ xenParseSxprPCI(virDomainDefPtr def,
int busID; int busID;
int slotID; int slotID;

12
suse-qemu-conf.patch
View File

@ -7,11 +7,11 @@ suse-qemu-conf-secdriver.patch, suse-qemu-conf-lockmgr.patch,
etc.), but for now they are all lumped together in this etc.), but for now they are all lumped together in this
single patch. single patch.
Index: libvirt-2.3.0/src/qemu/qemu.conf Index: libvirt-2.4.0/src/qemu/qemu.conf
=================================================================== ===================================================================
--- libvirt-2.3.0.orig/src/qemu/qemu.conf --- libvirt-2.4.0.orig/src/qemu/qemu.conf
+++ libvirt-2.3.0/src/qemu/qemu.conf +++ libvirt-2.4.0/src/qemu/qemu.conf
@@ -259,11 +259,20 @@ @@ -283,11 +283,20 @@
# isolation, but it cannot appear in a list of drivers. # isolation, but it cannot appear in a list of drivers.
# #
#security_driver = "selinux" #security_driver = "selinux"
@ -34,7 +34,7 @@ Index: libvirt-2.3.0/src/qemu/qemu.conf
# If set to non-zero, then attempts to create unconfined # If set to non-zero, then attempts to create unconfined
# guests will be blocked. Defaults to 0. # guests will be blocked. Defaults to 0.
@@ -507,11 +516,22 @@ @@ -531,11 +540,22 @@
#allow_disk_format_probing = 1 #allow_disk_format_probing = 1
@ -62,7 +62,7 @@ Index: libvirt-2.3.0/src/qemu/qemu.conf
# #
#lock_manager = "lockd" #lock_manager = "lockd"
@@ -602,9 +622,8 @@ @@ -626,9 +646,8 @@
# for x86_64 and i686, but it's AAVMF for aarch64. The libvirt default # for x86_64 and i686, but it's AAVMF for aarch64. The libvirt default
# follows this scheme. # follows this scheme.
#nvram = [ #nvram = [

6
systemd-service-xen.patch
View File

@ -1,7 +1,7 @@
Index: libvirt-2.3.0/daemon/libvirtd.service.in Index: libvirt-2.4.0/daemon/libvirtd.service.in
=================================================================== ===================================================================
--- libvirt-2.3.0.orig/daemon/libvirtd.service.in --- libvirt-2.4.0.orig/daemon/libvirtd.service.in
+++ libvirt-2.3.0/daemon/libvirtd.service.in +++ libvirt-2.4.0/daemon/libvirtd.service.in
@@ -13,6 +13,7 @@ After=iscsid.service @@ -13,6 +13,7 @@ After=iscsid.service
After=apparmor.service After=apparmor.service
After=local-fs.target After=local-fs.target

12
virtlockd-init-script.patch
View File

@ -1,9 +1,9 @@
Adjust virtlockd init files to conform to SUSE standards Adjust virtlockd init files to conform to SUSE standards
Index: libvirt-2.3.0/src/locking/virtlockd.sysconf Index: libvirt-2.4.0/src/locking/virtlockd.sysconf
=================================================================== ===================================================================
--- libvirt-2.3.0.orig/src/locking/virtlockd.sysconf --- libvirt-2.4.0.orig/src/locking/virtlockd.sysconf
+++ libvirt-2.3.0/src/locking/virtlockd.sysconf +++ libvirt-2.4.0/src/locking/virtlockd.sysconf
@@ -1,3 +1,7 @@ @@ -1,3 +1,7 @@
+## Path: System/Virtualization/virtlockd +## Path: System/Virtualization/virtlockd
+ +
@ -12,10 +12,10 @@ Index: libvirt-2.3.0/src/locking/virtlockd.sysconf
# #
# Pass extra arguments to virtlockd # Pass extra arguments to virtlockd
#VIRTLOCKD_ARGS= #VIRTLOCKD_ARGS=
Index: libvirt-2.3.0/src/locking/virtlockd.init.in Index: libvirt-2.4.0/src/locking/virtlockd.init.in
=================================================================== ===================================================================
--- libvirt-2.3.0.orig/src/locking/virtlockd.init.in --- libvirt-2.4.0.orig/src/locking/virtlockd.init.in
+++ libvirt-2.3.0/src/locking/virtlockd.init.in +++ libvirt-2.4.0/src/locking/virtlockd.init.in
@@ -4,59 +4,57 @@ @@ -4,59 +4,57 @@
# http://refspecs.linuxfoundation.org/LSB_5.0.0/LSB-Core-generic/LSB-Core-generic/initscrcomconv.html # http://refspecs.linuxfoundation.org/LSB_5.0.0/LSB-Core-generic/LSB-Core-generic/initscrcomconv.html
# #

12
virtlogd-init-script.patch
View File

@ -1,9 +1,9 @@
Adjust virtlogd init files to conform to SUSE standards Adjust virtlogd init files to conform to SUSE standards
Index: libvirt-2.3.0/src/logging/virtlogd.init.in Index: libvirt-2.4.0/src/logging/virtlogd.init.in
=================================================================== ===================================================================
--- libvirt-2.3.0.orig/src/logging/virtlogd.init.in --- libvirt-2.4.0.orig/src/logging/virtlogd.init.in
+++ libvirt-2.3.0/src/logging/virtlogd.init.in +++ libvirt-2.4.0/src/logging/virtlogd.init.in
@@ -4,59 +4,56 @@ @@ -4,59 +4,56 @@
# http://refspecs.linuxfoundation.org/LSB_5.0.0/LSB-Core-generic/LSB-Core-generic/initscrcomconv.html # http://refspecs.linuxfoundation.org/LSB_5.0.0/LSB-Core-generic/LSB-Core-generic/initscrcomconv.html
# #
@ -126,10 +126,10 @@ Index: libvirt-2.3.0/src/logging/virtlogd.init.in
esac esac
-exit $RETVAL -exit $RETVAL
+rc_exit +rc_exit
Index: libvirt-2.3.0/src/logging/virtlogd.sysconf Index: libvirt-2.4.0/src/logging/virtlogd.sysconf
=================================================================== ===================================================================
--- libvirt-2.3.0.orig/src/logging/virtlogd.sysconf --- libvirt-2.4.0.orig/src/logging/virtlogd.sysconf
+++ libvirt-2.3.0/src/logging/virtlogd.sysconf +++ libvirt-2.4.0/src/logging/virtlogd.sysconf
@@ -1,3 +1,7 @@ @@ -1,3 +1,7 @@
+## Path: System/Virtualization/virtlogd +## Path: System/Virtualization/virtlogd
+ +

6
xen-pv-cdrom.patch
View File

@ -1,7 +1,7 @@
Index: libvirt-2.3.0/src/xenconfig/xen_sxpr.c Index: libvirt-2.4.0/src/xenconfig/xen_sxpr.c
=================================================================== ===================================================================
--- libvirt-2.3.0.orig/src/xenconfig/xen_sxpr.c --- libvirt-2.4.0.orig/src/xenconfig/xen_sxpr.c
+++ libvirt-2.3.0/src/xenconfig/xen_sxpr.c +++ libvirt-2.4.0/src/xenconfig/xen_sxpr.c
@@ -392,7 +392,7 @@ xenParseSxprVifRate(const char *rate, un @@ -392,7 +392,7 @@ xenParseSxprVifRate(const char *rate, un
static int static int
xenParseSxprDisks(virDomainDefPtr def, xenParseSxprDisks(virDomainDefPtr def,

6
xen-sxpr-disk-type.patch
View File

@ -6,10 +6,10 @@ and 'file'. This was implicitly done prior to commit 9673418c.
https://bugzilla.suse.com/show_bug.cgi?id=938228 https://bugzilla.suse.com/show_bug.cgi?id=938228
Index: libvirt-2.3.0/src/xenconfig/xen_sxpr.c Index: libvirt-2.4.0/src/xenconfig/xen_sxpr.c
=================================================================== ===================================================================
--- libvirt-2.3.0.orig/src/xenconfig/xen_sxpr.c --- libvirt-2.4.0.orig/src/xenconfig/xen_sxpr.c
+++ libvirt-2.3.0/src/xenconfig/xen_sxpr.c +++ libvirt-2.4.0/src/xenconfig/xen_sxpr.c
@@ -506,10 +506,11 @@ xenParseSxprDisks(virDomainDefPtr def, @@ -506,10 +506,11 @@ xenParseSxprDisks(virDomainDefPtr def,
omnipotent, we can revisit this, perhaps stat()'ing omnipotent, we can revisit this, perhaps stat()'ing
the src file in question */ the src file in question */