From c7b51f773c717ea1cd3a8200cd92c5df02f026d264989c03cf4edbd44b70a3df Mon Sep 17 00:00:00 2001 From: James Fehlig Date: Tue, 7 Jun 2016 02:00:39 +0000 Subject: [PATCH] Accepting request 400351 from home:jfehlig:branches:Virtualization - Update to libvirt 1.3.5 - Many incremental improvements and bug fixes, see http://libvirt.org/news.html - Dropped patches: e4d131b8-mv-virDomainDefPostParseInternal.patch, 3e428670-post-parse-implicit-video.patch, 538012c8-default-vram.patch, 96b21fb0-vram-tests.patch, 400e716d-libxl-noprope-emulator.patch, b90c4b5f-tests-use-qemu-xen.patch, fccf2725-libxl-API-4.4.patch, 5325123d-libxl-migv2-save-restore.patch, f9edcfa4-libxl-migv2-migration.patch, a1c9a81a-libxl-rbd-fix.patch, ba566428-libxl-dom-iface-addrs.patch - spec: simplify and cleanup by removing many conditionals that are never toogled. Also drop conditionals for suse_version < 1310 OBS-URL: https://build.opensuse.org/request/show/400351 OBS-URL: https://build.opensuse.org/package/show/Virtualization/libvirt?expand=0&rev=538 --- 3e428670-post-parse-implicit-video.patch | 84 -- 400e716d-libxl-noprope-emulator.patch | 37 - 5325123d-libxl-migv2-save-restore.patch | 227 ---- 538012c8-default-vram.patch | 81 -- 96b21fb0-vram-tests.patch | 958 --------------- a1c9a81a-libxl-rbd-fix.patch | 70 -- apparmor-fixes.patch | 6 +- apparmor-no-mount.patch | 6 +- b90c4b5f-tests-use-qemu-xen.patch | 257 ---- ba566428-libxl-dom-iface-addrs.patch | 170 --- blockcopy-check-dst-identical-device.patch | 8 +- ...1b8-mv-virDomainDefPostParseInternal.patch | 105 -- f9edcfa4-libxl-migv2-migration.patch | 392 ------ fccf2725-libxl-API-4.4.patch | 58 - libvirt-1.3.4.tar.gz | 3 - libvirt-1.3.4.tar.gz.asc | 7 - libvirt-1.3.5.tar.gz | 3 + libvirt-1.3.5.tar.gz.asc | 7 + libvirt-guests-init-script.patch | 18 +- libvirt-power8-models.patch | 12 +- libvirt-suse-netcontrol.patch | 40 +- libvirt.changes | 21 + libvirt.spec | 1047 +++++------------ libvirtd-defaults.patch | 18 +- libvirtd-init-script.patch | 6 +- libxl-qemu-emulator-caps.patch | 6 +- libxl-support-block-script.patch | 12 +- lxc-wait-after-eth-del.patch | 24 +- ppc64le-canonical-name.patch | 6 +- qemu-apparmor-screenshot.patch | 6 +- support-managed-pci-xen-driver.patch | 16 +- suse-qemu-conf.patch | 6 +- systemd-service-xen.patch | 6 +- virtlockd-init-script.patch | 12 +- virtlogd-init-script.patch | 12 +- xen-pv-cdrom.patch | 6 +- xen-sxpr-disk-type.patch | 6 +- 37 files changed, 448 insertions(+), 3311 deletions(-) delete mode 100644 3e428670-post-parse-implicit-video.patch delete mode 100644 400e716d-libxl-noprope-emulator.patch delete mode 100644 5325123d-libxl-migv2-save-restore.patch delete mode 100644 538012c8-default-vram.patch delete mode 100644 96b21fb0-vram-tests.patch delete mode 100644 a1c9a81a-libxl-rbd-fix.patch delete mode 100644 b90c4b5f-tests-use-qemu-xen.patch delete mode 100644 ba566428-libxl-dom-iface-addrs.patch delete mode 100644 e4d131b8-mv-virDomainDefPostParseInternal.patch delete mode 100644 f9edcfa4-libxl-migv2-migration.patch delete mode 100644 fccf2725-libxl-API-4.4.patch delete mode 100644 libvirt-1.3.4.tar.gz delete mode 100644 libvirt-1.3.4.tar.gz.asc create mode 100644 libvirt-1.3.5.tar.gz create mode 100644 libvirt-1.3.5.tar.gz.asc diff --git a/3e428670-post-parse-implicit-video.patch b/3e428670-post-parse-implicit-video.patch deleted file mode 100644 index 2b394cf..0000000 --- a/3e428670-post-parse-implicit-video.patch +++ /dev/null @@ -1,84 +0,0 @@ -commit 3e4286703273b06a21ae07f3e76a66f9661199dc -Author: Ján Tomko -Date: Wed May 11 12:13:51 2016 +0200 - - Call per-device post-parse callback even on implicit video - - Commit 6879be48 moved adding of an implicit video device after XML - parsing. As a result, libxlDomainDeviceDefPostParse() is no longer - called to set the default vram when adding an implicit device. - Commit 6879be48 assumes virDomainVideoDefaultRAM() will set the - default vram, but it returns 0 if the domain virtType is - VIR_DOMAIN_VIRT_XEN. Attempting to start an HVM domain with vram=0 - results in - - error: unsupported configuration: videoram must be at least 4MB for CIRRUS - - The default vram setting for Xen HVM domains depends on the device - model used (qemu-xen vs qemu-traditional), hence setting the - default is deferred to libxlDomainDeviceDefPostParse(). - - Call the device post-parse callback even for implicit video, - to fill out the default vram even for VIR_DOMAIN_VIRT_XEN. - - https://bugzilla.redhat.com/show_bug.cgi?id=1334557 - Most-of-commit-message-by: Jim Fehlig - -Index: libvirt-1.3.4/src/conf/domain_conf.c -=================================================================== ---- libvirt-1.3.4.orig/src/conf/domain_conf.c -+++ libvirt-1.3.4/src/conf/domain_conf.c -@@ -4321,8 +4321,7 @@ virDomainDefPostParseDeviceIterator(virD - - static int - virDomainDefPostParseInternal(virDomainDefPtr def, -- virCapsPtr caps ATTRIBUTE_UNUSED, -- unsigned int parseFlags) -+ struct virDomainDefPostParseDeviceIteratorData *data) - { - /* verify init path for container based domains */ - if (def->os.type == VIR_DOMAIN_OSTYPE_EXE && !def->os.init) { -@@ -4331,7 +4330,7 @@ virDomainDefPostParseInternal(virDomainD - return -1; - } - -- if (virDomainDefPostParseMemory(def, parseFlags) < 0) -+ if (virDomainDefPostParseMemory(def, data->parseFlags) < 0) - return -1; - - if (virDomainDefRejectDuplicateControllers(def) < 0) -@@ -4346,11 +4345,22 @@ virDomainDefPostParseInternal(virDomainD - if (virDomainDefAddImplicitDevices(def) < 0) - return -1; - -- /* Mark the first video as primary. If the user specified primary="yes", -- * the parser already inserted the device at def->videos[0] */ -- if (def->nvideos != 0) -+ if (def->nvideos != 0) { -+ virDomainDeviceDef device = { -+ .type = VIR_DOMAIN_DEVICE_VIDEO, -+ .data.video = def->videos[0], -+ }; -+ -+ /* Mark the first video as primary. If the user specified primary="yes", -+ * the parser already inserted the device at def->videos[0] */ - def->videos[0]->primary = true; - -+ /* videos[0] might have been added in AddImplicitDevices, after we've -+ * done the per-device post-parse */ -+ if (virDomainDefPostParseDeviceIterator(NULL, &device, NULL, data) < 0) -+ return -1; -+ } -+ - /* clean up possibly duplicated metadata entries */ - virDomainDefMetadataSanitize(def); - -@@ -4388,7 +4398,7 @@ virDomainDefPostParse(virDomainDefPtr de - return ret; - - -- if ((ret = virDomainDefPostParseInternal(def, caps, parseFlags)) < 0) -+ if ((ret = virDomainDefPostParseInternal(def, &data)) < 0) - return ret; - - if (virDomainDefPostParseCheckFeatures(def, xmlopt) < 0) diff --git a/400e716d-libxl-noprope-emulator.patch b/400e716d-libxl-noprope-emulator.patch deleted file mode 100644 index f75a5c5..0000000 --- a/400e716d-libxl-noprope-emulator.patch +++ /dev/null @@ -1,37 +0,0 @@ -commit 400e716d7d8371fa718c27bb4f05b9a68929e64a -Author: Jim Fehlig -Date: Thu May 12 14:40:28 2016 -0600 - - libxl: don't attempt to probe a non-existent emulator - - When probing the with '-help' to determine if - it is the old qemu, errors are reported if the emulator - doesn't exist - - libvirt: error : internal error: Child process - (/usr/lib/xen/bin/qemu-dm -help) unexpected exit status 127: - libvirt: error : cannot execute binary /usr/lib/xen/bin/qemu-dm: - No such file or directory - - Avoid the probe if the specified emulator doesn't exist, - squelching the error. There is no behavior change since - libxlDomainGetEmulatorType() would return - LIBXL_DEVICE_MODEL_VERSION_QEMU_XEN if the probe failed - via virCommandRun(). - - Signed-off-by: Jim Fehlig - -Index: libvirt-1.3.4/src/libxl/libxl_conf.c -=================================================================== ---- libvirt-1.3.4.orig/src/libxl/libxl_conf.c -+++ libvirt-1.3.4/src/libxl/libxl_conf.c -@@ -916,6 +916,9 @@ libxlDomainGetEmulatorType(const virDoma - - if (def->os.type == VIR_DOMAIN_OSTYPE_HVM) { - if (def->emulator) { -+ if (!virFileExists(def->emulator)) -+ goto cleanup; -+ - cmd = virCommandNew(def->emulator); - - virCommandAddArgList(cmd, "-help", NULL); diff --git a/5325123d-libxl-migv2-save-restore.patch b/5325123d-libxl-migv2-save-restore.patch deleted file mode 100644 index 6cffa33..0000000 --- a/5325123d-libxl-migv2-save-restore.patch +++ /dev/null @@ -1,227 +0,0 @@ -commit 5325123d235deb07f39b73c06a7d9ab6494fa2c8 -Author: Jim Fehlig -Date: Mon May 2 12:00:39 2016 -0600 - - libxl: support Xen migration stream V2 in save/restore - - Xen 4.6 introduced a new migration stream commonly referred to as - "migration V2". Xen 4.6 and newer always produce this new stream, - whereas Xen 4.5 and older always produce the legacy stream. - Support for migration stream V2 can be detected at build time with - LIBXL_HAVE_SRM_V2 from libxl.h. The legacy and V2 streams are not - compatible, but a V2 host can accept and convert a legacy stream. - - Commit e7440656 changed the libxl driver to use the lowest libxl - API version possible (version 0x040200) to ensure the driver - builds against older Xen releases. The old 4.2 restore API does - not support specifying a stream version and assumes a legacy - stream, even if the incoming stream is migration V2. Thinking it - has been given a legacy stream, libxl will fail to convert an - incoming stream that is already V2, which causes the entire - restore operation to fail. Xen's libvirt-related OSSTest has been - failing since commit e7440656 landed in libvirt.git master. One - of the more recent failures can be seen here - - http://lists.xenproject.org/archives/html/xen-devel/2016-05/msg00071.html - - This patch changes the call to libxl_domain_create_restore() to - include the stream version if LIBXL_HAVE_SRM_V2 is defined. The - version field of the libxlSavefileHeader struct is also updated - to '2' when LIBXL_HAVE_SRM_V2 is defined, ensuring the stream - version in the header matches the actual stream version produced - by Xen. Along with bumping the libxl API requirement to 0x040400, - this patch fixes save/restore on a migration V2 Xen host. - - Oddly, migration has never used the libxlSavefileHeader. It - handles passing configuration in the Begin and Prepare phases, - and then calls libxl directly to transfer domain state/memory - in the Perform phase. A subsequent patch will add stream - version handling in the Begin and Prepare phase handshaking, - which will fix the migration related OSSTest failures. - - Signed-off-by: Jim Fehlig - -Index: libvirt-1.3.4/src/libxl/libxl_conf.h -=================================================================== ---- libvirt-1.3.4.orig/src/libxl/libxl_conf.h -+++ libvirt-1.3.4/src/libxl/libxl_conf.h -@@ -148,7 +148,11 @@ struct _libxlDriverPrivate { - }; - - # define LIBXL_SAVE_MAGIC "libvirt-xml\n \0 \r" --# define LIBXL_SAVE_VERSION 1 -+# ifdef LIBXL_HAVE_SRM_V2 -+# define LIBXL_SAVE_VERSION 2 -+# else -+# define LIBXL_SAVE_VERSION 1 -+# endif - - typedef struct _libxlSavefileHeader libxlSavefileHeader; - typedef libxlSavefileHeader *libxlSavefileHeaderPtr; -Index: libvirt-1.3.4/src/libxl/libxl_domain.c -=================================================================== ---- libvirt-1.3.4.orig/src/libxl/libxl_domain.c -+++ libvirt-1.3.4/src/libxl/libxl_domain.c -@@ -514,7 +514,7 @@ libxlDomainShutdownThread(void *opaque) - } - libxlDomainDestroyInternal(driver, vm); - libxlDomainCleanup(driver, vm); -- if (libxlDomainStart(driver, vm, false, -1) < 0) { -+ if (libxlDomainStartNew(driver, vm, false) < 0) { - virErrorPtr err = virGetLastError(); - VIR_ERROR(_("Failed to restart VM '%s': %s"), - vm->def->name, err ? err->message : _("unknown error")); -@@ -1006,14 +1006,23 @@ libxlDomainCreateIfaceNames(virDomainDef - } - - -+#ifdef LIBXL_HAVE_SRM_V2 -+# define LIBXL_DOMSTART_RESTORE_VER_ATTR /* empty */ -+#else -+# define LIBXL_DOMSTART_RESTORE_VER_ATTR ATTRIBUTE_UNUSED -+#endif -+ - /* - * Start a domain through libxenlight. - * - * virDomainObjPtr must be locked and a job acquired on invocation - */ --int --libxlDomainStart(libxlDriverPrivatePtr driver, virDomainObjPtr vm, -- bool start_paused, int restore_fd) -+static int -+libxlDomainStart(libxlDriverPrivatePtr driver, -+ virDomainObjPtr vm, -+ bool start_paused, -+ int restore_fd, -+ uint32_t restore_ver LIBXL_DOMSTART_RESTORE_VER_ATTR) - { - libxl_domain_config d_config; - virDomainDefPtr def = NULL; -@@ -1049,6 +1058,7 @@ libxlDomainStart(libxlDriverPrivatePtr d - goto cleanup; - - restore_fd = managed_save_fd; -+ restore_ver = hdr.version; - - if (STRNEQ(vm->def->name, def->name) || - memcmp(vm->def->uuid, def->uuid, VIR_UUID_BUFLEN)) { -@@ -1117,6 +1127,9 @@ libxlDomainStart(libxlDriverPrivatePtr d - &domid, NULL, &aop_console_how); - } else { - libxl_domain_restore_params_init(¶ms); -+#ifdef LIBXL_HAVE_SRM_V2 -+ params.stream_version = restore_ver; -+#endif - ret = libxl_domain_create_restore(cfg->ctx, &d_config, &domid, - restore_fd, ¶ms, NULL, - &aop_console_how); -@@ -1203,6 +1216,25 @@ libxlDomainStart(libxlDriverPrivatePtr d - return ret; - } - -+int -+libxlDomainStartNew(libxlDriverPrivatePtr driver, -+ virDomainObjPtr vm, -+ bool start_paused) -+{ -+ return libxlDomainStart(driver, vm, start_paused, -1, LIBXL_SAVE_VERSION); -+} -+ -+int -+libxlDomainStartRestore(libxlDriverPrivatePtr driver, -+ virDomainObjPtr vm, -+ bool start_paused, -+ int restore_fd, -+ uint32_t restore_ver) -+{ -+ return libxlDomainStart(driver, vm, start_paused, -+ restore_fd, restore_ver); -+} -+ - bool - libxlDomainDefCheckABIStability(libxlDriverPrivatePtr driver, - virDomainDefPtr src, -Index: libvirt-1.3.4/src/libxl/libxl_domain.h -=================================================================== ---- libvirt-1.3.4.orig/src/libxl/libxl_domain.h -+++ libvirt-1.3.4/src/libxl/libxl_domain.h -@@ -142,10 +142,16 @@ libxlDomainSetVcpuAffinities(libxlDriver - virDomainObjPtr vm); - - int --libxlDomainStart(libxlDriverPrivatePtr driver, -- virDomainObjPtr vm, -- bool start_paused, -- int restore_fd); -+libxlDomainStartNew(libxlDriverPrivatePtr driver, -+ virDomainObjPtr vm, -+ bool start_paused); -+ -+int -+libxlDomainStartRestore(libxlDriverPrivatePtr driver, -+ virDomainObjPtr vm, -+ bool start_paused, -+ int restore_fd, -+ uint32_t restore_ver); - - bool - libxlDomainDefCheckABIStability(libxlDriverPrivatePtr driver, -Index: libvirt-1.3.4/src/libxl/libxl_driver.c -=================================================================== ---- libvirt-1.3.4.orig/src/libxl/libxl_driver.c -+++ libvirt-1.3.4/src/libxl/libxl_driver.c -@@ -323,7 +323,7 @@ libxlAutostartDomain(virDomainObjPtr vm, - } - - if (vm->autostart && !virDomainObjIsActive(vm) && -- libxlDomainStart(driver, vm, false, -1) < 0) { -+ libxlDomainStartNew(driver, vm, false) < 0) { - err = virGetLastError(); - VIR_ERROR(_("Failed to autostart VM '%s': %s"), - vm->def->name, -@@ -998,8 +998,8 @@ libxlDomainCreateXML(virConnectPtr conn, - goto cleanup; - } - -- if (libxlDomainStart(driver, vm, (flags & VIR_DOMAIN_START_PAUSED) != 0, -- -1) < 0) { -+ if (libxlDomainStartNew(driver, vm, -+ (flags & VIR_DOMAIN_START_PAUSED) != 0) < 0) { - if (!vm->persistent) { - virDomainObjListRemove(driver->domains, vm); - vm = NULL; -@@ -1818,7 +1818,9 @@ libxlDomainRestoreFlags(virConnectPtr co - goto cleanup; - } - -- ret = libxlDomainStart(driver, vm, (flags & VIR_DOMAIN_SAVE_PAUSED) != 0, fd); -+ ret = libxlDomainStartRestore(driver, vm, -+ (flags & VIR_DOMAIN_SAVE_PAUSED) != 0, -+ fd, hdr.version); - if (ret < 0 && !vm->persistent) - virDomainObjListRemove(driver->domains, vm); - -@@ -2681,7 +2683,8 @@ libxlDomainCreateWithFlags(virDomainPtr - goto endjob; - } - -- ret = libxlDomainStart(driver, vm, (flags & VIR_DOMAIN_START_PAUSED) != 0, -1); -+ ret = libxlDomainStartNew(driver, vm, -+ (flags & VIR_DOMAIN_START_PAUSED) != 0); - if (ret < 0) - goto endjob; - dom->id = vm->def->id; -Index: libvirt-1.3.4/src/libxl/libxl_migration.c -=================================================================== ---- libvirt-1.3.4.orig/src/libxl/libxl_migration.c -+++ libvirt-1.3.4/src/libxl/libxl_migration.c -@@ -106,7 +106,7 @@ libxlDoMigrateReceive(void *opaque) - * Always start the domain paused. If needed, unpause in the - * finish phase, after transfer of the domain is complete. - */ -- ret = libxlDomainStart(driver, vm, true, recvfd); -+ ret = libxlDomainStartRestore(driver, vm, true, recvfd, LIBXL_SAVE_VERSION); - - if (ret < 0 && !vm->persistent) - remove_dom = true; diff --git a/538012c8-default-vram.patch b/538012c8-default-vram.patch deleted file mode 100644 index c925a8d..0000000 --- a/538012c8-default-vram.patch +++ /dev/null @@ -1,81 +0,0 @@ -commit 538012c8a30230065d1bfe09892279dd8b89193f -Author: Ján Tomko -Date: Wed May 11 12:39:52 2016 +0200 - - Fill out default vram in DeviceDefPostParse - - Move filling out the default video (v)ram to DeviceDefPostParse. - - This means it can be removed from virDomainVideoDefParseXML - and qemuParseCommandLine. Also, we no longer need to special case - VIR_DOMAIN_VIRT_XEN, since the per-driver callback gets called - before the generic one. - -Index: libvirt-1.3.4/src/conf/domain_conf.c -=================================================================== ---- libvirt-1.3.4.orig/src/conf/domain_conf.c -+++ libvirt-1.3.4/src/conf/domain_conf.c -@@ -4155,6 +4155,12 @@ virDomainDeviceDefPostParseInternal(virD - - if (dev->type == VIR_DOMAIN_DEVICE_VIDEO) { - virDomainVideoDefPtr video = dev->data.video; -+ /* Fill out (V)RAM if the driver-specific callback did not do so */ -+ if (video->ram == 0 && video->type == VIR_DOMAIN_VIDEO_TYPE_QXL) -+ video->ram = virDomainVideoDefaultRAM(def, video->type); -+ if (video->vram == 0) -+ video->vram = virDomainVideoDefaultRAM(def, video->type); -+ - video->ram = VIR_ROUND_UP_POWER_OF_TWO(video->ram); - video->vram = VIR_ROUND_UP_POWER_OF_TWO(video->vram); - } -@@ -11970,10 +11976,6 @@ unsigned int - virDomainVideoDefaultRAM(const virDomainDef *def, - const virDomainVideoType type) - { -- /* Defer setting default vram to the Xen drivers */ -- if (def->virtType == VIR_DOMAIN_VIRT_XEN) -- return 0; -- - switch (type) { - case VIR_DOMAIN_VIDEO_TYPE_VGA: - case VIR_DOMAIN_VIDEO_TYPE_CIRRUS: -@@ -12152,8 +12154,6 @@ virDomainVideoDefParseXML(xmlNodePtr nod - _("cannot parse video ram '%s'"), ram); - goto error; - } -- } else if (def->type == VIR_DOMAIN_VIDEO_TYPE_QXL) { -- def->ram = virDomainVideoDefaultRAM(dom, def->type); - } - - if (vram) { -@@ -12162,8 +12162,6 @@ virDomainVideoDefParseXML(xmlNodePtr nod - _("cannot parse video vram '%s'"), vram); - goto error; - } -- } else { -- def->vram = virDomainVideoDefaultRAM(dom, def->type); - } - - if (vram64) { -@@ -18612,7 +18610,6 @@ virDomainDefAddImplicitVideo(virDomainDe - _("cannot determine default video type")); - goto cleanup; - } -- video->vram = virDomainVideoDefaultRAM(def, video->type); - video->heads = 1; - if (VIR_APPEND_ELEMENT(def->videos, def->nvideos, video) < 0) - goto cleanup; -Index: libvirt-1.3.4/src/qemu/qemu_parse_command.c -=================================================================== ---- libvirt-1.3.4.orig/src/qemu/qemu_parse_command.c -+++ libvirt-1.3.4/src/qemu/qemu_parse_command.c -@@ -2585,9 +2585,7 @@ qemuParseCommandLine(virCapsPtr caps, - vid->type = VIR_DOMAIN_VIDEO_TYPE_XEN; - else - vid->type = video; -- vid->vram = virDomainVideoDefaultRAM(def, vid->type); - if (vid->type == VIR_DOMAIN_VIDEO_TYPE_QXL) { -- vid->ram = virDomainVideoDefaultRAM(def, vid->type); - vid->vgamem = QEMU_QXL_VGAMEM_DEFAULT; - } else { - vid->ram = 0; diff --git a/96b21fb0-vram-tests.patch b/96b21fb0-vram-tests.patch deleted file mode 100644 index 466847f..0000000 --- a/96b21fb0-vram-tests.patch +++ /dev/null @@ -1,958 +0,0 @@ -commit 96b21fb0ecf8242ceb298607da61b5718511a388 -Author: Ján Tomko -Date: Thu May 12 14:19:52 2016 +0200 - - Fix tests to include video ram size - - My commit 3e42867 started filling out the video size in post-parse, - but did not adjust the tests. - -Index: libvirt-1.3.4/tests/sexpr2xmldata/sexpr2xml-curmem.xml -=================================================================== ---- libvirt-1.3.4.orig/tests/sexpr2xmldata/sexpr2xml-curmem.xml -+++ libvirt-1.3.4/tests/sexpr2xmldata/sexpr2xml-curmem.xml -@@ -35,7 +35,7 @@ - - - - - -Index: libvirt-1.3.4/tests/sexpr2xmldata/sexpr2xml-fv-autoport.xml -=================================================================== ---- libvirt-1.3.4.orig/tests/sexpr2xmldata/sexpr2xml-fv-autoport.xml -+++ libvirt-1.3.4/tests/sexpr2xmldata/sexpr2xml-fv-autoport.xml -@@ -51,7 +51,7 @@ - - - - - -Index: libvirt-1.3.4/tests/sexpr2xmldata/sexpr2xml-fv-empty-kernel.xml -=================================================================== ---- libvirt-1.3.4.orig/tests/sexpr2xmldata/sexpr2xml-fv-empty-kernel.xml -+++ libvirt-1.3.4/tests/sexpr2xmldata/sexpr2xml-fv-empty-kernel.xml -@@ -44,7 +44,7 @@ - - - - - -Index: libvirt-1.3.4/tests/sexpr2xmldata/sexpr2xml-fv-force-hpet.xml -=================================================================== ---- libvirt-1.3.4.orig/tests/sexpr2xmldata/sexpr2xml-fv-force-hpet.xml -+++ libvirt-1.3.4/tests/sexpr2xmldata/sexpr2xml-fv-force-hpet.xml -@@ -47,7 +47,7 @@ - - - - - -Index: libvirt-1.3.4/tests/sexpr2xmldata/sexpr2xml-fv-force-nohpet.xml -=================================================================== ---- libvirt-1.3.4.orig/tests/sexpr2xmldata/sexpr2xml-fv-force-nohpet.xml -+++ libvirt-1.3.4/tests/sexpr2xmldata/sexpr2xml-fv-force-nohpet.xml -@@ -47,7 +47,7 @@ - - - - - -Index: libvirt-1.3.4/tests/sexpr2xmldata/sexpr2xml-fv-localtime.xml -=================================================================== ---- libvirt-1.3.4.orig/tests/sexpr2xmldata/sexpr2xml-fv-localtime.xml -+++ libvirt-1.3.4/tests/sexpr2xmldata/sexpr2xml-fv-localtime.xml -@@ -44,7 +44,7 @@ - - - - - -Index: libvirt-1.3.4/tests/sexpr2xmldata/sexpr2xml-fv-net-netfront.xml -=================================================================== ---- libvirt-1.3.4.orig/tests/sexpr2xmldata/sexpr2xml-fv-net-netfront.xml -+++ libvirt-1.3.4/tests/sexpr2xmldata/sexpr2xml-fv-net-netfront.xml -@@ -45,7 +45,7 @@ - - - - - -Index: libvirt-1.3.4/tests/sexpr2xmldata/sexpr2xml-fv-parallel-tcp.xml -=================================================================== ---- libvirt-1.3.4.orig/tests/sexpr2xmldata/sexpr2xml-fv-parallel-tcp.xml -+++ libvirt-1.3.4/tests/sexpr2xmldata/sexpr2xml-fv-parallel-tcp.xml -@@ -49,7 +49,7 @@ - - - - - -Index: libvirt-1.3.4/tests/sexpr2xmldata/sexpr2xml-fv-serial-dev-2-ports.xml -=================================================================== ---- libvirt-1.3.4.orig/tests/sexpr2xmldata/sexpr2xml-fv-serial-dev-2-ports.xml -+++ libvirt-1.3.4/tests/sexpr2xmldata/sexpr2xml-fv-serial-dev-2-ports.xml -@@ -56,7 +56,7 @@ - - - - - -Index: libvirt-1.3.4/tests/sexpr2xmldata/sexpr2xml-fv-serial-dev-2nd-port.xml -=================================================================== ---- libvirt-1.3.4.orig/tests/sexpr2xmldata/sexpr2xml-fv-serial-dev-2nd-port.xml -+++ libvirt-1.3.4/tests/sexpr2xmldata/sexpr2xml-fv-serial-dev-2nd-port.xml -@@ -52,7 +52,7 @@ - - - - - -Index: libvirt-1.3.4/tests/sexpr2xmldata/sexpr2xml-fv-serial-file.xml -=================================================================== ---- libvirt-1.3.4.orig/tests/sexpr2xmldata/sexpr2xml-fv-serial-file.xml -+++ libvirt-1.3.4/tests/sexpr2xmldata/sexpr2xml-fv-serial-file.xml -@@ -52,7 +52,7 @@ - - - - - -Index: libvirt-1.3.4/tests/sexpr2xmldata/sexpr2xml-fv-serial-null.xml -=================================================================== ---- libvirt-1.3.4.orig/tests/sexpr2xmldata/sexpr2xml-fv-serial-null.xml -+++ libvirt-1.3.4/tests/sexpr2xmldata/sexpr2xml-fv-serial-null.xml -@@ -50,7 +50,7 @@ - - - - - -Index: libvirt-1.3.4/tests/sexpr2xmldata/sexpr2xml-fv-serial-pipe.xml -=================================================================== ---- libvirt-1.3.4.orig/tests/sexpr2xmldata/sexpr2xml-fv-serial-pipe.xml -+++ libvirt-1.3.4/tests/sexpr2xmldata/sexpr2xml-fv-serial-pipe.xml -@@ -52,7 +52,7 @@ - - - - - -Index: libvirt-1.3.4/tests/sexpr2xmldata/sexpr2xml-fv-serial-pty.xml -=================================================================== ---- libvirt-1.3.4.orig/tests/sexpr2xmldata/sexpr2xml-fv-serial-pty.xml -+++ libvirt-1.3.4/tests/sexpr2xmldata/sexpr2xml-fv-serial-pty.xml -@@ -50,7 +50,7 @@ - - - - - -Index: libvirt-1.3.4/tests/sexpr2xmldata/sexpr2xml-fv-serial-stdio.xml -=================================================================== ---- libvirt-1.3.4.orig/tests/sexpr2xmldata/sexpr2xml-fv-serial-stdio.xml -+++ libvirt-1.3.4/tests/sexpr2xmldata/sexpr2xml-fv-serial-stdio.xml -@@ -50,7 +50,7 @@ - - - - - -Index: libvirt-1.3.4/tests/sexpr2xmldata/sexpr2xml-fv-serial-tcp-telnet.xml -=================================================================== ---- libvirt-1.3.4.orig/tests/sexpr2xmldata/sexpr2xml-fv-serial-tcp-telnet.xml -+++ libvirt-1.3.4/tests/sexpr2xmldata/sexpr2xml-fv-serial-tcp-telnet.xml -@@ -54,7 +54,7 @@ - - - - - -Index: libvirt-1.3.4/tests/sexpr2xmldata/sexpr2xml-fv-serial-tcp.xml -=================================================================== ---- libvirt-1.3.4.orig/tests/sexpr2xmldata/sexpr2xml-fv-serial-tcp.xml -+++ libvirt-1.3.4/tests/sexpr2xmldata/sexpr2xml-fv-serial-tcp.xml -@@ -54,7 +54,7 @@ - - - - - -Index: libvirt-1.3.4/tests/sexpr2xmldata/sexpr2xml-fv-serial-udp.xml -=================================================================== ---- libvirt-1.3.4.orig/tests/sexpr2xmldata/sexpr2xml-fv-serial-udp.xml -+++ libvirt-1.3.4/tests/sexpr2xmldata/sexpr2xml-fv-serial-udp.xml -@@ -54,7 +54,7 @@ - - - - - -Index: libvirt-1.3.4/tests/sexpr2xmldata/sexpr2xml-fv-serial-unix.xml -=================================================================== ---- libvirt-1.3.4.orig/tests/sexpr2xmldata/sexpr2xml-fv-serial-unix.xml -+++ libvirt-1.3.4/tests/sexpr2xmldata/sexpr2xml-fv-serial-unix.xml -@@ -52,7 +52,7 @@ - - - - - -Index: libvirt-1.3.4/tests/sexpr2xmldata/sexpr2xml-fv-sound-all.xml -=================================================================== ---- libvirt-1.3.4.orig/tests/sexpr2xmldata/sexpr2xml-fv-sound-all.xml -+++ libvirt-1.3.4/tests/sexpr2xmldata/sexpr2xml-fv-sound-all.xml -@@ -46,7 +46,7 @@ - - - - - -Index: libvirt-1.3.4/tests/sexpr2xmldata/sexpr2xml-fv-sound.xml -=================================================================== ---- libvirt-1.3.4.orig/tests/sexpr2xmldata/sexpr2xml-fv-sound.xml -+++ libvirt-1.3.4/tests/sexpr2xmldata/sexpr2xml-fv-sound.xml -@@ -46,7 +46,7 @@ - - - - - -Index: libvirt-1.3.4/tests/sexpr2xmldata/sexpr2xml-fv-usbmouse.xml -=================================================================== ---- libvirt-1.3.4.orig/tests/sexpr2xmldata/sexpr2xml-fv-usbmouse.xml -+++ libvirt-1.3.4/tests/sexpr2xmldata/sexpr2xml-fv-usbmouse.xml -@@ -45,7 +45,7 @@ - - - - - -Index: libvirt-1.3.4/tests/sexpr2xmldata/sexpr2xml-fv-usbtablet.xml -=================================================================== ---- libvirt-1.3.4.orig/tests/sexpr2xmldata/sexpr2xml-fv-usbtablet.xml -+++ libvirt-1.3.4/tests/sexpr2xmldata/sexpr2xml-fv-usbtablet.xml -@@ -45,7 +45,7 @@ - - - - - -Index: libvirt-1.3.4/tests/sexpr2xmldata/sexpr2xml-fv-utc.xml -=================================================================== ---- libvirt-1.3.4.orig/tests/sexpr2xmldata/sexpr2xml-fv-utc.xml -+++ libvirt-1.3.4/tests/sexpr2xmldata/sexpr2xml-fv-utc.xml -@@ -44,7 +44,7 @@ - - - - - -Index: libvirt-1.3.4/tests/sexpr2xmldata/sexpr2xml-fv-v2.xml -=================================================================== ---- libvirt-1.3.4.orig/tests/sexpr2xmldata/sexpr2xml-fv-v2.xml -+++ libvirt-1.3.4/tests/sexpr2xmldata/sexpr2xml-fv-v2.xml -@@ -44,7 +44,7 @@ - - - - - -Index: libvirt-1.3.4/tests/sexpr2xmldata/sexpr2xml-fv.xml -=================================================================== ---- libvirt-1.3.4.orig/tests/sexpr2xmldata/sexpr2xml-fv.xml -+++ libvirt-1.3.4/tests/sexpr2xmldata/sexpr2xml-fv.xml -@@ -44,7 +44,7 @@ - - - - - -Index: libvirt-1.3.4/tests/sexpr2xmldata/sexpr2xml-no-source-cdrom.xml -=================================================================== ---- libvirt-1.3.4.orig/tests/sexpr2xmldata/sexpr2xml-no-source-cdrom.xml -+++ libvirt-1.3.4/tests/sexpr2xmldata/sexpr2xml-no-source-cdrom.xml -@@ -49,7 +49,7 @@ - - - - - -Index: libvirt-1.3.4/tests/sexpr2xmldata/sexpr2xml-pv-vfb-new-vncdisplay.xml -=================================================================== ---- libvirt-1.3.4.orig/tests/sexpr2xmldata/sexpr2xml-pv-vfb-new-vncdisplay.xml -+++ libvirt-1.3.4/tests/sexpr2xmldata/sexpr2xml-pv-vfb-new-vncdisplay.xml -@@ -30,7 +30,7 @@ - - - - - -Index: libvirt-1.3.4/tests/sexpr2xmldata/sexpr2xml-pv-vfb-new.xml -=================================================================== ---- libvirt-1.3.4.orig/tests/sexpr2xmldata/sexpr2xml-pv-vfb-new.xml -+++ libvirt-1.3.4/tests/sexpr2xmldata/sexpr2xml-pv-vfb-new.xml -@@ -30,7 +30,7 @@ - - - - - -Index: libvirt-1.3.4/tests/sexpr2xmldata/sexpr2xml-pv-vfb-type-crash.xml -=================================================================== ---- libvirt-1.3.4.orig/tests/sexpr2xmldata/sexpr2xml-pv-vfb-type-crash.xml -+++ libvirt-1.3.4/tests/sexpr2xmldata/sexpr2xml-pv-vfb-type-crash.xml -@@ -33,7 +33,7 @@ - - - - - -Index: libvirt-1.3.4/tests/sexpr2xmldata/sexpr2xml-vif-rate.xml -=================================================================== ---- libvirt-1.3.4.orig/tests/sexpr2xmldata/sexpr2xml-vif-rate.xml -+++ libvirt-1.3.4/tests/sexpr2xmldata/sexpr2xml-vif-rate.xml -@@ -48,7 +48,7 @@ - - - - - -Index: libvirt-1.3.4/tests/xlconfigdata/test-disk-positional-parms-full.xml -=================================================================== ---- libvirt-1.3.4.orig/tests/xlconfigdata/test-disk-positional-parms-full.xml -+++ libvirt-1.3.4/tests/xlconfigdata/test-disk-positional-parms-full.xml -@@ -52,7 +52,7 @@ - - - - - -Index: libvirt-1.3.4/tests/xlconfigdata/test-disk-positional-parms-partial.xml -=================================================================== ---- libvirt-1.3.4.orig/tests/xlconfigdata/test-disk-positional-parms-partial.xml -+++ libvirt-1.3.4/tests/xlconfigdata/test-disk-positional-parms-partial.xml -@@ -52,7 +52,7 @@ - - - - - -Index: libvirt-1.3.4/tests/xlconfigdata/test-fullvirt-direct-kernel-boot-bogus-extra.xml -=================================================================== ---- libvirt-1.3.4.orig/tests/xlconfigdata/test-fullvirt-direct-kernel-boot-bogus-extra.xml -+++ libvirt-1.3.4/tests/xlconfigdata/test-fullvirt-direct-kernel-boot-bogus-extra.xml -@@ -49,7 +49,7 @@ - - - - - -Index: libvirt-1.3.4/tests/xlconfigdata/test-fullvirt-direct-kernel-boot-extra.xml -=================================================================== ---- libvirt-1.3.4.orig/tests/xlconfigdata/test-fullvirt-direct-kernel-boot-extra.xml -+++ libvirt-1.3.4/tests/xlconfigdata/test-fullvirt-direct-kernel-boot-extra.xml -@@ -49,7 +49,7 @@ - - - - - -Index: libvirt-1.3.4/tests/xlconfigdata/test-fullvirt-direct-kernel-boot.xml -=================================================================== ---- libvirt-1.3.4.orig/tests/xlconfigdata/test-fullvirt-direct-kernel-boot.xml -+++ libvirt-1.3.4/tests/xlconfigdata/test-fullvirt-direct-kernel-boot.xml -@@ -49,7 +49,7 @@ - - - - - -Index: libvirt-1.3.4/tests/xlconfigdata/test-fullvirt-multiusb.xml -=================================================================== ---- libvirt-1.3.4.orig/tests/xlconfigdata/test-fullvirt-multiusb.xml -+++ libvirt-1.3.4/tests/xlconfigdata/test-fullvirt-multiusb.xml -@@ -48,7 +48,7 @@ - - - - - -Index: libvirt-1.3.4/tests/xlconfigdata/test-fullvirt-nohap.xml -=================================================================== ---- libvirt-1.3.4.orig/tests/xlconfigdata/test-fullvirt-nohap.xml -+++ libvirt-1.3.4/tests/xlconfigdata/test-fullvirt-nohap.xml -@@ -56,7 +56,7 @@ - - - - - -Index: libvirt-1.3.4/tests/xlconfigdata/test-new-disk.xml -=================================================================== ---- libvirt-1.3.4.orig/tests/xlconfigdata/test-new-disk.xml -+++ libvirt-1.3.4/tests/xlconfigdata/test-new-disk.xml -@@ -52,7 +52,7 @@ - - - - - -Index: libvirt-1.3.4/tests/xlconfigdata/test-rbd-multihost-noauth.xml -=================================================================== ---- libvirt-1.3.4.orig/tests/xlconfigdata/test-rbd-multihost-noauth.xml -+++ libvirt-1.3.4/tests/xlconfigdata/test-rbd-multihost-noauth.xml -@@ -49,7 +49,7 @@ - - - - - -Index: libvirt-1.3.4/tests/xlconfigdata/test-spice-features.xml -=================================================================== ---- libvirt-1.3.4.orig/tests/xlconfigdata/test-spice-features.xml -+++ libvirt-1.3.4/tests/xlconfigdata/test-spice-features.xml -@@ -48,7 +48,7 @@ - - - - - -Index: libvirt-1.3.4/tests/xlconfigdata/test-spice.xml -=================================================================== ---- libvirt-1.3.4.orig/tests/xlconfigdata/test-spice.xml -+++ libvirt-1.3.4/tests/xlconfigdata/test-spice.xml -@@ -48,7 +48,7 @@ - - - - - -Index: libvirt-1.3.4/tests/xlconfigdata/test-vif-rate.xml -=================================================================== ---- libvirt-1.3.4.orig/tests/xlconfigdata/test-vif-rate.xml -+++ libvirt-1.3.4/tests/xlconfigdata/test-vif-rate.xml -@@ -55,7 +55,7 @@ - - - - - -Index: libvirt-1.3.4/tests/xmconfigdata/test-escape-paths.xml -=================================================================== ---- libvirt-1.3.4.orig/tests/xmconfigdata/test-escape-paths.xml -+++ libvirt-1.3.4/tests/xmconfigdata/test-escape-paths.xml -@@ -54,7 +54,7 @@ - - - - - -Index: libvirt-1.3.4/tests/xmconfigdata/test-fullvirt-default-feature.xml -=================================================================== ---- libvirt-1.3.4.orig/tests/xmconfigdata/test-fullvirt-default-feature.xml -+++ libvirt-1.3.4/tests/xmconfigdata/test-fullvirt-default-feature.xml -@@ -48,7 +48,7 @@ - - - - - -Index: libvirt-1.3.4/tests/xmconfigdata/test-fullvirt-force-hpet.xml -=================================================================== ---- libvirt-1.3.4.orig/tests/xmconfigdata/test-fullvirt-force-hpet.xml -+++ libvirt-1.3.4/tests/xmconfigdata/test-fullvirt-force-hpet.xml -@@ -48,7 +48,7 @@ - - - - - -Index: libvirt-1.3.4/tests/xmconfigdata/test-fullvirt-force-nohpet.xml -=================================================================== ---- libvirt-1.3.4.orig/tests/xmconfigdata/test-fullvirt-force-nohpet.xml -+++ libvirt-1.3.4/tests/xmconfigdata/test-fullvirt-force-nohpet.xml -@@ -48,7 +48,7 @@ - - - - - -Index: libvirt-1.3.4/tests/xmconfigdata/test-fullvirt-localtime.xml -=================================================================== ---- libvirt-1.3.4.orig/tests/xmconfigdata/test-fullvirt-localtime.xml -+++ libvirt-1.3.4/tests/xmconfigdata/test-fullvirt-localtime.xml -@@ -46,7 +46,7 @@ - - - - - -Index: libvirt-1.3.4/tests/xmconfigdata/test-fullvirt-net-netfront.xml -=================================================================== ---- libvirt-1.3.4.orig/tests/xmconfigdata/test-fullvirt-net-netfront.xml -+++ libvirt-1.3.4/tests/xmconfigdata/test-fullvirt-net-netfront.xml -@@ -46,7 +46,7 @@ - - - - - -Index: libvirt-1.3.4/tests/xmconfigdata/test-fullvirt-new-cdrom.xml -=================================================================== ---- libvirt-1.3.4.orig/tests/xmconfigdata/test-fullvirt-new-cdrom.xml -+++ libvirt-1.3.4/tests/xmconfigdata/test-fullvirt-new-cdrom.xml -@@ -46,7 +46,7 @@ - - - - - -Index: libvirt-1.3.4/tests/xmconfigdata/test-fullvirt-nohap.xml -=================================================================== ---- libvirt-1.3.4.orig/tests/xmconfigdata/test-fullvirt-nohap.xml -+++ libvirt-1.3.4/tests/xmconfigdata/test-fullvirt-nohap.xml -@@ -47,7 +47,7 @@ - - - - - -Index: libvirt-1.3.4/tests/xmconfigdata/test-fullvirt-parallel-tcp.xml -=================================================================== ---- libvirt-1.3.4.orig/tests/xmconfigdata/test-fullvirt-parallel-tcp.xml -+++ libvirt-1.3.4/tests/xmconfigdata/test-fullvirt-parallel-tcp.xml -@@ -51,7 +51,7 @@ - - - - - -Index: libvirt-1.3.4/tests/xmconfigdata/test-fullvirt-serial-dev-2-ports.xml -=================================================================== ---- libvirt-1.3.4.orig/tests/xmconfigdata/test-fullvirt-serial-dev-2-ports.xml -+++ libvirt-1.3.4/tests/xmconfigdata/test-fullvirt-serial-dev-2-ports.xml -@@ -58,7 +58,7 @@ - - - - - -Index: libvirt-1.3.4/tests/xmconfigdata/test-fullvirt-serial-dev-2nd-port.xml -=================================================================== ---- libvirt-1.3.4.orig/tests/xmconfigdata/test-fullvirt-serial-dev-2nd-port.xml -+++ libvirt-1.3.4/tests/xmconfigdata/test-fullvirt-serial-dev-2nd-port.xml -@@ -54,7 +54,7 @@ - - - - - -Index: libvirt-1.3.4/tests/xmconfigdata/test-fullvirt-serial-file.xml -=================================================================== ---- libvirt-1.3.4.orig/tests/xmconfigdata/test-fullvirt-serial-file.xml -+++ libvirt-1.3.4/tests/xmconfigdata/test-fullvirt-serial-file.xml -@@ -54,7 +54,7 @@ - - - - - -Index: libvirt-1.3.4/tests/xmconfigdata/test-fullvirt-serial-null.xml -=================================================================== ---- libvirt-1.3.4.orig/tests/xmconfigdata/test-fullvirt-serial-null.xml -+++ libvirt-1.3.4/tests/xmconfigdata/test-fullvirt-serial-null.xml -@@ -52,7 +52,7 @@ - - - - - -Index: libvirt-1.3.4/tests/xmconfigdata/test-fullvirt-serial-pipe.xml -=================================================================== ---- libvirt-1.3.4.orig/tests/xmconfigdata/test-fullvirt-serial-pipe.xml -+++ libvirt-1.3.4/tests/xmconfigdata/test-fullvirt-serial-pipe.xml -@@ -54,7 +54,7 @@ - - - - - -Index: libvirt-1.3.4/tests/xmconfigdata/test-fullvirt-serial-pty.xml -=================================================================== ---- libvirt-1.3.4.orig/tests/xmconfigdata/test-fullvirt-serial-pty.xml -+++ libvirt-1.3.4/tests/xmconfigdata/test-fullvirt-serial-pty.xml -@@ -52,7 +52,7 @@ - - - - - -Index: libvirt-1.3.4/tests/xmconfigdata/test-fullvirt-serial-stdio.xml -=================================================================== ---- libvirt-1.3.4.orig/tests/xmconfigdata/test-fullvirt-serial-stdio.xml -+++ libvirt-1.3.4/tests/xmconfigdata/test-fullvirt-serial-stdio.xml -@@ -52,7 +52,7 @@ - - - - - -Index: libvirt-1.3.4/tests/xmconfigdata/test-fullvirt-serial-tcp-telnet.xml -=================================================================== ---- libvirt-1.3.4.orig/tests/xmconfigdata/test-fullvirt-serial-tcp-telnet.xml -+++ libvirt-1.3.4/tests/xmconfigdata/test-fullvirt-serial-tcp-telnet.xml -@@ -56,7 +56,7 @@ - - - - - -Index: libvirt-1.3.4/tests/xmconfigdata/test-fullvirt-serial-tcp.xml -=================================================================== ---- libvirt-1.3.4.orig/tests/xmconfigdata/test-fullvirt-serial-tcp.xml -+++ libvirt-1.3.4/tests/xmconfigdata/test-fullvirt-serial-tcp.xml -@@ -56,7 +56,7 @@ - - - - - -Index: libvirt-1.3.4/tests/xmconfigdata/test-fullvirt-serial-udp.xml -=================================================================== ---- libvirt-1.3.4.orig/tests/xmconfigdata/test-fullvirt-serial-udp.xml -+++ libvirt-1.3.4/tests/xmconfigdata/test-fullvirt-serial-udp.xml -@@ -56,7 +56,7 @@ - - - - - -Index: libvirt-1.3.4/tests/xmconfigdata/test-fullvirt-serial-unix.xml -=================================================================== ---- libvirt-1.3.4.orig/tests/xmconfigdata/test-fullvirt-serial-unix.xml -+++ libvirt-1.3.4/tests/xmconfigdata/test-fullvirt-serial-unix.xml -@@ -54,7 +54,7 @@ - - - - - -Index: libvirt-1.3.4/tests/xmconfigdata/test-fullvirt-sound.xml -=================================================================== ---- libvirt-1.3.4.orig/tests/xmconfigdata/test-fullvirt-sound.xml -+++ libvirt-1.3.4/tests/xmconfigdata/test-fullvirt-sound.xml -@@ -48,7 +48,7 @@ - - - - - -Index: libvirt-1.3.4/tests/xmconfigdata/test-fullvirt-usbmouse.xml -=================================================================== ---- libvirt-1.3.4.orig/tests/xmconfigdata/test-fullvirt-usbmouse.xml -+++ libvirt-1.3.4/tests/xmconfigdata/test-fullvirt-usbmouse.xml -@@ -47,7 +47,7 @@ - - - - - -Index: libvirt-1.3.4/tests/xmconfigdata/test-fullvirt-usbtablet.xml -=================================================================== ---- libvirt-1.3.4.orig/tests/xmconfigdata/test-fullvirt-usbtablet.xml -+++ libvirt-1.3.4/tests/xmconfigdata/test-fullvirt-usbtablet.xml -@@ -47,7 +47,7 @@ - - - - - -Index: libvirt-1.3.4/tests/xmconfigdata/test-fullvirt-utc.xml -=================================================================== ---- libvirt-1.3.4.orig/tests/xmconfigdata/test-fullvirt-utc.xml -+++ libvirt-1.3.4/tests/xmconfigdata/test-fullvirt-utc.xml -@@ -46,7 +46,7 @@ - - - - - -Index: libvirt-1.3.4/tests/xmconfigdata/test-no-source-cdrom.xml -=================================================================== ---- libvirt-1.3.4.orig/tests/xmconfigdata/test-no-source-cdrom.xml -+++ libvirt-1.3.4/tests/xmconfigdata/test-no-source-cdrom.xml -@@ -49,7 +49,7 @@ - - - - - -Index: libvirt-1.3.4/tests/xmconfigdata/test-paravirt-net-e1000.xml -=================================================================== ---- libvirt-1.3.4.orig/tests/xmconfigdata/test-paravirt-net-e1000.xml -+++ libvirt-1.3.4/tests/xmconfigdata/test-paravirt-net-e1000.xml -@@ -33,7 +33,7 @@ - - - - - -Index: libvirt-1.3.4/tests/xmconfigdata/test-paravirt-net-vifname.xml -=================================================================== ---- libvirt-1.3.4.orig/tests/xmconfigdata/test-paravirt-net-vifname.xml -+++ libvirt-1.3.4/tests/xmconfigdata/test-paravirt-net-vifname.xml -@@ -34,7 +34,7 @@ - - - - - -Index: libvirt-1.3.4/tests/xmconfigdata/test-paravirt-new-pvfb-vncdisplay.xml -=================================================================== ---- libvirt-1.3.4.orig/tests/xmconfigdata/test-paravirt-new-pvfb-vncdisplay.xml -+++ libvirt-1.3.4/tests/xmconfigdata/test-paravirt-new-pvfb-vncdisplay.xml -@@ -32,7 +32,7 @@ - - - - - -Index: libvirt-1.3.4/tests/xmconfigdata/test-paravirt-new-pvfb.xml -=================================================================== ---- libvirt-1.3.4.orig/tests/xmconfigdata/test-paravirt-new-pvfb.xml -+++ libvirt-1.3.4/tests/xmconfigdata/test-paravirt-new-pvfb.xml -@@ -32,7 +32,7 @@ - - - - - -Index: libvirt-1.3.4/tests/xmconfigdata/test-pci-devs.xml -=================================================================== ---- libvirt-1.3.4.orig/tests/xmconfigdata/test-pci-devs.xml -+++ libvirt-1.3.4/tests/xmconfigdata/test-pci-devs.xml -@@ -49,7 +49,7 @@ - - - - - diff --git a/a1c9a81a-libxl-rbd-fix.patch b/a1c9a81a-libxl-rbd-fix.patch deleted file mode 100644 index 84faa53..0000000 --- a/a1c9a81a-libxl-rbd-fix.patch +++ /dev/null @@ -1,70 +0,0 @@ -commit a1c9a81a318f3cd558faed7fc4c4933f95c07a07 -Author: Jim Fehlig -Date: Mon May 23 15:56:01 2016 -0600 - - libxl: default to qemu driver for network disks - - Xen only supports network-based disks with the qemu (aka qdisk) driver. - Set the driverName to 'qemu' in libxlDomainDeviceDefPostParse() if - not already set. When starting a domain with network-based disks, - ensure the driverName is 'qemu'. - - Resolves: https://bugzilla.opensuse.org/show_bug.cgi?id=981094 - -Index: libvirt-1.3.4/src/libxl/libxl_conf.c -=================================================================== ---- libvirt-1.3.4.orig/src/libxl/libxl_conf.c -+++ libvirt-1.3.4/src/libxl/libxl_conf.c -@@ -1055,13 +1055,18 @@ libxlMakeNetworkDiskSrc(virStorageSource - int - libxlMakeDisk(virDomainDiskDefPtr l_disk, libxl_device_disk *x_disk) - { -- const char *driver; -- int format; -+ const char *driver = virDomainDiskGetDriver(l_disk); -+ int format = virDomainDiskGetFormat(l_disk); - int actual_type = virStorageSourceGetActualType(l_disk->src); - - libxl_device_disk_init(x_disk); - - if (actual_type == VIR_STORAGE_TYPE_NETWORK) { -+ if (STRNEQ_NULLABLE(driver, "qemu")) { -+ virReportError(VIR_ERR_OPERATION_INVALID, "%s", -+ _("only the 'qemu' driver can be used with network disks")); -+ return -1; -+ } - if (libxlMakeNetworkDiskSrc(l_disk->src, &x_disk->pdev_path) < 0) - return -1; - } else { -@@ -1072,8 +1077,6 @@ libxlMakeDisk(virDomainDiskDefPtr l_disk - if (VIR_STRDUP(x_disk->vdev, l_disk->dst) < 0) - return -1; - -- driver = virDomainDiskGetDriver(l_disk); -- format = virDomainDiskGetFormat(l_disk); - if (driver) { - if (STREQ(driver, "tap") || STREQ(driver, "tap2")) { - switch (format) { -Index: libvirt-1.3.4/src/libxl/libxl_domain.c -=================================================================== ---- libvirt-1.3.4.orig/src/libxl/libxl_domain.c -+++ libvirt-1.3.4/src/libxl/libxl_domain.c -@@ -364,6 +364,18 @@ libxlDomainDeviceDefPostParse(virDomainD - } - } - -+ /* for network-based disks, set 'qemu' as the default driver */ -+ if (dev->type == VIR_DOMAIN_DEVICE_DISK) { -+ virDomainDiskDefPtr disk = dev->data.disk; -+ int actual_type = virStorageSourceGetActualType(disk->src); -+ -+ if (actual_type == VIR_STORAGE_TYPE_NETWORK) { -+ if (!virDomainDiskGetDriver(disk) && -+ virDomainDiskSetDriver(disk, "qemu") < 0) -+ return -1; -+ } -+ } -+ - return 0; - } - diff --git a/apparmor-fixes.patch b/apparmor-fixes.patch index 6776044..f7720a2 100644 --- a/apparmor-fixes.patch +++ b/apparmor-fixes.patch @@ -1,7 +1,7 @@ -Index: libvirt-1.3.4/examples/apparmor/libvirt-qemu +Index: libvirt-1.3.5/examples/apparmor/libvirt-qemu =================================================================== ---- libvirt-1.3.4.orig/examples/apparmor/libvirt-qemu -+++ libvirt-1.3.4/examples/apparmor/libvirt-qemu +--- libvirt-1.3.5.orig/examples/apparmor/libvirt-qemu ++++ libvirt-1.3.5/examples/apparmor/libvirt-qemu @@ -143,6 +143,9 @@ # for restore /bin/bash rmix, diff --git a/apparmor-no-mount.patch b/apparmor-no-mount.patch index ca801a0..2a5459c 100644 --- a/apparmor-no-mount.patch +++ b/apparmor-no-mount.patch @@ -1,7 +1,7 @@ -Index: libvirt-1.3.4/examples/apparmor/libvirt-lxc +Index: libvirt-1.3.5/examples/apparmor/libvirt-lxc =================================================================== ---- libvirt-1.3.4.orig/examples/apparmor/libvirt-lxc -+++ libvirt-1.3.4/examples/apparmor/libvirt-lxc +--- libvirt-1.3.5.orig/examples/apparmor/libvirt-lxc ++++ libvirt-1.3.5/examples/apparmor/libvirt-lxc @@ -2,39 +2,15 @@ #include diff --git a/b90c4b5f-tests-use-qemu-xen.patch b/b90c4b5f-tests-use-qemu-xen.patch deleted file mode 100644 index 0f655df..0000000 --- a/b90c4b5f-tests-use-qemu-xen.patch +++ /dev/null @@ -1,257 +0,0 @@ -commit b90c4b5f505698d600303c5b4f03f5d229b329dd -Author: Jim Fehlig -Date: Thu May 12 14:40:29 2016 -0600 - - xlconfigtests: use qemu-xen in all test data files - - Some of the test configuration files in tests/xlconfigdata - use the old qemu-dm as the emulator. Many of the configuration - features tested (spice, rbd, multi-usb) are not even usable with - the old qemu. Change these files to use the new qemu-xen (also - known as qemu upstream) emulator. - - Note: This change fixes xlconfigtest failures when the old - qemu is actually installed on the system. During device post - parse, the libxl driver attempts to invoke the emulator to - determine if it is the old or new qemu so it can properly set - video RAM defaults. With the old qemu installed, the default - video RAM was set differently than the expected value. - Changing all the test data files to use qemu-xen ensures - predictable results wrt default video RAM size. - - Signed-off-by: Jim Fehlig - -Index: libvirt-1.3.4/tests/xlconfigdata/test-disk-positional-parms-full.cfg -=================================================================== ---- libvirt-1.3.4.orig/tests/xlconfigdata/test-disk-positional-parms-full.cfg -+++ libvirt-1.3.4/tests/xlconfigdata/test-disk-positional-parms-full.cfg -@@ -12,7 +12,7 @@ localtime = 0 - on_poweroff = "destroy" - on_reboot = "restart" - on_crash = "restart" --device_model = "/usr/lib/xen/bin/qemu-dm" -+device_model = "/usr/lib/xen/bin/qemu-system-i386" - sdl = 0 - vnc = 1 - vncunused = 1 -Index: libvirt-1.3.4/tests/xlconfigdata/test-disk-positional-parms-full.xml -=================================================================== ---- libvirt-1.3.4.orig/tests/xlconfigdata/test-disk-positional-parms-full.xml -+++ libvirt-1.3.4/tests/xlconfigdata/test-disk-positional-parms-full.xml -@@ -19,7 +19,7 @@ - restart - restart - -- /usr/lib/xen/bin/qemu-dm -+ /usr/lib/xen/bin/qemu-system-i386 - - - -Index: libvirt-1.3.4/tests/xlconfigdata/test-disk-positional-parms-partial.cfg -=================================================================== ---- libvirt-1.3.4.orig/tests/xlconfigdata/test-disk-positional-parms-partial.cfg -+++ libvirt-1.3.4/tests/xlconfigdata/test-disk-positional-parms-partial.cfg -@@ -12,7 +12,7 @@ localtime = 0 - on_poweroff = "destroy" - on_reboot = "restart" - on_crash = "restart" --device_model = "/usr/lib/xen/bin/qemu-dm" -+device_model = "/usr/lib/xen/bin/qemu-system-i386" - sdl = 0 - vnc = 1 - vncunused = 1 -Index: libvirt-1.3.4/tests/xlconfigdata/test-disk-positional-parms-partial.xml -=================================================================== ---- libvirt-1.3.4.orig/tests/xlconfigdata/test-disk-positional-parms-partial.xml -+++ libvirt-1.3.4/tests/xlconfigdata/test-disk-positional-parms-partial.xml -@@ -19,7 +19,7 @@ - restart - restart - -- /usr/lib/xen/bin/qemu-dm -+ /usr/lib/xen/bin/qemu-system-i386 - - - -Index: libvirt-1.3.4/tests/xlconfigdata/test-fullvirt-multiusb.cfg -=================================================================== ---- libvirt-1.3.4.orig/tests/xlconfigdata/test-fullvirt-multiusb.cfg -+++ libvirt-1.3.4/tests/xlconfigdata/test-fullvirt-multiusb.cfg -@@ -12,7 +12,7 @@ localtime = 0 - on_poweroff = "destroy" - on_reboot = "restart" - on_crash = "restart" --device_model = "/usr/lib/xen/bin/qemu-dm" -+device_model = "/usr/lib/xen/bin/qemu-system-i386" - sdl = 0 - vnc = 1 - vncunused = 1 -Index: libvirt-1.3.4/tests/xlconfigdata/test-fullvirt-multiusb.xml -=================================================================== ---- libvirt-1.3.4.orig/tests/xlconfigdata/test-fullvirt-multiusb.xml -+++ libvirt-1.3.4/tests/xlconfigdata/test-fullvirt-multiusb.xml -@@ -19,7 +19,7 @@ - restart - restart - -- /usr/lib/xen/bin/qemu-dm -+ /usr/lib/xen/bin/qemu-system-i386 - - - -Index: libvirt-1.3.4/tests/xlconfigdata/test-fullvirt-nohap.cfg -=================================================================== ---- libvirt-1.3.4.orig/tests/xlconfigdata/test-fullvirt-nohap.cfg -+++ libvirt-1.3.4/tests/xlconfigdata/test-fullvirt-nohap.cfg -@@ -13,7 +13,7 @@ localtime = 0 - on_poweroff = "destroy" - on_reboot = "restart" - on_crash = "restart" --device_model = "/usr/lib/xen/bin/qemu-dm" -+device_model = "/usr/lib/xen/bin/qemu-system-i386" - sdl = 0 - vnc = 1 - vncunused = 1 -Index: libvirt-1.3.4/tests/xlconfigdata/test-fullvirt-nohap.xml -=================================================================== ---- libvirt-1.3.4.orig/tests/xlconfigdata/test-fullvirt-nohap.xml -+++ libvirt-1.3.4/tests/xlconfigdata/test-fullvirt-nohap.xml -@@ -20,7 +20,7 @@ - restart - restart - -- /usr/lib/xen/bin/qemu-dm -+ /usr/lib/xen/bin/qemu-system-i386 - - - -Index: libvirt-1.3.4/tests/xlconfigdata/test-new-disk.cfg -=================================================================== ---- libvirt-1.3.4.orig/tests/xlconfigdata/test-new-disk.cfg -+++ libvirt-1.3.4/tests/xlconfigdata/test-new-disk.cfg -@@ -12,7 +12,7 @@ localtime = 0 - on_poweroff = "destroy" - on_reboot = "restart" - on_crash = "restart" --device_model = "/usr/lib/xen/bin/qemu-dm" -+device_model = "/usr/lib/xen/bin/qemu-system-i386" - sdl = 0 - vnc = 1 - vncunused = 1 -Index: libvirt-1.3.4/tests/xlconfigdata/test-new-disk.xml -=================================================================== ---- libvirt-1.3.4.orig/tests/xlconfigdata/test-new-disk.xml -+++ libvirt-1.3.4/tests/xlconfigdata/test-new-disk.xml -@@ -19,7 +19,7 @@ - restart - restart - -- /usr/lib/xen/bin/qemu-dm -+ /usr/lib/xen/bin/qemu-system-i386 - - - -Index: libvirt-1.3.4/tests/xlconfigdata/test-rbd-multihost-noauth.cfg -=================================================================== ---- libvirt-1.3.4.orig/tests/xlconfigdata/test-rbd-multihost-noauth.cfg -+++ libvirt-1.3.4/tests/xlconfigdata/test-rbd-multihost-noauth.cfg -@@ -12,7 +12,7 @@ localtime = 0 - on_poweroff = "destroy" - on_reboot = "restart" - on_crash = "restart" --device_model = "/usr/lib/xen/bin/qemu-dm" -+device_model = "/usr/lib/xen/bin/qemu-system-i386" - sdl = 0 - vnc = 1 - vncunused = 1 -Index: libvirt-1.3.4/tests/xlconfigdata/test-rbd-multihost-noauth.xml -=================================================================== ---- libvirt-1.3.4.orig/tests/xlconfigdata/test-rbd-multihost-noauth.xml -+++ libvirt-1.3.4/tests/xlconfigdata/test-rbd-multihost-noauth.xml -@@ -19,7 +19,7 @@ - restart - restart - -- /usr/lib/xen/bin/qemu-dm -+ /usr/lib/xen/bin/qemu-system-i386 - - - -Index: libvirt-1.3.4/tests/xlconfigdata/test-spice-features.cfg -=================================================================== ---- libvirt-1.3.4.orig/tests/xlconfigdata/test-spice-features.cfg -+++ libvirt-1.3.4/tests/xlconfigdata/test-spice-features.cfg -@@ -12,7 +12,7 @@ localtime = 0 - on_poweroff = "destroy" - on_reboot = "restart" - on_crash = "restart" --device_model = "/usr/lib/xen/bin/qemu-dm" -+device_model = "/usr/lib/xen/bin/qemu-system-i386" - vif = [ "mac=00:16:3e:66:92:9c,bridge=xenbr1,script=vif-bridge,model=e1000" ] - parallel = "none" - serial = "none" -Index: libvirt-1.3.4/tests/xlconfigdata/test-spice-features.xml -=================================================================== ---- libvirt-1.3.4.orig/tests/xlconfigdata/test-spice-features.xml -+++ libvirt-1.3.4/tests/xlconfigdata/test-spice-features.xml -@@ -19,7 +19,7 @@ - restart - restart - -- /usr/lib/xen/bin/qemu-dm -+ /usr/lib/xen/bin/qemu-system-i386 - - - -Index: libvirt-1.3.4/tests/xlconfigdata/test-spice.cfg -=================================================================== ---- libvirt-1.3.4.orig/tests/xlconfigdata/test-spice.cfg -+++ libvirt-1.3.4/tests/xlconfigdata/test-spice.cfg -@@ -12,7 +12,7 @@ localtime = 0 - on_poweroff = "destroy" - on_reboot = "restart" - on_crash = "restart" --device_model = "/usr/lib/xen/bin/qemu-dm" -+device_model = "/usr/lib/xen/bin/qemu-system-i386" - vif = [ "mac=00:16:3e:66:92:9c,bridge=xenbr1,script=vif-bridge,model=e1000" ] - parallel = "none" - serial = "none" -Index: libvirt-1.3.4/tests/xlconfigdata/test-spice.xml -=================================================================== ---- libvirt-1.3.4.orig/tests/xlconfigdata/test-spice.xml -+++ libvirt-1.3.4/tests/xlconfigdata/test-spice.xml -@@ -19,7 +19,7 @@ - restart - restart - -- /usr/lib/xen/bin/qemu-dm -+ /usr/lib/xen/bin/qemu-system-i386 - - - -Index: libvirt-1.3.4/tests/xlconfigdata/test-vif-rate.cfg -=================================================================== ---- libvirt-1.3.4.orig/tests/xlconfigdata/test-vif-rate.cfg -+++ libvirt-1.3.4/tests/xlconfigdata/test-vif-rate.cfg -@@ -12,7 +12,7 @@ localtime = 0 - on_poweroff = "destroy" - on_reboot = "restart" - on_crash = "restart" --device_model = "/usr/lib/xen/bin/qemu-dm" -+device_model = "/usr/lib/xen/bin/qemu-system-i386" - sdl = 0 - vnc = 1 - vncunused = 1 -Index: libvirt-1.3.4/tests/xlconfigdata/test-vif-rate.xml -=================================================================== ---- libvirt-1.3.4.orig/tests/xlconfigdata/test-vif-rate.xml -+++ libvirt-1.3.4/tests/xlconfigdata/test-vif-rate.xml -@@ -19,7 +19,7 @@ - restart - restart - -- /usr/lib/xen/bin/qemu-dm -+ /usr/lib/xen/bin/qemu-system-i386 - - - diff --git a/ba566428-libxl-dom-iface-addrs.patch b/ba566428-libxl-dom-iface-addrs.patch deleted file mode 100644 index 906b9f9..0000000 --- a/ba566428-libxl-dom-iface-addrs.patch +++ /dev/null @@ -1,170 +0,0 @@ -commit ba5664288553b046018fa84fd3b9a851ee0032e7 -Author: Chunyan Liu -Date: Fri May 13 14:21:23 2016 +0800 - - libxl: add .domainInterfaceAddresses - - Add .domainInterfaceAddresses so that user can have a way to - get domain interface address by 'virsh domifaddr'. Currently - it only supports '--source lease'. - - Signed-off: Chunyan Liu - -Index: libvirt-1.3.4/src/libxl/libxl_driver.c -=================================================================== ---- libvirt-1.3.4.orig/src/libxl/libxl_driver.c -+++ libvirt-1.3.4/src/libxl/libxl_driver.c -@@ -5425,6 +5425,145 @@ static int libxlNodeGetSecurityModel(vir - return 0; - } - -+static int -+libxlGetDHCPInterfaces(virDomainPtr dom, -+ virDomainObjPtr vm, -+ virDomainInterfacePtr **ifaces) -+{ -+ int rv = -1; -+ int n_leases = 0; -+ size_t i, j; -+ size_t ifaces_count = 0; -+ virNetworkPtr network = NULL; -+ char macaddr[VIR_MAC_STRING_BUFLEN]; -+ virDomainInterfacePtr iface = NULL; -+ virNetworkDHCPLeasePtr *leases = NULL; -+ virDomainInterfacePtr *ifaces_ret = NULL; -+ -+ if (!dom->conn->networkDriver || -+ !dom->conn->networkDriver->networkGetDHCPLeases) { -+ virReportError(VIR_ERR_INTERNAL_ERROR, "%s", -+ _("Network driver does not support DHCP lease query")); -+ return -1; -+ } -+ -+ for (i = 0; i < vm->def->nnets; i++) { -+ if (vm->def->nets[i]->type != VIR_DOMAIN_NET_TYPE_NETWORK) -+ continue; -+ -+ virMacAddrFormat(&(vm->def->nets[i]->mac), macaddr); -+ virObjectUnref(network); -+ network = virNetworkLookupByName(dom->conn, -+ vm->def->nets[i]->data.network.name); -+ -+ if ((n_leases = virNetworkGetDHCPLeases(network, macaddr, -+ &leases, 0)) < 0) -+ goto error; -+ -+ if (n_leases) { -+ if (VIR_EXPAND_N(ifaces_ret, ifaces_count, 1) < 0) -+ goto error; -+ -+ if (VIR_ALLOC(ifaces_ret[ifaces_count - 1]) < 0) -+ goto error; -+ -+ iface = ifaces_ret[ifaces_count - 1]; -+ /* Assuming each lease corresponds to a separate IP */ -+ iface->naddrs = n_leases; -+ -+ if (VIR_ALLOC_N(iface->addrs, iface->naddrs) < 0) -+ goto error; -+ -+ if (VIR_STRDUP(iface->name, vm->def->nets[i]->ifname) < 0) -+ goto cleanup; -+ -+ if (VIR_STRDUP(iface->hwaddr, macaddr) < 0) -+ goto cleanup; -+ } -+ -+ for (j = 0; j < n_leases; j++) { -+ virNetworkDHCPLeasePtr lease = leases[j]; -+ virDomainIPAddressPtr ip_addr = &iface->addrs[j]; -+ -+ if (VIR_STRDUP(ip_addr->addr, lease->ipaddr) < 0) -+ goto cleanup; -+ -+ ip_addr->type = lease->type; -+ ip_addr->prefix = lease->prefix; -+ } -+ -+ for (j = 0; j < n_leases; j++) -+ virNetworkDHCPLeaseFree(leases[j]); -+ -+ VIR_FREE(leases); -+ } -+ -+ *ifaces = ifaces_ret; -+ ifaces_ret = NULL; -+ rv = ifaces_count; -+ -+ cleanup: -+ virObjectUnref(network); -+ if (leases) { -+ for (i = 0; i < n_leases; i++) -+ virNetworkDHCPLeaseFree(leases[i]); -+ } -+ VIR_FREE(leases); -+ -+ return rv; -+ -+ error: -+ if (ifaces_ret) { -+ for (i = 0; i < ifaces_count; i++) -+ virDomainInterfaceFree(ifaces_ret[i]); -+ } -+ VIR_FREE(ifaces_ret); -+ -+ goto cleanup; -+} -+ -+ -+static int -+libxlDomainInterfaceAddresses(virDomainPtr dom, -+ virDomainInterfacePtr **ifaces, -+ unsigned int source, -+ unsigned int flags) -+{ -+ virDomainObjPtr vm = NULL; -+ int ret = -1; -+ -+ virCheckFlags(0, -1); -+ -+ if (!(vm = libxlDomObjFromDomain(dom))) -+ goto cleanup; -+ -+ if (virDomainInterfaceAddressesEnsureACL(dom->conn, vm->def) < 0) -+ goto cleanup; -+ -+ if (!virDomainObjIsActive(vm)) { -+ virReportError(VIR_ERR_OPERATION_INVALID, "%s", -+ _("domain is not running")); -+ goto cleanup; -+ } -+ -+ switch (source) { -+ case VIR_DOMAIN_INTERFACE_ADDRESSES_SRC_LEASE: -+ ret = libxlGetDHCPInterfaces(dom, vm, ifaces); -+ break; -+ -+ default: -+ virReportError(VIR_ERR_ARGUMENT_UNSUPPORTED, -+ _("Unsupported IP address data source %d"), -+ source); -+ break; -+ } -+ -+ cleanup: -+ virDomainObjEndAPI(&vm); -+ return ret; -+} -+ -+ - static virHypervisorDriver libxlHypervisorDriver = { - .name = LIBXL_DRIVER_NAME, - .connectOpen = libxlConnectOpen, /* 0.9.0 */ -@@ -5525,6 +5664,7 @@ static virHypervisorDriver libxlHypervis - .domainMigrateFinish3Params = libxlDomainMigrateFinish3Params, /* 1.2.6 */ - .domainMigrateConfirm3Params = libxlDomainMigrateConfirm3Params, /* 1.2.6 */ - .nodeGetSecurityModel = libxlNodeGetSecurityModel, /* 1.2.16 */ -+ .domainInterfaceAddresses = libxlDomainInterfaceAddresses, /* 1.3.5 */ - }; - - static virConnectDriver libxlConnectDriver = { diff --git a/blockcopy-check-dst-identical-device.patch b/blockcopy-check-dst-identical-device.patch index 4902a4f..85d919c 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.3.4/src/qemu/qemu_driver.c +Index: libvirt-1.3.5/src/qemu/qemu_driver.c =================================================================== ---- libvirt-1.3.4.orig/src/qemu/qemu_driver.c -+++ libvirt-1.3.4/src/qemu/qemu_driver.c -@@ -16796,6 +16796,15 @@ qemuDomainBlockCopyCommon(virDomainObjPt +--- libvirt-1.3.5.orig/src/qemu/qemu_driver.c ++++ libvirt-1.3.5/src/qemu/qemu_driver.c +@@ -16432,6 +16432,15 @@ qemuDomainBlockCopyCommon(virDomainObjPt _("non-file destination not supported yet")); goto endjob; } diff --git a/e4d131b8-mv-virDomainDefPostParseInternal.patch b/e4d131b8-mv-virDomainDefPostParseInternal.patch deleted file mode 100644 index 10f6b26..0000000 --- a/e4d131b8-mv-virDomainDefPostParseInternal.patch +++ /dev/null @@ -1,105 +0,0 @@ -commit e4d131b8cb12679814b6fda159281f472b615524 -Author: Ján Tomko -Date: Wed May 11 11:57:33 2016 +0200 - - Move virDomainDefPostParseInternal after virDomainDeviceDefPostParse - - Future commit will call DeviceDefPostParse on a device auto-added - in DomainDefPostParse. - -Index: libvirt-1.3.4/src/conf/domain_conf.c -=================================================================== ---- libvirt-1.3.4.orig/src/conf/domain_conf.c -+++ libvirt-1.3.4/src/conf/domain_conf.c -@@ -3905,45 +3905,6 @@ virDomainDefPostParseTimer(virDomainDefP - } - - --static int --virDomainDefPostParseInternal(virDomainDefPtr def, -- virCapsPtr caps ATTRIBUTE_UNUSED, -- unsigned int parseFlags) --{ -- /* verify init path for container based domains */ -- if (def->os.type == VIR_DOMAIN_OSTYPE_EXE && !def->os.init) { -- virReportError(VIR_ERR_XML_ERROR, "%s", -- _("init binary must be specified")); -- return -1; -- } -- -- if (virDomainDefPostParseMemory(def, parseFlags) < 0) -- return -1; -- -- if (virDomainDefRejectDuplicateControllers(def) < 0) -- return -1; -- -- if (virDomainDefRejectDuplicatePanics(def) < 0) -- return -1; -- -- if (virDomainDefPostParseTimer(def) < 0) -- return -1; -- -- if (virDomainDefAddImplicitDevices(def) < 0) -- return -1; -- -- /* Mark the first video as primary. If the user specified primary="yes", -- * the parser already inserted the device at def->videos[0] */ -- if (def->nvideos != 0) -- def->videos[0]->primary = true; -- -- /* clean up possibly duplicated metadata entries */ -- virDomainDefMetadataSanitize(def); -- -- return 0; --} -- -- - /* Check if a drive type address $controller:$bus:$target:$unit is already - * taken by a disk or not. - */ -@@ -4358,6 +4319,45 @@ virDomainDefPostParseDeviceIterator(virD - } - - -+static int -+virDomainDefPostParseInternal(virDomainDefPtr def, -+ virCapsPtr caps ATTRIBUTE_UNUSED, -+ unsigned int parseFlags) -+{ -+ /* verify init path for container based domains */ -+ if (def->os.type == VIR_DOMAIN_OSTYPE_EXE && !def->os.init) { -+ virReportError(VIR_ERR_XML_ERROR, "%s", -+ _("init binary must be specified")); -+ return -1; -+ } -+ -+ if (virDomainDefPostParseMemory(def, parseFlags) < 0) -+ return -1; -+ -+ if (virDomainDefRejectDuplicateControllers(def) < 0) -+ return -1; -+ -+ if (virDomainDefRejectDuplicatePanics(def) < 0) -+ return -1; -+ -+ if (virDomainDefPostParseTimer(def) < 0) -+ return -1; -+ -+ if (virDomainDefAddImplicitDevices(def) < 0) -+ return -1; -+ -+ /* Mark the first video as primary. If the user specified primary="yes", -+ * the parser already inserted the device at def->videos[0] */ -+ if (def->nvideos != 0) -+ def->videos[0]->primary = true; -+ -+ /* clean up possibly duplicated metadata entries */ -+ virDomainDefMetadataSanitize(def); -+ -+ return 0; -+} -+ -+ - int - virDomainDefPostParse(virDomainDefPtr def, - virCapsPtr caps, diff --git a/f9edcfa4-libxl-migv2-migration.patch b/f9edcfa4-libxl-migv2-migration.patch deleted file mode 100644 index 48c0b63..0000000 --- a/f9edcfa4-libxl-migv2-migration.patch +++ /dev/null @@ -1,392 +0,0 @@ -commit f9edcfa47396fdaab69ed72f0d5e0b751aa014fa -Author: Jim Fehlig -Date: Fri Apr 29 15:08:05 2016 -0600 - - libxl: support migration stream V2 in migration - - Similar to "support Xen migration stream V2 in save/restore", - add support for indicating the migration stream version in - the migration code. To accomplish this, add a minimal migration - cookie in the libxl driver that is passed between source and - destination hosts. Initially, the cookie is only used in - the Begin and Prepare phases of migration to communicate the - version of the migration stream produced by the source. - - Signed-off-by: Jim Fehlig - -Index: libvirt-1.3.4/src/libxl/libxl_driver.c -=================================================================== ---- libvirt-1.3.4.orig/src/libxl/libxl_driver.c -+++ libvirt-1.3.4/src/libxl/libxl_driver.c -@@ -5151,8 +5151,8 @@ static char * - libxlDomainMigrateBegin3Params(virDomainPtr domain, - virTypedParameterPtr params, - int nparams, -- char **cookieout ATTRIBUTE_UNUSED, -- int *cookieoutlen ATTRIBUTE_UNUSED, -+ char **cookieout, -+ int *cookieoutlen, - unsigned int flags) - { - const char *xmlin = NULL; -@@ -5193,15 +5193,16 @@ libxlDomainMigrateBegin3Params(virDomain - return NULL; - } - -- return libxlDomainMigrationBegin(domain->conn, vm, xmlin); -+ return libxlDomainMigrationBegin(domain->conn, vm, xmlin, -+ cookieout, cookieoutlen); - } - - static int - libxlDomainMigratePrepare3Params(virConnectPtr dconn, - virTypedParameterPtr params, - int nparams, -- const char *cookiein ATTRIBUTE_UNUSED, -- int cookieinlen ATTRIBUTE_UNUSED, -+ const char *cookiein, -+ int cookieinlen, - char **cookieout ATTRIBUTE_UNUSED, - int *cookieoutlen ATTRIBUTE_UNUSED, - char **uri_out, -@@ -5240,7 +5241,8 @@ libxlDomainMigratePrepare3Params(virConn - if (virDomainMigratePrepare3ParamsEnsureACL(dconn, def) < 0) - goto error; - -- if (libxlDomainMigrationPrepare(dconn, &def, uri_in, uri_out, flags) < 0) -+ if (libxlDomainMigrationPrepare(dconn, &def, uri_in, uri_out, -+ cookiein, cookieinlen, flags) < 0) - goto error; - - return 0; -Index: libvirt-1.3.4/src/libxl/libxl_migration.c -=================================================================== ---- libvirt-1.3.4.orig/src/libxl/libxl_migration.c -+++ libvirt-1.3.4/src/libxl/libxl_migration.c -@@ -48,6 +48,18 @@ - - VIR_LOG_INIT("libxl.libxl_migration"); - -+typedef struct _libxlMigrationCookie libxlMigrationCookie; -+typedef libxlMigrationCookie *libxlMigrationCookiePtr; -+struct _libxlMigrationCookie { -+ /* Host properties */ -+ char *srcHostname; -+ uint32_t xenMigStreamVer; -+ -+ /* Guest properties */ -+ unsigned char uuid[VIR_UUID_BUFLEN]; -+ char *name; -+}; -+ - typedef struct _libxlMigrationDstArgs { - virObject parent; - -@@ -55,6 +67,7 @@ typedef struct _libxlMigrationDstArgs { - virConnectPtr conn; - virDomainObjPtr vm; - unsigned int flags; -+ libxlMigrationCookiePtr migcookie; - - /* for freeing listen sockets */ - virNetSocketPtr *socks; -@@ -63,11 +76,166 @@ typedef struct _libxlMigrationDstArgs { - - static virClassPtr libxlMigrationDstArgsClass; - -+ -+static void -+libxlMigrationCookieFree(libxlMigrationCookiePtr mig) -+{ -+ if (!mig) -+ return; -+ -+ VIR_FREE(mig->srcHostname); -+ VIR_FREE(mig->name); -+ VIR_FREE(mig); -+} -+ -+static libxlMigrationCookiePtr -+libxlMigrationCookieNew(virDomainObjPtr dom) -+{ -+ libxlMigrationCookiePtr mig = NULL; -+ -+ if (VIR_ALLOC(mig) < 0) -+ goto error; -+ -+ if (VIR_STRDUP(mig->name, dom->def->name) < 0) -+ goto error; -+ -+ memcpy(mig->uuid, dom->def->uuid, VIR_UUID_BUFLEN); -+ -+ if (!(mig->srcHostname = virGetHostname())) -+ goto error; -+ -+ mig->xenMigStreamVer = LIBXL_SAVE_VERSION; -+ -+ return mig; -+ -+ error: -+ libxlMigrationCookieFree(mig); -+ return NULL; -+} -+ -+ -+static int -+libxlMigrationBakeCookie(libxlMigrationCookiePtr mig, -+ char **cookieout, -+ int *cookieoutlen) -+{ -+ virBuffer buf = VIR_BUFFER_INITIALIZER; -+ char uuidstr[VIR_UUID_STRING_BUFLEN]; -+ -+ if (!cookieout || !cookieoutlen) -+ return 0; -+ -+ *cookieoutlen = 0; -+ virUUIDFormat(mig->uuid, uuidstr); -+ -+ virBufferAddLit(&buf, "\n"); -+ virBufferAdjustIndent(&buf, 2); -+ virBufferEscapeString(&buf, "%s\n", mig->name); -+ virBufferAsprintf(&buf, "%s\n", uuidstr); -+ virBufferEscapeString(&buf, "%s\n", mig->srcHostname); -+ virBufferAsprintf(&buf, "%u\n", mig->xenMigStreamVer); -+ virBufferAdjustIndent(&buf, -2); -+ virBufferAddLit(&buf, "\n"); -+ -+ if (virBufferCheckError(&buf) < 0) -+ return -1; -+ -+ *cookieout = virBufferContentAndReset(&buf); -+ *cookieoutlen = strlen(*cookieout) + 1; -+ -+ VIR_DEBUG("cookielen=%d cookie=%s", *cookieoutlen, *cookieout); -+ -+ return 0; -+} -+ -+static int -+libxlMigrationEatCookie(const char *cookiein, -+ int cookieinlen, -+ libxlMigrationCookiePtr *migout) -+{ -+ libxlMigrationCookiePtr mig = NULL; -+ xmlDocPtr doc = NULL; -+ xmlXPathContextPtr ctxt = NULL; -+ char *uuidstr = NULL; -+ int ret = -1; -+ -+ /* -+ * Assume a legacy (V1) migration stream if request came from a -+ * source host without cookie support, and hence no way to -+ * specify a stream version. -+ */ -+ if (!cookiein || !cookieinlen) { -+ if (VIR_ALLOC(mig) < 0) -+ return -1; -+ -+ mig->xenMigStreamVer = 1; -+ *migout = mig; -+ return 0; -+ } -+ -+ if (cookiein[cookieinlen-1] != '\0') { -+ virReportError(VIR_ERR_INTERNAL_ERROR, "%s", -+ _("Migration cookie was not NULL terminated")); -+ return -1; -+ } -+ -+ VIR_DEBUG("cookielen=%d cookie='%s'", cookieinlen, NULLSTR(cookiein)); -+ -+ if (VIR_ALLOC(mig) < 0) -+ return -1; -+ -+ if (!(doc = virXMLParseStringCtxt(cookiein, -+ _("(libxl_migration_cookie)"), -+ &ctxt))) -+ goto error; -+ -+ /* Extract domain name */ -+ if (!(mig->name = virXPathString("string(./name[1])", ctxt))) { -+ virReportError(VIR_ERR_INTERNAL_ERROR, -+ "%s", _("missing name element in migration data")); -+ goto error; -+ } -+ -+ /* Extract domain uuid */ -+ uuidstr = virXPathString("string(./uuid[1])", ctxt); -+ if (!uuidstr) { -+ virReportError(VIR_ERR_INTERNAL_ERROR, -+ "%s", _("missing uuid element in migration data")); -+ goto error; -+ } -+ if (virUUIDParse(uuidstr, mig->uuid) < 0) { -+ virReportError(VIR_ERR_INTERNAL_ERROR, -+ "%s", _("malformed uuid element")); -+ goto error; -+ } -+ -+ if (virXPathUInt("string(./migration-stream-version[1])", -+ ctxt, &mig->xenMigStreamVer) < 0) { -+ virReportError(VIR_ERR_INTERNAL_ERROR, "%s", -+ _("missing Xen migration stream version")); -+ goto error; -+ } -+ -+ *migout = mig; -+ ret = 0; -+ goto cleanup; -+ -+ error: -+ libxlMigrationCookieFree(mig); -+ -+ cleanup: -+ VIR_FREE(uuidstr); -+ xmlXPathFreeContext(ctxt); -+ xmlFreeDoc(doc); -+ return ret; -+} -+ - static void - libxlMigrationDstArgsDispose(void *obj) - { - libxlMigrationDstArgs *args = obj; - -+ libxlMigrationCookieFree(args->migcookie); - VIR_FREE(args->socks); - } - -@@ -106,7 +274,8 @@ libxlDoMigrateReceive(void *opaque) - * Always start the domain paused. If needed, unpause in the - * finish phase, after transfer of the domain is complete. - */ -- ret = libxlDomainStartRestore(driver, vm, true, recvfd, LIBXL_SAVE_VERSION); -+ ret = libxlDomainStartRestore(driver, vm, true, recvfd, -+ args->migcookie->xenMigStreamVer); - - if (ret < 0 && !vm->persistent) - remove_dom = true; -@@ -227,10 +396,13 @@ libxlDomainMigrationIsAllowed(virDomainD - char * - libxlDomainMigrationBegin(virConnectPtr conn, - virDomainObjPtr vm, -- const char *xmlin) -+ const char *xmlin, -+ char **cookieout, -+ int *cookieoutlen) - { - libxlDriverPrivatePtr driver = conn->privateData; - libxlDriverConfigPtr cfg = libxlDriverConfigGet(driver); -+ libxlMigrationCookiePtr mig; - virDomainDefPtr tmpdef = NULL; - virDomainDefPtr def; - char *xml = NULL; -@@ -238,6 +410,12 @@ libxlDomainMigrationBegin(virConnectPtr - if (libxlDomainObjBeginJob(driver, vm, LIBXL_JOB_MODIFY) < 0) - goto cleanup; - -+ if (!(mig = libxlMigrationCookieNew(vm))) -+ goto endjob; -+ -+ if (libxlMigrationBakeCookie(mig, cookieout, cookieoutlen) < 0) -+ goto endjob; -+ - if (xmlin) { - if (!(tmpdef = virDomainDefParseString(xmlin, cfg->caps, - driver->xmlopt, -@@ -308,9 +486,12 @@ libxlDomainMigrationPrepare(virConnectPt - virDomainDefPtr *def, - const char *uri_in, - char **uri_out, -+ const char *cookiein, -+ int cookieinlen, - unsigned int flags) - { - libxlDriverPrivatePtr driver = dconn->privateData; -+ libxlMigrationCookiePtr mig = NULL; - virDomainObjPtr vm = NULL; - char *hostname = NULL; - unsigned short port; -@@ -323,6 +504,16 @@ libxlDomainMigrationPrepare(virConnectPt - size_t i; - int ret = -1; - -+ if (libxlMigrationEatCookie(cookiein, cookieinlen, &mig) < 0) -+ goto error; -+ -+ if (mig->xenMigStreamVer > LIBXL_SAVE_VERSION) { -+ virReportError(VIR_ERR_OPERATION_UNSUPPORTED, -+ _("Xen migration stream version '%d' is not supported on this host"), -+ mig->xenMigStreamVer); -+ goto error; -+ } -+ - if (!(vm = virDomainObjListAdd(driver->domains, *def, - driver->xmlopt, - VIR_DOMAIN_OBJ_LIST_ADD_LIVE | -@@ -409,6 +600,7 @@ libxlDomainMigrationPrepare(virConnectPt - args->flags = flags; - args->socks = socks; - args->nsocks = nsocks; -+ args->migcookie = mig; - - for (i = 0; i < nsocks; i++) { - if (virNetSocketSetBlocking(socks[i], true) < 0) -@@ -479,11 +671,14 @@ libxlDoMigrateP2P(libxlDriverPrivatePtr - char *uri_out = NULL; - char *dom_xml = NULL; - unsigned long destflags; -+ char *cookieout = NULL; -+ int cookieoutlen; - bool cancelled = true; - virErrorPtr orig_err = NULL; - int ret = -1; - -- dom_xml = libxlDomainMigrationBegin(sconn, vm, xmlin); -+ dom_xml = libxlDomainMigrationBegin(sconn, vm, xmlin, -+ &cookieout, &cookieoutlen); - if (!dom_xml) - goto cleanup; - -@@ -509,7 +704,7 @@ libxlDoMigrateP2P(libxlDriverPrivatePtr - VIR_DEBUG("Prepare3"); - virObjectUnlock(vm); - ret = dconn->driver->domainMigratePrepare3Params -- (dconn, params, nparams, NULL, 0, NULL, NULL, &uri_out, destflags); -+ (dconn, params, nparams, cookieout, cookieoutlen, NULL, NULL, &uri_out, destflags); - virObjectLock(vm); - - if (ret == -1) -@@ -580,6 +775,7 @@ libxlDoMigrateP2P(libxlDriverPrivatePtr - virFreeError(orig_err); - } - -+ VIR_FREE(cookieout); - VIR_FREE(dom_xml); - VIR_FREE(uri_out); - virTypedParamsFree(params, nparams); -Index: libvirt-1.3.4/src/libxl/libxl_migration.h -=================================================================== ---- libvirt-1.3.4.orig/src/libxl/libxl_migration.h -+++ libvirt-1.3.4/src/libxl/libxl_migration.h -@@ -42,7 +42,9 @@ - char * - libxlDomainMigrationBegin(virConnectPtr conn, - virDomainObjPtr vm, -- const char *xmlin); -+ const char *xmlin, -+ char **cookieout, -+ int *cookieoutlen); - - virDomainDefPtr - libxlDomainMigrationPrepareDef(libxlDriverPrivatePtr driver, -@@ -54,6 +56,8 @@ libxlDomainMigrationPrepare(virConnectPt - virDomainDefPtr *def, - const char *uri_in, - char **uri_out, -+ const char *cookiein, -+ int cookieinlen, - unsigned int flags); - - int diff --git a/fccf2725-libxl-API-4.4.patch b/fccf2725-libxl-API-4.4.patch deleted file mode 100644 index 5443a53..0000000 --- a/fccf2725-libxl-API-4.4.patch +++ /dev/null @@ -1,58 +0,0 @@ -commit fccf27253cedd131c5c4720d31d96ecc68c20e59 -Author: Jim Fehlig -Date: Thu Apr 28 21:08:28 2016 -0600 - - libxl: switch to using libxl_domain_create_restore from v4.4 API - - In LIBXL_API_VERSION 0x040400, the libxl_domain_create_restore API - gained a parameter for specifying restore parameters. Switch to - using version 0x040400, which will be useful in a subsequent commit - to specify the Xen migration stream version when restoring. - - Signed-off-by: Jim Fehlig - -Index: libvirt-1.3.4/configure.ac -=================================================================== ---- libvirt-1.3.4.orig/configure.ac -+++ libvirt-1.3.4/configure.ac -@@ -919,10 +919,11 @@ if test "$with_libxl" != "no" ; then - fi - fi - --# Until there is a need to use enhancements of libxl APIs such as --# libxl_domain_create_restore and libxl_set_vcpuaffinity, stick with --# the APIs as defined in libxl API version 4.2.0. --LIBXL_CFLAGS="$LIBXL_CFLAGS -DLIBXL_API_VERSION=0x040200" -+# LIBXL_API_VERSION 4.4.0 introduced a new parameter to -+# libxl_domain_create_restore for specifying restore parameters. -+# The libxl driver will make use of this new parameter for specifying -+# the Xen migration stream version. -+LIBXL_CFLAGS="$LIBXL_CFLAGS -DLIBXL_API_VERSION=0x040400" - LIBS="$old_LIBS" - CFLAGS="$old_CFLAGS" - -Index: libvirt-1.3.4/src/libxl/libxl_domain.c -=================================================================== ---- libvirt-1.3.4.orig/src/libxl/libxl_domain.c -+++ libvirt-1.3.4/src/libxl/libxl_domain.c -@@ -1028,6 +1028,7 @@ libxlDomainStart(libxlDriverPrivatePtr d - libxlDriverConfigPtr cfg; - virHostdevManagerPtr hostdev_mgr = driver->hostdevMgr; - libxl_asyncprogress_how aop_console_how; -+ libxl_domain_restore_params params; - - libxl_domain_config_init(&d_config); - -@@ -1115,8 +1116,11 @@ libxlDomainStart(libxlDriverPrivatePtr d - ret = libxl_domain_create_new(cfg->ctx, &d_config, - &domid, NULL, &aop_console_how); - } else { -+ libxl_domain_restore_params_init(¶ms); - ret = libxl_domain_create_restore(cfg->ctx, &d_config, &domid, -- restore_fd, NULL, &aop_console_how); -+ restore_fd, ¶ms, NULL, -+ &aop_console_how); -+ libxl_domain_restore_params_dispose(¶ms); - } - virObjectLock(vm); - diff --git a/libvirt-1.3.4.tar.gz b/libvirt-1.3.4.tar.gz deleted file mode 100644 index 71e9d03..0000000 --- a/libvirt-1.3.4.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:e2396ebebb3f3fdb50429ce8faa99559f6e8e3cc0493d5fa0c1999db189c25bd -size 30493908 diff --git a/libvirt-1.3.4.tar.gz.asc b/libvirt-1.3.4.tar.gz.asc deleted file mode 100644 index 5415754..0000000 --- a/libvirt-1.3.4.tar.gz.asc +++ /dev/null @@ -1,7 +0,0 @@ ------BEGIN PGP SIGNATURE----- -Version: GnuPG v1 - -iEYEABECAAYFAlclYEcACgkQRga4pd6VvB/HJQCgizqtyrYwlDuQFmBEEl6eKeeN -TBIAoIEqYhNYMPdI+JVwL7bVphzi3yFE -=deea ------END PGP SIGNATURE----- diff --git a/libvirt-1.3.5.tar.gz b/libvirt-1.3.5.tar.gz new file mode 100644 index 0000000..dd7cf4c --- /dev/null +++ b/libvirt-1.3.5.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:93a23c44eb431da46c9458f95a66e29c9b98e37515d44b6be09e75b35ec94ac8 +size 35109092 diff --git a/libvirt-1.3.5.tar.gz.asc b/libvirt-1.3.5.tar.gz.asc new file mode 100644 index 0000000..9a8161b --- /dev/null +++ b/libvirt-1.3.5.tar.gz.asc @@ -0,0 +1,7 @@ +-----BEGIN PGP SIGNATURE----- +Version: GnuPG v1 + +iEYEABECAAYFAldS8J8ACgkQRga4pd6VvB+VvwCcDfgIkCFsfgj5XmnLdb4oQjc0 +RXoAnirOBaSfylYPmgQJDnXHkFCh89LD +=PDgX +-----END PGP SIGNATURE----- diff --git a/libvirt-guests-init-script.patch b/libvirt-guests-init-script.patch index 2db70da..9e6dc5d 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.3.4/tools/libvirt-guests.init.in +Index: libvirt-1.3.5/tools/libvirt-guests.init.in =================================================================== ---- libvirt-1.3.4.orig/tools/libvirt-guests.init.in -+++ libvirt-1.3.4/tools/libvirt-guests.init.in +--- libvirt-1.3.5.orig/tools/libvirt-guests.init.in ++++ libvirt-1.3.5/tools/libvirt-guests.init.in @@ -4,27 +4,27 @@ # http://refspecs.linuxfoundation.org/LSB_5.0.0/LSB-Core-generic/LSB-Core-generic/initscrcomconv.html # @@ -45,10 +45,10 @@ Index: libvirt-1.3.4/tools/libvirt-guests.init.in # exec @libexecdir@/libvirt-guests.sh "$@" -Index: libvirt-1.3.4/tools/libvirt-guests.sh.in +Index: libvirt-1.3.5/tools/libvirt-guests.sh.in =================================================================== ---- libvirt-1.3.4.orig/tools/libvirt-guests.sh.in -+++ libvirt-1.3.4/tools/libvirt-guests.sh.in +--- libvirt-1.3.5.orig/tools/libvirt-guests.sh.in ++++ libvirt-1.3.5/tools/libvirt-guests.sh.in @@ -16,14 +16,13 @@ # License along with this library. If not, see # . @@ -208,10 +208,10 @@ Index: libvirt-1.3.4/tools/libvirt-guests.sh.in esac -exit $RETVAL +rc_exit -Index: libvirt-1.3.4/tools/libvirt-guests.sysconf +Index: libvirt-1.3.5/tools/libvirt-guests.sysconf =================================================================== ---- libvirt-1.3.4.orig/tools/libvirt-guests.sysconf -+++ libvirt-1.3.4/tools/libvirt-guests.sysconf +--- libvirt-1.3.5.orig/tools/libvirt-guests.sysconf ++++ libvirt-1.3.5/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 7eea87e..875ead7 100644 --- a/libvirt-power8-models.patch +++ b/libvirt-power8-models.patch @@ -1,19 +1,19 @@ -Index: libvirt-1.3.4/src/cpu/cpu_map.xml +Index: libvirt-1.3.5/src/cpu/cpu_map.xml =================================================================== ---- libvirt-1.3.4.orig/src/cpu/cpu_map.xml -+++ libvirt-1.3.4/src/cpu/cpu_map.xml -@@ -1424,6 +1424,16 @@ +--- libvirt-1.3.5.orig/src/cpu/cpu_map.xml ++++ libvirt-1.3.5/src/cpu/cpu_map.xml +@@ -1430,6 +1430,16 @@ + + -+ ++ + + + + -+ ++ + + diff --git a/libvirt-suse-netcontrol.patch b/libvirt-suse-netcontrol.patch index 0daacc3..51a78c3 100644 --- a/libvirt-suse-netcontrol.patch +++ b/libvirt-suse-netcontrol.patch @@ -1,7 +1,7 @@ -Index: libvirt-1.3.4/configure.ac +Index: libvirt-1.3.5/configure.ac =================================================================== ---- libvirt-1.3.4.orig/configure.ac -+++ libvirt-1.3.4/configure.ac +--- libvirt-1.3.5.orig/configure.ac ++++ libvirt-1.3.5/configure.ac @@ -248,6 +248,7 @@ LIBVIRT_CHECK_FUSE LIBVIRT_CHECK_GLUSTER LIBVIRT_CHECK_HAL @@ -10,7 +10,7 @@ Index: libvirt-1.3.4/configure.ac LIBVIRT_CHECK_NUMACTL LIBVIRT_CHECK_OPENWSMAN LIBVIRT_CHECK_PCIACCESS -@@ -2471,11 +2472,12 @@ if test "$with_libvirtd" = "no" ; then +@@ -2396,11 +2397,12 @@ if test "$with_libvirtd" = "no" ; then with_interface=no fi @@ -26,7 +26,7 @@ Index: libvirt-1.3.4/configure.ac esac if test "$with_interface" = "yes" ; then -@@ -2854,6 +2856,7 @@ LIBVIRT_RESULT_FUSE +@@ -2779,6 +2781,7 @@ LIBVIRT_RESULT_FUSE LIBVIRT_RESULT_GLUSTER LIBVIRT_RESULT_HAL LIBVIRT_RESULT_NETCF @@ -34,10 +34,10 @@ Index: libvirt-1.3.4/configure.ac LIBVIRT_RESULT_NUMACTL LIBVIRT_RESULT_OPENWSMAN LIBVIRT_RESULT_PCIACCESS -Index: libvirt-1.3.4/src/Makefile.am +Index: libvirt-1.3.5/src/Makefile.am =================================================================== ---- libvirt-1.3.4.orig/src/Makefile.am -+++ libvirt-1.3.4/src/Makefile.am +--- libvirt-1.3.5.orig/src/Makefile.am ++++ libvirt-1.3.5/src/Makefile.am @@ -932,6 +932,10 @@ if WITH_NETCF INTERFACE_DRIVER_SOURCES += \ interface/interface_backend_netcf.c @@ -60,11 +60,11 @@ Index: libvirt-1.3.4/src/Makefile.am if WITH_UDEV libvirt_driver_interface_la_CFLAGS += $(UDEV_CFLAGS) libvirt_driver_interface_la_LIBADD += $(UDEV_LIBS) -Index: libvirt-1.3.4/tools/virsh.c +Index: libvirt-1.3.5/tools/virsh.c =================================================================== ---- libvirt-1.3.4.orig/tools/virsh.c -+++ libvirt-1.3.4/tools/virsh.c -@@ -623,6 +623,8 @@ virshShowVersion(vshControl *ctl ATTRIBU +--- libvirt-1.3.5.orig/tools/virsh.c ++++ libvirt-1.3.5/tools/virsh.c +@@ -597,6 +597,8 @@ virshShowVersion(vshControl *ctl ATTRIBU vshPrint(ctl, " Interface"); # if defined(WITH_NETCF) vshPrint(ctl, " netcf"); @@ -73,10 +73,10 @@ Index: libvirt-1.3.4/tools/virsh.c # elif defined(WITH_UDEV) vshPrint(ctl, " udev"); # endif -Index: libvirt-1.3.4/src/interface/interface_backend_netcf.c +Index: libvirt-1.3.5/src/interface/interface_backend_netcf.c =================================================================== ---- libvirt-1.3.4.orig/src/interface/interface_backend_netcf.c -+++ libvirt-1.3.4/src/interface/interface_backend_netcf.c +--- libvirt-1.3.5.orig/src/interface/interface_backend_netcf.c ++++ libvirt-1.3.5/src/interface/interface_backend_netcf.c @@ -23,7 +23,12 @@ #include @@ -160,10 +160,10 @@ Index: libvirt-1.3.4/src/interface/interface_backend_netcf.c if (virSetSharedInterfaceDriver(&interfaceDriver) < 0) return -1; if (virRegisterStateDriver(&interfaceStateDriver) < 0) -Index: libvirt-1.3.4/src/interface/interface_driver.c +Index: libvirt-1.3.5/src/interface/interface_driver.c =================================================================== ---- libvirt-1.3.4.orig/src/interface/interface_driver.c -+++ libvirt-1.3.4/src/interface/interface_driver.c +--- libvirt-1.3.5.orig/src/interface/interface_driver.c ++++ libvirt-1.3.5/src/interface/interface_driver.c @@ -30,8 +30,15 @@ interfaceRegister(void) if (netcfIfaceRegister() == 0) return 0; @@ -181,10 +181,10 @@ Index: libvirt-1.3.4/src/interface/interface_driver.c if (udevIfaceRegister() == 0) return 0; #endif /* WITH_UDEV */ -Index: libvirt-1.3.4/m4/virt-netcontrol.m4 +Index: libvirt-1.3.5/m4/virt-netcontrol.m4 =================================================================== --- /dev/null -+++ libvirt-1.3.4/m4/virt-netcontrol.m4 ++++ libvirt-1.3.5/m4/virt-netcontrol.m4 @@ -0,0 +1,35 @@ +dnl The libnetcontrol library +dnl diff --git a/libvirt.changes b/libvirt.changes index 0ce597b..e1da9f3 100644 --- a/libvirt.changes +++ b/libvirt.changes @@ -1,3 +1,24 @@ +------------------------------------------------------------------- +Mon Jun 6 14:59:59 UTC 2016 - jfehlig@suse.com + +- Update to libvirt 1.3.5 + - Many incremental improvements and bug fixes, see + http://libvirt.org/news.html + - Dropped patches: + e4d131b8-mv-virDomainDefPostParseInternal.patch, + 3e428670-post-parse-implicit-video.patch, + 538012c8-default-vram.patch, 96b21fb0-vram-tests.patch, + 400e716d-libxl-noprope-emulator.patch, + b90c4b5f-tests-use-qemu-xen.patch, + fccf2725-libxl-API-4.4.patch, + 5325123d-libxl-migv2-save-restore.patch, + f9edcfa4-libxl-migv2-migration.patch, + a1c9a81a-libxl-rbd-fix.patch, + ba566428-libxl-dom-iface-addrs.patch +- spec: simplify and cleanup by removing many conditionals that + are never toogled. Also drop conditionals for suse_version < + 1310 + ------------------------------------------------------------------- Fri May 27 10:15:43 UTC 2016 - jengelh@inai.de diff --git a/libvirt.spec b/libvirt.spec index ed76847..4a8c6a6 100644 --- a/libvirt.spec +++ b/libvirt.spec @@ -16,33 +16,13 @@ # -# For now, default to a full server + client build -%define client_only 0 - -# Disable all server side drivers if client only build requested -%if %{client_only} - %define server_drivers 0 -%else - %define server_drivers 1 -%endif - -# Always build with dlopen'd modules -%define with_driver_modules 1 - -# Now set the defaults for all the important features, independent -# of any particular OS - -# First the daemon itself -%define with_libvirtd 0%{!?_without_libvirtd:%{server_drivers}} -%define with_avahi 0%{!?_without_avahi:%{server_drivers}} - -# Then the hypervisor drivers that run in libvirtd -%define with_xen 0%{!?_without_xen:%{server_drivers}} -%define with_qemu 0%{!?_without_qemu:%{server_drivers}} -%define with_lxc 0%{!?_without_lxc:%{server_drivers}} -%define with_uml 0%{!?_without_uml:%{server_drivers}} -%define with_libxl 0%{!?_without_libxl:%{server_drivers}} -%define with_vbox 0%{!?_without_vbox:%{server_drivers}} +# The hypervisor drivers that run in libvirtd +%define with_xen 0%{!?_without_xen:1} +%define with_qemu 0%{!?_without_qemu:1} +%define with_lxc 0%{!?_without_lxc:1} +%define with_uml 0%{!?_without_uml:1} +%define with_libxl 0%{!?_without_libxl:1} +%define with_vbox 0%{!?_without_vbox:1} # Then the hypervisor drivers that run outside libvirtd, in libvirt.so %define with_openvz 0%{!?_without_openvz:1} @@ -50,248 +30,130 @@ %define with_phyp 0%{!?_without_phyp:0} %define with_esx 0%{!?_without_esx:1} %define with_hyperv 0%{!?_without_hyperv:0} -%define with_xenapi 0%{!?_without_xenapi:1} -%define with_vz 0%{!?_without_vz:1} # Then the secondary host drivers, which run inside libvirtd -%define with_interface 0%{!?_without_interface:%{server_drivers}} -%define with_network 0%{!?_without_network:%{server_drivers}} -%define with_storage_fs 0%{!?_without_storage_fs:%{server_drivers}} -%define with_storage_lvm 0%{!?_without_storage_lvm:%{server_drivers}} -%define with_storage_iscsi 0%{!?_without_storage_iscsi:%{server_drivers}} -%define with_storage_disk 0%{!?_without_storage_disk:%{server_drivers}} -%define with_storage_mpath 0%{!?_without_storage_mpath:%{server_drivers}} %define with_storage_rbd 0 %define with_storage_sheepdog 0 %define with_storage_gluster 0 -%define with_numactl 0%{!?_without_numactl:%{server_drivers}} -%define with_selinux 0%{!?_without_selinux:%{server_drivers}} -%define with_apparmor 0%{!?_without_apparmor:%{server_drivers}} +%define with_numactl 0%{!?_without_numactl:1} +%define with_apparmor 0%{!?_without_apparmor:1} # Optional bits on by default -%define with_polkit 0%{!?_without_polkit:1} -%define with_udev 0%{!?_without_udev:%{server_drivers}} -%define with_audit 0%{!?_without_audit:1} -%define with_yajl 0%{!?_without_yajl:%{server_drivers}} -%define with_sanlock 0%{!?_without_sanlock:%{server_drivers}} -%define with_netcontrol 0%{!?_without_netcontrol:%{server_drivers}} +%define with_sanlock 0%{!?_without_sanlock:1} +%define with_polkit_rules 1 # A few optional bits off by default, we enable later -%define with_polkit_rules 0 -%define with_capng 0%{!?_without_capng:0} -%define with_fuse 0%{!?_without_fuse:0} -%define with_netcf 0%{!?_without_netcf:0} -%define with_nwfilter 0%{!?_without_nwfilter:0} -%define with_libpcap 0%{!?_without_libpcap:0} -%define with_macvtap 0%{!?_without_macvtap:0} -%define with_libnl 0%{!?_without_libnl:0} -%define with_dtrace 0%{!?_without_dtrace:0} %define with_cgconfig 0%{!?_without_cgconfig:0} %define with_systemd 0%{!?_without_systemd:0} %define with_numad 0%{!?_without_numad:0} %define with_firewalld 0%{!?_without_firewalld:0} -%define with_libssh2 0%{!?_without_libssh2:0} %define with_wireshark 0%{!?_without_wireshark:0} %define with_systemd_daemon 0%{!?_without_systemd_daemon:0} # Xen no longer contains xm/xend so disable building the legacy Xen driver -%define with_xen 0%{!?_without_xen:0} - -# Non-server/HV driver defaults which are always enabled -%define with_sasl 0%{!?_without_sasl:1} -%define with_nss_plugin 0%{!?_without_nss_plugin:1} +%define with_xen 0 # Set the OS / architecture specific special cases # Xen is available only on x86_64 and arm %ifnarch x86_64 %arm aarch64 - %define with_xen 0 - %define with_libxl 0 + %define with_xen 0 + %define with_libxl 0 %endif -# numactl only on x86_64 and ia64 -%ifnarch x86_64 ia64 - %define with_numactl 0 +# numactl package has "ExclusiveArch: ia64 x86_64 ppc64 ppc64le ppc %sparc" +# We'll only use it on x86_64 ppc64 ppc64le +%ifnarch x86_64 ppc64 ppc64le + %define with_numactl 0 %endif # vbox is available only on i386 x86_64 %ifnarch %{ix86} x86_64 - %define with_vbox 0 + %define with_vbox 0 %endif -# SLES doesn't contain OpenVZ, VBox, UML, ESX, VMWare, Citrix XenAPI, -# hyper-v, or vz (Virtuozzo) +# Disable hypervisor drivers not supported in SLE %if 0%{?sles_version} - %define with_openvz 0 - %define with_vbox 0 - %define with_uml 0 - %define with_esx 0 - %define with_vmware 0 - %define with_xenapi 0 - %define with_hyperv 0 - %define with_vz 0 + %define with_openvz 0 + %define with_vbox 0 + %define with_uml 0 + %define with_vmware 0 + %define with_hyperv 0 %endif # Enable phyp driver for IBM Power systems %ifarch ppc64 - %define with_phyp 1 -%endif - -# LXC and selinux are not available on anything < 11.1 -%if 0%{?suse_version} < 1110 - %define with_lxc 0 - %define with_selinux 0 + %define with_phyp 1 %endif # Support systemd on 12.1 and later %if 0%{?suse_version} >= 1210 - %define with_systemd 0%{!?_without_systemd:1} + %define with_systemd 0%{!?_without_systemd:1} %define with_systemd_daemon 1 %endif -# libcapng is used to manage capabilities in 11.3 or newer. -# It is also used by lxc and needs to be enabled if lxc is enabled. -%if 0%{?suse_version} >= 1130 || %{with_lxc} - %define with_capng 0%{!?_without_capng:1} -%endif - -%if 0%{?suse_version} >= 1230 - %define with_fuse 0%{!?_without_fuse:1} -%endif - -# interface requires netcontrol -%if ! 0%{?with_netcontrol} - %define with_interface 0 -%endif - -# Support libssh2 in 12.3 and later -%if 0%{?suse_version} >= 1230 - %define with_libssh2 0%{!?_without_libssh2:1} -%endif - # libvirt commit 37397320 changed the configure check for wireshark to # use pkgconfig, but our wireshark packages do not provide wireshark.pc. # Disable the dissector for now -%define with_wireshark 0 +%define with_wireshark 0 -# Disable some drivers when building without libvirt daemon. -# The logic is the same as in configure.ac -%if ! %{with_libvirtd} - %define with_interface 0 - %define with_network 0 - %define with_qemu 0 - %define with_lxc 0 - %define with_uml 0 - %define with_vbox 0 - %define with_udev 0 - %define with_storage_fs 0 - %define with_storage_lvm 0 - %define with_storage_iscsi 0 - %define with_storage_mpath 0 - %define with_storage_rbd 0 - %define with_storage_sheepdog 0 - %define with_storage_gluster 0 - %define with_storage_disk 0 -%endif - -# Enable libpcap library -%if %{with_qemu} || %{with_lxc} - %if 0%{?suse_version} >= 1140 - %define with_nwfilter 0%{!?_without_nwfilter:%{server_drivers}} - %define with_libpcap 0%{!?_without_libpcap:%{server_drivers}} - %define with_macvtap 0%{!?_without_macvtap:%{server_drivers}} - # numad is used to manage the CPU and memory placement dynamically. - # It is only available on x86, and openSUSE >= 13.1 - %if 0%{?suse_version} >= 1310 - %ifarch i386 i586 i686 x86_64 - %define with_numad 0%{!?_without_numad:%{server_drivers}} - %endif - %endif - # Force QEMU to run as qemu:qemu - %define qemu_user qemu - %define qemu_group qemu - %else - %define qemu_user root - %define qemu_group root +# numad is used to manage the CPU and memory placement dynamically for +# qemu, lxc, and uml drivers. We'll only use in on x86_64 +%if %{with_qemu} || %{with_lxc} || %{with_uml} + %ifarch x86_64 + %define with_numad 0%{!?_without_numad:1} %endif %endif -# Advertise OVMF for >= 13.1 -%if 0%{?suse_version} >= 1310 - %define with_loader_nvram --with-loader-nvram="/usr/share/qemu/ovmf-x86_64-ms-code.bin:/usr/share/qemu/ovmf-x86_64-ms-vars.bin" -%endif +# Force QEMU to run as qemu:qemu +%define qemu_user qemu +%define qemu_group qemu -%if %{with_macvtap} - %define with_libnl 1 -%endif +%define arg_loader_nvram --with-loader-nvram="/usr/share/qemu/ovmf-x86_64-ms-code.bin:/usr/share/qemu/ovmf-x86_64-ms-vars.bin" # Pull in cgroups config system %if %{with_qemu} || %{with_lxc} - %define with_cgconfig 0%{!?_without_cgconfig:1} -%endif - -%if %{with_udev} - %define with_nodedev 1 -%else - %define with_nodedev 0 -%endif - -%if %{with_storage_fs} || %{with_storage_mpath} || %{with_storage_iscsi} || %{with_storage_lvm} || %{with_storage_disk} - %define with_storage 1 -%else - %define with_storage 0 + %define with_cgconfig 0%{!?_without_cgconfig:1} %endif %define _fwdefdir /etc/sysconfig/SuSEfirewall2.d/services Name: libvirt Url: http://libvirt.org/ -Version: 1.3.4 +Version: 1.3.5 Release: 0 Summary: Library providing a simple virtualization API License: LGPL-2.1+ Group: Development/Libraries/C and C++ -%if %{with_libvirtd} Requires: libvirt-daemon = %{version}-%{release} - %if %{with_network} Requires: libvirt-daemon-config-network = %{version}-%{release} - %endif - %if %{with_nwfilter} Requires: libvirt-daemon-config-nwfilter = %{version}-%{release} - %endif - %if %{with_driver_modules} - %if %{with_libxl} +%if %{with_libxl} Requires: libvirt-daemon-driver-libxl = %{version}-%{release} - %endif - %if %{with_lxc} +%endif +%if %{with_lxc} Requires: libvirt-daemon-driver-lxc = %{version}-%{release} - %endif - %if %{with_qemu} +%endif +%if %{with_qemu} Requires: libvirt-daemon-driver-qemu = %{version}-%{release} - %endif - %if %{with_uml} +%endif +%if %{with_uml} Requires: libvirt-daemon-driver-uml = %{version}-%{release} - %endif - %if %{with_xen} +%endif +%if %{with_xen} Requires: libvirt-daemon-driver-xen = %{version}-%{release} - %endif - %if %{with_vbox} +%endif +%if %{with_vbox} Requires: libvirt-daemon-driver-vbox = %{version}-%{release} - %endif - %if %{with_nwfilter} -Requires: libvirt-daemon-driver-nwfilter = %{version}-%{release} - %endif - %if %{with_interface} -Requires: libvirt-daemon-driver-interface = %{version}-%{release} - %endif -Requires: libvirt-daemon-driver-network = %{version}-%{release} -Requires: libvirt-daemon-driver-nodedev = %{version}-%{release} -Requires: libvirt-daemon-driver-secret = %{version}-%{release} -Requires: libvirt-daemon-driver-storage = %{version}-%{release} - %endif %endif Requires: libvirt-client = %{version}-%{release} +Requires: libvirt-daemon-driver-interface = %{version}-%{release} +Requires: libvirt-daemon-driver-network = %{version}-%{release} +Requires: libvirt-daemon-driver-nodedev = %{version}-%{release} +Requires: libvirt-daemon-driver-nwfilter = %{version}-%{release} +Requires: libvirt-daemon-driver-secret = %{version}-%{release} +Requires: libvirt-daemon-driver-storage = %{version}-%{release} # All build-time requirements. Run-time requirements are # listed against each sub-RPM @@ -324,86 +186,39 @@ BuildRequires: python BuildRequires: python-xml BuildRequires: readline-devel BuildRequires: xhtml-dtd -%if %{with_libvirtd} # For pool-build probing for existing pools BuildRequires: libblkid-devel >= 2.17 -%endif -%if %{with_udev} BuildRequires: libpciaccess0-devel >= 0.10.9 BuildRequires: libudev-devel >= 145 -%endif -%if %{with_yajl} BuildRequires: libyajl-devel -%endif %if %{with_sanlock} BuildRequires: sanlock-devel >= 2.4 %endif -%if %{with_libpcap} -BuildRequires: libpcap-devel -%endif -%if %{with_libnl} - %if 0%{?suse_version} >= 1310 -BuildRequires: libnl3-devel - %else - %if 0%{?suse_version} >= 1210 -BuildRequires: libnl-1_1-devel - %else -BuildRequires: libnl-devel - %endif - %endif -%endif -%if %{with_avahi} BuildRequires: libavahi-devel -%endif -%if %{with_selinux} +BuildRequires: libnl3-devel +BuildRequires: libpcap-devel BuildRequires: libselinux-devel -%endif %if %{with_apparmor} BuildRequires: libapparmor-devel %endif -%if %{with_network} BuildRequires: dnsmasq >= 2.41 BuildRequires: iptables # TODO BuildRequires: iptables-ipv6 -BuildRequires: radvd -%endif -%if %{with_nwfilter} -BuildRequires: ebtables -%endif -%if %{with_sasl} BuildRequires: cyrus-sasl-devel -%endif -%if %{with_polkit} - %if 0%{?suse_version} > 1140 -%define with_polkit_rules 1 - %endif - %if 0%{?suse_version} > 1110 -BuildRequires: polkit >= 0.9 -BuildRequires: polkit-devel >= 0.9 - %else -BuildRequires: PolicyKit-devel >= 0.6 - %endif -%endif -%if %{with_storage_fs} +BuildRequires: ebtables +BuildRequires: polkit >= 0.93 +BuildRequires: polkit-devel >= 0.93 +BuildRequires: radvd # For mount/umount in FS driver BuildRequires: util-linux -%endif -%if %{with_storage_lvm} # For LVM drivers BuildRequires: lvm2 -%endif -%if %{with_storage_iscsi} # For ISCSI driver BuildRequires: open-iscsi -%endif -%if %{with_storage_disk} # For disk driver BuildRequires: parted-devel -%endif -%if %{with_storage_mpath} # For Multipath support BuildRequires: device-mapper-devel -%endif %if %{with_storage_rbd} BuildRequires: ceph-devel %endif @@ -411,31 +226,19 @@ BuildRequires: ceph-devel # For QEMU/LXC numa info BuildRequires: libnuma-devel %endif -%if %{with_capng} -BuildRequires: libcap-ng-devel >= 0.5.0 -%endif -%if %{with_fuse} BuildRequires: fuse-devel >= 2.8.6 -%endif -%if %{with_phyp} || %{with_libssh2} -BuildRequires: libssh2-devel -%endif -%if %{with_netcontrol} +BuildRequires: libcap-ng-devel >= 0.5.0 BuildRequires: libnetcontrol-devel >= 0.2.0 -%endif +BuildRequires: libssh2-devel %if %{with_esx} BuildRequires: libcurl-devel %endif %if %{with_hyperv} BuildRequires: libwsman-devel >= 2.2.3 %endif -%if %{with_audit} BuildRequires: audit-devel -%endif -%if %{with_dtrace} # we need /usr/sbin/dtrace BuildRequires: systemtap-sdt-devel -%endif %if %{with_numad} BuildRequires: numad %endif @@ -443,11 +246,9 @@ BuildRequires: numad BuildRequires: wireshark-devel %endif %if %{with_qemu} - %if 0%{?suse_version} > 1130 # BuildRequire qemu-tools so configure can detect qemu-bridge-helper -# path. Ignore SLE11, which predates the qemu-tools package. +# path. BuildRequires: qemu-tools - %endif %endif Source0: %{name}-%{version}.tar.gz @@ -458,17 +259,6 @@ Source4: libvirtd-relocation-server.fw Source99: baselibs.conf Source100: %{name}-rpmlintrc # Upstream patches -Patch0: e4d131b8-mv-virDomainDefPostParseInternal.patch -Patch1: 3e428670-post-parse-implicit-video.patch -Patch2: 538012c8-default-vram.patch -Patch3: 96b21fb0-vram-tests.patch -Patch4: 400e716d-libxl-noprope-emulator.patch -Patch5: b90c4b5f-tests-use-qemu-xen.patch -Patch6: fccf2725-libxl-API-4.4.patch -Patch7: 5325123d-libxl-migv2-save-restore.patch -Patch8: f9edcfa4-libxl-migv2-migration.patch -Patch9: a1c9a81a-libxl-rbd-fix.patch -Patch10: ba566428-libxl-dom-iface-addrs.patch # Patches pending upstream review # Need to go upstream Patch150: xen-pv-cdrom.patch @@ -518,8 +308,6 @@ Group: Development/Libraries/C and C++ Includes the API reference for the libvirt C library, and a complete copy of the libvirt.org website documentation. -%if %{with_libvirtd} - %package daemon Summary: Server side daemon and supporting files for libvirt library Group: Development/Libraries/C and C++ @@ -536,67 +324,45 @@ Requires: modutils Requires: bridge-utils Requires: iproute Requires: logrotate - - %if %{with_udev} Requires: udev >= 145 - %endif - %if %{with_polkit} - %if 0%{?suse_version} > 1110 Recommends: polkit >= 0.93 - %else -Recommends: PolicyKit >= 0.6 - %endif - %ifarch i386 i586 i686 x86_64 ia64 +%ifarch i386 i586 i686 x86_64 ia64 # For virConnectGetSysinfo Requires: dmidecode - %endif - %endif - %if %{with_systemd} +%endif +%if %{with_systemd} # For service management %{?systemd_requires} - %endif - %if %{with_numad} +%endif +%if %{with_numad} Requires: numad - %endif +%endif %description daemon Server side daemon required to manage the virtualization capabilities of recent versions of Linux. Requires a hypervisor specific sub-RPM for specific drivers. - %if %{with_network} - %package daemon-config-network Summary: Default configuration files for the libvirtd daemon Group: Development/Libraries/C and C++ Requires: libvirt-daemon = %{version}-%{release} - %if %{with_driver_modules} Requires: libvirt-daemon-driver-network = %{version}-%{release} - %endif %description daemon-config-network Default configuration files for setting up NAT based networking - %endif - - %if %{with_nwfilter} %package daemon-config-nwfilter Summary: Network filter configuration files for the libvirtd Group: Development/Libraries/C and C++ Requires: libvirt-daemon = %{version}-%{release} - %if %{with_driver_modules} Requires: libvirt-daemon-driver-nwfilter = %{version}-%{release} - %endif %description daemon-config-nwfilter Network filter configuration files for the libvirt daemon, used for cleaning guest network traffic. - %endif - - %if %{with_driver_modules} - %if %{with_network} %package daemon-driver-network Summary: Network driver plugin for the libvirtd daemon @@ -611,9 +377,6 @@ Requires: radvd The network driver plugin for the libvirtd daemon, providing an implementation of the virtual network APIs using the Linux bridge capabilities. - %endif - - %if %{with_nwfilter} %package daemon-driver-nwfilter Summary: A nwfilter driver plugin for the libvirtd daemon @@ -627,9 +390,6 @@ Requires: libvirt-daemon = %{version}-%{release} The nwfilter driver plugin for the libvirtd daemon, providing an implementation of the firewall APIs using the ebtables, iptables and ip6tables capabilities - %endif - - %if %{with_nodedev} %package daemon-driver-nodedev Summary: Nodedev driver plugin for the libvirtd daemon @@ -640,9 +400,6 @@ Requires: libvirt-daemon = %{version}-%{release} The nodedev driver plugin for the libvirtd daemon, providing an implementation of the node device APIs using the udev capabilities. - %endif - - %if %{with_interface} %package daemon-driver-interface Summary: Interface driver plugin for the libvirtd daemon @@ -653,7 +410,6 @@ Requires: libvirt-daemon = %{version}-%{release} The interface driver plugin for the libvirtd daemon, providing an implementation of the network interface APIs using the netcontrol library - %endif %package daemon-driver-secret Summary: Secret driver plugin for the libvirtd daemon @@ -664,46 +420,33 @@ Requires: libvirt-daemon = %{version}-%{release} The secret driver plugin for the libvirtd daemon, providing an implementation of the secret key APIs. - %if %{with_storage} - %package daemon-driver-storage Summary: Storage driver plugin for the libvirtd daemon Group: Development/Libraries/C and C++ Requires: libvirt-daemon = %{version}-%{release} - %if %{with_storage_fs} Requires: nfs-utils # For mkfs Requires: util-linux - %endif - %if %{with_qemu} +%if %{with_qemu} # From QEMU RPMs Requires: /usr/bin/qemu-img - %endif - %if %{with_storage_lvm} +%endif # For LVM drivers Requires: lvm2 - %endif - %if %{with_storage_iscsi} # For ISCSI driver Requires: open-iscsi - %endif - %if %{with_storage_disk} # For disk driver Requires: device-mapper Requires: parted - %endif - %if %{with_storage_mpath} # For multipath support Requires: device-mapper - %endif %description daemon-driver-storage The storage driver plugin for the libvirtd daemon, providing an implementation of the storage APIs using LVM, iSCSI, parted and more. - %endif - %if %{with_qemu} +%if %{with_qemu} %package daemon-driver-qemu Summary: Qemu driver plugin for the libvirtd daemon @@ -716,18 +459,16 @@ Requires: libvirt-daemon-driver-storage = %{version}-%{release} # For image compression Requires: bzip2 Requires: gzip -Requires: xz - %if 0%{?suse_version} > 1210 Requires: lzop - %endif Requires: qemu +Requires: xz %description daemon-driver-qemu The qemu driver plugin for the libvirtd daemon, providing an implementation of the hypervisor driver APIs using QEMU. - %endif +%endif - %if %{with_lxc} +%if %{with_lxc} %package daemon-driver-lxc Summary: LXC driver plugin for the libvirtd daemon @@ -740,9 +481,9 @@ Requires: libvirt-daemon-driver-network = %{version}-%{release} The LXC driver plugin for the libvirtd daemon, providing an implementation of the hypervisor driver APIs using the Linux kernel - %endif +%endif - %if %{with_uml} +%if %{with_uml} %package daemon-driver-uml Summary: Uml driver plugin for the libvirtd daemon @@ -753,9 +494,9 @@ Requires: libvirt-daemon = %{version}-%{release} The UML driver plugin for the libvirtd daemon, providing an implementation of the hypervisor driver APIs using User Mode Linux - %endif +%endif - %if %{with_xen} +%if %{with_xen} %package daemon-driver-xen Summary: Xen driver plugin for the libvirtd daemon @@ -765,9 +506,9 @@ Requires: libvirt-daemon = %{version}-%{release} %description daemon-driver-xen The Xen driver plugin for the libvirtd daemon, providing an implementation of the hypervisor driver APIs using Xen. - %endif +%endif - %if %{with_vbox} +%if %{with_vbox} %package daemon-driver-vbox Summary: VirtualBox driver plugin for the libvirtd daemon @@ -778,9 +519,9 @@ Requires: libvirt-daemon = %{version}-%{release} The vbox driver plugin for the libvirtd daemon, providing an implementation of the hypervisor driver APIs using VirtualBox - %endif +%endif - %if %{with_libxl} +%if %{with_libxl} %package daemon-driver-libxl Summary: Libxl driver plugin for the libvirtd daemon @@ -790,134 +531,112 @@ Requires: libvirt-daemon = %{version}-%{release} %description daemon-driver-libxl The Libxl driver plugin for the libvirtd daemon, providing an implementation of the hypervisor driver APIs using libxl. - %endif - %endif # with_driver_modules +%endif - %if %{with_qemu} +%if %{with_qemu} %package daemon-qemu Summary: Server side daemon & driver required to run QEMU guests Group: Development/Libraries/C and C++ Requires: libvirt-daemon = %{version}-%{release} - %if %{with_driver_modules} - %if %{with_interface} Requires: libvirt-daemon-driver-interface = %{version}-%{release} - %endif Requires: libvirt-daemon-driver-network = %{version}-%{release} Requires: libvirt-daemon-driver-nodedev = %{version}-%{release} Requires: libvirt-daemon-driver-nwfilter = %{version}-%{release} Requires: libvirt-daemon-driver-qemu = %{version}-%{release} Requires: libvirt-daemon-driver-secret = %{version}-%{release} - %endif %description daemon-qemu Server side daemon and driver required to manage the virtualization capabilities of the QEMU emulators - %endif +%endif - %if %{with_lxc} +%if %{with_lxc} %package daemon-lxc Summary: Server side daemon & driver required to run LXC guests Group: Development/Libraries/C and C++ Requires: libvirt-daemon = %{version}-%{release} - %if %{with_driver_modules} - %if %{with_interface} Requires: libvirt-daemon-driver-interface = %{version}-%{release} - %endif Requires: libvirt-daemon-driver-lxc = %{version}-%{release} Requires: libvirt-daemon-driver-network = %{version}-%{release} Requires: libvirt-daemon-driver-nodedev = %{version}-%{release} Requires: libvirt-daemon-driver-nwfilter = %{version}-%{release} Requires: libvirt-daemon-driver-secret = %{version}-%{release} Requires: libvirt-daemon-driver-storage = %{version}-%{release} - %endif %description daemon-lxc Server side daemon and driver required to manage the virtualization capabilities of LXC - %endif +%endif - %if %{with_uml} +%if %{with_uml} %package daemon-uml Summary: Server side daemon & driver required to run UML guests Group: Development/Libraries/C and C++ Requires: libvirt-daemon = %{version}-%{release} - %if %{with_driver_modules} - %if %{with_interface} Requires: libvirt-daemon-driver-interface = %{version}-%{release} - %endif Requires: libvirt-daemon-driver-network = %{version}-%{release} Requires: libvirt-daemon-driver-nodedev = %{version}-%{release} Requires: libvirt-daemon-driver-nwfilter = %{version}-%{release} Requires: libvirt-daemon-driver-secret = %{version}-%{release} Requires: libvirt-daemon-driver-storage = %{version}-%{release} Requires: libvirt-daemon-driver-uml = %{version}-%{release} - %endif %description daemon-uml Server side daemon and driver required to manage the virtualization capabilities of UML - %endif +%endif - %if %{with_xen} || %{with_libxl} +%if %{with_xen} || %{with_libxl} %package daemon-xen Summary: Server side daemon & driver required to run XEN guests Group: Development/Libraries/C and C++ Requires: libvirt-daemon = %{version}-%{release} - %if %{with_driver_modules} - %if %{with_xen} + %if %{with_xen} Requires: libvirt-daemon-driver-xen = %{version}-%{release} - %endif - %if %{with_libxl} + %endif + %if %{with_libxl} Requires: libvirt-daemon-driver-libxl = %{version}-%{release} - %endif - %if %{with_interface} + %endif Requires: libvirt-daemon-driver-interface = %{version}-%{release} - %endif Requires: libvirt-daemon-driver-network = %{version}-%{release} Requires: libvirt-daemon-driver-nodedev = %{version}-%{release} Requires: libvirt-daemon-driver-nwfilter = %{version}-%{release} Requires: libvirt-daemon-driver-secret = %{version}-%{release} Requires: libvirt-daemon-driver-storage = %{version}-%{release} - %endif Requires: xen %description daemon-xen Server side daemon and driver required to manage the virtualization capabilities of XEN - %endif +%endif - %if %{with_vbox} +%if %{with_vbox} %package daemon-vbox Summary: Server side daemon & driver required to run VirtualBox guests Group: Development/Libraries/C and C++ Requires: libvirt-daemon = %{version}-%{release} - %if %{with_driver_modules} - %if %{with_interface} Requires: libvirt-daemon-driver-interface = %{version}-%{release} - %endif Requires: libvirt-daemon-driver-network = %{version}-%{release} Requires: libvirt-daemon-driver-nodedev = %{version}-%{release} Requires: libvirt-daemon-driver-nwfilter = %{version}-%{release} Requires: libvirt-daemon-driver-secret = %{version}-%{release} Requires: libvirt-daemon-driver-storage = %{version}-%{release} Requires: libvirt-daemon-driver-vbox = %{version}-%{release} - %endif Requires: virtualbox %description daemon-vbox Server side daemon and driver required to manage the virtualization capabilities of VirtualBox - %endif -%endif # with_libvirtd +%endif %package client Summary: Client side library and utilities of the libvirt library @@ -930,13 +649,11 @@ Requires: netcat-openbsd # Needed by libvirt-guests init script. Requires: gettext-runtime # Needed by virt-pki-validate script. -Requires: gnutls -%if %{with_sasl} Requires: cyrus-sasl +Requires: gnutls # Not technically required, but makes 'out-of-box' config # work correctly & doesn't have onerous dependencies Requires: cyrus-sasl-digestmd5 -%endif %description client Shared libraries and client binaries needed to access to the @@ -980,7 +697,6 @@ Requires: wireshark Wireshark dissector plugin for better analysis of libvirt RPC traffic. %endif -%if %{with_nss_plugin} %package nss Summary: Libvirt plugin for Name Service Switch Group: Development/Libraries/C and C++ @@ -988,21 +704,9 @@ Requires: libvirt-daemon-driver-network = %{version}-%{release} %description nss libvirt plugin for NSS for translating domain names into IP addresses. -%endif %prep %setup -q -%patch0 -p1 -%patch1 -p1 -%patch2 -p1 -%patch3 -p1 -%patch4 -p1 -%patch5 -p1 -%patch6 -p1 -%patch7 -p1 -%patch8 -p1 -%patch9 -p1 -%patch10 -p1 %patch150 -p1 %patch151 -p1 %patch152 -p1 @@ -1025,216 +729,179 @@ libvirt plugin for NSS for translating domain names into IP addresses. %patch214 -p1 %build -%if ! %{with_xen} - %define _without_xen --without-xen -%endif -%if ! %{with_qemu} - %define _without_qemu --without-qemu -%endif -%if ! %{with_openvz} - %define _without_openvz --without-openvz -%endif -%if ! %{with_lxc} - %define _without_lxc --without-lxc -%endif -%if ! %{with_vbox} - %define _without_vbox --without-vbox -%endif -%if ! %{with_xenapi} - %define _without_xenapi --without-xenapi -%endif -%if ! %{with_uml} - %define _without_uml --without-uml -%endif -%if ! %{with_phyp} - %define _without_phyp --without-phyp -%endif -%if ! %{with_esx} - %define _without_esx --without-esx -%endif -%if ! %{with_vmware} - %define _without_vmware --without-vmware -%endif -%if ! %{with_hyperv} - %define _without_hyperv --without-hyperv -%endif -%if ! %{with_vz} - %define _without_vz --without-vz -%endif -%if ! %{with_libxl} - %define _without_libxl --without-libxl -%endif -%if ! %{with_libvirtd} - %define _without_libvirtd --without-libvirtd -%endif -%if ! %{with_storage_fs} - %define _without_storage_fs --without-storage-fs -%endif -%if ! %{with_storage_lvm} - %define _without_storage_lvm --without-storage-lvm -%endif -%if ! %{with_storage_iscsi} - %define _without_storage_iscsi --without-storage-iscsi -%endif -%if ! %{with_storage_disk} - %define _without_storage_disk --without-storage-disk -%endif -%if ! %{with_storage_mpath} - %define _without_storage_mpath --without-storage-mpath -%endif -%if ! %{with_storage_rbd} - %define _without_storage_rbd --without-storage-rbd -%endif -%if ! %{with_storage_sheepdog} - %define _without_storage_sheepdog --without-storage-sheepdog -%endif -%if ! %{with_storage_gluster} - %define _without_storage_gluster --without-storage-gluster -%endif -%if ! %{with_numactl} - %define _without_numactl --without-numactl -%endif -%if ! %{with_numad} - %define _without_numad --without-numad -%endif -%if ! %{with_selinux} - %define _without_selinux --without-selinux -%endif -%if ! %{with_apparmor} - %define _without_apparmor --without-apparmor +%if %{with_xen} + %define arg_xen --with-xen %else - %define _with_apparmor_profiles --with-apparmor-profiles + %define arg_xen --without-xen %endif -%if ! %{with_capng} - %define _without_capng --without-capng +%if %{with_qemu} + %define arg_qemu --with-qemu +%else + %define arg_qemu --without-qemu %endif -%if ! %{with_fuse} - %define _without_fuse --without-fuse +%if %{with_openvz} + %define arg_openvz --with-openvz +%else + %define arg_openvz --without-openvz %endif -%if ! %{with_netcf} - %define _without_netcf --without-netcf +%if %{with_lxc} + %define arg_lxc --with-lxc +%else + %define arg_lxc --without-lxc %endif -%if ! %{with_netcontrol} - %define _without_netcontrol --without-netcontrol +%if %{with_vbox} + %define arg_vbox --with-vbox +%else + %define arg_vbox --without-vbox %endif -%if ! %{with_udev} - %define _without_udev --without-udev +%if %{with_uml} + %define arg_uml --with-uml +%else + %define arg_uml --without-uml %endif -%if ! %{with_yajl} - %define _without_yajl --without-yajl +%if %{with_phyp} + %define arg_phyp --with-phyp +%else + %define arg_phyp --without-phyp %endif -%if ! %{with_macvtap} - %define _without_macvtap --without-macvtap +%if %{with_esx} + %define arg_esx --with-esx +%else + %define arg_esx --without-esx %endif -%if ! %{with_polkit} - %define _without_polkit --without-polkit +%if %{with_vmware} + %define arg_vmware --with-vmware +%else + %define arg_vmware --without-vmware %endif -%if ! %{with_audit} - %define _without_audit --without-audit +%if %{with_hyperv} + %define arg_hyperv --with-hyperv +%else + %define arg_hyperv --without-hyperv %endif -%if ! %{with_dtrace} - %define _without_dtrace --without-dtrace +%if %{with_libxl} + %define arg_libxl --with-libxl +%else + %define arg_libxl --without-libxl %endif -%if ! %{with_interface} - %define _without_interface --without-interface +%if %{with_storage_rbd} + %define arg_storage_rbd --with-storage-rbd +%else + %define arg_storage_rbd --without-storage-rbd %endif -%if ! %{with_network} - %define _without_network --without-network +%if %{with_storage_sheepdog} + %define arg_storage_sheepdog --with-storage-sheepdog +%else + %define arg_storage_sheepdog --without-storage-sheepdog %endif -%if ! %{with_sasl} - %define _without_sasl --without-sasl +%if %{with_storage_gluster} + %define arg_storage_gluster --with-storage-gluster +%else + %define arg_storage_gluster --without-storage-gluster %endif -%if ! %{with_avahi} - %define _without_avahi --without-avahi +%if %{with_numactl} + %define arg_numactl --with-numactl +%else + %define arg_numactl --without-numactl %endif -%if ! %{with_libpcap} - %define _without_libpcap --without-libpcap +%if %{with_numad} + %define arg_numad --with-numad +%else + %define arg_numad --without-numad %endif -%if ! %{with_sanlock} - %define _without_sanlock --without-sanlock +%if %{with_apparmor} + %define arg_apparmor --with-apparmor + %define arg_apparmor_profiles --with-apparmor-profiles +%else + %define arg_apparmor --without-apparmor +%endif +%if %{with_sanlock} + %define arg_sanlock --with-sanlock +%else + %define arg_sanlock --without-sanlock %endif %if %{with_systemd} - %define init_scripts --with-init_script=systemd+redhat + %define arg_init_script --with-init-script=systemd %else - %define init_scripts --with-init_script=redhat -%endif -%if ! %{with_driver_modules} - %define _without_driver_modules --without-driver-modules + %define arg_init_script --with-init-script=redhat %endif %if %{with_firewalld} - %define _with_firewalld --with-firewalld + %define arg_firewalld --with-firewalld +%else + %define arg_firewalld --without-firewalld %endif -%if ! %{with_wireshark} - %define _without_wireshark --without-wireshark-dissector +%if %{with_wireshark} + %define arg_wireshark --with-wireshark-dissector +%else + %define arg_wireshark --without-wireshark-dissector %endif -%if ! %{with_systemd_daemon} - %define _without_systemd_daemon --without-systemd-daemon -%endif -%if ! %{with_nss_plugin} - %define _without_nss_plugin --without-nss-plugin -%endif -%if %{with_selinux} - %define with_selinux_mount --with-selinux-mount="/sys/fs/selinux" +%if %{with_systemd_daemon} + %define arg_systemd_daemon --with-systemd-daemon +%else + %define arg_systemd_daemon --without-systemd-daemon %endif +%define arg_selinux_mount --with-selinux-mount="/selinux" + autoreconf -f -i export CFLAGS="$RPM_OPT_FLAGS" %configure --disable-static --with-pic \ - %{?_without_xen} \ - %{?_without_qemu} \ - %{?_without_openvz} \ - %{?_without_lxc} \ - %{?_without_vbox} \ - %{?_without_libxl} \ - %{?_without_xenapi} \ - %{?_without_sasl} \ - %{?_without_avahi} \ - %{?_without_polkit} \ - %{?_without_libvirtd} \ - %{?_without_uml} \ - %{?_without_phyp} \ - %{?_without_esx} \ - %{?_without_hyperv} \ - %{?_without_vmware} \ - %{?_without_vz} \ - %{?_without_interface} \ - %{?_without_network} \ - %{?_without_storage_fs} \ - %{?_without_storage_lvm} \ - %{?_without_storage_iscsi} \ - %{?_without_storage_disk} \ - %{?_without_storage_mpath} \ - %{?_without_storage_rbd} \ - %{?_without_storage_sheepdog} \ - %{?_without_storage_gluster} \ - %{?_without_numactl} \ - %{?_without_numad} \ - %{?_without_capng} \ - %{?_without_fuse} \ - %{?_without_netcf} \ - %{?_without_netcontrol} \ - %{?_without_selinux} \ - %{?_with_selinux_mount} \ - %{?_without_apparmor} \ - %{?_with_apparmor_profiles} \ - %{?_without_udev} \ - %{?_without_yajl} \ - %{?_without_sanlock} \ - %{?_without_libpcap} \ - %{?_without_macvtap} \ - %{?_without_audit} \ - %{?_without_dtrace} \ - %{?_without_driver_modules} \ - %{?_with_firewalld} \ - %{?_without_wireshark} \ - %{?_without_systemd_daemon} \ - %{?_without_nss_plugin} \ + %{?arg_xen} \ + %{?arg_qemu} \ + %{?arg_openvz} \ + %{?arg_lxc} \ + %{?arg_vbox} \ + %{?arg_libxl} \ + --with-sasl \ + --with-avahi \ + --with-polkit \ + --with-libvirtd \ + %{?arg_uml} \ + %{?arg_phyp} \ + %{?arg_esx} \ + %{?arg_hyperv} \ + %{?arg_vmware} \ + --without-xenapi \ + --without-vz \ + --without-bhyve \ + --with-interface \ + --with-network \ + --with-storage-fs \ + --with-storage-lvm \ + --with-storage-iscsi \ + --with-storage-disk \ + --with-storage-mpath \ + %{?arg_storage_rbd} \ + %{?arg_storage_sheepdog} \ + %{?arg_storage_gluster} \ + %{?arg_numactl} \ + %{?arg_numad} \ + --with-capng \ + --with-fuse \ + --without-netcf \ + --with-netcontrol \ + --with-selinux \ + %{?arg_selinux_mount} \ + %{?arg_apparmor} \ + %{?arg_apparmor_profiles} \ + --with-udev \ + --with-yajl \ + %{?arg_sanlock} \ + --with-libpcap \ + --with-macvtap \ + --with-audit \ + --with-dtrace \ + --with-driver-modules \ + %{?arg_firewalld} \ + %{?arg_wireshark} \ + %{?arg_systemd_daemon} \ + --with-nss-plugin \ --libexecdir=%{_libdir}/%{name} \ --with-qemu-user=%{qemu_user} \ --with-qemu-group=%{qemu_group} \ - %{?with_loader_nvram} \ + %{?arg_loader_nvram} \ --without-login-shell \ - %{init_scripts} \ + %{arg_init_script} \ ac_cv_path_MODPROBE=/sbin/modprobe \ ac_cv_path_UDEVADM=/sbin/udevadm \ ac_cv_path_SHOWMOUNT=/usr/sbin/showmount @@ -1254,10 +921,8 @@ mv $RPM_BUILD_ROOT%{_libdir}/wireshark/plugins/*/libvirt.so \ rm -f $RPM_BUILD_ROOT%{_libdir}/*.a rm -f $RPM_BUILD_ROOT%{_libdir}/%{name}/lock-driver/*.la rm -f $RPM_BUILD_ROOT%{_libdir}/%{name}/lock-driver/*.a -%if %{with_driver_modules} rm -f $RPM_BUILD_ROOT%{_libdir}/%{name}/connection-driver/*.la rm -f $RPM_BUILD_ROOT%{_libdir}/%{name}/connection-driver/*.a -%endif # remove currently unsupported locale(s) for dir in $RPM_BUILD_ROOT/usr/share/locale/* do @@ -1283,7 +948,6 @@ cat > $RPM_BUILD_ROOT%{_docdir}/libvirt/libvirt.README << 'EOF' The libvirt package no longer contains any files. It exists now only to fulfill its 'Provides' contract. EOF -%if %{with_network} install -d -m 0755 $RPM_BUILD_ROOT%{_localstatedir}/lib/libvirt/dnsmasq/ install -d -m 0755 $RPM_BUILD_ROOT%{_datadir}/libvirt/networks/ cp $RPM_BUILD_ROOT%{_sysconfdir}/libvirt/qemu/networks/default.xml \ @@ -1292,14 +956,6 @@ rm -f $RPM_BUILD_ROOT%{_sysconfdir}/libvirt/qemu/networks/default.xml rm -f $RPM_BUILD_ROOT%{_sysconfdir}/libvirt/qemu/networks/autostart/default.xml # Strip auto-generated UUID - we need it generated per-install sed -i -e "//d" $RPM_BUILD_ROOT%{_datadir}/libvirt/networks/default.xml -%else -rm -f $RPM_BUILD_ROOT%{_sysconfdir}/libvirt/qemu/networks/default.xml -rm -f $RPM_BUILD_ROOT%{_sysconfdir}/libvirt/qemu/networks/autostart/default.xml -%endif -%if ! %{with_nwfilter} -rm -rf $RPM_BUILD_ROOT%{_sysconfdir}/libvirt/nwfilter -rm -rf $RPM_BUILD_ROOT%{_libdir}/%{name}/connection-driver/libvirt_driver_nwfilter.so -%endif %if %{with_lxc} cat > $RPM_BUILD_ROOT%{_docdir}/libvirt/libvirt-daemon-lxc.README << 'EOF' Any empty package encapsulating requirements for a libvirtd capable @@ -1356,36 +1012,34 @@ rm -f $RPM_BUILD_ROOT%{_datadir}/augeas/lenses/tests/test_libvirt_sanlock.aug # init scripts mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/init.d mkdir -p $RPM_BUILD_ROOT%{_localstatedir}/adm/fillup-templates -%if %{with_libvirtd} # Currently using our own libvirtd init script rm -f $RPM_BUILD_ROOT%{_sysconfdir}/rc.d/init.d/libvirtd - %if %{with_systemd} +%if %{with_systemd} ln -s %{_sbindir}/service $RPM_BUILD_ROOT%{_sbindir}/rclibvirtd - %else +%else install %SOURCE3 $RPM_BUILD_ROOT%{_sysconfdir}/init.d/libvirtd ln -s /etc/init.d/libvirtd $RPM_BUILD_ROOT%{_sbindir}/rclibvirtd - %endif +%endif mv $RPM_BUILD_ROOT%{_sysconfdir}/sysconfig/libvirtd $RPM_BUILD_ROOT%{_localstatedir}/adm/fillup-templates/sysconfig.libvirtd rm -f $RPM_BUILD_ROOT/usr/lib/sysctl.d/60-libvirtd.conf # For other services, use the in-tree scripts - %if %{with_systemd} +%if %{with_systemd} rm -f $RPM_BUILD_ROOT%{_sysconfdir}/rc.d/init.d/virtlogd ln -s %{_sbindir}/service $RPM_BUILD_ROOT%{_sbindir}/rcvirtlogd rm -f $RPM_BUILD_ROOT%{_sysconfdir}/rc.d/init.d/virtlockd ln -s %{_sbindir}/service $RPM_BUILD_ROOT%{_sbindir}/rcvirtlockd - %else +%else mv $RPM_BUILD_ROOT%{_sysconfdir}/rc.d/init.d/virtlogd $RPM_BUILD_ROOT%{_sysconfdir}/init.d/virtlogd ln -s /etc/init.d/virtlogd $RPM_BUILD_ROOT%{_sbindir}/rcvirtlogd mv $RPM_BUILD_ROOT%{_sysconfdir}/rc.d/init.d/virtlockd $RPM_BUILD_ROOT%{_sysconfdir}/init.d/virtlockd ln -s /etc/init.d/virtlockd $RPM_BUILD_ROOT%{_sbindir}/rcvirtlockd - %endif +%endif mv $RPM_BUILD_ROOT%{_sysconfdir}/sysconfig/virtlogd $RPM_BUILD_ROOT%{_localstatedir}/adm/fillup-templates/sysconfig.virtlogd mv $RPM_BUILD_ROOT%{_sysconfdir}/sysconfig/virtlockd $RPM_BUILD_ROOT%{_localstatedir}/adm/fillup-templates/sysconfig.virtlockd #install firewall definitions format is described here: #/usr/share/SuSEfirewall2/services/TEMPLATE mkdir -p $RPM_BUILD_ROOT/%{_fwdefdir} install -m 644 %{S:4} $RPM_BUILD_ROOT/%{_fwdefdir}/libvirtd-relocation-server -%endif %if %{with_systemd} rm -f $RPM_BUILD_ROOT%{_sysconfdir}/rc.d/init.d/libvirt-guests ln -s %{_sbindir}/service $RPM_BUILD_ROOT%{_sbindir}/rclibvirt-guests @@ -1395,14 +1049,17 @@ mkdir -p $RPM_BUILD_ROOT%{_sbindir} ln -s %{_sysconfdir}/init.d/libvirt-guests $RPM_BUILD_ROOT%{_sbindir}/rclibvirt-guests %endif mv $RPM_BUILD_ROOT%{_sysconfdir}/sysconfig/libvirt-guests $RPM_BUILD_ROOT%{_localstatedir}/adm/fillup-templates/sysconfig.libvirt-guests +%ifarch %{power64} s390x x86_64 +mv $RPM_BUILD_ROOT%{_datadir}/systemtap/tapset/libvirt_probes.stp \ + $RPM_BUILD_ROOT%{_datadir}/systemtap/tapset/libvirt_probes-64.stp +mv $RPM_BUILD_ROOT%{_datadir}/systemtap/tapset/libvirt_qemu_probes.stp \ + $RPM_BUILD_ROOT%{_datadir}/systemtap/tapset/libvirt_qemu_probes-64.stp +%endif %fdupes -s $RPM_BUILD_ROOT %clean rm -rf $RPM_BUILD_ROOT -# Ignore 'make check' on older code base -%if 0%{?suse_version} >= 1210 - %check cd tests SKIP_TESTS="" @@ -1410,9 +1067,9 @@ SKIP_TESTS="" # virnetsockettest: needs unsupported linux-user syscalls SKIP_TESTS="$SKIP_TESTS virnetsockettest" # virportallocatortest fails on aarch64 due to unsupported IPV6_V6ONLY flag - %ifarch aarch64 +%ifarch aarch64 SKIP_TESTS="$SKIP_TESTS virportallocatortest" - %endif +%endif for i in $SKIP_TESTS do rm -f $i @@ -1425,44 +1082,41 @@ then cat test-suite.log || true exit 1 fi -%endif - -%if %{with_libvirtd} %pre daemon - %if %{with_systemd} +%if %{with_systemd} %service_add_pre libvirtd.service %service_add_pre virtlockd.service virtlockd.socket %service_add_pre virtlogd.service virtlogd.socket - %endif +%endif %{_bindir}/getent group libvirt >/dev/null || \ %{_sbindir}/groupadd -r libvirt || : %post daemon /sbin/ldconfig - %if %{with_systemd} +%if %{with_systemd} %service_add_post libvirtd.service %service_add_post virtlockd.service virtlockd.socket %service_add_post virtlogd.service virtlogd.socket - %endif +%endif %{fillup_only -n libvirtd} %{fillup_only -n virtlockd} %{fillup_only -n virtlogd} %preun daemon - %if %{with_systemd} +%if %{with_systemd} %service_del_preun libvirtd.service %service_del_preun virtlockd.service virtlockd.socket %service_del_preun virtlogd.service virtlogd.socket - %else +%else %stop_on_removal libvirtd %stop_on_removal virtlockd %stop_on_removal virtlogd - %endif +%endif %postun daemon /sbin/ldconfig - %if %{with_systemd} +%if %{with_systemd} # On upgrade, defer restarting daemons until %posttrans if test $1 -eq 0 ; then for service in libvirtd virtlockd virtlogd ; do @@ -1470,11 +1124,11 @@ if test $1 -eq 0 ; then done /usr/bin/systemctl daemon-reload >/dev/null 2>&1 || : fi - %else +%else %restart_on_update libvirtd %restart_on_update virtlockd %restart_on_update virtlogd - %endif +%endif %insserv_cleanup %posttrans daemon @@ -1494,21 +1148,19 @@ fi # guests %triggerpostun daemon -- libvirt-daemon < 1.3.0 if [ $1 -ge 1 ] ; then - %if %{with_systemd} +%if %{with_systemd} /usr/bin/systemctl is-enabled libvirtd.service 1>/dev/null 2>&1 && /usr/bin/systemctl enable virtlogd.socket || : /usr/bin/systemctl is-active libvirtd.service 1>/dev/null 2>&1 && /usr/bin/systemctl start virtlogd.socket || : - %else +%else /sbin/chkconfig libvirtd 1>/dev/null 2>&1 && /sbin/chkconfig virtlogd on || : /sbin/service libvirtd status 1>/dev/null 2>&1 && /sbin/service virtlogd start || : - %endif +%endif fi - %if %{with_network} - %post daemon-config-network # Install the default network if one doesn't exist if test $1 -eq 1 && test ! -f %{_sysconfdir}/libvirt/qemu/networks/default.xml ; then @@ -1517,13 +1169,11 @@ if test $1 -eq 1 && test ! -f %{_sysconfdir}/libvirt/qemu/networks/default.xml ; < %{_datadir}/libvirt/networks/default.xml \ > %{_sysconfdir}/libvirt/qemu/networks/default.xml fi - %endif -%endif # with_libvirtd %pre client - %if %{with_systemd} +%if %{with_systemd} %service_add_pre libvirt-guests.service - %endif +%endif %post client /sbin/ldconfig @@ -1549,19 +1199,15 @@ fi %endif %insserv_cleanup -%if %{with_nss_plugin} %post nss /sbin/ldconfig %postun nss /sbin/ldconfig -%endif %files %doc %{_docdir}/%{name}/libvirt.README -%if %{with_libvirtd} - %files daemon %{_sbindir}/libvirtd %{_sbindir}/virtlogd @@ -1572,17 +1218,17 @@ fi %{_localstatedir}/adm/fillup-templates/sysconfig.libvirtd %{_localstatedir}/adm/fillup-templates/sysconfig.virtlogd %{_localstatedir}/adm/fillup-templates/sysconfig.virtlockd - %if %{with_systemd} +%if %{with_systemd} %{_unitdir}/libvirtd.service %{_unitdir}/virtlogd.service %{_unitdir}/virtlogd.socket %{_unitdir}/virtlockd.service %{_unitdir}/virtlockd.socket - %else +%else %config /etc/init.d/libvirtd %config /etc/init.d/virtlogd %config /etc/init.d/virtlockd - %endif +%endif %{_sbindir}/rclibvirtd %{_sbindir}/rcvirtlogd %{_sbindir}/rcvirtlockd @@ -1601,10 +1247,9 @@ fi %{_datadir}/augeas/lenses/tests/test_virtlockd.aug %{_datadir}/augeas/lenses/libvirt_lockd.aug %{_datadir}/augeas/lenses/tests/test_libvirt_lockd.aug - %if %{with_dtrace} -%{_datadir}/systemtap/tapset/libvirt_probes.stp +%{_datadir}/systemtap/tapset/libvirt_probes*.stp +%{_datadir}/systemtap/tapset/libvirt_qemu_probes*.stp %{_datadir}/systemtap/tapset/libvirt_functions.stp - %endif %dir %{_localstatedir}/lib/libvirt/ %dir %attr(0711, root, root) %{_localstatedir}/lib/libvirt/images/ %dir %attr(0711, root, root) %{_localstatedir}/lib/libvirt/filesystems/ @@ -1613,21 +1258,15 @@ fi %dir %attr(0700, root, root) %{_localstatedir}/log/libvirt/ %dir %attr(0755, root, root) %{_libdir}/%{name}/lock-driver %attr(0755, root, root) %{_libdir}/%{name}/lock-driver/lockd.so - %if %{with_polkit} - %if %{with_polkit_rules} +%if %{with_polkit_rules} %{_datadir}/polkit-1/rules.d/50-libvirt.rules - %endif - %if 0%{?suse_version} > 1110 +%endif %{_datadir}/polkit-1/actions/org.libvirt.unix.policy - %else -%{_datadir}/PolicyKit/policy/org.libvirt.unix.policy - %endif - %endif %attr(0755, root, root) %{_libdir}/%{name}/libvirt_iohelper %doc %{_mandir}/man8/libvirtd.8* %doc %{_mandir}/man8/virtlogd.8* %doc %{_mandir}/man8/virtlockd.8* - %if %{with_apparmor} +%if %{with_apparmor} %dir %{_sysconfdir}/apparmor.d %dir %{_sysconfdir}/apparmor.d/abstractions %dir %{_sysconfdir}/apparmor.d/libvirt @@ -1638,85 +1277,20 @@ fi %config(noreplace) %{_sysconfdir}/apparmor.d/libvirt/TEMPLATE.lxc %config(noreplace) %{_sysconfdir}/apparmor.d/libvirt/TEMPLATE.qemu %{_libdir}/%{name}/virt-aa-helper - %endif +%endif %config %{_fwdefdir}/libvirtd-relocation-server - %if ! %{with_driver_modules} - %if %{with_network} || %{with_qemu} -%dir %attr(0700, root, root) %{_sysconfdir}/libvirt/qemu/ - %endif - %if %{with_network} -%dir %attr(0700, root, root) %{_sysconfdir}/libvirt/qemu/networks/ -%dir %attr(0700, root, root) %{_sysconfdir}/libvirt/qemu/networks/autostart -%dir %attr(0700, root, root) %{_localstatedir}/lib/libvirt/network/ -%dir %attr(0755, root, root) %{_localstatedir}/lib/libvirt/dnsmasq/ -%attr(0755, root, root) %{_libdir}/%{name}/libvirt_leaseshelper - %endif - %if %{with_nwfilter} -%dir %attr(0700, root, root) %{_sysconfdir}/libvirt/nwfilter/ - %endif - %if %{with_qemu} -%config(noreplace) %{_sysconfdir}/libvirt/qemu.conf -%config(noreplace) %{_sysconfdir}/libvirt/qemu-lockd.conf -%config(noreplace) %{_sysconfdir}/logrotate.d/libvirtd.qemu -%dir %attr(0751, %{qemu_user}, %{qemu_group}) %{_localstatedir}/lib/libvirt/qemu/ -%dir %attr(0750, %{qemu_user}, %{qemu_group}) %{_localstatedir}/cache/libvirt/qemu/ -%dir %attr(0700, root, root) %{_localstatedir}/log/libvirt/qemu/ -%{_datadir}/augeas/lenses/libvirtd_qemu.aug -%{_datadir}/augeas/lenses/tests/test_libvirtd_qemu.aug - %endif - %if %{with_lxc} -%config(noreplace) %{_sysconfdir}/libvirt/lxc.conf -%config(noreplace) %{_sysconfdir}/logrotate.d/libvirtd.lxc -%dir %attr(0700, root, root) %{_localstatedir}/lib/libvirt/lxc/ -%dir %attr(0700, root, root) %{_localstatedir}/log/libvirt/lxc/ -%attr(0755, root, root) %{_libdir}/%{name}/libvirt_lxc -%{_datadir}/augeas/lenses/libvirtd_lxc.aug -%{_datadir}/augeas/lenses/tests/test_libvirtd_lxc.aug -%attr(0755, root, root) %{_bindir}/virt-lxc-convert - %endif - %if %{with_uml} -%config(noreplace) %{_sysconfdir}/logrotate.d/libvirtd.uml -%dir %attr(0700, root, root) %{_localstatedir}/lib/libvirt/uml/ -%dir %attr(0700, root, root) %{_localstatedir}/log/libvirt/uml/ - %endif - %if %{with_libxl} -%config(noreplace) %{_sysconfdir}/libvirt/libxl.conf -%config(noreplace) %{_sysconfdir}/logrotate.d/libvirtd.libxl -%config(noreplace) %{_sysconfdir}/libvirt/libxl-lockd.conf -%dir %attr(0700, root, root) %{_localstatedir}/lib/libvirt/libxl/ -%dir %attr(0700, root, root) %{_localstatedir}/log/libvirt/libxl/ -%{_datadir}/augeas/lenses/libvirtd_libxl.aug -%{_datadir}/augeas/lenses/tests/test_libvirtd_libxl.aug - %endif - %if %{with_storage_disk} -%attr(0755, root, root) %{_libdir}/%{name}/libvirt_parthelper - %endif - %endif # ! %{with_driver_modules} - - %if %{with_network} - %files daemon-config-network %dir %{_datadir}/libvirt/networks/ %{_datadir}/libvirt/networks/default.xml - %endif - - %if %{with_nwfilter} %files daemon-config-nwfilter %dir %attr(0700, root, root) %{_sysconfdir}/libvirt/nwfilter/ %{_sysconfdir}/libvirt/nwfilter/*.xml - %endif - - %if %{with_driver_modules} - %if %{with_interface} %files daemon-driver-interface %dir %{_libdir}/%{name}/connection-driver %{_libdir}/%{name}/connection-driver/libvirt_driver_interface.so - %endif - - %if %{with_network} %files daemon-driver-network %dir %attr(0700, root, root) %{_sysconfdir}/libvirt/qemu/ @@ -1727,38 +1301,26 @@ fi %attr(0755, root, root) %{_libdir}/%{name}/libvirt_leaseshelper %dir %{_libdir}/%{name}/connection-driver %{_libdir}/%{name}/connection-driver/libvirt_driver_network.so - %endif - - %if %{with_nodedev} %files daemon-driver-nodedev %dir %{_libdir}/%{name}/connection-driver %{_libdir}/%{name}/connection-driver/libvirt_driver_nodedev.so - %endif - - %if %{with_nwfilter} %files daemon-driver-nwfilter %dir %attr(0700, root, root) %{_sysconfdir}/libvirt/nwfilter/ %dir %{_libdir}/%{name}/connection-driver %{_libdir}/%{name}/connection-driver/libvirt_driver_nwfilter.so - %endif %files daemon-driver-secret %dir %{_libdir}/%{name}/connection-driver %{_libdir}/%{name}/connection-driver/libvirt_driver_secret.so - %if %{with_storage} - %files daemon-driver-storage - %if %{with_storage_disk} %attr(0755, root, root) %{_libdir}/%{name}/libvirt_parthelper - %endif %dir %{_libdir}/%{name}/connection-driver %{_libdir}/%{name}/connection-driver/libvirt_driver_storage.so - %endif - %if %{with_qemu} +%if %{with_qemu} %files daemon-driver-qemu %config(noreplace) %{_sysconfdir}/libvirt/qemu.conf @@ -1771,9 +1333,9 @@ fi %{_datadir}/augeas/lenses/tests/test_libvirtd_qemu.aug %dir %{_libdir}/%{name}/connection-driver %{_libdir}/%{name}/connection-driver/libvirt_driver_qemu.so - %endif +%endif - %if %{with_lxc} +%if %{with_lxc} %files daemon-driver-lxc %config(noreplace) %{_sysconfdir}/libvirt/lxc.conf @@ -1786,9 +1348,9 @@ fi %dir %{_libdir}/%{name}/connection-driver %{_libdir}/%{name}/connection-driver/libvirt_driver_lxc.so %attr(0755, root, root) %{_bindir}/virt-lxc-convert - %endif +%endif - %if %{with_uml} +%if %{with_uml} %files daemon-driver-uml %config(noreplace) %{_sysconfdir}/logrotate.d/libvirtd.uml @@ -1796,16 +1358,16 @@ fi %dir %attr(0700, root, root) %{_localstatedir}/log/libvirt/uml/ %dir %{_libdir}/%{name}/connection-driver %{_libdir}/%{name}/connection-driver/libvirt_driver_uml.so - %endif +%endif - %if %{with_xen} +%if %{with_xen} %files daemon-driver-xen %dir %{_libdir}/%{name}/connection-driver %{_libdir}/%{name}/connection-driver/libvirt_driver_xen.so - %endif +%endif - %if %{with_libxl} +%if %{with_libxl} %files daemon-driver-libxl %config(noreplace) %{_sysconfdir}/libvirt/libxl.conf @@ -1817,45 +1379,43 @@ fi %dir %attr(0700, root, root) %{_localstatedir}/log/libvirt/libxl/ %dir %{_libdir}/%{name}/connection-driver %{_libdir}/%{name}/connection-driver/libvirt_driver_libxl.so - %endif +%endif - %if %{with_vbox} +%if %{with_vbox} %files daemon-driver-vbox %{_libdir}/%{name}/connection-driver/libvirt_driver_vbox.so - %endif - %endif # with_driver_modules +%endif - %if %{with_qemu} +%if %{with_qemu} %files daemon-qemu %doc %{_docdir}/%{name}/libvirt-daemon-qemu.README - %endif +%endif - %if %{with_lxc} +%if %{with_lxc} %files daemon-lxc %doc %{_docdir}/%{name}/libvirt-daemon-lxc.README - %endif +%endif - %if %{with_uml} +%if %{with_uml} %files daemon-uml %doc %{_docdir}/%{name}/libvirt-daemon-uml.README - %endif +%endif - %if %{with_xen} || %{with_libxl} +%if %{with_xen} || %{with_libxl} %files daemon-xen %doc %{_docdir}/%{name}/libvirt-daemon-xen.README - %endif +%endif - %if %{with_vbox} +%if %{with_vbox} %files daemon-vbox %doc %{_docdir}/%{name}/libvirt-daemon-vbox.README - %endif -%endif # with_libvirtd +%endif %files client -f %{name}.lang %doc AUTHORS ChangeLog.gz NEWS README COPYING COPYING.LESSER TODO @@ -1902,10 +1462,8 @@ fi %{_datadir}/libvirt/schemas/storagevol.rng %{_datadir}/libvirt/cpu_map.xml %{_datadir}/libvirt/libvirtLogo.png -%if %{with_sasl} %dir %{_sysconfdir}/sasl2/ %config(noreplace) %{_sysconfdir}/sasl2/libvirt.conf -%endif %files devel %{_libdir}/libvirt.so @@ -1962,10 +1520,7 @@ fi %{_libdir}/wireshark/plugins/libvirt.so %endif -%if %{with_nss_plugin} - %files nss %{_libdir}/libnss_libvirt.so.2 -%endif %changelog diff --git a/libvirtd-defaults.patch b/libvirtd-defaults.patch index ee8c32d..f55c0ba 100644 --- a/libvirtd-defaults.patch +++ b/libvirtd-defaults.patch @@ -1,7 +1,7 @@ -Index: libvirt-1.3.4/daemon/libvirtd.conf +Index: libvirt-1.3.5/daemon/libvirtd.conf =================================================================== ---- libvirt-1.3.4.orig/daemon/libvirtd.conf -+++ libvirt-1.3.4/daemon/libvirtd.conf +--- libvirt-1.3.5.orig/daemon/libvirtd.conf ++++ libvirt-1.3.5/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.3.4/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.3.4/daemon/libvirtd-config.c +Index: libvirt-1.3.5/daemon/libvirtd-config.c =================================================================== ---- libvirt-1.3.4.orig/daemon/libvirtd-config.c -+++ libvirt-1.3.4/daemon/libvirtd-config.c +--- libvirt-1.3.5.orig/daemon/libvirtd-config.c ++++ libvirt-1.3.5/daemon/libvirtd-config.c @@ -242,7 +242,7 @@ daemonConfigNew(bool privileged ATTRIBUT if (VIR_ALLOC(data) < 0) return NULL; @@ -26,10 +26,10 @@ Index: libvirt-1.3.4/daemon/libvirtd-config.c data->listen_tcp = 0; if (VIR_STRDUP(data->tls_port, LIBVIRTD_TLS_PORT) < 0 || -Index: libvirt-1.3.4/daemon/test_libvirtd.aug.in +Index: libvirt-1.3.5/daemon/test_libvirtd.aug.in =================================================================== ---- libvirt-1.3.4.orig/daemon/test_libvirtd.aug.in -+++ libvirt-1.3.4/daemon/test_libvirtd.aug.in +--- libvirt-1.3.5.orig/daemon/test_libvirtd.aug.in ++++ libvirt-1.3.5/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 844f513..960e813 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.3.4/daemon/libvirtd.sysconf +Index: libvirt-1.3.5/daemon/libvirtd.sysconf =================================================================== ---- libvirt-1.3.4.orig/daemon/libvirtd.sysconf -+++ libvirt-1.3.4/daemon/libvirtd.sysconf +--- libvirt-1.3.5.orig/daemon/libvirtd.sysconf ++++ libvirt-1.3.5/daemon/libvirtd.sysconf @@ -1,16 +1,25 @@ +## Path: System/Virtualization/libvirt + diff --git a/libxl-qemu-emulator-caps.patch b/libxl-qemu-emulator-caps.patch index f13f13d..5680b9a 100644 --- a/libxl-qemu-emulator-caps.patch +++ b/libxl-qemu-emulator-caps.patch @@ -8,10 +8,10 @@ as the default , instead of the qemu-xen one. See FATE#320638 for details. -Index: libvirt-1.3.4/src/libxl/libxl_conf.c +Index: libvirt-1.3.5/src/libxl/libxl_conf.c =================================================================== ---- libvirt-1.3.4.orig/src/libxl/libxl_conf.c -+++ libvirt-1.3.4/src/libxl/libxl_conf.c +--- libvirt-1.3.5.orig/src/libxl/libxl_conf.c ++++ libvirt-1.3.5/src/libxl/libxl_conf.c @@ -439,7 +439,7 @@ libxlCapsInitGuests(libxl_ctx *ctx, virC if ((guest = virCapabilitiesAddGuest(caps, guest_archs[i].hvm ? VIR_DOMAIN_OSTYPE_HVM : VIR_DOMAIN_OSTYPE_XEN, diff --git a/libxl-support-block-script.patch b/libxl-support-block-script.patch index de8476c..5772df8 100644 --- a/libxl-support-block-script.patch +++ b/libxl-support-block-script.patch @@ -7,10 +7,10 @@ and npiv. For more details, see bsc#954872 and FATE#319810 -Index: libvirt-1.3.4/src/libxl/libxl_conf.c +Index: libvirt-1.3.5/src/libxl/libxl_conf.c =================================================================== ---- libvirt-1.3.4.orig/src/libxl/libxl_conf.c -+++ libvirt-1.3.4/src/libxl/libxl_conf.c +--- libvirt-1.3.5.orig/src/libxl/libxl_conf.c ++++ libvirt-1.3.5/src/libxl/libxl_conf.c @@ -905,6 +905,25 @@ libxlDiskSetDiscard(libxl_device_disk *x } @@ -37,7 +37,7 @@ Index: libvirt-1.3.4/src/libxl/libxl_conf.c #define LIBXL_QEMU_DM_STR "Options specific to the Xen version:" int -@@ -1055,6 +1074,7 @@ libxlMakeNetworkDiskSrc(virStorageSource +@@ -1058,6 +1077,7 @@ libxlMakeNetworkDiskSrc(virStorageSource int libxlMakeDisk(virDomainDiskDefPtr l_disk, libxl_device_disk *x_disk) { @@ -45,7 +45,7 @@ Index: libvirt-1.3.4/src/libxl/libxl_conf.c const char *driver = virDomainDiskGetDriver(l_disk); int format = virDomainDiskGetFormat(l_disk); int actual_type = virStorageSourceGetActualType(l_disk->src); -@@ -1070,7 +1090,7 @@ libxlMakeDisk(virDomainDiskDefPtr l_disk +@@ -1073,7 +1093,7 @@ libxlMakeDisk(virDomainDiskDefPtr l_disk if (libxlMakeNetworkDiskSrc(l_disk->src, &x_disk->pdev_path) < 0) return -1; } else { @@ -54,7 +54,7 @@ Index: libvirt-1.3.4/src/libxl/libxl_conf.c return -1; } -@@ -1177,6 +1197,9 @@ libxlMakeDisk(virDomainDiskDefPtr l_disk +@@ -1180,6 +1200,9 @@ libxlMakeDisk(virDomainDiskDefPtr l_disk x_disk->is_cdrom = l_disk->device == VIR_DOMAIN_DISK_DEVICE_CDROM ? 1 : 0; if (libxlDiskSetDiscard(x_disk, l_disk->discard) < 0) return -1; diff --git a/lxc-wait-after-eth-del.patch b/lxc-wait-after-eth-del.patch index 1e4680c..64ac636 100644 --- a/lxc-wait-after-eth-del.patch +++ b/lxc-wait-after-eth-del.patch @@ -13,10 +13,10 @@ device with the same name that is being created. src/lxc/lxc_process.c | 1 + 3 files changed, 4 insertions(+) -Index: libvirt-1.3.4/src/lxc/lxc_controller.c +Index: libvirt-1.3.5/src/lxc/lxc_controller.c =================================================================== ---- libvirt-1.3.4.orig/src/lxc/lxc_controller.c -+++ libvirt-1.3.4/src/lxc/lxc_controller.c +--- libvirt-1.3.5.orig/src/lxc/lxc_controller.c ++++ libvirt-1.3.5/src/lxc/lxc_controller.c @@ -2009,6 +2009,7 @@ static int virLXCControllerDeleteInterfa if (virNetDevVethDelete(ctrl->veths[i]) < 0) ret = -1; @@ -25,19 +25,19 @@ Index: libvirt-1.3.4/src/lxc/lxc_controller.c return ret; } -Index: libvirt-1.3.4/src/lxc/lxc_driver.c +Index: libvirt-1.3.5/src/lxc/lxc_driver.c =================================================================== ---- libvirt-1.3.4.orig/src/lxc/lxc_driver.c -+++ libvirt-1.3.4/src/lxc/lxc_driver.c -@@ -4268,6 +4268,7 @@ lxcDomainAttachDeviceNetLive(virConnectP - case VIR_DOMAIN_NET_TYPE_BRIDGE: +--- libvirt-1.3.5.orig/src/lxc/lxc_driver.c ++++ libvirt-1.3.5/src/lxc/lxc_driver.c +@@ -4350,6 +4350,7 @@ lxcDomainAttachDeviceNetLive(virConnectP case VIR_DOMAIN_NET_TYPE_NETWORK: + case VIR_DOMAIN_NET_TYPE_ETHERNET: ignore_value(virNetDevVethDelete(veth)); + virFileWaitForDevices(); break; case VIR_DOMAIN_NET_TYPE_DIRECT: -@@ -4696,6 +4697,7 @@ lxcDomainDetachDeviceNetLive(virDomainOb +@@ -4779,6 +4780,7 @@ lxcDomainDetachDeviceNetLive(virDomainOb virDomainAuditNet(vm, detach, NULL, "detach", false); goto cleanup; } @@ -45,10 +45,10 @@ Index: libvirt-1.3.4/src/lxc/lxc_driver.c break; /* It'd be nice to support this, but with macvlan -Index: libvirt-1.3.4/src/lxc/lxc_process.c +Index: libvirt-1.3.5/src/lxc/lxc_process.c =================================================================== ---- libvirt-1.3.4.orig/src/lxc/lxc_process.c -+++ libvirt-1.3.4/src/lxc/lxc_process.c +--- libvirt-1.3.5.orig/src/lxc/lxc_process.c ++++ libvirt-1.3.5/src/lxc/lxc_process.c @@ -221,6 +221,7 @@ static void virLXCProcessCleanup(virLXCD } networkReleaseActualDevice(vm->def, iface); diff --git a/ppc64le-canonical-name.patch b/ppc64le-canonical-name.patch index 19da17b..ca1311e 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.3.4/src/util/virarch.c +Index: libvirt-1.3.5/src/util/virarch.c =================================================================== ---- libvirt-1.3.4.orig/src/util/virarch.c -+++ libvirt-1.3.4/src/util/virarch.c +--- libvirt-1.3.5.orig/src/util/virarch.c ++++ libvirt-1.3.5/src/util/virarch.c @@ -169,6 +169,8 @@ virArch virArchFromHost(void) arch = VIR_ARCH_I686; } else if (STREQ(ut.machine, "amd64")) { diff --git a/qemu-apparmor-screenshot.patch b/qemu-apparmor-screenshot.patch index de905c6..a6615bd 100644 --- a/qemu-apparmor-screenshot.patch +++ b/qemu-apparmor-screenshot.patch @@ -1,7 +1,7 @@ -Index: libvirt-1.3.4/examples/apparmor/libvirt-qemu +Index: libvirt-1.3.5/examples/apparmor/libvirt-qemu =================================================================== ---- libvirt-1.3.4.orig/examples/apparmor/libvirt-qemu -+++ libvirt-1.3.4/examples/apparmor/libvirt-qemu +--- libvirt-1.3.5.orig/examples/apparmor/libvirt-qemu ++++ libvirt-1.3.5/examples/apparmor/libvirt-qemu @@ -152,6 +152,9 @@ /sys/bus/ r, /sys/class/ r, diff --git a/support-managed-pci-xen-driver.patch b/support-managed-pci-xen-driver.patch index 4674f42..f05cd57 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.3.4/src/xenconfig/xen_common.c +Index: libvirt-1.3.5/src/xenconfig/xen_common.c =================================================================== ---- libvirt-1.3.4.orig/src/xenconfig/xen_common.c -+++ libvirt-1.3.4/src/xenconfig/xen_common.c +--- libvirt-1.3.5.orig/src/xenconfig/xen_common.c ++++ libvirt-1.3.5/src/xenconfig/xen_common.c @@ -394,6 +394,8 @@ xenParsePCI(virConfPtr conf, virDomainDe { virConfValuePtr list = virConfGetValue(conf, "pci"); @@ -58,7 +58,7 @@ Index: libvirt-1.3.4/src/xenconfig/xen_common.c + goto skippci; + } + - if (!(hostdev = virDomainHostdevDefAlloc())) + if (!(hostdev = virDomainHostdevDefAlloc(NULL))) return -1; - hostdev->managed = false; @@ -66,10 +66,10 @@ Index: libvirt-1.3.4/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.3.4/src/xenconfig/xen_sxpr.c +Index: libvirt-1.3.5/src/xenconfig/xen_sxpr.c =================================================================== ---- libvirt-1.3.4.orig/src/xenconfig/xen_sxpr.c -+++ libvirt-1.3.4/src/xenconfig/xen_sxpr.c +--- libvirt-1.3.5.orig/src/xenconfig/xen_sxpr.c ++++ libvirt-1.3.5/src/xenconfig/xen_sxpr.c @@ -1062,6 +1062,7 @@ xenParseSxprPCI(virDomainDefPtr def, int busID; int slotID; @@ -84,7 +84,7 @@ Index: libvirt-1.3.4/src/xenconfig/xen_sxpr.c + managed = sexpr_int(node, "dev/opts/managed"); + - if (!(dev = virDomainHostdevDefAlloc())) + if (!(dev = virDomainHostdevDefAlloc(NULL))) goto error; dev->mode = VIR_DOMAIN_HOSTDEV_MODE_SUBSYS; diff --git a/suse-qemu-conf.patch b/suse-qemu-conf.patch index 1dcaf1f..c811813 100644 --- a/suse-qemu-conf.patch +++ b/suse-qemu-conf.patch @@ -1,7 +1,7 @@ -Index: libvirt-1.3.4/src/qemu/qemu.conf +Index: libvirt-1.3.5/src/qemu/qemu.conf =================================================================== ---- libvirt-1.3.4.orig/src/qemu/qemu.conf -+++ libvirt-1.3.4/src/qemu/qemu.conf +--- libvirt-1.3.5.orig/src/qemu/qemu.conf ++++ libvirt-1.3.5/src/qemu/qemu.conf @@ -201,11 +201,20 @@ # isolation, but it cannot appear in a list of drivers. # diff --git a/systemd-service-xen.patch b/systemd-service-xen.patch index 301efa0..7671f0a 100644 --- a/systemd-service-xen.patch +++ b/systemd-service-xen.patch @@ -1,7 +1,7 @@ -Index: libvirt-1.3.4/daemon/libvirtd.service.in +Index: libvirt-1.3.5/daemon/libvirtd.service.in =================================================================== ---- libvirt-1.3.4.orig/daemon/libvirtd.service.in -+++ libvirt-1.3.4/daemon/libvirtd.service.in +--- libvirt-1.3.5.orig/daemon/libvirtd.service.in ++++ libvirt-1.3.5/daemon/libvirtd.service.in @@ -12,6 +12,7 @@ After=iscsid.service After=apparmor.service After=local-fs.target diff --git a/virtlockd-init-script.patch b/virtlockd-init-script.patch index 49efcae..9068497 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.3.4/src/locking/virtlockd.sysconf +Index: libvirt-1.3.5/src/locking/virtlockd.sysconf =================================================================== ---- libvirt-1.3.4.orig/src/locking/virtlockd.sysconf -+++ libvirt-1.3.4/src/locking/virtlockd.sysconf +--- libvirt-1.3.5.orig/src/locking/virtlockd.sysconf ++++ libvirt-1.3.5/src/locking/virtlockd.sysconf @@ -1,3 +1,7 @@ +## Path: System/Virtualization/virtlockd + @@ -12,10 +12,10 @@ Index: libvirt-1.3.4/src/locking/virtlockd.sysconf # # Pass extra arguments to virtlockd #VIRTLOCKD_ARGS= -Index: libvirt-1.3.4/src/locking/virtlockd.init.in +Index: libvirt-1.3.5/src/locking/virtlockd.init.in =================================================================== ---- libvirt-1.3.4.orig/src/locking/virtlockd.init.in -+++ libvirt-1.3.4/src/locking/virtlockd.init.in +--- libvirt-1.3.5.orig/src/locking/virtlockd.init.in ++++ libvirt-1.3.5/src/locking/virtlockd.init.in @@ -4,59 +4,57 @@ # http://refspecs.linuxfoundation.org/LSB_5.0.0/LSB-Core-generic/LSB-Core-generic/initscrcomconv.html # diff --git a/virtlogd-init-script.patch b/virtlogd-init-script.patch index e25e92e..4a645a3 100644 --- a/virtlogd-init-script.patch +++ b/virtlogd-init-script.patch @@ -1,9 +1,9 @@ Adjust virtlogd init files to conform to SUSE standards -Index: libvirt-1.3.4/src/logging/virtlogd.init.in +Index: libvirt-1.3.5/src/logging/virtlogd.init.in =================================================================== ---- libvirt-1.3.4.orig/src/logging/virtlogd.init.in -+++ libvirt-1.3.4/src/logging/virtlogd.init.in +--- libvirt-1.3.5.orig/src/logging/virtlogd.init.in ++++ libvirt-1.3.5/src/logging/virtlogd.init.in @@ -4,59 +4,56 @@ # http://refspecs.linuxfoundation.org/LSB_5.0.0/LSB-Core-generic/LSB-Core-generic/initscrcomconv.html # @@ -126,10 +126,10 @@ Index: libvirt-1.3.4/src/logging/virtlogd.init.in esac -exit $RETVAL +rc_exit -Index: libvirt-1.3.4/src/logging/virtlogd.sysconf +Index: libvirt-1.3.5/src/logging/virtlogd.sysconf =================================================================== ---- libvirt-1.3.4.orig/src/logging/virtlogd.sysconf -+++ libvirt-1.3.4/src/logging/virtlogd.sysconf +--- libvirt-1.3.5.orig/src/logging/virtlogd.sysconf ++++ libvirt-1.3.5/src/logging/virtlogd.sysconf @@ -1,3 +1,7 @@ +## Path: System/Virtualization/virtlogd + diff --git a/xen-pv-cdrom.patch b/xen-pv-cdrom.patch index 688a045..0e54885 100644 --- a/xen-pv-cdrom.patch +++ b/xen-pv-cdrom.patch @@ -1,7 +1,7 @@ -Index: libvirt-1.3.4/src/xenconfig/xen_sxpr.c +Index: libvirt-1.3.5/src/xenconfig/xen_sxpr.c =================================================================== ---- libvirt-1.3.4.orig/src/xenconfig/xen_sxpr.c -+++ libvirt-1.3.4/src/xenconfig/xen_sxpr.c +--- libvirt-1.3.5.orig/src/xenconfig/xen_sxpr.c ++++ libvirt-1.3.5/src/xenconfig/xen_sxpr.c @@ -392,7 +392,7 @@ xenParseSxprVifRate(const char *rate, un static int xenParseSxprDisks(virDomainDefPtr def, diff --git a/xen-sxpr-disk-type.patch b/xen-sxpr-disk-type.patch index df4e8f9..45ad60b 100644 --- a/xen-sxpr-disk-type.patch +++ b/xen-sxpr-disk-type.patch @@ -6,10 +6,10 @@ and 'file'. This was implicitly done prior to commit 9673418c. https://bugzilla.suse.com/show_bug.cgi?id=938228 -Index: libvirt-1.3.4/src/xenconfig/xen_sxpr.c +Index: libvirt-1.3.5/src/xenconfig/xen_sxpr.c =================================================================== ---- libvirt-1.3.4.orig/src/xenconfig/xen_sxpr.c -+++ libvirt-1.3.4/src/xenconfig/xen_sxpr.c +--- libvirt-1.3.5.orig/src/xenconfig/xen_sxpr.c ++++ libvirt-1.3.5/src/xenconfig/xen_sxpr.c @@ -506,10 +506,11 @@ xenParseSxprDisks(virDomainDefPtr def, omnipotent, we can revisit this, perhaps stat()'ing the src file in question */