From 084e297a8a85475db94d4f2ef5b1df1029dee99e0561dcc1c601a1a896af3c69 Mon Sep 17 00:00:00 2001 From: James Fehlig Date: Mon, 3 Nov 2014 22:53:40 +0000 Subject: [PATCH] Accepting request 259573 from home:jfehlig:branches:Virtualization - Update to libvirt 1.2.10 - Many incremental improvements and bug fixes, see http://libvirt.org/news.html OBS-URL: https://build.opensuse.org/request/show/259573 OBS-URL: https://build.opensuse.org/package/show/Virtualization/libvirt?expand=0&rev=416 --- apparmor-no-mount.patch | 6 +-- blockcopy-check-dst-identical-device.patch | 8 +-- disable-virCgroupGetPercpuStats-test.patch | 6 +-- fix-pci-attach-xen-driver.patch | 6 +-- install-apparmor-profiles.patch | 22 ++++---- libvirt-1.2.10.tar.gz | 3 ++ libvirt-1.2.10.tar.gz.asc | 7 +++ libvirt-1.2.9.tar.gz | 3 -- libvirt-1.2.9.tar.gz.asc | 7 --- libvirt-guests-init-script.patch | 18 +++---- libvirt-power8-models.patch | 6 +-- libvirt-ppc64le-support.patch | 58 +++++++++++----------- libvirt-suse-netcontrol.patch | 42 ++++++++-------- libvirt.changes | 7 +++ libvirt.spec | 2 +- libvirtd-defaults.patch | 18 +++---- libvirtd-init-script.patch | 6 +-- ppc64le-canonical-name.patch | 6 +-- support-managed-pci-xen-driver.patch | 12 ++--- suse-qemu-conf.patch | 6 +-- systemd-service-xen.patch | 6 +-- virtlockd-init-script.patch | 12 ++--- xen-name-for-devid.patch | 6 +-- xen-pv-cdrom.patch | 6 +-- 24 files changed, 143 insertions(+), 136 deletions(-) create mode 100644 libvirt-1.2.10.tar.gz create mode 100644 libvirt-1.2.10.tar.gz.asc delete mode 100644 libvirt-1.2.9.tar.gz delete mode 100644 libvirt-1.2.9.tar.gz.asc diff --git a/apparmor-no-mount.patch b/apparmor-no-mount.patch index 8fa73d2..763b0ce 100644 --- a/apparmor-no-mount.patch +++ b/apparmor-no-mount.patch @@ -1,7 +1,7 @@ -Index: libvirt-1.2.9/examples/apparmor/libvirt-lxc +Index: libvirt-1.2.10/examples/apparmor/libvirt-lxc =================================================================== ---- libvirt-1.2.9.orig/examples/apparmor/libvirt-lxc -+++ libvirt-1.2.9/examples/apparmor/libvirt-lxc +--- libvirt-1.2.10.orig/examples/apparmor/libvirt-lxc ++++ libvirt-1.2.10/examples/apparmor/libvirt-lxc @@ -2,39 +2,15 @@ #include diff --git a/blockcopy-check-dst-identical-device.patch b/blockcopy-check-dst-identical-device.patch index cda57d0..f298bc9 100644 --- a/blockcopy-check-dst-identical-device.patch +++ b/blockcopy-check-dst-identical-device.patch @@ -11,11 +11,11 @@ Signed-off-by: Chunyan Liu src/qemu/qemu_driver.c | 7 +++++++ 1 file changed, 7 insertions(+) -Index: libvirt-1.2.9/src/qemu/qemu_driver.c +Index: libvirt-1.2.10/src/qemu/qemu_driver.c =================================================================== ---- libvirt-1.2.9.orig/src/qemu/qemu_driver.c -+++ libvirt-1.2.9/src/qemu/qemu_driver.c -@@ -15589,6 +15589,15 @@ qemuDomainBlockCopyCommon(virDomainObjPt +--- libvirt-1.2.10.orig/src/qemu/qemu_driver.c ++++ libvirt-1.2.10/src/qemu/qemu_driver.c +@@ -15936,6 +15936,15 @@ qemuDomainBlockCopyCommon(virDomainObjPt virReportError(VIR_ERR_ARGUMENT_UNSUPPORTED, "%s", _("non-file destination not supported yet")); } diff --git a/disable-virCgroupGetPercpuStats-test.patch b/disable-virCgroupGetPercpuStats-test.patch index c961779..b0e4480 100644 --- a/disable-virCgroupGetPercpuStats-test.patch +++ b/disable-virCgroupGetPercpuStats-test.patch @@ -1,7 +1,7 @@ -Index: libvirt-1.2.9/tests/vircgrouptest.c +Index: libvirt-1.2.10/tests/vircgrouptest.c =================================================================== ---- libvirt-1.2.9.orig/tests/vircgrouptest.c -+++ libvirt-1.2.9/tests/vircgrouptest.c +--- libvirt-1.2.10.orig/tests/vircgrouptest.c ++++ libvirt-1.2.10/tests/vircgrouptest.c @@ -33,7 +33,6 @@ # include "virlog.h" # include "virfile.h" diff --git a/fix-pci-attach-xen-driver.patch b/fix-pci-attach-xen-driver.patch index 5bd58da..4ed8386 100644 --- a/fix-pci-attach-xen-driver.patch +++ b/fix-pci-attach-xen-driver.patch @@ -8,10 +8,10 @@ uses the 'device_configure' RPC. This patch changes the xend driver to always call 'device_configure' for PCI devices to be consistent with the usage in the xen tools. -Index: libvirt-1.2.9/src/xen/xend_internal.c +Index: libvirt-1.2.10/src/xen/xend_internal.c =================================================================== ---- libvirt-1.2.9.orig/src/xen/xend_internal.c -+++ libvirt-1.2.9/src/xen/xend_internal.c +--- libvirt-1.2.10.orig/src/xen/xend_internal.c ++++ libvirt-1.2.10/src/xen/xend_internal.c @@ -2221,6 +2221,7 @@ xenDaemonAttachDeviceFlags(virConnectPtr virBuffer buf = VIR_BUFFER_INITIALIZER; char class[8], ref[80]; diff --git a/install-apparmor-profiles.patch b/install-apparmor-profiles.patch index f415362..a06f9ec 100644 --- a/install-apparmor-profiles.patch +++ b/install-apparmor-profiles.patch @@ -1,7 +1,7 @@ -Index: libvirt-1.2.9/examples/apparmor/Makefile.am +Index: libvirt-1.2.10/examples/apparmor/Makefile.am =================================================================== ---- libvirt-1.2.9.orig/examples/apparmor/Makefile.am -+++ libvirt-1.2.9/examples/apparmor/Makefile.am +--- libvirt-1.2.10.orig/examples/apparmor/Makefile.am ++++ libvirt-1.2.10/examples/apparmor/Makefile.am @@ -19,10 +19,22 @@ EXTRA_DIST= \ TEMPLATE.lxc \ libvirt-qemu \ @@ -27,10 +27,10 @@ Index: libvirt-1.2.9/examples/apparmor/Makefile.am apparmordir = $(sysconfdir)/apparmor.d/ apparmor_DATA = \ usr.lib.libvirt.virt-aa-helper \ -Index: libvirt-1.2.9/examples/apparmor/usr.lib.libvirt.virt-aa-helper.in +Index: libvirt-1.2.10/examples/apparmor/usr.lib.libvirt.virt-aa-helper.in =================================================================== --- /dev/null -+++ libvirt-1.2.9/examples/apparmor/usr.lib.libvirt.virt-aa-helper.in ++++ libvirt-1.2.10/examples/apparmor/usr.lib.libvirt.virt-aa-helper.in @@ -0,0 +1,48 @@ +# Last Modified: Mon Apr 5 15:10:27 2010 +#include @@ -80,10 +80,10 @@ Index: libvirt-1.2.9/examples/apparmor/usr.lib.libvirt.virt-aa-helper.in + /**.[iI][sS][oO] r, + /**/disk{,.*} r, +} -Index: libvirt-1.2.9/examples/apparmor/usr.sbin.libvirtd.in +Index: libvirt-1.2.10/examples/apparmor/usr.sbin.libvirtd.in =================================================================== --- /dev/null -+++ libvirt-1.2.9/examples/apparmor/usr.sbin.libvirtd.in ++++ libvirt-1.2.10/examples/apparmor/usr.sbin.libvirtd.in @@ -0,0 +1,68 @@ +# Last Modified: Mon Apr 5 15:03:58 2010 +#include @@ -153,9 +153,9 @@ Index: libvirt-1.2.9/examples/apparmor/usr.sbin.libvirtd.in + change_profile -> @{LIBVIRT}-[0-9a-f]*-[0-9a-f]*-[0-9a-f]*-[0-9a-f]*-[0-9a-f]*, + +} -Index: libvirt-1.2.9/examples/apparmor/usr.lib.libvirt.virt-aa-helper +Index: libvirt-1.2.10/examples/apparmor/usr.lib.libvirt.virt-aa-helper =================================================================== ---- libvirt-1.2.9.orig/examples/apparmor/usr.lib.libvirt.virt-aa-helper +--- libvirt-1.2.10.orig/examples/apparmor/usr.lib.libvirt.virt-aa-helper +++ /dev/null @@ -1,48 +0,0 @@ -# Last Modified: Mon Apr 5 15:10:27 2010 @@ -206,9 +206,9 @@ Index: libvirt-1.2.9/examples/apparmor/usr.lib.libvirt.virt-aa-helper - /**.[iI][sS][oO] r, - /**/disk{,.*} r, -} -Index: libvirt-1.2.9/examples/apparmor/usr.sbin.libvirtd +Index: libvirt-1.2.10/examples/apparmor/usr.sbin.libvirtd =================================================================== ---- libvirt-1.2.9.orig/examples/apparmor/usr.sbin.libvirtd +--- libvirt-1.2.10.orig/examples/apparmor/usr.sbin.libvirtd +++ /dev/null @@ -1,63 +0,0 @@ -# Last Modified: Mon Apr 5 15:03:58 2010 diff --git a/libvirt-1.2.10.tar.gz b/libvirt-1.2.10.tar.gz new file mode 100644 index 0000000..6c10450 --- /dev/null +++ b/libvirt-1.2.10.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:5050f4cea3dd59d3eca25c3d3f16085e10d624ecc18bd35820cd3dac6f46c08e +size 30029503 diff --git a/libvirt-1.2.10.tar.gz.asc b/libvirt-1.2.10.tar.gz.asc new file mode 100644 index 0000000..280e7a9 --- /dev/null +++ b/libvirt-1.2.10.tar.gz.asc @@ -0,0 +1,7 @@ +-----BEGIN PGP SIGNATURE----- +Version: GnuPG v1 + +iEYEABECAAYFAlRXIOgACgkQRga4pd6VvB+obgCcCzOsG4rjI5PZs5Br9SXZuh41 +vUkAoIaaoJv304OoiEdsCr1x4gAwaFpU +=FzVc +-----END PGP SIGNATURE----- diff --git a/libvirt-1.2.9.tar.gz b/libvirt-1.2.9.tar.gz deleted file mode 100644 index 48a0e79..0000000 --- a/libvirt-1.2.9.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:95931a5a52f451b9ab73d6a5ae11a5740e1ba69a66520c2a0cffc6068a7e8fc4 -size 30154430 diff --git a/libvirt-1.2.9.tar.gz.asc b/libvirt-1.2.9.tar.gz.asc deleted file mode 100644 index b80890b..0000000 --- a/libvirt-1.2.9.tar.gz.asc +++ /dev/null @@ -1,7 +0,0 @@ ------BEGIN PGP SIGNATURE----- -Version: GnuPG v1 - -iEYEABECAAYFAlQrvjoACgkQRga4pd6VvB/bJwCfasEmR26TtY5jQNlVG6ChqYHU -bhwAnRMdkTBkoQsPLMuKQYpeLtpFKfkX -=VHOB ------END PGP SIGNATURE----- diff --git a/libvirt-guests-init-script.patch b/libvirt-guests-init-script.patch index eea6669..96b7c70 100644 --- a/libvirt-guests-init-script.patch +++ b/libvirt-guests-init-script.patch @@ -1,9 +1,9 @@ Adjust libvirt-guests init files to conform to SUSE standards -Index: libvirt-1.2.9/tools/libvirt-guests.init.in +Index: libvirt-1.2.10/tools/libvirt-guests.init.in =================================================================== ---- libvirt-1.2.9.orig/tools/libvirt-guests.init.in -+++ libvirt-1.2.9/tools/libvirt-guests.init.in +--- libvirt-1.2.10.orig/tools/libvirt-guests.init.in ++++ libvirt-1.2.10/tools/libvirt-guests.init.in @@ -3,15 +3,15 @@ # the following is the LSB init header # @@ -28,10 +28,10 @@ Index: libvirt-1.2.9/tools/libvirt-guests.init.in ### END INIT INFO # the following is chkconfig init header -Index: libvirt-1.2.9/tools/libvirt-guests.sh.in +Index: libvirt-1.2.10/tools/libvirt-guests.sh.in =================================================================== ---- libvirt-1.2.9.orig/tools/libvirt-guests.sh.in -+++ libvirt-1.2.9/tools/libvirt-guests.sh.in +--- libvirt-1.2.10.orig/tools/libvirt-guests.sh.in ++++ libvirt-1.2.10/tools/libvirt-guests.sh.in @@ -16,14 +16,13 @@ # License along with this library. If not, see # . @@ -189,10 +189,10 @@ Index: libvirt-1.2.9/tools/libvirt-guests.sh.in esac -exit $RETVAL +rc_exit -Index: libvirt-1.2.9/tools/libvirt-guests.sysconf +Index: libvirt-1.2.10/tools/libvirt-guests.sysconf =================================================================== ---- libvirt-1.2.9.orig/tools/libvirt-guests.sysconf -+++ libvirt-1.2.9/tools/libvirt-guests.sysconf +--- libvirt-1.2.10.orig/tools/libvirt-guests.sysconf ++++ libvirt-1.2.10/tools/libvirt-guests.sysconf @@ -1,19 +1,29 @@ +## Path: System/Virtualization/libvirt-guests + diff --git a/libvirt-power8-models.patch b/libvirt-power8-models.patch index 3a5ad9d..287675c 100644 --- a/libvirt-power8-models.patch +++ b/libvirt-power8-models.patch @@ -1,7 +1,7 @@ -Index: libvirt-1.2.9/src/cpu/cpu_map.xml +Index: libvirt-1.2.10/src/cpu/cpu_map.xml =================================================================== ---- libvirt-1.2.9.orig/src/cpu/cpu_map.xml -+++ libvirt-1.2.9/src/cpu/cpu_map.xml +--- libvirt-1.2.10.orig/src/cpu/cpu_map.xml ++++ libvirt-1.2.10/src/cpu/cpu_map.xml @@ -627,5 +627,15 @@ diff --git a/libvirt-ppc64le-support.patch b/libvirt-ppc64le-support.patch index dea65c7..53a0f00 100644 --- a/libvirt-ppc64le-support.patch +++ b/libvirt-ppc64le-support.patch @@ -1,8 +1,8 @@ -Index: libvirt-1.2.9/src/conf/domain_conf.c +Index: libvirt-1.2.10/src/conf/domain_conf.c =================================================================== ---- libvirt-1.2.9.orig/src/conf/domain_conf.c -+++ libvirt-1.2.9/src/conf/domain_conf.c -@@ -9863,7 +9863,8 @@ virDomainVideoDefaultType(const virDomai +--- libvirt-1.2.10.orig/src/conf/domain_conf.c ++++ libvirt-1.2.10/src/conf/domain_conf.c +@@ -10043,7 +10043,8 @@ virDomainVideoDefaultType(const virDomai (STREQ(def->os.type, "xen") || STREQ(def->os.type, "linux"))) return VIR_DOMAIN_VIDEO_TYPE_XEN; @@ -12,10 +12,10 @@ Index: libvirt-1.2.9/src/conf/domain_conf.c return VIR_DOMAIN_VIDEO_TYPE_VGA; else return VIR_DOMAIN_VIDEO_TYPE_CIRRUS; -Index: libvirt-1.2.9/src/cpu/cpu_powerpc.c +Index: libvirt-1.2.10/src/cpu/cpu_powerpc.c =================================================================== ---- libvirt-1.2.9.orig/src/cpu/cpu_powerpc.c -+++ libvirt-1.2.9/src/cpu/cpu_powerpc.c +--- libvirt-1.2.10.orig/src/cpu/cpu_powerpc.c ++++ libvirt-1.2.10/src/cpu/cpu_powerpc.c @@ -38,7 +38,7 @@ VIR_LOG_INIT("cpu.cpu_powerpc"); @@ -25,11 +25,11 @@ Index: libvirt-1.2.9/src/cpu/cpu_powerpc.c struct ppc_vendor { char *name; -Index: libvirt-1.2.9/src/qemu/qemu_capabilities.c +Index: libvirt-1.2.10/src/qemu/qemu_capabilities.c =================================================================== ---- libvirt-1.2.9.orig/src/qemu/qemu_capabilities.c -+++ libvirt-1.2.9/src/qemu/qemu_capabilities.c -@@ -632,7 +632,8 @@ virQEMUCapsProbeCPUModels(virQEMUCapsPtr +--- libvirt-1.2.10.orig/src/qemu/qemu_capabilities.c ++++ libvirt-1.2.10/src/qemu/qemu_capabilities.c +@@ -633,7 +633,8 @@ virQEMUCapsProbeCPUModels(virQEMUCapsPtr if (qemuCaps->arch == VIR_ARCH_I686 || qemuCaps->arch == VIR_ARCH_X86_64) { parse = virQEMUCapsParseX86Models; @@ -39,7 +39,7 @@ Index: libvirt-1.2.9/src/qemu/qemu_capabilities.c parse = virQEMUCapsParsePPCModels; } else { VIR_DEBUG("don't know how to parse %s CPU models", -@@ -2001,7 +2002,8 @@ bool virQEMUCapsHasPCIMultiBus(virQEMUCa +@@ -2003,7 +2004,8 @@ bool virQEMUCapsHasPCIMultiBus(virQEMUCa return true; if (def->os.arch == VIR_ARCH_PPC || @@ -49,7 +49,7 @@ Index: libvirt-1.2.9/src/qemu/qemu_capabilities.c /* * Usage of pci.0 naming: * -@@ -3571,7 +3573,9 @@ virQEMUCapsSupportsChardev(virDomainDefP +@@ -3573,7 +3575,9 @@ virQEMUCapsSupportsChardev(virDomainDefP !virQEMUCapsGet(qemuCaps, QEMU_CAPS_DEVICE)) return false; @@ -60,10 +60,10 @@ Index: libvirt-1.2.9/src/qemu/qemu_capabilities.c /* only pseries need -device spapr-vty with -chardev */ return (chr->deviceType == VIR_DOMAIN_CHR_DEVICE_TYPE_SERIAL && chr->info.type == VIR_DOMAIN_DEVICE_ADDRESS_TYPE_SPAPRVIO); -Index: libvirt-1.2.9/src/qemu/qemu_command.c +Index: libvirt-1.2.10/src/qemu/qemu_command.c =================================================================== ---- libvirt-1.2.9.orig/src/qemu/qemu_command.c -+++ libvirt-1.2.9/src/qemu/qemu_command.c +--- libvirt-1.2.10.orig/src/qemu/qemu_command.c ++++ libvirt-1.2.10/src/qemu/qemu_command.c @@ -713,7 +713,8 @@ qemuSetSCSIControllerModel(virDomainDefP return -1; } @@ -74,7 +74,7 @@ Index: libvirt-1.2.9/src/qemu/qemu_command.c STRPREFIX(def->os.machine, "pseries")) { *model = VIR_DOMAIN_CONTROLLER_MODEL_SCSI_IBMVSCSI; } else if (virQEMUCapsGet(qemuCaps, QEMU_CAPS_SCSI_LSI)) { -@@ -1260,7 +1261,8 @@ int qemuDomainAssignSpaprVIOAddresses(vi +@@ -1264,7 +1265,8 @@ int qemuDomainAssignSpaprVIOAddresses(vi for (i = 0; i < def->nserials; i++) { if (def->serials[i]->deviceType == VIR_DOMAIN_CHR_DEVICE_TYPE_SERIAL && @@ -84,7 +84,7 @@ Index: libvirt-1.2.9/src/qemu/qemu_command.c STRPREFIX(def->os.machine, "pseries")) def->serials[i]->info.type = VIR_DOMAIN_DEVICE_ADDRESS_TYPE_SPAPRVIO; if (qemuAssignSpaprVIOAddress(def, &def->serials[i]->info, -@@ -1269,7 +1271,8 @@ int qemuDomainAssignSpaprVIOAddresses(vi +@@ -1273,7 +1275,8 @@ int qemuDomainAssignSpaprVIOAddresses(vi } if (def->nvram) { @@ -94,7 +94,7 @@ Index: libvirt-1.2.9/src/qemu/qemu_command.c STRPREFIX(def->os.machine, "pseries")) def->nvram->info.type = VIR_DOMAIN_DEVICE_ADDRESS_TYPE_SPAPRVIO; if (qemuAssignSpaprVIOAddress(def, &def->nvram->info, -@@ -4191,7 +4194,8 @@ qemuBuildUSBControllerDevStr(virDomainDe +@@ -4195,7 +4198,8 @@ qemuBuildUSBControllerDevStr(virDomainDe model = def->model; if (model == -1) { @@ -104,7 +104,7 @@ Index: libvirt-1.2.9/src/qemu/qemu_command.c model = VIR_DOMAIN_CONTROLLER_MODEL_USB_PCI_OHCI; else model = VIR_DOMAIN_CONTROLLER_MODEL_USB_PIIX3_UHCI; -@@ -8421,7 +8425,8 @@ qemuBuildCommandLine(virConnectPtr conn, +@@ -8573,7 +8577,8 @@ qemuBuildCommandLine(virConnectPtr conn, !qemuDomainMachineIsQ35(def) && (!virQEMUCapsGet(qemuCaps, QEMU_CAPS_PIIX3_USB_UHCI) || (!virQEMUCapsGet(qemuCaps, QEMU_CAPS_PCI_OHCI) && @@ -114,7 +114,7 @@ Index: libvirt-1.2.9/src/qemu/qemu_command.c if (usblegacy) { virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", _("Multiple legacy USB controllers are " -@@ -9619,7 +9624,8 @@ qemuBuildCommandLine(virConnectPtr conn, +@@ -9771,7 +9776,8 @@ qemuBuildCommandLine(virConnectPtr conn, } if (def->nvram) { @@ -124,7 +124,7 @@ Index: libvirt-1.2.9/src/qemu/qemu_command.c STRPREFIX(def->os.machine, "pseries")) { if (!virQEMUCapsGet(qemuCaps, QEMU_CAPS_DEVICE_NVRAM)) { virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", -@@ -9737,7 +9743,8 @@ qemuBuildSerialChrDeviceStr(char **devic +@@ -9894,7 +9900,8 @@ qemuBuildSerialChrDeviceStr(char **devic { virBuffer cmd = VIR_BUFFER_INITIALIZER; @@ -134,7 +134,7 @@ Index: libvirt-1.2.9/src/qemu/qemu_command.c if (serial->deviceType == VIR_DOMAIN_CHR_DEVICE_TYPE_SERIAL && serial->info.type == VIR_DOMAIN_DEVICE_ADDRESS_TYPE_SPAPRVIO) { virBufferAsprintf(&cmd, "spapr-vty,chardev=char%s", -@@ -10159,8 +10166,9 @@ qemuParseCommandLineDisk(virDomainXMLOpt +@@ -10316,8 +10323,9 @@ qemuParseCommandLineDisk(virDomainXMLOpt if (VIR_ALLOC(def->src) < 0) goto error; @@ -146,7 +146,7 @@ Index: libvirt-1.2.9/src/qemu/qemu_command.c def->bus = VIR_DOMAIN_DISK_BUS_SCSI; else def->bus = VIR_DOMAIN_DISK_BUS_IDE; -@@ -10252,7 +10260,8 @@ qemuParseCommandLineDisk(virDomainXMLOpt +@@ -10409,7 +10417,8 @@ qemuParseCommandLineDisk(virDomainXMLOpt } else if (STREQ(keywords[i], "if")) { if (STREQ(values[i], "ide")) { def->bus = VIR_DOMAIN_DISK_BUS_IDE; @@ -156,7 +156,7 @@ Index: libvirt-1.2.9/src/qemu/qemu_command.c dom->os.machine && STRPREFIX(dom->os.machine, "pseries"))) { virReportError(VIR_ERR_INTERNAL_ERROR, _("pseries systems do not support ide devices '%s'"), val); -@@ -11497,8 +11506,9 @@ qemuParseCommandLine(virCapsPtr qemuCaps +@@ -11654,8 +11663,9 @@ qemuParseCommandLine(virCapsPtr qemuCaps } if (STREQ(arg, "-cdrom")) { disk->device = VIR_DOMAIN_DISK_DEVICE_CDROM; @@ -168,7 +168,7 @@ Index: libvirt-1.2.9/src/qemu/qemu_command.c disk->bus = VIR_DOMAIN_DISK_BUS_SCSI; if (VIR_STRDUP(disk->dst, "hdc") < 0) goto error; -@@ -11513,9 +11523,10 @@ qemuParseCommandLine(virCapsPtr qemuCaps +@@ -11670,9 +11680,10 @@ qemuParseCommandLine(virCapsPtr qemuCaps disk->bus = VIR_DOMAIN_DISK_BUS_IDE; else disk->bus = VIR_DOMAIN_DISK_BUS_SCSI; @@ -182,10 +182,10 @@ Index: libvirt-1.2.9/src/qemu/qemu_command.c } if (VIR_STRDUP(disk->dst, arg + 1) < 0) goto error; -Index: libvirt-1.2.9/src/qemu/qemu_domain.c +Index: libvirt-1.2.10/src/qemu/qemu_domain.c =================================================================== ---- libvirt-1.2.9.orig/src/qemu/qemu_domain.c -+++ libvirt-1.2.9/src/qemu/qemu_domain.c +--- libvirt-1.2.10.orig/src/qemu/qemu_domain.c ++++ libvirt-1.2.10/src/qemu/qemu_domain.c @@ -980,6 +980,7 @@ qemuDomainDefPostParse(virDomainDefPtr d break; diff --git a/libvirt-suse-netcontrol.patch b/libvirt-suse-netcontrol.patch index 1addf95..1af1d9f 100644 --- a/libvirt-suse-netcontrol.patch +++ b/libvirt-suse-netcontrol.patch @@ -1,7 +1,7 @@ -Index: libvirt-1.2.9/configure.ac +Index: libvirt-1.2.10/configure.ac =================================================================== ---- libvirt-1.2.9.orig/configure.ac -+++ libvirt-1.2.9/configure.ac +--- libvirt-1.2.10.orig/configure.ac ++++ libvirt-1.2.10/configure.ac @@ -237,6 +237,7 @@ LIBVIRT_CHECK_FUSE LIBVIRT_CHECK_GLUSTER LIBVIRT_CHECK_HAL @@ -26,7 +26,7 @@ Index: libvirt-1.2.9/configure.ac esac if test "$with_interface" = "yes" ; then -@@ -2882,6 +2884,7 @@ LIBVIRT_RESULT_FUSE +@@ -2895,6 +2897,7 @@ LIBVIRT_RESULT_FUSE LIBVIRT_RESULT_GLUSTER LIBVIRT_RESULT_HAL LIBVIRT_RESULT_NETCF @@ -34,11 +34,11 @@ Index: libvirt-1.2.9/configure.ac LIBVIRT_RESULT_NUMACTL LIBVIRT_RESULT_OPENWSMAN LIBVIRT_RESULT_PCIACCESS -Index: libvirt-1.2.9/src/Makefile.am +Index: libvirt-1.2.10/src/Makefile.am =================================================================== ---- libvirt-1.2.9.orig/src/Makefile.am -+++ libvirt-1.2.9/src/Makefile.am -@@ -826,6 +826,10 @@ if WITH_NETCF +--- libvirt-1.2.10.orig/src/Makefile.am ++++ libvirt-1.2.10/src/Makefile.am +@@ -856,6 +856,10 @@ if WITH_NETCF INTERFACE_DRIVER_SOURCES += \ interface/interface_backend_netcf.c endif WITH_NETCF @@ -49,7 +49,7 @@ Index: libvirt-1.2.9/src/Makefile.am if WITH_UDEV INTERFACE_DRIVER_SOURCES += \ interface/interface_backend_udev.c -@@ -1465,10 +1469,15 @@ if WITH_NETCF +@@ -1499,10 +1503,15 @@ if WITH_NETCF libvirt_driver_interface_la_CFLAGS += $(NETCF_CFLAGS) libvirt_driver_interface_la_LIBADD += $(NETCF_LIBS) else ! WITH_NETCF @@ -65,10 +65,10 @@ Index: libvirt-1.2.9/src/Makefile.am endif ! WITH_NETCF if WITH_DRIVER_MODULES libvirt_driver_interface_la_LIBADD += ../gnulib/lib/libgnu.la -Index: libvirt-1.2.9/tools/virsh.c +Index: libvirt-1.2.10/tools/virsh.c =================================================================== ---- libvirt-1.2.9.orig/tools/virsh.c -+++ libvirt-1.2.9/tools/virsh.c +--- libvirt-1.2.10.orig/tools/virsh.c ++++ libvirt-1.2.10/tools/virsh.c @@ -3340,6 +3340,8 @@ vshShowVersion(vshControl *ctl ATTRIBUTE vshPrint(ctl, " Interface"); # if defined(WITH_NETCF) @@ -78,10 +78,10 @@ Index: libvirt-1.2.9/tools/virsh.c # elif defined(WITH_UDEV) vshPrint(ctl, " udev"); # endif -Index: libvirt-1.2.9/src/interface/interface_backend_netcf.c +Index: libvirt-1.2.10/src/interface/interface_backend_netcf.c =================================================================== ---- libvirt-1.2.9.orig/src/interface/interface_backend_netcf.c -+++ libvirt-1.2.9/src/interface/interface_backend_netcf.c +--- libvirt-1.2.10.orig/src/interface/interface_backend_netcf.c ++++ libvirt-1.2.10/src/interface/interface_backend_netcf.c @@ -23,7 +23,12 @@ #include @@ -98,7 +98,7 @@ Index: libvirt-1.2.9/src/interface/interface_backend_netcf.c #include "datatypes.h" @@ -65,6 +70,37 @@ VIR_ONCE_GLOBAL_INIT(virNetcfDriverState - static virNetcfDriverStatePtr driverState = NULL; + static virNetcfDriverStatePtr driverState; +#ifdef WITH_NETCONTROL +static void @@ -165,10 +165,10 @@ Index: libvirt-1.2.9/src/interface/interface_backend_netcf.c return 0; } -Index: libvirt-1.2.9/src/interface/interface_driver.c +Index: libvirt-1.2.10/src/interface/interface_driver.c =================================================================== ---- libvirt-1.2.9.orig/src/interface/interface_driver.c -+++ libvirt-1.2.9/src/interface/interface_driver.c +--- libvirt-1.2.10.orig/src/interface/interface_driver.c ++++ libvirt-1.2.10/src/interface/interface_driver.c @@ -30,8 +30,15 @@ interfaceRegister(void) if (netcfIfaceRegister() == 0) return 0; @@ -186,10 +186,10 @@ Index: libvirt-1.2.9/src/interface/interface_driver.c if (udevIfaceRegister() == 0) return 0; #endif /* WITH_UDEV */ -Index: libvirt-1.2.9/m4/virt-netcontrol.m4 +Index: libvirt-1.2.10/m4/virt-netcontrol.m4 =================================================================== --- /dev/null -+++ libvirt-1.2.9/m4/virt-netcontrol.m4 ++++ libvirt-1.2.10/m4/virt-netcontrol.m4 @@ -0,0 +1,35 @@ +dnl The libnetcontrol library +dnl diff --git a/libvirt.changes b/libvirt.changes index 630d62b..59b7927 100644 --- a/libvirt.changes +++ b/libvirt.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Mon Nov 3 11:08:49 MST 2014 - jfehlig@suse.com + +- Update to libvirt 1.2.10 + - Many incremental improvements and bug fixes, see + http://libvirt.org/news.html + ------------------------------------------------------------------- Mon Oct 27 21:20:08 UTC 2014 - cbosdonnat@suse.com diff --git a/libvirt.spec b/libvirt.spec index b0e95a4..2a9a9b8 100644 --- a/libvirt.spec +++ b/libvirt.spec @@ -235,7 +235,7 @@ Name: libvirt Url: http://libvirt.org/ -Version: 1.2.9 +Version: 1.2.10 Release: 0 Summary: Library providing a simple virtualization API License: LGPL-2.1+ diff --git a/libvirtd-defaults.patch b/libvirtd-defaults.patch index fd9ca07..2caa275 100644 --- a/libvirtd-defaults.patch +++ b/libvirtd-defaults.patch @@ -1,7 +1,7 @@ -Index: libvirt-1.2.9/daemon/libvirtd.conf +Index: libvirt-1.2.10/daemon/libvirtd.conf =================================================================== ---- libvirt-1.2.9.orig/daemon/libvirtd.conf -+++ libvirt-1.2.9/daemon/libvirtd.conf +--- libvirt-1.2.10.orig/daemon/libvirtd.conf ++++ libvirt-1.2.10/daemon/libvirtd.conf @@ -18,8 +18,8 @@ # It is necessary to setup a CA and issue server certificates before # using this capability. @@ -13,10 +13,10 @@ Index: libvirt-1.2.9/daemon/libvirtd.conf # Listen for unencrypted TCP connections on the public TCP/IP port. # NB, must pass the --listen flag to the libvirtd process for this to -Index: libvirt-1.2.9/daemon/libvirtd-config.c +Index: libvirt-1.2.10/daemon/libvirtd-config.c =================================================================== ---- libvirt-1.2.9.orig/daemon/libvirtd-config.c -+++ libvirt-1.2.9/daemon/libvirtd-config.c +--- libvirt-1.2.10.orig/daemon/libvirtd-config.c ++++ libvirt-1.2.10/daemon/libvirtd-config.c @@ -229,7 +229,7 @@ daemonConfigNew(bool privileged ATTRIBUT if (VIR_ALLOC(data) < 0) return NULL; @@ -26,10 +26,10 @@ Index: libvirt-1.2.9/daemon/libvirtd-config.c data->listen_tcp = 0; if (VIR_STRDUP(data->tls_port, LIBVIRTD_TLS_PORT) < 0 || -Index: libvirt-1.2.9/daemon/test_libvirtd.aug.in +Index: libvirt-1.2.10/daemon/test_libvirtd.aug.in =================================================================== ---- libvirt-1.2.9.orig/daemon/test_libvirtd.aug.in -+++ libvirt-1.2.9/daemon/test_libvirtd.aug.in +--- libvirt-1.2.10.orig/daemon/test_libvirtd.aug.in ++++ libvirt-1.2.10/daemon/test_libvirtd.aug.in @@ -2,7 +2,7 @@ module Test_libvirtd = ::CONFIG:: diff --git a/libvirtd-init-script.patch b/libvirtd-init-script.patch index e0c6e7e..e5ede6b 100644 --- a/libvirtd-init-script.patch +++ b/libvirtd-init-script.patch @@ -1,9 +1,9 @@ Adjust libvirtd sysconfig file to conform to SUSE standards -Index: libvirt-1.2.9/daemon/libvirtd.sysconf +Index: libvirt-1.2.10/daemon/libvirtd.sysconf =================================================================== ---- libvirt-1.2.9.orig/daemon/libvirtd.sysconf -+++ libvirt-1.2.9/daemon/libvirtd.sysconf +--- libvirt-1.2.10.orig/daemon/libvirtd.sysconf ++++ libvirt-1.2.10/daemon/libvirtd.sysconf @@ -1,16 +1,25 @@ +## Path: System/Virtualization/libvirt + diff --git a/ppc64le-canonical-name.patch b/ppc64le-canonical-name.patch index 92aff1b..a3a4e8c 100644 --- a/ppc64le-canonical-name.patch +++ b/ppc64le-canonical-name.patch @@ -2,10 +2,10 @@ Canonicalize hostarch name ppc64le to ppc64 See bnc#894956 -Index: libvirt-1.2.9/src/util/virarch.c +Index: libvirt-1.2.10/src/util/virarch.c =================================================================== ---- libvirt-1.2.9.orig/src/util/virarch.c -+++ libvirt-1.2.9/src/util/virarch.c +--- libvirt-1.2.10.orig/src/util/virarch.c ++++ libvirt-1.2.10/src/util/virarch.c @@ -169,6 +169,8 @@ virArch virArchFromHost(void) arch = VIR_ARCH_I686; } else if (STREQ(ut.machine, "amd64")) { diff --git a/support-managed-pci-xen-driver.patch b/support-managed-pci-xen-driver.patch index 2465389..bf9e21a 100644 --- a/support-managed-pci-xen-driver.patch +++ b/support-managed-pci-xen-driver.patch @@ -8,10 +8,10 @@ Subject: [PATCH] support managed pci devices in xen driver src/xenxs/xen_xm.c | 28 +++++++++++++++++++++++++++- 2 files changed, 35 insertions(+), 15 deletions(-) -Index: libvirt-1.2.9/src/xenconfig/xen_common.c +Index: libvirt-1.2.10/src/xenconfig/xen_common.c =================================================================== ---- libvirt-1.2.9.orig/src/xenconfig/xen_common.c -+++ libvirt-1.2.9/src/xenconfig/xen_common.c +--- libvirt-1.2.10.orig/src/xenconfig/xen_common.c ++++ libvirt-1.2.10/src/xenconfig/xen_common.c @@ -401,6 +401,8 @@ xenParsePCI(virConfPtr conf, virDomainDe { virConfValuePtr list = virConfGetValue(conf, "pci"); @@ -66,10 +66,10 @@ Index: libvirt-1.2.9/src/xenconfig/xen_common.c hostdev->source.subsys.type = VIR_DOMAIN_HOSTDEV_SUBSYS_TYPE_PCI; hostdev->source.subsys.u.pci.addr.domain = domainID; hostdev->source.subsys.u.pci.addr.bus = busID; -Index: libvirt-1.2.9/src/xenconfig/xen_sxpr.c +Index: libvirt-1.2.10/src/xenconfig/xen_sxpr.c =================================================================== ---- libvirt-1.2.9.orig/src/xenconfig/xen_sxpr.c -+++ libvirt-1.2.9/src/xenconfig/xen_sxpr.c +--- libvirt-1.2.10.orig/src/xenconfig/xen_sxpr.c ++++ libvirt-1.2.10/src/xenconfig/xen_sxpr.c @@ -999,6 +999,7 @@ xenParseSxprPCI(virDomainDefPtr def, int busID; int slotID; diff --git a/suse-qemu-conf.patch b/suse-qemu-conf.patch index 53213d8..aa761ea 100644 --- a/suse-qemu-conf.patch +++ b/suse-qemu-conf.patch @@ -1,7 +1,7 @@ -Index: libvirt-1.2.9/src/qemu/qemu.conf +Index: libvirt-1.2.10/src/qemu/qemu.conf =================================================================== ---- libvirt-1.2.9.orig/src/qemu/qemu.conf -+++ libvirt-1.2.9/src/qemu/qemu.conf +--- libvirt-1.2.10.orig/src/qemu/qemu.conf ++++ libvirt-1.2.10/src/qemu/qemu.conf @@ -200,7 +200,16 @@ # a special value; security_driver can be set to that value in # isolation, but it cannot appear in a list of drivers. diff --git a/systemd-service-xen.patch b/systemd-service-xen.patch index e2c6f50..aad227e 100644 --- a/systemd-service-xen.patch +++ b/systemd-service-xen.patch @@ -1,7 +1,7 @@ -Index: libvirt-1.2.9/daemon/libvirtd.service.in +Index: libvirt-1.2.10/daemon/libvirtd.service.in =================================================================== ---- libvirt-1.2.9.orig/daemon/libvirtd.service.in -+++ libvirt-1.2.9/daemon/libvirtd.service.in +--- libvirt-1.2.10.orig/daemon/libvirtd.service.in ++++ libvirt-1.2.10/daemon/libvirtd.service.in @@ -5,6 +5,8 @@ After=network.target After=dbus.service After=iscsid.service diff --git a/virtlockd-init-script.patch b/virtlockd-init-script.patch index 5cbaa8a..6175099 100644 --- a/virtlockd-init-script.patch +++ b/virtlockd-init-script.patch @@ -1,9 +1,9 @@ Adjust virtlockd init files to conform to SUSE standards -Index: libvirt-1.2.9/src/locking/virtlockd.sysconf +Index: libvirt-1.2.10/src/locking/virtlockd.sysconf =================================================================== ---- libvirt-1.2.9.orig/src/locking/virtlockd.sysconf -+++ libvirt-1.2.9/src/locking/virtlockd.sysconf +--- libvirt-1.2.10.orig/src/locking/virtlockd.sysconf ++++ libvirt-1.2.10/src/locking/virtlockd.sysconf @@ -1,3 +1,7 @@ +## Path: System/Virtualization/virtlockd + @@ -12,10 +12,10 @@ Index: libvirt-1.2.9/src/locking/virtlockd.sysconf # # Pass extra arguments to virtlockd #VIRTLOCKD_ARGS= -Index: libvirt-1.2.9/src/locking/virtlockd.init.in +Index: libvirt-1.2.10/src/locking/virtlockd.init.in =================================================================== ---- libvirt-1.2.9.orig/src/locking/virtlockd.init.in -+++ libvirt-1.2.9/src/locking/virtlockd.init.in +--- libvirt-1.2.10.orig/src/locking/virtlockd.init.in ++++ libvirt-1.2.10/src/locking/virtlockd.init.in @@ -4,12 +4,14 @@ # http://www.linux-foundation.org/spec//booksets/LSB-Core-generic/LSB-Core-generic.html#INITSCRCOMCONV # diff --git a/xen-name-for-devid.patch b/xen-name-for-devid.patch index 0089e14..c5860df 100644 --- a/xen-name-for-devid.patch +++ b/xen-name-for-devid.patch @@ -14,10 +14,10 @@ is inactive. We obviously can't search xenstore when the domain is inactive. -Index: libvirt-1.2.9/src/xen/xend_internal.c +Index: libvirt-1.2.10/src/xen/xend_internal.c =================================================================== ---- libvirt-1.2.9.orig/src/xen/xend_internal.c -+++ libvirt-1.2.9/src/xen/xend_internal.c +--- libvirt-1.2.10.orig/src/xen/xend_internal.c ++++ libvirt-1.2.10/src/xen/xend_internal.c @@ -72,7 +72,7 @@ VIR_LOG_INIT("xen.xend_internal"); #define XEND_RCV_BUF_MAX_LEN (256 * 1024) diff --git a/xen-pv-cdrom.patch b/xen-pv-cdrom.patch index b73dfa0..fd92d9a 100644 --- a/xen-pv-cdrom.patch +++ b/xen-pv-cdrom.patch @@ -1,7 +1,7 @@ -Index: libvirt-1.2.9/src/xenconfig/xen_sxpr.c +Index: libvirt-1.2.10/src/xenconfig/xen_sxpr.c =================================================================== ---- libvirt-1.2.9.orig/src/xenconfig/xen_sxpr.c -+++ libvirt-1.2.9/src/xenconfig/xen_sxpr.c +--- libvirt-1.2.10.orig/src/xenconfig/xen_sxpr.c ++++ libvirt-1.2.10/src/xenconfig/xen_sxpr.c @@ -334,7 +334,7 @@ xenParseSxprChar(const char *value, static int xenParseSxprDisks(virDomainDefPtr def,