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

Accepting request 239388 from home:jfehlig:branches:Virtualization

Browse Source 
- Move 'Requires' of qemu from libvirt-daemon-qemu subpackage to
  libvirt-daemon-driver-qemu
  bnc#885267

- Temporarily disable virt-aa-helper-test, which fails in Factory

- Update to libvirt 1.2.6
  - libxl: add migration support and fixes
  - Many incremental improvements and bug fixes, see
    http://libvirt.org/news.html
  - Drop upstream patch libxl-migration-support.patch
  - Drop ia64-clone.patch since libvirt is not built for IA64

OBS-URL: https://build.opensuse.org/request/show/239388
OBS-URL: https://build.opensuse.org/package/show/Virtualization/libvirt?expand=0&rev=388
This commit is contained in:
James Fehlig 2014-07-02 19:21:03 +00:00 committed by Git OBS Bridge
parent 260c505ef7
commit 803ff43893
23 changed files with 252 additions and 1320 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
add-nocow-to-vol-xml.patch
View File

@ -8,10 +8,10 @@ Date: Wed May 7 12:45:40 2014 +0800
Signed-off-by: Chunyan Liu <cyliu@suse.com> Signed-off-by: Chunyan Liu <cyliu@suse.com>
Index: libvirt-1.2.5/docs/schemas/storagevol.rng Index: libvirt-1.2.6/docs/schemas/storagevol.rng
=================================================================== ===================================================================
--- libvirt-1.2.5.orig/docs/schemas/storagevol.rng --- libvirt-1.2.6.orig/docs/schemas/storagevol.rng
+++ libvirt-1.2.5/docs/schemas/storagevol.rng +++ libvirt-1.2.6/docs/schemas/storagevol.rng
@@ -138,6 +138,11 @@ @@ -138,6 +138,11 @@
<ref name='compat'/> <ref name='compat'/>
</optional> </optional>
@ -24,11 +24,11 @@ Index: libvirt-1.2.5/docs/schemas/storagevol.rng
<ref name='fileFormatFeatures'/> <ref name='fileFormatFeatures'/>
</optional> </optional>
</interleave> </interleave>
Index: libvirt-1.2.5/src/conf/storage_conf.c Index: libvirt-1.2.6/src/conf/storage_conf.c
=================================================================== ===================================================================
--- libvirt-1.2.5.orig/src/conf/storage_conf.c --- libvirt-1.2.6.orig/src/conf/storage_conf.c
+++ libvirt-1.2.5/src/conf/storage_conf.c +++ libvirt-1.2.6/src/conf/storage_conf.c
@@ -1395,6 +1395,9 @@ virStorageVolDefParseXML(virStoragePoolD @@ -1397,6 +1397,9 @@ virStorageVolDefParseXML(virStoragePoolD
virStringFreeList(version); virStringFreeList(version);
} }
@ -38,10 +38,10 @@ Index: libvirt-1.2.5/src/conf/storage_conf.c
if (options->featureFromString && virXPathNode("./target/features", ctxt)) { if (options->featureFromString && virXPathNode("./target/features", ctxt)) {
if ((n = virXPathNodeSet("./target/features/*", ctxt, &nodes)) < 0) if ((n = virXPathNodeSet("./target/features/*", ctxt, &nodes)) < 0)
goto error; goto error;
Index: libvirt-1.2.5/src/storage/storage_backend.c Index: libvirt-1.2.6/src/storage/storage_backend.c
=================================================================== ===================================================================
--- libvirt-1.2.5.orig/src/storage/storage_backend.c --- libvirt-1.2.6.orig/src/storage/storage_backend.c
+++ libvirt-1.2.5/src/storage/storage_backend.c +++ libvirt-1.2.6/src/storage/storage_backend.c
@@ -37,6 +37,9 @@ @@ -37,6 +37,9 @@
#ifdef __linux__ #ifdef __linux__
# include <sys/ioctl.h> # include <sys/ioctl.h>
@ -99,10 +99,10 @@ Index: libvirt-1.2.5/src/storage/storage_backend.c
vol->target.features) < 0) { vol->target.features) < 0) {
virCommandFree(cmd); virCommandFree(cmd);
return NULL; return NULL;
Index: libvirt-1.2.5/src/util/virstoragefile.h Index: libvirt-1.2.6/src/util/virstoragefile.h
=================================================================== ===================================================================
--- libvirt-1.2.5.orig/src/util/virstoragefile.h --- libvirt-1.2.6.orig/src/util/virstoragefile.h
+++ libvirt-1.2.5/src/util/virstoragefile.h +++ libvirt-1.2.6/src/util/virstoragefile.h
@@ -232,6 +232,7 @@ struct _virStorageSource { @@ -232,6 +232,7 @@ struct _virStorageSource {
* pool-specific enum for storage volumes */ * pool-specific enum for storage volumes */
virBitmapPtr features; virBitmapPtr features;

6
disable-virCgroupGetPercpuStats-test.patch
View File

@ -1,7 +1,7 @@
Index: libvirt-1.2.5/tests/vircgrouptest.c Index: libvirt-1.2.6/tests/vircgrouptest.c
=================================================================== ===================================================================
--- libvirt-1.2.5.orig/tests/vircgrouptest.c --- libvirt-1.2.6.orig/tests/vircgrouptest.c
+++ libvirt-1.2.5/tests/vircgrouptest.c +++ libvirt-1.2.6/tests/vircgrouptest.c
@@ -33,7 +33,6 @@ @@ -33,7 +33,6 @@
# include "virlog.h" # include "virlog.h"
# include "virfile.h" # include "virfile.h"

10
fix-pci-attach-xen-driver.patch
View File

@ -8,11 +8,11 @@ uses the 'device_configure' RPC.
This patch changes the xend driver to always call 'device_configure' for This patch changes the xend driver to always call 'device_configure' for
PCI devices to be consistent with the usage in the xen tools. PCI devices to be consistent with the usage in the xen tools.
Index: libvirt-1.2.5/src/xen/xend_internal.c Index: libvirt-1.2.6/src/xen/xend_internal.c
=================================================================== ===================================================================
--- libvirt-1.2.5.orig/src/xen/xend_internal.c --- libvirt-1.2.6.orig/src/xen/xend_internal.c
+++ libvirt-1.2.5/src/xen/xend_internal.c +++ libvirt-1.2.6/src/xen/xend_internal.c
@@ -2219,6 +2219,7 @@ xenDaemonAttachDeviceFlags(virConnectPtr @@ -2222,6 +2222,7 @@ xenDaemonAttachDeviceFlags(virConnectPtr
virBuffer buf = VIR_BUFFER_INITIALIZER; virBuffer buf = VIR_BUFFER_INITIALIZER;
char class[8], ref[80]; char class[8], ref[80];
char *target = NULL; char *target = NULL;
@ -20,7 +20,7 @@ Index: libvirt-1.2.5/src/xen/xend_internal.c
virCheckFlags(VIR_DOMAIN_AFFECT_LIVE | VIR_DOMAIN_AFFECT_CONFIG, -1); virCheckFlags(VIR_DOMAIN_AFFECT_LIVE | VIR_DOMAIN_AFFECT_CONFIG, -1);
@@ -2317,8 +2318,18 @@ xenDaemonAttachDeviceFlags(virConnectPtr @@ -2320,8 +2321,18 @@ xenDaemonAttachDeviceFlags(virConnectPtr
} }
sexpr = virBufferContentAndReset(&buf); sexpr = virBufferContentAndReset(&buf);

66
ia64-clone.patch
View File

@ -1,66 +0,0 @@
Index: libvirt-1.2.5/src/lxc/lxc_container.c
===================================================================
--- libvirt-1.2.5.orig/src/lxc/lxc_container.c
+++ libvirt-1.2.5/src/lxc/lxc_container.c
@@ -164,12 +164,19 @@ int lxcContainerHasReboot(void)
VIR_FREE(buf);
cmd = v ? LINUX_REBOOT_CMD_CAD_ON : LINUX_REBOOT_CMD_CAD_OFF;
+#ifdef __ia64__
+ stacksize *= 2;
+#endif
if (VIR_ALLOC_N(stack, stacksize) < 0)
return -1;
childStack = stack + stacksize;
+#ifdef __ia64__
+ cpid = __clone2(lxcContainerRebootChild, childStack, stacksize, flags, &cmd);
+#else
cpid = clone(lxcContainerRebootChild, childStack, flags, &cmd);
+#endif
VIR_FREE(stack);
if (cpid < 0) {
virReportSystemError(errno, "%s",
@@ -2007,6 +2014,9 @@ int lxcContainerStart(virDomainDefPtr de
.handshakefd = handshakefd
};
+#ifdef __ia64__
+ stacksize *= 2;
+#endif
/* allocate a stack for the container */
if (VIR_ALLOC_N(stack, stacksize) < 0)
return -1;
@@ -2032,7 +2042,11 @@ int lxcContainerStart(virDomainDefPtr de
cflags |= CLONE_NEWNET;
}
+#ifdef __ia64__
+ pid = __clone2(lxcContainerChild, stacktop, stacksize, cflags, &args);
+#else
pid = clone(lxcContainerChild, stacktop, cflags, &args);
+#endif
VIR_FREE(stack);
VIR_DEBUG("clone() completed, new container PID is %d", pid);
@@ -2066,12 +2080,19 @@ int lxcContainerAvailable(int features)
if (features & LXC_CONTAINER_FEATURE_NET)
flags |= CLONE_NEWNET;
+#ifdef __ia64__
+ stacksize *= 2;
+#endif
if (VIR_ALLOC_N(stack, stacksize) < 0)
return -1;
childStack = stack + stacksize;
+#ifdef __ia64__
+ cpid = __clone2(lxcContainerDummyChild, childStack, stacksize, flags, NULL);
+#else
cpid = clone(lxcContainerDummyChild, childStack, flags, NULL);
+#endif
VIR_FREE(stack);
if (cpid < 0) {
char ebuf[1024] ATTRIBUTE_UNUSED;

22
install-apparmor-profiles.patch
View File

@ -1,7 +1,7 @@
Index: libvirt-1.2.5/examples/apparmor/Makefile.am Index: libvirt-1.2.6/examples/apparmor/Makefile.am
=================================================================== ===================================================================
--- libvirt-1.2.5.orig/examples/apparmor/Makefile.am --- libvirt-1.2.6.orig/examples/apparmor/Makefile.am
+++ libvirt-1.2.5/examples/apparmor/Makefile.am +++ libvirt-1.2.6/examples/apparmor/Makefile.am
@@ -18,10 +18,22 @@ EXTRA_DIST= \ @@ -18,10 +18,22 @@ EXTRA_DIST= \
TEMPLATE \ TEMPLATE \
libvirt-qemu \ libvirt-qemu \
@ -27,10 +27,10 @@ Index: libvirt-1.2.5/examples/apparmor/Makefile.am
apparmordir = $(sysconfdir)/apparmor.d/ apparmordir = $(sysconfdir)/apparmor.d/
apparmor_DATA = \ apparmor_DATA = \
usr.lib.libvirt.virt-aa-helper \ usr.lib.libvirt.virt-aa-helper \
Index: libvirt-1.2.5/examples/apparmor/usr.lib.libvirt.virt-aa-helper.in Index: libvirt-1.2.6/examples/apparmor/usr.lib.libvirt.virt-aa-helper.in
=================================================================== ===================================================================
--- /dev/null --- /dev/null
+++ libvirt-1.2.5/examples/apparmor/usr.lib.libvirt.virt-aa-helper.in +++ libvirt-1.2.6/examples/apparmor/usr.lib.libvirt.virt-aa-helper.in
@@ -0,0 +1,48 @@ @@ -0,0 +1,48 @@
+# Last Modified: Mon Apr 5 15:10:27 2010 +# Last Modified: Mon Apr 5 15:10:27 2010
+#include <tunables/global> +#include <tunables/global>
@ -80,10 +80,10 @@ Index: libvirt-1.2.5/examples/apparmor/usr.lib.libvirt.virt-aa-helper.in
+ /**.[iI][sS][oO] r, + /**.[iI][sS][oO] r,
+ /**/disk{,.*} r, + /**/disk{,.*} r,
+} +}
Index: libvirt-1.2.5/examples/apparmor/usr.sbin.libvirtd.in Index: libvirt-1.2.6/examples/apparmor/usr.sbin.libvirtd.in
=================================================================== ===================================================================
--- /dev/null --- /dev/null
+++ libvirt-1.2.5/examples/apparmor/usr.sbin.libvirtd.in +++ libvirt-1.2.6/examples/apparmor/usr.sbin.libvirtd.in
@@ -0,0 +1,67 @@ @@ -0,0 +1,67 @@
+# Last Modified: Mon Apr 5 15:03:58 2010 +# Last Modified: Mon Apr 5 15:03:58 2010
+#include <tunables/global> +#include <tunables/global>
@ -152,9 +152,9 @@ Index: libvirt-1.2.5/examples/apparmor/usr.sbin.libvirtd.in
+ change_profile -> @{LIBVIRT}-[0-9a-f]*-[0-9a-f]*-[0-9a-f]*-[0-9a-f]*-[0-9a-f]*, + change_profile -> @{LIBVIRT}-[0-9a-f]*-[0-9a-f]*-[0-9a-f]*-[0-9a-f]*-[0-9a-f]*,
+ +
+} +}
Index: libvirt-1.2.5/examples/apparmor/usr.lib.libvirt.virt-aa-helper Index: libvirt-1.2.6/examples/apparmor/usr.lib.libvirt.virt-aa-helper
=================================================================== ===================================================================
--- libvirt-1.2.5.orig/examples/apparmor/usr.lib.libvirt.virt-aa-helper --- libvirt-1.2.6.orig/examples/apparmor/usr.lib.libvirt.virt-aa-helper
+++ /dev/null +++ /dev/null
@@ -1,48 +0,0 @@ @@ -1,48 +0,0 @@
-# Last Modified: Mon Apr 5 15:10:27 2010 -# Last Modified: Mon Apr 5 15:10:27 2010
@ -205,9 +205,9 @@ Index: libvirt-1.2.5/examples/apparmor/usr.lib.libvirt.virt-aa-helper
- /**.[iI][sS][oO] r, - /**.[iI][sS][oO] r,
- /**/disk{,.*} r, - /**/disk{,.*} r,
-} -}
Index: libvirt-1.2.5/examples/apparmor/usr.sbin.libvirtd Index: libvirt-1.2.6/examples/apparmor/usr.sbin.libvirtd
=================================================================== ===================================================================
--- libvirt-1.2.5.orig/examples/apparmor/usr.sbin.libvirtd --- libvirt-1.2.6.orig/examples/apparmor/usr.sbin.libvirtd
+++ /dev/null +++ /dev/null
@@ -1,63 +0,0 @@ @@ -1,63 +0,0 @@
-# Last Modified: Mon Apr 5 15:03:58 2010 -# Last Modified: Mon Apr 5 15:03:58 2010

3
libvirt-1.2.5.tar.bz2
View File

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

3
libvirt-1.2.6.tar.bz2 Normal file
View File

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

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-1.2.5/tools/libvirt-guests.init.in Index: libvirt-1.2.6/tools/libvirt-guests.init.in
=================================================================== ===================================================================
--- libvirt-1.2.5.orig/tools/libvirt-guests.init.in --- libvirt-1.2.6.orig/tools/libvirt-guests.init.in
+++ libvirt-1.2.5/tools/libvirt-guests.init.in +++ libvirt-1.2.6/tools/libvirt-guests.init.in
@@ -3,15 +3,15 @@ @@ -3,15 +3,15 @@
# the following is the LSB init header # the following is the LSB init header
# #
@ -28,10 +28,10 @@ Index: libvirt-1.2.5/tools/libvirt-guests.init.in
### END INIT INFO ### END INIT INFO
# the following is chkconfig init header # the following is chkconfig init header
Index: libvirt-1.2.5/tools/libvirt-guests.sh.in Index: libvirt-1.2.6/tools/libvirt-guests.sh.in
=================================================================== ===================================================================
--- libvirt-1.2.5.orig/tools/libvirt-guests.sh.in --- libvirt-1.2.6.orig/tools/libvirt-guests.sh.in
+++ libvirt-1.2.5/tools/libvirt-guests.sh.in +++ libvirt-1.2.6/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/>.
@ -189,10 +189,10 @@ Index: libvirt-1.2.5/tools/libvirt-guests.sh.in
esac esac
-exit $RETVAL -exit $RETVAL
+rc_exit +rc_exit
Index: libvirt-1.2.5/tools/libvirt-guests.sysconf Index: libvirt-1.2.6/tools/libvirt-guests.sysconf
=================================================================== ===================================================================
--- libvirt-1.2.5.orig/tools/libvirt-guests.sysconf --- libvirt-1.2.6.orig/tools/libvirt-guests.sysconf
+++ libvirt-1.2.5/tools/libvirt-guests.sysconf +++ libvirt-1.2.6/tools/libvirt-guests.sysconf
@@ -1,19 +1,29 @@ @@ -1,19 +1,29 @@
+## Path: System/Virtualization/libvirt-guests +## Path: System/Virtualization/libvirt-guests
+ +

42
libvirt-suse-netcontrol.patch
View File

@ -1,7 +1,7 @@
Index: libvirt-1.2.5/configure.ac Index: libvirt-1.2.6/configure.ac
=================================================================== ===================================================================
--- libvirt-1.2.5.orig/configure.ac --- libvirt-1.2.6.orig/configure.ac
+++ libvirt-1.2.5/configure.ac +++ libvirt-1.2.6/configure.ac
@@ -237,6 +237,7 @@ LIBVIRT_CHECK_FUSE @@ -237,6 +237,7 @@ LIBVIRT_CHECK_FUSE
LIBVIRT_CHECK_GLUSTER LIBVIRT_CHECK_GLUSTER
LIBVIRT_CHECK_HAL LIBVIRT_CHECK_HAL
@ -26,7 +26,7 @@ Index: libvirt-1.2.5/configure.ac
esac esac
if test "$with_interface" = "yes" ; then if test "$with_interface" = "yes" ; then
@@ -2815,6 +2817,7 @@ LIBVIRT_RESULT_FUSE @@ -2822,6 +2824,7 @@ LIBVIRT_RESULT_FUSE
LIBVIRT_RESULT_GLUSTER LIBVIRT_RESULT_GLUSTER
LIBVIRT_RESULT_HAL LIBVIRT_RESULT_HAL
LIBVIRT_RESULT_NETCF LIBVIRT_RESULT_NETCF
@ -34,11 +34,11 @@ Index: libvirt-1.2.5/configure.ac
LIBVIRT_RESULT_NUMACTL LIBVIRT_RESULT_NUMACTL
LIBVIRT_RESULT_OPENWSMAN LIBVIRT_RESULT_OPENWSMAN
LIBVIRT_RESULT_PCIACCESS LIBVIRT_RESULT_PCIACCESS
Index: libvirt-1.2.5/src/Makefile.am Index: libvirt-1.2.6/src/Makefile.am
=================================================================== ===================================================================
--- libvirt-1.2.5.orig/src/Makefile.am --- libvirt-1.2.6.orig/src/Makefile.am
+++ libvirt-1.2.5/src/Makefile.am +++ libvirt-1.2.6/src/Makefile.am
@@ -813,6 +813,10 @@ if WITH_NETCF @@ -818,6 +818,10 @@ if WITH_NETCF
INTERFACE_DRIVER_SOURCES += \ INTERFACE_DRIVER_SOURCES += \
interface/interface_backend_netcf.c interface/interface_backend_netcf.c
endif WITH_NETCF endif WITH_NETCF
@ -49,7 +49,7 @@ Index: libvirt-1.2.5/src/Makefile.am
if WITH_UDEV if WITH_UDEV
INTERFACE_DRIVER_SOURCES += \ INTERFACE_DRIVER_SOURCES += \
interface/interface_backend_udev.c interface/interface_backend_udev.c
@@ -1403,10 +1407,15 @@ if WITH_NETCF @@ -1414,10 +1418,15 @@ if WITH_NETCF
libvirt_driver_interface_la_CFLAGS += $(NETCF_CFLAGS) libvirt_driver_interface_la_CFLAGS += $(NETCF_CFLAGS)
libvirt_driver_interface_la_LIBADD += $(NETCF_LIBS) libvirt_driver_interface_la_LIBADD += $(NETCF_LIBS)
else ! WITH_NETCF else ! WITH_NETCF
@ -65,11 +65,11 @@ Index: libvirt-1.2.5/src/Makefile.am
endif ! WITH_NETCF endif ! WITH_NETCF
if WITH_DRIVER_MODULES if WITH_DRIVER_MODULES
libvirt_driver_interface_la_LIBADD += ../gnulib/lib/libgnu.la libvirt_driver_interface_la_LIBADD += ../gnulib/lib/libgnu.la
Index: libvirt-1.2.5/tools/virsh.c Index: libvirt-1.2.6/tools/virsh.c
=================================================================== ===================================================================
--- libvirt-1.2.5.orig/tools/virsh.c --- libvirt-1.2.6.orig/tools/virsh.c
+++ libvirt-1.2.5/tools/virsh.c +++ libvirt-1.2.6/tools/virsh.c
@@ -3252,6 +3252,8 @@ vshShowVersion(vshControl *ctl ATTRIBUTE @@ -3320,6 +3320,8 @@ vshShowVersion(vshControl *ctl ATTRIBUTE
vshPrint(ctl, " Interface"); vshPrint(ctl, " Interface");
# if defined(WITH_NETCF) # if defined(WITH_NETCF)
vshPrint(ctl, " netcf"); vshPrint(ctl, " netcf");
@ -78,10 +78,10 @@ Index: libvirt-1.2.5/tools/virsh.c
# elif defined(WITH_UDEV) # elif defined(WITH_UDEV)
vshPrint(ctl, " udev"); vshPrint(ctl, " udev");
# endif # endif
Index: libvirt-1.2.5/src/interface/interface_backend_netcf.c Index: libvirt-1.2.6/src/interface/interface_backend_netcf.c
=================================================================== ===================================================================
--- libvirt-1.2.5.orig/src/interface/interface_backend_netcf.c --- libvirt-1.2.6.orig/src/interface/interface_backend_netcf.c
+++ libvirt-1.2.5/src/interface/interface_backend_netcf.c +++ libvirt-1.2.6/src/interface/interface_backend_netcf.c
@@ -23,7 +23,12 @@ @@ -23,7 +23,12 @@
#include <config.h> #include <config.h>
@ -165,10 +165,10 @@ Index: libvirt-1.2.5/src/interface/interface_backend_netcf.c
return 0; return 0;
} }
Index: libvirt-1.2.5/src/interface/interface_driver.c Index: libvirt-1.2.6/src/interface/interface_driver.c
=================================================================== ===================================================================
--- libvirt-1.2.5.orig/src/interface/interface_driver.c --- libvirt-1.2.6.orig/src/interface/interface_driver.c
+++ libvirt-1.2.5/src/interface/interface_driver.c +++ libvirt-1.2.6/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;
@ -186,10 +186,10 @@ Index: libvirt-1.2.5/src/interface/interface_driver.c
if (udevIfaceRegister() == 0) if (udevIfaceRegister() == 0)
return 0; return 0;
#endif /* WITH_UDEV */ #endif /* WITH_UDEV */
Index: libvirt-1.2.5/m4/virt-netcontrol.m4 Index: libvirt-1.2.6/m4/virt-netcontrol.m4
=================================================================== ===================================================================
--- /dev/null --- /dev/null
+++ libvirt-1.2.5/m4/virt-netcontrol.m4 +++ libvirt-1.2.6/m4/virt-netcontrol.m4
@@ -0,0 +1,35 @@ @@ -0,0 +1,35 @@
+dnl The libnetcontrol library +dnl The libnetcontrol library
+dnl +dnl

22
libvirt.changes
View File

@ -1,3 +1,25 @@
-------------------------------------------------------------------
Wed Jul 2 12:49:36 MDT 2014 - jfehlig@suse.com
- Move 'Requires' of qemu from libvirt-daemon-qemu subpackage to
libvirt-daemon-driver-qemu
bnc#885267
-------------------------------------------------------------------
Wed Jul 2 12:42:35 MDT 2014 - jfehlig@suse.com
- Temporarily disable virt-aa-helper-test, which fails in Factory
-------------------------------------------------------------------
Wed Jul 2 11:31:22 MDT 2014 - jfehlig@suse.com
- Update to libvirt 1.2.6
- libxl: add migration support and fixes
- Many incremental improvements and bug fixes, see
http://libvirt.org/news.html
- Drop upstream patch libxl-migration-support.patch
- Drop ia64-clone.patch since libvirt is not built for IA64
------------------------------------------------------------------- -------------------------------------------------------------------
Wed Jun 25 13:42:00 UTC 2014 - cbosdonnat@suse.com Wed Jun 25 13:42:00 UTC 2014 - cbosdonnat@suse.com

36
libvirt.spec
View File

@ -235,7 +235,7 @@
Name: libvirt Name: libvirt
Url: http://libvirt.org/ Url: http://libvirt.org/
Version: 1.2.5 Version: 1.2.6
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+
@ -430,14 +430,12 @@ Source99: baselibs.conf
# Upstream patches # Upstream patches
# Need to go upstream # Need to go upstream
Patch100: xen-name-for-devid.patch Patch100: xen-name-for-devid.patch
Patch101: ia64-clone.patch Patch101: xen-pv-cdrom.patch
Patch102: xen-pv-cdrom.patch Patch102: add-nocow-to-vol-xml.patch
Patch103: add-nocow-to-vol-xml.patch
# pending review upstream patches # pending review upstream patches
Patch150: libxl-migration-support.patch Patch150: lxc-keep-caps-feature.patch
Patch151: lxc-keep-caps-feature.patch Patch151: lxc-keep-caps-feature-conversion.patch
Patch152: lxc-keep-caps-feature-conversion.patch Patch152: lxc-keep-caps-feature-doc.patch
Patch153: lxc-keep-caps-feature-doc.patch
# Our patches # Our patches
Patch200: libvirtd-defaults.patch Patch200: libvirtd-defaults.patch
Patch201: libvirtd-init-script.patch Patch201: libvirtd-init-script.patch
@ -685,6 +683,7 @@ Requires: xz
%if 0%{?suse_version} > 1210 %if 0%{?suse_version} > 1210
Requires: lzop Requires: lzop
%endif %endif
Requires: qemu
%description daemon-driver-qemu %description daemon-driver-qemu
The qemu driver plugin for the libvirtd daemon, providing The qemu driver plugin for the libvirtd daemon, providing
@ -775,7 +774,6 @@ Requires: libvirt-daemon-driver-qemu = %{version}-%{release}
Requires: libvirt-daemon-driver-secret = %{version}-%{release} Requires: libvirt-daemon-driver-secret = %{version}-%{release}
Requires: libvirt-daemon-driver-storage = %{version}-%{release} Requires: libvirt-daemon-driver-storage = %{version}-%{release}
%endif %endif
Requires: qemu
%description daemon-qemu %description daemon-qemu
Server side daemon and driver required to manage the virtualization Server side daemon and driver required to manage the virtualization
@ -952,11 +950,9 @@ namespaces.
%patch100 -p1 %patch100 -p1
%patch101 -p1 %patch101 -p1
%patch102 -p1 %patch102 -p1
%patch103 -p1
%patch150 -p1 %patch150 -p1
%patch151 -p1 %patch151 -p1
%patch152 -p1 %patch152 -p1
%patch153 -p1
%patch200 -p1 %patch200 -p1
%patch201 -p1 %patch201 -p1
%patch202 -p1 %patch202 -p1
@ -1333,6 +1329,8 @@ EXTRA="$EXTRA virnetsockettest"
%ifarch aarch64 %ifarch aarch64
EXTRA="$EXTRA virportallocatortest" EXTRA="$EXTRA virportallocatortest"
%endif %endif
# temporarily disable failing virt-aa-helper-test
EXTRA="$EXTRA virt-aa-helper-test"
for i in nodeinfotest seclabeltest $EXTRA for i in nodeinfotest seclabeltest $EXTRA
do do
rm -f $i rm -f $i
@ -1504,6 +1502,7 @@ fi
%dir %attr(0700, root, root) %{_sysconfdir}/libvirt/qemu/networks/autostart %dir %attr(0700, root, root) %{_sysconfdir}/libvirt/qemu/networks/autostart
%dir %attr(0700, root, root) %{_localstatedir}/lib/libvirt/network/ %dir %attr(0700, root, root) %{_localstatedir}/lib/libvirt/network/
%dir %attr(0755, root, root) %{_localstatedir}/lib/libvirt/dnsmasq/ %dir %attr(0755, root, root) %{_localstatedir}/lib/libvirt/dnsmasq/
%attr(0755, root, root) %{_libdir}/%{name}/libvirt_leaseshelper
%dir %{_datadir}/libvirt/networks/ %dir %{_datadir}/libvirt/networks/
%{_datadir}/libvirt/networks/default.xml %{_datadir}/libvirt/networks/default.xml
%endif %endif
@ -1579,6 +1578,7 @@ fi
%dir %attr(0700, root, root) %{_sysconfdir}/libvirt/qemu/networks/autostart %dir %attr(0700, root, root) %{_sysconfdir}/libvirt/qemu/networks/autostart
%dir %attr(0700, root, root) %{_localstatedir}/lib/libvirt/network/ %dir %attr(0700, root, root) %{_localstatedir}/lib/libvirt/network/
%dir %attr(0755, root, root) %{_localstatedir}/lib/libvirt/dnsmasq/ %dir %attr(0755, root, root) %{_localstatedir}/lib/libvirt/dnsmasq/
%attr(0755, root, root) %{_libdir}/%{name}/libvirt_leaseshelper
%dir %{_libdir}/%{name}/connection-driver %dir %{_libdir}/%{name}/connection-driver
%{_libdir}/%{name}/connection-driver/libvirt_driver_network.so %{_libdir}/%{name}/connection-driver/libvirt_driver_network.so
%endif %endif
@ -1736,7 +1736,9 @@ fi
%{_bindir}/virt-pki-validate %{_bindir}/virt-pki-validate
%{_bindir}/virt-host-validate %{_bindir}/virt-host-validate
%dir %{_libdir}/%{name} %dir %{_libdir}/%{name}
%{_libdir}/lib*.so.* %{_libdir}/libvirt.so.*
%{_libdir}/libvirt-qemu.so.*
%{_libdir}/libvirt-lxc.so.*
%attr(0755, root, root) %{_libdir}/%{name}/libvirt-guests.sh %attr(0755, root, root) %{_libdir}/%{name}/libvirt-guests.sh
%{_localstatedir}/adm/fillup-templates/sysconfig.libvirt-guests %{_localstatedir}/adm/fillup-templates/sysconfig.libvirt-guests
%if %{with_systemd} %if %{with_systemd}
@ -1772,9 +1774,17 @@ fi
%files devel %files devel
%defattr(-, root, root) %defattr(-, root, root)
%{_libdir}/libvirt.so
%{_libdir}/libvirt-qemu.so
%{_libdir}/libvirt-lxc.so
%{_includedir}/libvirt %{_includedir}/libvirt
%{_libdir}/*.so %{_includedir}/libvirt/virterror.h
%{_includedir}/libvirt/libvirt.h
%{_includedir}/libvirt/libvirt-qemu.h
%{_includedir}/libvirt/libvirt-lxc.h
%{_libdir}/pkgconfig/libvirt.pc %{_libdir}/pkgconfig/libvirt.pc
%{_libdir}/pkgconfig/libvirt-qemu.pc
%{_libdir}/pkgconfig/libvirt-lxc.pc
%dir %{_datadir}/libvirt/api/ %dir %{_datadir}/libvirt/api/
%{_datadir}/libvirt/api/libvirt-api.xml %{_datadir}/libvirt/api/libvirt-api.xml
%{_datadir}/libvirt/api/libvirt-qemu-api.xml %{_datadir}/libvirt/api/libvirt-qemu-api.xml

18
libvirtd-defaults.patch
View File

@ -1,7 +1,7 @@
Index: libvirt-1.2.5/daemon/libvirtd.conf Index: libvirt-1.2.6/daemon/libvirtd.conf
=================================================================== ===================================================================
--- libvirt-1.2.5.orig/daemon/libvirtd.conf --- libvirt-1.2.6.orig/daemon/libvirtd.conf
+++ libvirt-1.2.5/daemon/libvirtd.conf +++ libvirt-1.2.6/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-1.2.5/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-1.2.5/daemon/libvirtd-config.c Index: libvirt-1.2.6/daemon/libvirtd-config.c
=================================================================== ===================================================================
--- libvirt-1.2.5.orig/daemon/libvirtd-config.c --- libvirt-1.2.6.orig/daemon/libvirtd-config.c
+++ libvirt-1.2.5/daemon/libvirtd-config.c +++ libvirt-1.2.6/daemon/libvirtd-config.c
@@ -229,7 +229,7 @@ daemonConfigNew(bool privileged ATTRIBUT @@ -229,7 +229,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-1.2.5/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-1.2.5/daemon/test_libvirtd.aug.in Index: libvirt-1.2.6/daemon/test_libvirtd.aug.in
=================================================================== ===================================================================
--- libvirt-1.2.5.orig/daemon/test_libvirtd.aug.in --- libvirt-1.2.6.orig/daemon/test_libvirtd.aug.in
+++ libvirt-1.2.5/daemon/test_libvirtd.aug.in +++ libvirt-1.2.6/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-1.2.5/daemon/libvirtd.sysconf Index: libvirt-1.2.6/daemon/libvirtd.sysconf
=================================================================== ===================================================================
--- libvirt-1.2.5.orig/daemon/libvirtd.sysconf --- libvirt-1.2.6.orig/daemon/libvirtd.sysconf
+++ libvirt-1.2.5/daemon/libvirtd.sysconf +++ libvirt-1.2.6/daemon/libvirtd.sysconf
@@ -1,16 +1,25 @@ @@ -1,16 +1,25 @@
+## Path: System/Virtualization/libvirt +## Path: System/Virtualization/libvirt
+ +

1028
libxl-migration-support.patch
View File

File diff suppressed because it is too large Load Diff

101
lxc-keep-caps-feature-conversion.patch
View File

@ -18,11 +18,11 @@ Subject: [PATCH 2/3] lxc domain from xml: convert lxc.cap.drop
tests/lxcconf2xmldata/lxcconf2xml-vlannetwork.xml | 4 ++++ tests/lxcconf2xmldata/lxcconf2xml-vlannetwork.xml | 4 ++++
12 files changed, 61 insertions(+) 12 files changed, 61 insertions(+)
diff --git a/src/lxc/lxc_native.c b/src/lxc/lxc_native.c Index: libvirt-1.2.6/src/lxc/lxc_native.c
index f4c4556..29ec188 100644 ===================================================================
--- a/src/lxc/lxc_native.c --- libvirt-1.2.6.orig/src/lxc/lxc_native.c
+++ b/src/lxc/lxc_native.c +++ libvirt-1.2.6/src/lxc/lxc_native.c
@@ -838,6 +838,28 @@ lxcSetBlkioTune(virDomainDefPtr def, virConfPtr properties) @@ -838,6 +838,28 @@ lxcSetBlkioTune(virDomainDefPtr def, vir
return 0; return 0;
} }
@ -61,10 +61,10 @@ index f4c4556..29ec188 100644
goto cleanup; goto cleanup;
error: error:
diff --git a/tests/lxcconf2xmldata/lxcconf2xml-blkiotune.xml b/tests/lxcconf2xmldata/lxcconf2xml-blkiotune.xml Index: libvirt-1.2.6/tests/lxcconf2xmldata/lxcconf2xml-blkiotune.xml
index 36b8e52..c9c0469 100644 ===================================================================
--- a/tests/lxcconf2xmldata/lxcconf2xml-blkiotune.xml --- libvirt-1.2.6.orig/tests/lxcconf2xmldata/lxcconf2xml-blkiotune.xml
+++ b/tests/lxcconf2xmldata/lxcconf2xml-blkiotune.xml +++ libvirt-1.2.6/tests/lxcconf2xmldata/lxcconf2xml-blkiotune.xml
@@ -25,6 +25,8 @@ @@ -25,6 +25,8 @@
</os> </os>
<features> <features>
@ -74,10 +74,10 @@ index 36b8e52..c9c0469 100644
</features> </features>
<clock offset='utc'/> <clock offset='utc'/>
<on_poweroff>destroy</on_poweroff> <on_poweroff>destroy</on_poweroff>
diff --git a/tests/lxcconf2xmldata/lxcconf2xml-cpusettune.xml b/tests/lxcconf2xmldata/lxcconf2xml-cpusettune.xml Index: libvirt-1.2.6/tests/lxcconf2xmldata/lxcconf2xml-cpusettune.xml
index 932ab61..e7863fa 100644 ===================================================================
--- a/tests/lxcconf2xmldata/lxcconf2xml-cpusettune.xml --- libvirt-1.2.6.orig/tests/lxcconf2xmldata/lxcconf2xml-cpusettune.xml
+++ b/tests/lxcconf2xmldata/lxcconf2xml-cpusettune.xml +++ libvirt-1.2.6/tests/lxcconf2xmldata/lxcconf2xml-cpusettune.xml
@@ -13,6 +13,8 @@ @@ -13,6 +13,8 @@
</os> </os>
<features> <features>
@ -87,10 +87,10 @@ index 932ab61..e7863fa 100644
</features> </features>
<clock offset='utc'/> <clock offset='utc'/>
<on_poweroff>destroy</on_poweroff> <on_poweroff>destroy</on_poweroff>
diff --git a/tests/lxcconf2xmldata/lxcconf2xml-cputune.xml b/tests/lxcconf2xmldata/lxcconf2xml-cputune.xml Index: libvirt-1.2.6/tests/lxcconf2xmldata/lxcconf2xml-cputune.xml
index 1bab1c6..50c5358 100644 ===================================================================
--- a/tests/lxcconf2xmldata/lxcconf2xml-cputune.xml --- libvirt-1.2.6.orig/tests/lxcconf2xmldata/lxcconf2xml-cputune.xml
+++ b/tests/lxcconf2xmldata/lxcconf2xml-cputune.xml +++ libvirt-1.2.6/tests/lxcconf2xmldata/lxcconf2xml-cputune.xml
@@ -15,6 +15,8 @@ @@ -15,6 +15,8 @@
</os> </os>
<features> <features>
@ -100,10 +100,10 @@ index 1bab1c6..50c5358 100644
</features> </features>
<clock offset='utc'/> <clock offset='utc'/>
<on_poweroff>destroy</on_poweroff> <on_poweroff>destroy</on_poweroff>
diff --git a/tests/lxcconf2xmldata/lxcconf2xml-idmap.xml b/tests/lxcconf2xmldata/lxcconf2xml-idmap.xml Index: libvirt-1.2.6/tests/lxcconf2xmldata/lxcconf2xml-idmap.xml
index 050ccd6..80a83ff 100644 ===================================================================
--- a/tests/lxcconf2xmldata/lxcconf2xml-idmap.xml --- libvirt-1.2.6.orig/tests/lxcconf2xmldata/lxcconf2xml-idmap.xml
+++ b/tests/lxcconf2xmldata/lxcconf2xml-idmap.xml +++ libvirt-1.2.6/tests/lxcconf2xmldata/lxcconf2xml-idmap.xml
@@ -14,6 +14,8 @@ @@ -14,6 +14,8 @@
</idmap> </idmap>
<features> <features>
@ -113,10 +113,10 @@ index 050ccd6..80a83ff 100644
</features> </features>
<clock offset='utc'/> <clock offset='utc'/>
<on_poweroff>destroy</on_poweroff> <on_poweroff>destroy</on_poweroff>
diff --git a/tests/lxcconf2xmldata/lxcconf2xml-macvlannetwork.xml b/tests/lxcconf2xmldata/lxcconf2xml-macvlannetwork.xml Index: libvirt-1.2.6/tests/lxcconf2xmldata/lxcconf2xml-macvlannetwork.xml
index 996c0f7..3105b8c 100644 ===================================================================
--- a/tests/lxcconf2xmldata/lxcconf2xml-macvlannetwork.xml --- libvirt-1.2.6.orig/tests/lxcconf2xmldata/lxcconf2xml-macvlannetwork.xml
+++ b/tests/lxcconf2xmldata/lxcconf2xml-macvlannetwork.xml +++ libvirt-1.2.6/tests/lxcconf2xmldata/lxcconf2xml-macvlannetwork.xml
@@ -8,6 +8,10 @@ @@ -8,6 +8,10 @@
<type>exe</type> <type>exe</type>
<init>/sbin/init</init> <init>/sbin/init</init>
@ -128,10 +128,10 @@ index 996c0f7..3105b8c 100644
<clock offset='utc'/> <clock offset='utc'/>
<on_poweroff>destroy</on_poweroff> <on_poweroff>destroy</on_poweroff>
<on_reboot>restart</on_reboot> <on_reboot>restart</on_reboot>
diff --git a/tests/lxcconf2xmldata/lxcconf2xml-memtune.xml b/tests/lxcconf2xmldata/lxcconf2xml-memtune.xml Index: libvirt-1.2.6/tests/lxcconf2xmldata/lxcconf2xml-memtune.xml
index b7c919e..7df1ef0 100644 ===================================================================
--- a/tests/lxcconf2xmldata/lxcconf2xml-memtune.xml --- libvirt-1.2.6.orig/tests/lxcconf2xmldata/lxcconf2xml-memtune.xml
+++ b/tests/lxcconf2xmldata/lxcconf2xml-memtune.xml +++ libvirt-1.2.6/tests/lxcconf2xmldata/lxcconf2xml-memtune.xml
@@ -15,6 +15,8 @@ @@ -15,6 +15,8 @@
</os> </os>
<features> <features>
@ -141,10 +141,10 @@ index b7c919e..7df1ef0 100644
</features> </features>
<clock offset='utc'/> <clock offset='utc'/>
<on_poweroff>destroy</on_poweroff> <on_poweroff>destroy</on_poweroff>
diff --git a/tests/lxcconf2xmldata/lxcconf2xml-nonenetwork.xml b/tests/lxcconf2xmldata/lxcconf2xml-nonenetwork.xml Index: libvirt-1.2.6/tests/lxcconf2xmldata/lxcconf2xml-nonenetwork.xml
index 6d9e16d..e002b99 100644 ===================================================================
--- a/tests/lxcconf2xmldata/lxcconf2xml-nonenetwork.xml --- libvirt-1.2.6.orig/tests/lxcconf2xmldata/lxcconf2xml-nonenetwork.xml
+++ b/tests/lxcconf2xmldata/lxcconf2xml-nonenetwork.xml +++ libvirt-1.2.6/tests/lxcconf2xmldata/lxcconf2xml-nonenetwork.xml
@@ -8,6 +8,10 @@ @@ -8,6 +8,10 @@
<type>exe</type> <type>exe</type>
<init>/sbin/init</init> <init>/sbin/init</init>
@ -156,10 +156,10 @@ index 6d9e16d..e002b99 100644
<clock offset='utc'/> <clock offset='utc'/>
<on_poweroff>destroy</on_poweroff> <on_poweroff>destroy</on_poweroff>
<on_reboot>restart</on_reboot> <on_reboot>restart</on_reboot>
diff --git a/tests/lxcconf2xmldata/lxcconf2xml-nonetwork.xml b/tests/lxcconf2xmldata/lxcconf2xml-nonetwork.xml Index: libvirt-1.2.6/tests/lxcconf2xmldata/lxcconf2xml-nonetwork.xml
index 101324a..dc9d635 100644 ===================================================================
--- a/tests/lxcconf2xmldata/lxcconf2xml-nonetwork.xml --- libvirt-1.2.6.orig/tests/lxcconf2xmldata/lxcconf2xml-nonetwork.xml
+++ b/tests/lxcconf2xmldata/lxcconf2xml-nonetwork.xml +++ libvirt-1.2.6/tests/lxcconf2xmldata/lxcconf2xml-nonetwork.xml
@@ -10,6 +10,8 @@ @@ -10,6 +10,8 @@
</os> </os>
<features> <features>
@ -169,10 +169,10 @@ index 101324a..dc9d635 100644
</features> </features>
<clock offset='utc'/> <clock offset='utc'/>
<on_poweroff>destroy</on_poweroff> <on_poweroff>destroy</on_poweroff>
diff --git a/tests/lxcconf2xmldata/lxcconf2xml-physnetwork.xml b/tests/lxcconf2xmldata/lxcconf2xml-physnetwork.xml Index: libvirt-1.2.6/tests/lxcconf2xmldata/lxcconf2xml-physnetwork.xml
index 5fe1b03..cfaceb5 100644 ===================================================================
--- a/tests/lxcconf2xmldata/lxcconf2xml-physnetwork.xml --- libvirt-1.2.6.orig/tests/lxcconf2xmldata/lxcconf2xml-physnetwork.xml
+++ b/tests/lxcconf2xmldata/lxcconf2xml-physnetwork.xml +++ libvirt-1.2.6/tests/lxcconf2xmldata/lxcconf2xml-physnetwork.xml
@@ -8,6 +8,10 @@ @@ -8,6 +8,10 @@
<type>exe</type> <type>exe</type>
<init>/sbin/init</init> <init>/sbin/init</init>
@ -184,10 +184,10 @@ index 5fe1b03..cfaceb5 100644
<clock offset='utc'/> <clock offset='utc'/>
<on_poweroff>destroy</on_poweroff> <on_poweroff>destroy</on_poweroff>
<on_reboot>restart</on_reboot> <on_reboot>restart</on_reboot>
diff --git a/tests/lxcconf2xmldata/lxcconf2xml-simple.xml b/tests/lxcconf2xmldata/lxcconf2xml-simple.xml Index: libvirt-1.2.6/tests/lxcconf2xmldata/lxcconf2xml-simple.xml
index b3c3659..549fc39 100644 ===================================================================
--- a/tests/lxcconf2xmldata/lxcconf2xml-simple.xml --- libvirt-1.2.6.orig/tests/lxcconf2xmldata/lxcconf2xml-simple.xml
+++ b/tests/lxcconf2xmldata/lxcconf2xml-simple.xml +++ libvirt-1.2.6/tests/lxcconf2xmldata/lxcconf2xml-simple.xml
@@ -8,6 +8,14 @@ @@ -8,6 +8,14 @@
<type arch='i686'>exe</type> <type arch='i686'>exe</type>
<init>/sbin/init</init> <init>/sbin/init</init>
@ -203,10 +203,10 @@ index b3c3659..549fc39 100644
<clock offset='utc'/> <clock offset='utc'/>
<on_poweroff>destroy</on_poweroff> <on_poweroff>destroy</on_poweroff>
<on_reboot>restart</on_reboot> <on_reboot>restart</on_reboot>
diff --git a/tests/lxcconf2xmldata/lxcconf2xml-vlannetwork.xml b/tests/lxcconf2xmldata/lxcconf2xml-vlannetwork.xml Index: libvirt-1.2.6/tests/lxcconf2xmldata/lxcconf2xml-vlannetwork.xml
index 45348ed..712be3e 100644 ===================================================================
--- a/tests/lxcconf2xmldata/lxcconf2xml-vlannetwork.xml --- libvirt-1.2.6.orig/tests/lxcconf2xmldata/lxcconf2xml-vlannetwork.xml
+++ b/tests/lxcconf2xmldata/lxcconf2xml-vlannetwork.xml +++ libvirt-1.2.6/tests/lxcconf2xmldata/lxcconf2xml-vlannetwork.xml
@@ -8,6 +8,10 @@ @@ -8,6 +8,10 @@
<type>exe</type> <type>exe</type>
<init>/sbin/init</init> <init>/sbin/init</init>
@ -218,6 +218,3 @@ index 45348ed..712be3e 100644
<clock offset='utc'/> <clock offset='utc'/>
<on_poweroff>destroy</on_poweroff> <on_poweroff>destroy</on_poweroff>
<on_reboot>restart</on_reboot> <on_reboot>restart</on_reboot>
--
1.8.4.5

13
lxc-keep-caps-feature-doc.patch
View File

@ -8,11 +8,11 @@ Subject: [PATCH 3/3] lxc: update doc to mention features/capabilities/* domain
docs/drvlxc.html.in | 47 +++++++++++++++++++++++++++++++++++++++++++++++ docs/drvlxc.html.in | 47 +++++++++++++++++++++++++++++++++++++++++++++++
1 file changed, 47 insertions(+) 1 file changed, 47 insertions(+)
diff --git a/docs/drvlxc.html.in b/docs/drvlxc.html.in Index: libvirt-1.2.6/docs/drvlxc.html.in
index fc4bc20..403ce24 100644 ===================================================================
--- a/docs/drvlxc.html.in --- libvirt-1.2.6.orig/docs/drvlxc.html.in
+++ b/docs/drvlxc.html.in +++ libvirt-1.2.6/docs/drvlxc.html.in
@@ -540,6 +540,53 @@ debootstrap, whatever) under /opt/vm-1-root: @@ -540,6 +540,53 @@ debootstrap, whatever) under /opt/vm-1-r
&lt;/domain&gt; &lt;/domain&gt;
</pre> </pre>
@ -66,6 +66,3 @@ index fc4bc20..403ce24 100644
<h2><a name="usage">Container usage / management</a></h2> <h2><a name="usage">Container usage / management</a></h2>
--
1.8.4.5

92
lxc-keep-caps-feature.patch
View File

@ -25,10 +25,10 @@ this mechanism.
9 files changed, 602 insertions(+), 25 deletions(-) 9 files changed, 602 insertions(+), 25 deletions(-)
create mode 100644 tests/domainschemadata/domain-caps-features.xml create mode 100644 tests/domainschemadata/domain-caps-features.xml
Index: libvirt-1.2.5/docs/schemas/domaincommon.rng Index: libvirt-1.2.6/docs/schemas/domaincommon.rng
=================================================================== ===================================================================
--- libvirt-1.2.5.orig/docs/schemas/domaincommon.rng --- libvirt-1.2.6.orig/docs/schemas/domaincommon.rng
+++ libvirt-1.2.5/docs/schemas/domaincommon.rng +++ libvirt-1.2.6/docs/schemas/domaincommon.rng
@@ -3744,6 +3744,9 @@ @@ -3744,6 +3744,9 @@
<empty/> <empty/>
</element> </element>
@ -39,7 +39,7 @@ Index: libvirt-1.2.5/docs/schemas/domaincommon.rng
</interleave> </interleave>
</element> </element>
</optional> </optional>
@@ -4290,6 +4293,200 @@ @@ -4311,6 +4314,200 @@
</element> </element>
</define> </define>
@ -240,7 +240,7 @@ Index: libvirt-1.2.5/docs/schemas/domaincommon.rng
<define name="featurestate"> <define name="featurestate">
<attribute name="state"> <attribute name="state">
<choice> <choice>
@@ -4298,6 +4495,16 @@ @@ -4319,6 +4516,16 @@
</choice> </choice>
</attribute> </attribute>
</define> </define>
@ -257,10 +257,10 @@ Index: libvirt-1.2.5/docs/schemas/domaincommon.rng
<!-- <!--
Optional hypervisor extensions in their own namespace: Optional hypervisor extensions in their own namespace:
Index: libvirt-1.2.5/src/conf/domain_conf.c Index: libvirt-1.2.6/src/conf/domain_conf.c
=================================================================== ===================================================================
--- libvirt-1.2.5.orig/src/conf/domain_conf.c --- libvirt-1.2.6.orig/src/conf/domain_conf.c
+++ libvirt-1.2.5/src/conf/domain_conf.c +++ libvirt-1.2.6/src/conf/domain_conf.c
@@ -147,18 +147,63 @@ VIR_ENUM_IMPL(virDomainFeature, VIR_DOMA @@ -147,18 +147,63 @@ VIR_ENUM_IMPL(virDomainFeature, VIR_DOMA
"viridian", "viridian",
"privnet", "privnet",
@ -326,7 +326,7 @@ Index: libvirt-1.2.5/src/conf/domain_conf.c
VIR_ENUM_IMPL(virDomainLifecycle, VIR_DOMAIN_LIFECYCLE_LAST, VIR_ENUM_IMPL(virDomainLifecycle, VIR_DOMAIN_LIFECYCLE_LAST,
"destroy", "destroy",
"restart", "restart",
@@ -11835,6 +11880,22 @@ virDomainDefParseXML(xmlDocPtr xml, @@ -11879,6 +11924,22 @@ virDomainDefParseXML(xmlDocPtr xml,
def->features[val] = VIR_DOMAIN_FEATURE_STATE_ON; def->features[val] = VIR_DOMAIN_FEATURE_STATE_ON;
break; break;
@ -349,7 +349,7 @@ Index: libvirt-1.2.5/src/conf/domain_conf.c
case VIR_DOMAIN_FEATURE_PVSPINLOCK: case VIR_DOMAIN_FEATURE_PVSPINLOCK:
node = ctxt->node; node = ctxt->node;
ctxt->node = nodes[i]; ctxt->node = nodes[i];
@@ -11943,6 +12004,37 @@ virDomainDefParseXML(xmlDocPtr xml, @@ -11987,6 +12048,37 @@ virDomainDefParseXML(xmlDocPtr xml,
ctxt->node = node; ctxt->node = node;
} }
@ -387,7 +387,7 @@ Index: libvirt-1.2.5/src/conf/domain_conf.c
if (virDomainEventActionParseXML(ctxt, "on_reboot", if (virDomainEventActionParseXML(ctxt, "on_reboot",
"string(./on_reboot[1])", "string(./on_reboot[1])",
&def->onReboot, &def->onReboot,
@@ -17125,6 +17217,19 @@ verify(((VIR_DOMAIN_XML_INTERNAL_STATUS @@ -17184,6 +17276,19 @@ verify(((VIR_DOMAIN_XML_INTERNAL_STATUS
VIR_DOMAIN_XML_INTERNAL_CLOCK_ADJUST) VIR_DOMAIN_XML_INTERNAL_CLOCK_ADJUST)
& DUMPXML_FLAGS) == 0); & DUMPXML_FLAGS) == 0);
@ -407,7 +407,7 @@ Index: libvirt-1.2.5/src/conf/domain_conf.c
/* This internal version can accept VIR_DOMAIN_XML_INTERNAL_*, /* This internal version can accept VIR_DOMAIN_XML_INTERNAL_*,
* whereas the public version cannot. Also, it appends to an existing * whereas the public version cannot. Also, it appends to an existing
* buffer (possibly with auto-indent), rather than flattening to string. * buffer (possibly with auto-indent), rather than flattening to string.
@@ -17655,6 +17760,25 @@ virDomainDefFormatInternal(virDomainDefP @@ -17703,6 +17808,25 @@ virDomainDefFormatInternal(virDomainDefP
virBufferAddLit(buf, "</hyperv>\n"); virBufferAddLit(buf, "</hyperv>\n");
break; break;
@ -433,23 +433,22 @@ Index: libvirt-1.2.5/src/conf/domain_conf.c
case VIR_DOMAIN_FEATURE_LAST: case VIR_DOMAIN_FEATURE_LAST:
break; break;
} }
Index: libvirt-1.2.5/src/conf/domain_conf.h Index: libvirt-1.2.6/src/conf/domain_conf.h
=================================================================== ===================================================================
--- libvirt-1.2.5.orig/src/conf/domain_conf.h --- libvirt-1.2.6.orig/src/conf/domain_conf.h
+++ libvirt-1.2.5/src/conf/domain_conf.h +++ libvirt-1.2.6/src/conf/domain_conf.h
@@ -1526,6 +1526,7 @@ enum virDomainFeature { @@ -1528,6 +1528,7 @@ typedef enum {
VIR_DOMAIN_FEATURE_PRIVNET, VIR_DOMAIN_FEATURE_PRIVNET,
VIR_DOMAIN_FEATURE_HYPERV, VIR_DOMAIN_FEATURE_HYPERV,
VIR_DOMAIN_FEATURE_PVSPINLOCK, VIR_DOMAIN_FEATURE_PVSPINLOCK,
+ VIR_DOMAIN_FEATURE_CAPABILITIES, + VIR_DOMAIN_FEATURE_CAPABILITIES,
VIR_DOMAIN_FEATURE_LAST VIR_DOMAIN_FEATURE_LAST
}; } virDomainFeature;
@@ -1546,6 +1547,56 @@ enum virDomainHyperv { @@ -1549,6 +1550,56 @@ typedef enum {
VIR_DOMAIN_HYPERV_LAST } virDomainHyperv;
};
+typedef enum { typedef enum {
+ VIR_DOMAIN_CAPABILITIES_POLICY_DEFAULT = 0, + VIR_DOMAIN_CAPABILITIES_POLICY_DEFAULT = 0,
+ VIR_DOMAIN_CAPABILITIES_POLICY_ALLOW, + VIR_DOMAIN_CAPABILITIES_POLICY_ALLOW,
+ VIR_DOMAIN_CAPABILITIES_POLICY_DENY, + VIR_DOMAIN_CAPABILITIES_POLICY_DENY,
@ -499,10 +498,11 @@ Index: libvirt-1.2.5/src/conf/domain_conf.h
+ VIR_DOMAIN_CAPS_FEATURE_LAST + VIR_DOMAIN_CAPS_FEATURE_LAST
+ } virDomainCapsFeature; + } virDomainCapsFeature;
+ +
enum virDomainLifecycleAction { +typedef enum {
VIR_DOMAIN_LIFECYCLE_DESTROY, VIR_DOMAIN_LIFECYCLE_DESTROY,
VIR_DOMAIN_LIFECYCLE_RESTART, VIR_DOMAIN_LIFECYCLE_RESTART,
@@ -1915,6 +1966,9 @@ struct _virDomainDef { VIR_DOMAIN_LIFECYCLE_RESTART_RENAME,
@@ -1917,6 +1968,9 @@ struct _virDomainDef {
int hyperv_features[VIR_DOMAIN_HYPERV_LAST]; int hyperv_features[VIR_DOMAIN_HYPERV_LAST];
unsigned int hyperv_spinlocks; unsigned int hyperv_spinlocks;
@ -521,11 +521,11 @@ Index: libvirt-1.2.5/src/conf/domain_conf.h
VIR_ENUM_DECL(virDomainLifecycle) VIR_ENUM_DECL(virDomainLifecycle)
VIR_ENUM_DECL(virDomainLifecycleCrash) VIR_ENUM_DECL(virDomainLifecycleCrash)
VIR_ENUM_DECL(virDomainPMState) VIR_ENUM_DECL(virDomainPMState)
Index: libvirt-1.2.5/src/libvirt_private.syms Index: libvirt-1.2.6/src/libvirt_private.syms
=================================================================== ===================================================================
--- libvirt-1.2.5.orig/src/libvirt_private.syms --- libvirt-1.2.6.orig/src/libvirt_private.syms
+++ libvirt-1.2.5/src/libvirt_private.syms +++ libvirt-1.2.6/src/libvirt_private.syms
@@ -129,6 +129,8 @@ virDomainBlockedReasonTypeFromString; @@ -139,6 +139,8 @@ virDomainBlockedReasonTypeFromString;
virDomainBlockedReasonTypeToString; virDomainBlockedReasonTypeToString;
virDomainBootMenuTypeFromString; virDomainBootMenuTypeFromString;
virDomainBootMenuTypeToString; virDomainBootMenuTypeToString;
@ -534,7 +534,7 @@ Index: libvirt-1.2.5/src/libvirt_private.syms
virDomainChrConsoleTargetTypeFromString; virDomainChrConsoleTargetTypeFromString;
virDomainChrConsoleTargetTypeToString; virDomainChrConsoleTargetTypeToString;
virDomainChrDefForeach; virDomainChrDefForeach;
@@ -1013,6 +1015,7 @@ virBufferVasprintf; @@ -1027,6 +1029,7 @@ virBufferVasprintf;
# util/vircgroup.h # util/vircgroup.h
virCgroupAddTask; virCgroupAddTask;
virCgroupAddTaskController; virCgroupAddTaskController;
@ -542,11 +542,11 @@ Index: libvirt-1.2.5/src/libvirt_private.syms
virCgroupAllowDevice; virCgroupAllowDevice;
virCgroupAllowDeviceMajor; virCgroupAllowDeviceMajor;
virCgroupAllowDevicePath; virCgroupAllowDevicePath;
Index: libvirt-1.2.5/src/lxc/lxc_cgroup.c Index: libvirt-1.2.6/src/lxc/lxc_cgroup.c
=================================================================== ===================================================================
--- libvirt-1.2.5.orig/src/lxc/lxc_cgroup.c --- libvirt-1.2.6.orig/src/lxc/lxc_cgroup.c
+++ libvirt-1.2.5/src/lxc/lxc_cgroup.c +++ libvirt-1.2.6/src/lxc/lxc_cgroup.c
@@ -367,6 +367,14 @@ static int virLXCCgroupSetupDeviceACL(vi @@ -363,6 +363,14 @@ static int virLXCCgroupSetupDeviceACL(vi
if (virCgroupDenyAllDevices(cgroup) < 0) if (virCgroupDenyAllDevices(cgroup) < 0)
goto cleanup; goto cleanup;
@ -561,11 +561,11 @@ Index: libvirt-1.2.5/src/lxc/lxc_cgroup.c
for (i = 0; devices[i].type != 0; i++) { for (i = 0; devices[i].type != 0; i++) {
virLXCCgroupDevicePolicyPtr dev = &devices[i]; virLXCCgroupDevicePolicyPtr dev = &devices[i];
if (virCgroupAllowDevice(cgroup, if (virCgroupAllowDevice(cgroup,
Index: libvirt-1.2.5/src/lxc/lxc_container.c Index: libvirt-1.2.6/src/lxc/lxc_container.c
=================================================================== ===================================================================
--- libvirt-1.2.5.orig/src/lxc/lxc_container.c --- libvirt-1.2.6.orig/src/lxc/lxc_container.c
+++ libvirt-1.2.5/src/lxc/lxc_container.c +++ libvirt-1.2.6/src/lxc/lxc_container.c
@@ -1739,25 +1739,232 @@ static int lxcContainerResolveSymlinks(v @@ -1732,25 +1732,232 @@ static int lxcContainerResolveSymlinks(v
* host system, since they are not currently "containerized" * host system, since they are not currently "containerized"
*/ */
#if WITH_CAPNG #if WITH_CAPNG
@ -812,7 +812,7 @@ Index: libvirt-1.2.5/src/lxc/lxc_container.c
} }
if ((ret = capng_apply(CAPNG_SELECT_BOTH)) < 0) { if ((ret = capng_apply(CAPNG_SELECT_BOTH)) < 0) {
@@ -1775,7 +1982,8 @@ static int lxcContainerDropCapabilities( @@ -1768,7 +1975,8 @@ static int lxcContainerDropCapabilities(
return 0; return 0;
} }
#else #else
@ -822,7 +822,7 @@ Index: libvirt-1.2.5/src/lxc/lxc_container.c
{ {
VIR_WARN("libcap-ng support not compiled in, unable to clear capabilities"); VIR_WARN("libcap-ng support not compiled in, unable to clear capabilities");
return 0; return 0;
@@ -1881,7 +2089,7 @@ static int lxcContainerChild(void *data) @@ -1874,7 +2082,7 @@ static int lxcContainerChild(void *data)
} }
/* drop a set of root capabilities */ /* drop a set of root capabilities */
@ -831,10 +831,10 @@ Index: libvirt-1.2.5/src/lxc/lxc_container.c
goto cleanup; goto cleanup;
if (lxcContainerSendContinue(argv->handshakefd) < 0) { if (lxcContainerSendContinue(argv->handshakefd) < 0) {
Index: libvirt-1.2.5/src/util/vircgroup.c Index: libvirt-1.2.6/src/util/vircgroup.c
=================================================================== ===================================================================
--- libvirt-1.2.5.orig/src/util/vircgroup.c --- libvirt-1.2.6.orig/src/util/vircgroup.c
+++ libvirt-1.2.5/src/util/vircgroup.c +++ libvirt-1.2.6/src/util/vircgroup.c
@@ -2622,6 +2622,62 @@ virCgroupDenyAllDevices(virCgroupPtr gro @@ -2622,6 +2622,62 @@ virCgroupDenyAllDevices(virCgroupPtr gro
"a"); "a");
} }
@ -932,10 +932,10 @@ Index: libvirt-1.2.5/src/util/vircgroup.c
int int
virCgroupDenyAllDevices(virCgroupPtr group ATTRIBUTE_UNUSED) virCgroupDenyAllDevices(virCgroupPtr group ATTRIBUTE_UNUSED)
Index: libvirt-1.2.5/src/util/vircgroup.h Index: libvirt-1.2.6/src/util/vircgroup.h
=================================================================== ===================================================================
--- libvirt-1.2.5.orig/src/util/vircgroup.h --- libvirt-1.2.6.orig/src/util/vircgroup.h
+++ libvirt-1.2.5/src/util/vircgroup.h +++ libvirt-1.2.6/src/util/vircgroup.h
@@ -175,6 +175,8 @@ enum { @@ -175,6 +175,8 @@ enum {
int virCgroupDenyAllDevices(virCgroupPtr group); int virCgroupDenyAllDevices(virCgroupPtr group);
@ -945,10 +945,10 @@ Index: libvirt-1.2.5/src/util/vircgroup.h
int virCgroupAllowDevice(virCgroupPtr group, int virCgroupAllowDevice(virCgroupPtr group,
char type, char type,
int major, int major,
Index: libvirt-1.2.5/tests/domainschemadata/domain-caps-features.xml Index: libvirt-1.2.6/tests/domainschemadata/domain-caps-features.xml
=================================================================== ===================================================================
--- /dev/null --- /dev/null
+++ libvirt-1.2.5/tests/domainschemadata/domain-caps-features.xml +++ libvirt-1.2.6/tests/domainschemadata/domain-caps-features.xml
@@ -0,0 +1,28 @@ @@ -0,0 +1,28 @@
+<domain type='lxc'> +<domain type='lxc'>
+ <name>demo</name> + <name>demo</name>

18
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-1.2.5/src/xenxs/xen_sxpr.c Index: libvirt-1.2.6/src/xenxs/xen_sxpr.c
=================================================================== ===================================================================
--- libvirt-1.2.5.orig/src/xenxs/xen_sxpr.c --- libvirt-1.2.6.orig/src/xenxs/xen_sxpr.c
+++ libvirt-1.2.5/src/xenxs/xen_sxpr.c +++ libvirt-1.2.6/src/xenxs/xen_sxpr.c
@@ -997,6 +997,7 @@ xenParseSxprPCI(virDomainDefPtr def, @@ -997,6 +997,7 @@ xenParseSxprPCI(virDomainDefPtr def,
int busID; int busID;
int slotID; int slotID;
@ -78,11 +78,11 @@ Index: libvirt-1.2.5/src/xenxs/xen_sxpr.c
xenFormatSxprPCI(def->hostdevs[i], buf); xenFormatSxprPCI(def->hostdevs[i], buf);
} }
} }
Index: libvirt-1.2.5/src/xenxs/xen_xm.c Index: libvirt-1.2.6/src/xenxs/xen_xm.c
=================================================================== ===================================================================
--- libvirt-1.2.5.orig/src/xenxs/xen_xm.c --- libvirt-1.2.6.orig/src/xenxs/xen_xm.c
+++ libvirt-1.2.5/src/xenxs/xen_xm.c +++ libvirt-1.2.6/src/xenxs/xen_xm.c
@@ -807,6 +807,8 @@ xenParseXM(virConfPtr conf, int xendConf @@ -819,6 +819,8 @@ xenParseXM(virConfPtr conf, int xendConf
int busID; int busID;
int slotID; int slotID;
int funcID; int funcID;
@ -91,7 +91,7 @@ Index: libvirt-1.2.5/src/xenxs/xen_xm.c
domain[0] = bus[0] = slot[0] = func[0] = '\0'; domain[0] = bus[0] = slot[0] = func[0] = '\0';
@@ -816,6 +818,11 @@ xenParseXM(virConfPtr conf, int xendConf @@ -828,6 +830,11 @@ xenParseXM(virConfPtr conf, int xendConf
/* pci=['0000:00:1b.0','0000:00:13.0'] */ /* pci=['0000:00:1b.0','0000:00:13.0'] */
if (!(key = list->str)) if (!(key = list->str))
goto skippci; goto skippci;
@ -103,7 +103,7 @@ Index: libvirt-1.2.5/src/xenxs/xen_xm.c
if (!(nextkey = strchr(key, ':'))) if (!(nextkey = strchr(key, ':')))
goto skippci; goto skippci;
@@ -864,10 +871,30 @@ xenParseXM(virConfPtr conf, int xendConf @@ -876,10 +883,30 @@ xenParseXM(virConfPtr conf, int xendConf
if (virStrToLong_i(func, NULL, 16, &funcID) < 0) if (virStrToLong_i(func, NULL, 16, &funcID) < 0)
goto skippci; goto skippci;

6
suse-qemu-conf.patch
View File

@ -1,7 +1,7 @@
Index: libvirt-1.2.5/src/qemu/qemu.conf Index: libvirt-1.2.6/src/qemu/qemu.conf
=================================================================== ===================================================================
--- libvirt-1.2.5.orig/src/qemu/qemu.conf --- libvirt-1.2.6.orig/src/qemu/qemu.conf
+++ libvirt-1.2.5/src/qemu/qemu.conf +++ libvirt-1.2.6/src/qemu/qemu.conf
@@ -200,7 +200,16 @@ @@ -200,7 +200,16 @@
# a special value; security_driver can be set to that value in # a special value; security_driver can be set to that value in
# isolation, but it cannot appear in a list of drivers. # isolation, but it cannot appear in a list of drivers.

6
systemd-service-xen.patch
View File

@ -1,7 +1,7 @@
Index: libvirt-1.2.5/daemon/libvirtd.service.in Index: libvirt-1.2.6/daemon/libvirtd.service.in
=================================================================== ===================================================================
--- libvirt-1.2.5.orig/daemon/libvirtd.service.in --- libvirt-1.2.6.orig/daemon/libvirtd.service.in
+++ libvirt-1.2.5/daemon/libvirtd.service.in +++ libvirt-1.2.6/daemon/libvirtd.service.in
@@ -10,6 +10,8 @@ After=network.target @@ -10,6 +10,8 @@ After=network.target
After=dbus.service After=dbus.service
After=iscsid.service After=iscsid.service

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-1.2.5/src/locking/virtlockd.sysconf Index: libvirt-1.2.6/src/locking/virtlockd.sysconf
=================================================================== ===================================================================
--- libvirt-1.2.5.orig/src/locking/virtlockd.sysconf --- libvirt-1.2.6.orig/src/locking/virtlockd.sysconf
+++ libvirt-1.2.5/src/locking/virtlockd.sysconf +++ libvirt-1.2.6/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-1.2.5/src/locking/virtlockd.sysconf
# #
# Pass extra arguments to virtlockd # Pass extra arguments to virtlockd
#VIRTLOCKD_ARGS= #VIRTLOCKD_ARGS=
Index: libvirt-1.2.5/src/locking/virtlockd.init.in Index: libvirt-1.2.6/src/locking/virtlockd.init.in
=================================================================== ===================================================================
--- libvirt-1.2.5.orig/src/locking/virtlockd.init.in --- libvirt-1.2.6.orig/src/locking/virtlockd.init.in
+++ libvirt-1.2.5/src/locking/virtlockd.init.in +++ libvirt-1.2.6/src/locking/virtlockd.init.in
@@ -4,12 +4,14 @@ @@ -4,12 +4,14 @@
# http://www.linux-foundation.org/spec//booksets/LSB-Core-generic/LSB-Core-generic.html#INITSCRCOMCONV # http://www.linux-foundation.org/spec//booksets/LSB-Core-generic/LSB-Core-generic.html#INITSCRCOMCONV
# #

12
xen-name-for-devid.patch
View File

@ -14,10 +14,10 @@
is inactive. We obviously can't search xenstore when the domain is is inactive. We obviously can't search xenstore when the domain is
inactive. inactive.
Index: libvirt-1.2.5/src/xen/xend_internal.c Index: libvirt-1.2.6/src/xen/xend_internal.c
=================================================================== ===================================================================
--- libvirt-1.2.5.orig/src/xen/xend_internal.c --- libvirt-1.2.6.orig/src/xen/xend_internal.c
+++ libvirt-1.2.5/src/xen/xend_internal.c +++ libvirt-1.2.6/src/xen/xend_internal.c
@@ -72,7 +72,7 @@ VIR_LOG_INIT("xen.xend_internal"); @@ -72,7 +72,7 @@ VIR_LOG_INIT("xen.xend_internal");
#define XEND_RCV_BUF_MAX_LEN (256 * 1024) #define XEND_RCV_BUF_MAX_LEN (256 * 1024)
@ -27,7 +27,7 @@ Index: libvirt-1.2.5/src/xen/xend_internal.c
virDomainDeviceDefPtr dev, char *class, virDomainDeviceDefPtr dev, char *class,
char *ref, int ref_len); char *ref, int ref_len);
@@ -3328,37 +3328,35 @@ xenDaemonDomainBlockPeek(virConnectPtr c @@ -3331,37 +3331,35 @@ xenDaemonDomainBlockPeek(virConnectPtr c
* Returns 0 in case of success, -1 in case of failure. * Returns 0 in case of success, -1 in case of failure.
*/ */
static int static int
@ -80,7 +80,7 @@ Index: libvirt-1.2.5/src/xen/xend_internal.c
} else if (dev->type == VIR_DOMAIN_DEVICE_NET) { } else if (dev->type == VIR_DOMAIN_DEVICE_NET) {
char mac[VIR_MAC_STRING_BUFLEN]; char mac[VIR_MAC_STRING_BUFLEN];
virDomainNetDefPtr netdef = dev->data.net; virDomainNetDefPtr netdef = dev->data.net;
@@ -3366,16 +3364,22 @@ virDomainXMLDevID(virConnectPtr conn, @@ -3369,16 +3367,22 @@ virDomainXMLDevID(virConnectPtr conn,
strcpy(class, "vif"); strcpy(class, "vif");
@ -113,7 +113,7 @@ Index: libvirt-1.2.5/src/xen/xend_internal.c
} else if (dev->type == VIR_DOMAIN_DEVICE_HOSTDEV && } else if (dev->type == VIR_DOMAIN_DEVICE_HOSTDEV &&
dev->data.hostdev->mode == VIR_DOMAIN_HOSTDEV_MODE_SUBSYS && dev->data.hostdev->mode == VIR_DOMAIN_HOSTDEV_MODE_SUBSYS &&
dev->data.hostdev->source.subsys.type == VIR_DOMAIN_HOSTDEV_SUBSYS_TYPE_PCI) { dev->data.hostdev->source.subsys.type == VIR_DOMAIN_HOSTDEV_SUBSYS_TYPE_PCI) {
@@ -3391,17 +3395,44 @@ virDomainXMLDevID(virConnectPtr conn, @@ -3394,17 +3398,44 @@ virDomainXMLDevID(virConnectPtr conn,
strcpy(class, "pci"); strcpy(class, "pci");

6
xen-pv-cdrom.patch
View File

@ -1,7 +1,7 @@
Index: libvirt-1.2.5/src/xenxs/xen_sxpr.c Index: libvirt-1.2.6/src/xenxs/xen_sxpr.c
=================================================================== ===================================================================
--- libvirt-1.2.5.orig/src/xenxs/xen_sxpr.c --- libvirt-1.2.6.orig/src/xenxs/xen_sxpr.c
+++ libvirt-1.2.5/src/xenxs/xen_sxpr.c +++ libvirt-1.2.6/src/xenxs/xen_sxpr.c
@@ -332,7 +332,7 @@ xenParseSxprChar(const char *value, @@ -332,7 +332,7 @@ xenParseSxprChar(const char *value,
static int static int
xenParseSxprDisks(virDomainDefPtr def, xenParseSxprDisks(virDomainDefPtr def,