From c626f4fb313801fc4a546fc44186101a76a0846fc682d9c9eb6d3b6717c4f254 Mon Sep 17 00:00:00 2001 From: James Fehlig Date: Thu, 5 Sep 2019 16:31:28 +0000 Subject: [PATCH] Accepting request 728569 from home:jfehlig:branches:Virtualization - Update to libvirt 5.7.0 - Experimental split of libvirtd into separate daemons - bsc#1145440, bsc#1145586 - Many incremental improvements and bug fixes, see https://libvirt.org/news.html - Dropped patches: 93c1d5fe-network-fix-ability-to-use-openvswitch-with-vlans.patch, blockcopy-check-dst-identical-device.patch, suse-libvirtd-service-xen.patch OBS-URL: https://build.opensuse.org/request/show/728569 OBS-URL: https://build.opensuse.org/package/show/Virtualization/libvirt?expand=0&rev=773 --- ...stats-functions-from-the-qemu-driver.patch | 62 ++--- ...ibxl-add-support-for-BlockResize-API.patch | 10 +- ...c-implement-connectGetAllDomainStats.patch | 6 +- ...bility-to-use-openvswitch-with-vlans.patch | 39 --- blockcopy-check-dst-identical-device.patch | 32 --- libvirt-5.6.0.tar.xz | 3 - libvirt-5.6.0.tar.xz.asc | 11 - libvirt-5.7.0.tar.xz | 3 + libvirt-5.7.0.tar.xz.asc | 11 + libvirt-power8-models.patch | 6 +- libvirt-suse-netcontrol.patch | 42 +-- libvirt.changes | 13 + libvirt.spec | 257 ++++++++++++++++-- libxl-dom-reset.patch | 8 +- libxl-set-cach-mode.patch | 6 +- libxl-set-migration-constraints.patch | 52 ++-- libxl-support-block-script.patch | 6 +- lxc-wait-after-eth-del.patch | 18 +- ...e-dhcp-authoritative-on-static-netwo.patch | 14 +- ppc64le-canonical-name.patch | 6 +- qemu-apparmor-screenshot.patch | 6 +- support-managed-pci-xen-driver.patch | 6 +- suse-apparmor-libnl-paths.patch | 18 +- suse-libvirt-guests-service.patch | 12 +- suse-libvirtd-disable-tls.patch | 49 ++-- suse-libvirtd-service-xen.patch | 22 -- suse-libvirtd-sysconfig-settings.patch | 18 +- suse-libxl-disable-autoballoon.patch | 12 +- suse-ovmf-paths.patch | 20 +- suse-qemu-conf.patch | 12 +- suse-virtlockd-sysconfig-settings.patch | 6 +- suse-virtlogd-sysconfig-settings.patch | 6 +- virt-create-rootfs.patch | 20 +- 33 files changed, 461 insertions(+), 351 deletions(-) delete mode 100644 93c1d5fe-network-fix-ability-to-use-openvswitch-with-vlans.patch delete mode 100644 blockcopy-check-dst-identical-device.patch delete mode 100644 libvirt-5.6.0.tar.xz delete mode 100644 libvirt-5.6.0.tar.xz.asc create mode 100644 libvirt-5.7.0.tar.xz create mode 100644 libvirt-5.7.0.tar.xz.asc delete mode 100644 suse-libvirtd-service-xen.patch diff --git a/0001-Extract-stats-functions-from-the-qemu-driver.patch b/0001-Extract-stats-functions-from-the-qemu-driver.patch index 52f406c..3108524 100644 --- a/0001-Extract-stats-functions-from-the-qemu-driver.patch +++ b/0001-Extract-stats-functions-from-the-qemu-driver.patch @@ -18,10 +18,10 @@ them. create mode 100644 src/conf/domain_stats.c create mode 100644 src/conf/domain_stats.h -Index: libvirt-5.6.0/src/conf/domain_stats.c +Index: libvirt-5.7.0/src/conf/domain_stats.c =================================================================== --- /dev/null -+++ libvirt-5.6.0/src/conf/domain_stats.c ++++ libvirt-5.7.0/src/conf/domain_stats.c @@ -0,0 +1,139 @@ +/* + * domain_stats.c: domain stats extraction helpers @@ -162,10 +162,10 @@ Index: libvirt-5.6.0/src/conf/domain_stats.c +} + +#undef STATS_ADD_NET_PARAM -Index: libvirt-5.6.0/src/conf/domain_stats.h +Index: libvirt-5.7.0/src/conf/domain_stats.h =================================================================== --- /dev/null -+++ libvirt-5.6.0/src/conf/domain_stats.h ++++ libvirt-5.7.0/src/conf/domain_stats.h @@ -0,0 +1,64 @@ +/* + * domain_stats.h: domain stats extraction helpers @@ -231,11 +231,11 @@ Index: libvirt-5.6.0/src/conf/domain_stats.h + int *maxparams); + +#endif /* __DOMAIN_STATS_H */ -Index: libvirt-5.6.0/src/libvirt_private.syms +Index: libvirt-5.7.0/src/libvirt_private.syms =================================================================== ---- libvirt-5.6.0.orig/src/libvirt_private.syms -+++ libvirt-5.6.0/src/libvirt_private.syms -@@ -694,6 +694,9 @@ virDomainConfNWFilterInstantiate; +--- libvirt-5.7.0.orig/src/libvirt_private.syms ++++ libvirt-5.7.0/src/libvirt_private.syms +@@ -695,6 +695,9 @@ virDomainConfNWFilterInstantiate; virDomainConfNWFilterTeardown; virDomainConfVMNWFilterTeardown; @@ -245,7 +245,7 @@ Index: libvirt-5.6.0/src/libvirt_private.syms # conf/interface_conf.h virInterfaceDefFormat; -@@ -1645,6 +1648,7 @@ virCgroupGetMemoryUsage; +@@ -1648,6 +1651,7 @@ virCgroupGetMemoryUsage; virCgroupGetMemSwapHardLimit; virCgroupGetMemSwapUsage; virCgroupGetPercpuStats; @@ -253,11 +253,11 @@ Index: libvirt-5.6.0/src/libvirt_private.syms virCgroupHasController; virCgroupHasEmptyTasks; virCgroupKillPainfully; -Index: libvirt-5.6.0/src/qemu/qemu_driver.c +Index: libvirt-5.7.0/src/qemu/qemu_driver.c =================================================================== ---- libvirt-5.6.0.orig/src/qemu/qemu_driver.c -+++ libvirt-5.6.0/src/qemu/qemu_driver.c -@@ -68,6 +68,7 @@ +--- libvirt-5.7.0.orig/src/qemu/qemu_driver.c ++++ libvirt-5.7.0/src/qemu/qemu_driver.c +@@ -67,6 +67,7 @@ #include "virarptable.h" #include "viruuid.h" #include "domain_conf.h" @@ -265,7 +265,7 @@ Index: libvirt-5.6.0/src/qemu/qemu_driver.c #include "domain_audit.h" #include "node_device_conf.h" #include "virpci.h" -@@ -20662,21 +20663,7 @@ qemuDomainGetStatsState(virQEMUDriverPtr +@@ -20767,21 +20768,7 @@ qemuDomainGetStatsState(virQEMUDriverPtr int *maxparams, unsigned int privflags ATTRIBUTE_UNUSED) { @@ -288,7 +288,7 @@ Index: libvirt-5.6.0/src/qemu/qemu_driver.c } -@@ -20866,37 +20853,7 @@ qemuDomainGetStatsCpuCgroup(virDomainObj +@@ -20998,37 +20985,7 @@ qemuDomainGetStatsCpuCgroup(virDomainObj int *maxparams) { qemuDomainObjPrivatePtr priv = dom->privateData; @@ -327,7 +327,7 @@ Index: libvirt-5.6.0/src/qemu/qemu_driver.c } -@@ -21092,44 +21049,6 @@ qemuDomainGetStatsVcpu(virQEMUDriverPtr +@@ -21224,44 +21181,6 @@ qemuDomainGetStatsVcpu(virQEMUDriverPtr return ret; } @@ -372,7 +372,7 @@ Index: libvirt-5.6.0/src/qemu/qemu_driver.c static int qemuDomainGetStatsInterface(virQEMUDriverPtr driver ATTRIBUTE_UNUSED, virDomainObjPtr dom, -@@ -21137,68 +21056,9 @@ qemuDomainGetStatsInterface(virQEMUDrive +@@ -21269,68 +21188,9 @@ qemuDomainGetStatsInterface(virQEMUDrive int *maxparams, unsigned int privflags ATTRIBUTE_UNUSED) { @@ -442,7 +442,7 @@ Index: libvirt-5.6.0/src/qemu/qemu_driver.c #define QEMU_ADD_BLOCK_PARAM_UI(record, maxparams, num, name, value) \ do { \ char param_name[VIR_TYPED_PARAM_FIELD_LENGTH]; \ -@@ -21431,10 +21291,10 @@ qemuDomainGetStatsBlockExportHeader(virD +@@ -21560,10 +21420,10 @@ qemuDomainGetStatsBlockExportHeader(virD { int ret = -1; @@ -455,7 +455,7 @@ Index: libvirt-5.6.0/src/qemu/qemu_driver.c if (src->id) QEMU_ADD_BLOCK_PARAM_UI(records, nrecords, recordnr, "backingIndex", src->id); -@@ -21588,7 +21448,7 @@ qemuDomainGetStatsBlock(virQEMUDriverPtr +@@ -21717,7 +21577,7 @@ qemuDomainGetStatsBlock(virQEMUDriverPtr * after the iteration than it is to iterate twice; but we still * want count listed first. */ count_index = record->nparams; @@ -464,7 +464,7 @@ Index: libvirt-5.6.0/src/qemu/qemu_driver.c for (i = 0; i < dom->def->ndisks; i++) { if (qemuDomainGetStatsBlockExportDisk(dom->def->disks[i], stats, nodestats, -@@ -21613,8 +21473,6 @@ qemuDomainGetStatsBlock(virQEMUDriverPtr +@@ -21742,8 +21602,6 @@ qemuDomainGetStatsBlock(virQEMUDriverPtr #undef QEMU_ADD_BLOCK_PARAM_ULL @@ -473,7 +473,7 @@ Index: libvirt-5.6.0/src/qemu/qemu_driver.c #define QEMU_ADD_IOTHREAD_PARAM_UI(record, maxparams, id, name, value) \ do { \ char param_name[VIR_TYPED_PARAM_FIELD_LENGTH]; \ -@@ -21666,7 +21524,7 @@ qemuDomainGetStatsIOThread(virQEMUDriver +@@ -21795,7 +21653,7 @@ qemuDomainGetStatsIOThread(virQEMUDriver if (niothreads == 0) return 0; @@ -482,7 +482,7 @@ Index: libvirt-5.6.0/src/qemu/qemu_driver.c for (i = 0; i < niothreads; i++) { if (iothreads[i]->poll_valid) { -@@ -21699,8 +21557,6 @@ qemuDomainGetStatsIOThread(virQEMUDriver +@@ -21828,8 +21686,6 @@ qemuDomainGetStatsIOThread(virQEMUDriver #undef QEMU_ADD_IOTHREAD_PARAM_ULL @@ -491,10 +491,10 @@ Index: libvirt-5.6.0/src/qemu/qemu_driver.c static int qemuDomainGetStatsPerfOneEvent(virPerfPtr perf, virPerfEventType type, -Index: libvirt-5.6.0/src/util/vircgroup.c +Index: libvirt-5.7.0/src/util/vircgroup.c =================================================================== ---- libvirt-5.6.0.orig/src/util/vircgroup.c -+++ libvirt-5.6.0/src/util/vircgroup.c +--- libvirt-5.7.0.orig/src/util/vircgroup.c ++++ libvirt-5.7.0/src/util/vircgroup.c @@ -2791,6 +2791,44 @@ virCgroupControllerAvailable(int control return ret; } @@ -556,10 +556,10 @@ Index: libvirt-5.6.0/src/util/vircgroup.c int virCgroupNewPartition(const char *path ATTRIBUTE_UNUSED, bool create ATTRIBUTE_UNUSED, -Index: libvirt-5.6.0/src/util/vircgroup.h +Index: libvirt-5.7.0/src/util/vircgroup.h =================================================================== ---- libvirt-5.6.0.orig/src/util/vircgroup.h -+++ libvirt-5.6.0/src/util/vircgroup.h +--- libvirt-5.7.0.orig/src/util/vircgroup.h ++++ libvirt-5.7.0/src/util/vircgroup.h @@ -285,3 +285,7 @@ int virCgroupSetOwner(virCgroupPtr cgrou int virCgroupHasEmptyTasks(virCgroupPtr cgroup, int controller); @@ -568,10 +568,10 @@ Index: libvirt-5.6.0/src/util/vircgroup.h +int virCgroupGetStatsCpu(virCgroupPtr cgroup, + virDomainStatsRecordPtr record, + int *maxparams); -Index: libvirt-5.6.0/src/conf/Makefile.inc.am +Index: libvirt-5.7.0/src/conf/Makefile.inc.am =================================================================== ---- libvirt-5.6.0.orig/src/conf/Makefile.inc.am -+++ libvirt-5.6.0/src/conf/Makefile.inc.am +--- libvirt-5.7.0.orig/src/conf/Makefile.inc.am ++++ libvirt-5.7.0/src/conf/Makefile.inc.am @@ -26,6 +26,8 @@ DOMAIN_CONF_SOURCES = \ conf/domain_audit.h \ conf/domain_nwfilter.c \ diff --git a/0001-libxl-add-support-for-BlockResize-API.patch b/0001-libxl-add-support-for-BlockResize-API.patch index 332814e..0b7a435 100644 --- a/0001-libxl-add-support-for-BlockResize-API.patch +++ b/0001-libxl-add-support-for-BlockResize-API.patch @@ -19,11 +19,11 @@ reworking this patch and submitting it to upstream libvirt. src/libxl/libxl_driver.c | 91 ++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 91 insertions(+) -Index: libvirt-5.6.0/src/libxl/libxl_driver.c +Index: libvirt-5.7.0/src/libxl/libxl_driver.c =================================================================== ---- libvirt-5.6.0.orig/src/libxl/libxl_driver.c -+++ libvirt-5.6.0/src/libxl/libxl_driver.c -@@ -5280,6 +5280,97 @@ libxlDomainMemoryStats(virDomainPtr dom, +--- libvirt-5.7.0.orig/src/libxl/libxl_driver.c ++++ libvirt-5.7.0/src/libxl/libxl_driver.c +@@ -5290,6 +5290,97 @@ libxlDomainMemoryStats(virDomainPtr dom, #undef LIBXL_SET_MEMSTAT @@ -121,7 +121,7 @@ Index: libvirt-5.6.0/src/libxl/libxl_driver.c static int libxlDomainGetJobInfo(virDomainPtr dom, virDomainJobInfoPtr info) -@@ -6664,6 +6755,7 @@ static virHypervisorDriver libxlHypervis +@@ -6738,6 +6829,7 @@ static virHypervisorDriver libxlHypervis #endif .nodeGetFreeMemory = libxlNodeGetFreeMemory, /* 0.9.0 */ .nodeGetCellsFreeMemory = libxlNodeGetCellsFreeMemory, /* 1.1.1 */ diff --git a/0002-lxc-implement-connectGetAllDomainStats.patch b/0002-lxc-implement-connectGetAllDomainStats.patch index 6c89c45..2e74110 100644 --- a/0002-lxc-implement-connectGetAllDomainStats.patch +++ b/0002-lxc-implement-connectGetAllDomainStats.patch @@ -9,10 +9,10 @@ them using the existing API. src/lxc/lxc_driver.c | 138 +++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 138 insertions(+) -Index: libvirt-5.6.0/src/lxc/lxc_driver.c +Index: libvirt-5.7.0/src/lxc/lxc_driver.c =================================================================== ---- libvirt-5.6.0.orig/src/lxc/lxc_driver.c -+++ libvirt-5.6.0/src/lxc/lxc_driver.c +--- libvirt-5.7.0.orig/src/lxc/lxc_driver.c ++++ libvirt-5.7.0/src/lxc/lxc_driver.c @@ -75,6 +75,7 @@ #include "viraccessapichecklxc.h" #include "virhostdev.h" diff --git a/93c1d5fe-network-fix-ability-to-use-openvswitch-with-vlans.patch b/93c1d5fe-network-fix-ability-to-use-openvswitch-with-vlans.patch deleted file mode 100644 index 47a1115..0000000 --- a/93c1d5fe-network-fix-ability-to-use-openvswitch-with-vlans.patch +++ /dev/null @@ -1,39 +0,0 @@ -From 93c1d5fe7bb7a62ef884eb41b505b2809d1704b6 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= -Date: Thu, 8 Aug 2019 13:42:24 +0100 -Subject: [PATCH] network: fix ability to use openvswitch with vlans -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -Use the correct enum constant when validating vlan usage. -This fixes a merge error in - - commit 6cb0ec48bd95c95489a987e05a88e8bcf1f9109c - Author: Daniel P. Berrangé - Date: Mon Sep 3 17:34:22 2018 +0100 - - network: convert networkAllocateActualDevice to virNetworkPortDef - -Reviewed-by: Michal Privoznik -Signed-off-by: Daniel P. Berrangé ---- - src/network/bridge_driver.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/src/network/bridge_driver.c b/src/network/bridge_driver.c -index 41fa89a..72e1186 100644 ---- a/src/network/bridge_driver.c -+++ b/src/network/bridge_driver.c -@@ -4814,7 +4814,7 @@ networkAllocatePort(virNetworkObjPtr obj, - if (!(port->plugtype == VIR_NETWORK_PORT_PLUG_TYPE_HOSTDEV_PCI || - (port->plugtype == VIR_NETWORK_PORT_PLUG_TYPE_DIRECT && - port->plug.direct.mode == VIR_NETDEV_MACVLAN_MODE_PASSTHRU) || -- (port->plugtype == VIR_DOMAIN_NET_TYPE_BRIDGE && -+ (port->plugtype == VIR_NETWORK_PORT_PLUG_TYPE_BRIDGE && - port->virtPortProfile && - port->virtPortProfile->virtPortType == VIR_NETDEV_VPORT_PROFILE_OPENVSWITCH))) { - virReportError(VIR_ERR_CONFIG_UNSUPPORTED, --- -2.22.0 - diff --git a/blockcopy-check-dst-identical-device.patch b/blockcopy-check-dst-identical-device.patch deleted file mode 100644 index 4939574..0000000 --- a/blockcopy-check-dst-identical-device.patch +++ /dev/null @@ -1,32 +0,0 @@ -From 475b272c126d53f3985860422dc96b01b470423e Mon Sep 17 00:00:00 2001 -From: Chunyan Liu -Date: Tue, 29 Jul 2014 17:31:28 +0800 -Subject: [PATCH] blockcopy: check dst = identical device - -Check whether dst is the same device as source, if yes, report -error and exit. - -Signed-off-by: Chunyan Liu ---- - src/qemu/qemu_driver.c | 7 +++++++ - 1 file changed, 7 insertions(+) - -Index: libvirt-5.6.0/src/qemu/qemu_driver.c -=================================================================== ---- libvirt-5.6.0.orig/src/qemu/qemu_driver.c -+++ libvirt-5.6.0/src/qemu/qemu_driver.c -@@ -18403,6 +18403,14 @@ qemuDomainBlockCopyCommon(virDomainObjPt - goto endjob; - } - -+ if (STREQ_NULLABLE(realpath(disk->src->path, NULL), -+ realpath(mirror->path, NULL))) { -+ virReportError(VIR_ERR_INVALID_ARG, -+ _("destination '%s' is the same as disk '%s' source"), -+ mirror->path, path); -+ goto endjob; -+ } -+ - if (qemuDomainStorageFileInit(driver, vm, mirror, NULL) < 0) - goto endjob; - diff --git a/libvirt-5.6.0.tar.xz b/libvirt-5.6.0.tar.xz deleted file mode 100644 index 0f1bd7d..0000000 --- a/libvirt-5.6.0.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:65f4f9924e10135aa694ca8bcb0b55725883d08e0b32c42111603d573aabb9b4 -size 13147976 diff --git a/libvirt-5.6.0.tar.xz.asc b/libvirt-5.6.0.tar.xz.asc deleted file mode 100644 index c7540a6..0000000 --- a/libvirt-5.6.0.tar.xz.asc +++ /dev/null @@ -1,11 +0,0 @@ ------BEGIN PGP SIGNATURE----- - -iQEzBAABCAAdFiEE20ZoG7ka3OoXD6LUFViLJllr6l0FAl1IZMkACgkQFViLJllr -6l377ggA0/nhSYP9gyfo/KD4jvwuwEVDWMD96kjqxHV9N/Sc8jN03T0k0BUIYJvC -gEFeMIm/e4pxEmQO/fHwTQabM4raccVV/dXMP3FIK7oPJz7lf+x/qCeE15umgmjY -OcGKOy/6pco04MBFUu3ULnC6dZZLTSVrS+yw27vJNRJoB74TqbpvXGOUDkdlDvJP -eWlc2ssBo0st1Ew0tH+Gp9Wmk4tE9ygN2OU2nlxS/V9s1XAGLi+nuj2SNU9FX6pr -3E7xv52FnwOddMnPwUJTT5LByDW+WL3ci5XcQ/JMXj74k3U70mrKKiEeCsNkFPoH -PIX+frHu9OXEyjy2MlljH6bST1G9Wg== -=YV5i ------END PGP SIGNATURE----- diff --git a/libvirt-5.7.0.tar.xz b/libvirt-5.7.0.tar.xz new file mode 100644 index 0000000..da24952 --- /dev/null +++ b/libvirt-5.7.0.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:7e91f23574c73f0da8812917922d45af1044dbe31d2526aa34e2ff29bfef62e0 +size 13235904 diff --git a/libvirt-5.7.0.tar.xz.asc b/libvirt-5.7.0.tar.xz.asc new file mode 100644 index 0000000..2966956 --- /dev/null +++ b/libvirt-5.7.0.tar.xz.asc @@ -0,0 +1,11 @@ +-----BEGIN PGP SIGNATURE----- + +iQEzBAABCAAdFiEE20ZoG7ka3OoXD6LUFViLJllr6l0FAl1uhdgACgkQFViLJllr +6l0KNQgAlGxX8floI0ZHRtgeqe2mLE548yVnQBz7OHFsFDPSn3DdnLB3vMXe77iP +Bp7T3T7a7O6UqRvrYvcHsFP/UaNQcMvxdljB2M+QNifFRVS/Qbg2M3QZV65xsIaX +EhxmxX4lzIufNu0jUpVUq31kSzgIszzCZBR4UxjE5NB1uD88EbRwEcGFwnVHiPVx +ARUyamKZkT/ugptqRcrM6rC2wwEdXXWa4COGXXVXCJh3UefQyqyxk+iyMtsC0Qde +J5buwnrTwSdRRBZTL90t4c1bcZ130zqrDMvWPGywZ3KAgyk8BVbycqPBtnI4kAvZ +XPfoRg1qn6ppnfuH6aVF2osQ9MkPqg== +=YxDo +-----END PGP SIGNATURE----- diff --git a/libvirt-power8-models.patch b/libvirt-power8-models.patch index 06da996..b996b62 100644 --- a/libvirt-power8-models.patch +++ b/libvirt-power8-models.patch @@ -2,10 +2,10 @@ Add POWER8 v2.0 and v2.1 to cpu map XML From: -Index: libvirt-5.6.0/src/cpu_map/ppc64_POWER8.xml +Index: libvirt-5.7.0/src/cpu_map/ppc64_POWER8.xml =================================================================== ---- libvirt-5.6.0.orig/src/cpu_map/ppc64_POWER8.xml -+++ libvirt-5.6.0/src/cpu_map/ppc64_POWER8.xml +--- libvirt-5.7.0.orig/src/cpu_map/ppc64_POWER8.xml ++++ libvirt-5.7.0/src/cpu_map/ppc64_POWER8.xml @@ -4,5 +4,7 @@ diff --git a/libvirt-suse-netcontrol.patch b/libvirt-suse-netcontrol.patch index 5f36d98..1f205b2 100644 --- a/libvirt-suse-netcontrol.patch +++ b/libvirt-suse-netcontrol.patch @@ -1,8 +1,8 @@ -Index: libvirt-5.6.0/configure.ac +Index: libvirt-5.7.0/configure.ac =================================================================== ---- libvirt-5.6.0.orig/configure.ac -+++ libvirt-5.6.0/configure.ac -@@ -261,6 +261,7 @@ LIBVIRT_ARG_LIBSSH +--- libvirt-5.7.0.orig/configure.ac ++++ libvirt-5.7.0/configure.ac +@@ -285,6 +285,7 @@ LIBVIRT_ARG_LIBSSH LIBVIRT_ARG_LIBXML LIBVIRT_ARG_MACVTAP LIBVIRT_ARG_NETCF @@ -10,7 +10,7 @@ Index: libvirt-5.6.0/configure.ac LIBVIRT_ARG_NLS LIBVIRT_ARG_NSS LIBVIRT_ARG_NUMACTL -@@ -304,6 +305,7 @@ LIBVIRT_CHECK_LIBSSH +@@ -328,6 +329,7 @@ LIBVIRT_CHECK_LIBSSH LIBVIRT_CHECK_LIBXML LIBVIRT_CHECK_MACVTAP LIBVIRT_CHECK_NETCF @@ -18,7 +18,7 @@ Index: libvirt-5.6.0/configure.ac LIBVIRT_CHECK_NLS LIBVIRT_CHECK_NUMACTL LIBVIRT_CHECK_NWFILTER -@@ -988,6 +990,7 @@ LIBVIRT_RESULT_LIBXL +@@ -1025,6 +1027,7 @@ LIBVIRT_RESULT_LIBXL LIBVIRT_RESULT_LIBXML LIBVIRT_RESULT_MACVTAP LIBVIRT_RESULT_NETCF @@ -26,10 +26,10 @@ Index: libvirt-5.6.0/configure.ac LIBVIRT_RESULT_NLS LIBVIRT_RESULT_NSS LIBVIRT_RESULT_NUMACTL -Index: libvirt-5.6.0/tools/virsh.c +Index: libvirt-5.7.0/tools/virsh.c =================================================================== ---- libvirt-5.6.0.orig/tools/virsh.c -+++ libvirt-5.6.0/tools/virsh.c +--- libvirt-5.7.0.orig/tools/virsh.c ++++ libvirt-5.7.0/tools/virsh.c @@ -561,6 +561,8 @@ virshShowVersion(vshControl *ctl ATTRIBU vshPrint(ctl, " Interface"); # if defined(WITH_NETCF) @@ -39,10 +39,10 @@ Index: libvirt-5.6.0/tools/virsh.c # elif defined(WITH_UDEV) vshPrint(ctl, " udev"); # endif -Index: libvirt-5.6.0/src/interface/interface_backend_netcf.c +Index: libvirt-5.7.0/src/interface/interface_backend_netcf.c =================================================================== ---- libvirt-5.6.0.orig/src/interface/interface_backend_netcf.c -+++ libvirt-5.6.0/src/interface/interface_backend_netcf.c +--- libvirt-5.7.0.orig/src/interface/interface_backend_netcf.c ++++ libvirt-5.7.0/src/interface/interface_backend_netcf.c @@ -21,7 +21,12 @@ #include @@ -117,7 +117,7 @@ Index: libvirt-5.6.0/src/interface/interface_backend_netcf.c + * TODO: finer-grained check? E.g. is_nm_enabled() + */ + if (ncf_init(&netcf, NULL) != 0) { -+ VIR_WARN("Failed to intialize libnetcontrol. Management of interface devices is disabled"); ++ VIR_WARN("Failed to initialize libnetcontrol. Management of interface devices is disabled"); + return 0; + } + @@ -126,10 +126,10 @@ Index: libvirt-5.6.0/src/interface/interface_backend_netcf.c if (virRegisterConnectDriver(&interfaceConnectDriver, false) < 0) return -1; if (virSetSharedInterfaceDriver(&interfaceDriver) < 0) -Index: libvirt-5.6.0/src/interface/interface_driver.c +Index: libvirt-5.7.0/src/interface/interface_driver.c =================================================================== ---- libvirt-5.6.0.orig/src/interface/interface_driver.c -+++ libvirt-5.6.0/src/interface/interface_driver.c +--- libvirt-5.7.0.orig/src/interface/interface_driver.c ++++ libvirt-5.7.0/src/interface/interface_driver.c @@ -30,8 +30,15 @@ interfaceRegister(void) if (netcfIfaceRegister() == 0) return 0; @@ -147,10 +147,10 @@ Index: libvirt-5.6.0/src/interface/interface_driver.c if (udevIfaceRegister() == 0) return 0; #endif /* WITH_UDEV */ -Index: libvirt-5.6.0/m4/virt-netcontrol.m4 +Index: libvirt-5.7.0/m4/virt-netcontrol.m4 =================================================================== --- /dev/null -+++ libvirt-5.6.0/m4/virt-netcontrol.m4 ++++ libvirt-5.7.0/m4/virt-netcontrol.m4 @@ -0,0 +1,39 @@ +dnl The libnetcontrol library +dnl @@ -191,10 +191,10 @@ Index: libvirt-5.6.0/m4/virt-netcontrol.m4 +AC_DEFUN([LIBVIRT_RESULT_NETCONTROL],[ + LIBVIRT_RESULT_LIB([NETCONTROL]) +]) -Index: libvirt-5.6.0/src/interface/Makefile.inc.am +Index: libvirt-5.7.0/src/interface/Makefile.inc.am =================================================================== ---- libvirt-5.6.0.orig/src/interface/Makefile.inc.am -+++ libvirt-5.6.0/src/interface/Makefile.inc.am +--- libvirt-5.7.0.orig/src/interface/Makefile.inc.am ++++ libvirt-5.7.0/src/interface/Makefile.inc.am @@ -6,6 +6,7 @@ INTERFACE_DRIVER_SOURCES = \ $(NULL) diff --git a/libvirt.changes b/libvirt.changes index 6c89d43..cb031ee 100644 --- a/libvirt.changes +++ b/libvirt.changes @@ -1,3 +1,16 @@ +------------------------------------------------------------------- +Wed Sep 4 20:54:24 UTC 2019 - James Fehlig + +- Update to libvirt 5.7.0 + - Experimental split of libvirtd into separate daemons + - bsc#1145440, bsc#1145586 + - Many incremental improvements and bug fixes, see + https://libvirt.org/news.html + - Dropped patches: + 93c1d5fe-network-fix-ability-to-use-openvswitch-with-vlans.patch, + blockcopy-check-dst-identical-device.patch, + suse-libvirtd-service-xen.patch + ------------------------------------------------------------------- Thu Aug 15 19:54:20 UTC 2019 - Martin Wilck diff --git a/libvirt.spec b/libvirt.spec index f565ece..ec0c3cc 100644 --- a/libvirt.spec +++ b/libvirt.spec @@ -183,7 +183,7 @@ Name: libvirt Url: http://libvirt.org/ -Version: 5.6.0 +Version: 5.7.0 Release: 0 Summary: Library providing a virtualization API License: LGPL-2.1-or-later @@ -337,35 +337,32 @@ Source6: libvirtd-relocation-server.xml Source99: baselibs.conf Source100: %{name}-rpmlintrc # Upstream patches -Patch0: 93c1d5fe-network-fix-ability-to-use-openvswitch-with-vlans.patch # Patches pending upstream review Patch100: libxl-dom-reset.patch Patch101: network-don-t-use-dhcp-authoritative-on-static-netwo.patch # Need to go upstream -Patch150: blockcopy-check-dst-identical-device.patch -Patch151: libvirt-power8-models.patch -Patch152: ppc64le-canonical-name.patch -Patch153: libxl-set-migration-constraints.patch -Patch154: libxl-set-cach-mode.patch -Patch155: 0001-Extract-stats-functions-from-the-qemu-driver.patch -Patch156: 0002-lxc-implement-connectGetAllDomainStats.patch -Patch157: 0001-libxl-add-support-for-BlockResize-API.patch +Patch150: libvirt-power8-models.patch +Patch151: ppc64le-canonical-name.patch +Patch152: libxl-set-migration-constraints.patch +Patch153: libxl-set-cach-mode.patch +Patch154: 0001-Extract-stats-functions-from-the-qemu-driver.patch +Patch155: 0002-lxc-implement-connectGetAllDomainStats.patch +Patch156: 0001-libxl-add-support-for-BlockResize-API.patch # Our patches Patch200: suse-libvirtd-disable-tls.patch Patch201: suse-libvirtd-sysconfig-settings.patch Patch202: suse-libvirt-guests-service.patch Patch203: suse-virtlockd-sysconfig-settings.patch Patch204: suse-virtlogd-sysconfig-settings.patch -Patch205: suse-libvirtd-service-xen.patch -Patch206: suse-qemu-conf.patch -Patch207: suse-ovmf-paths.patch -Patch208: suse-apparmor-libnl-paths.patch -Patch209: support-managed-pci-xen-driver.patch -Patch210: libxl-support-block-script.patch -Patch211: qemu-apparmor-screenshot.patch -Patch212: libvirt-suse-netcontrol.patch -Patch213: lxc-wait-after-eth-del.patch -Patch214: suse-libxl-disable-autoballoon.patch +Patch205: suse-qemu-conf.patch +Patch206: suse-ovmf-paths.patch +Patch207: suse-apparmor-libnl-paths.patch +Patch208: support-managed-pci-xen-driver.patch +Patch209: libxl-support-block-script.patch +Patch210: qemu-apparmor-screenshot.patch +Patch211: libvirt-suse-netcontrol.patch +Patch212: lxc-wait-after-eth-del.patch +Patch213: suse-libxl-disable-autoballoon.patch # SLES-Only patches %if ! 0%{?is_opensuse} Patch400: virt-create-rootfs.patch @@ -870,7 +867,6 @@ libvirt plugin for NSS for translating domain names into IP addresses. %prep %setup -q -%patch0 -p1 %patch100 -p1 %patch101 -p1 %patch150 -p1 @@ -880,7 +876,6 @@ libvirt plugin for NSS for translating domain names into IP addresses. %patch154 -p1 %patch155 -p1 %patch156 -p1 -%patch157 -p1 %patch200 -p1 %patch201 -p1 %patch202 -p1 @@ -895,7 +890,6 @@ libvirt plugin for NSS for translating domain names into IP addresses. %patch211 -p1 %patch212 -p1 %patch213 -p1 -%patch214 -p1 %if ! 0%{?is_opensuse} %patch400 -p1 %endif @@ -1024,6 +1018,7 @@ autoreconf -f -i export CFLAGS="%{optflags}" export PYTHON=%{_bindir}/python3 %configure --disable-static \ + --with-runstatedir=%{_rundir} \ %{?arg_qemu} \ %{?arg_openvz} \ %{?arg_lxc} \ @@ -1039,6 +1034,7 @@ export PYTHON=%{_bindir}/python3 --without-xenapi \ --without-vz \ --without-bhyve \ + --with-remote-default-mode=legacy \ --with-interface \ --with-network \ --with-storage-fs \ @@ -1249,7 +1245,7 @@ fi %if %{with_firewalld} %firewalld_reload %endif -%service_add_post libvirtd.service libvirtd.socket libvirtd-ro.socket libvirtd-admin.socket libvirtd-tcp.socket libvirtd-tls.socket virtlockd.service virtlockd.socket virtlogd.service virtlogd.socket virtlockd-admin.socket virtlogd-admin.socket +%service_add_post libvirtd.service libvirtd.socket libvirtd-ro.socket libvirtd-admin.socket libvirtd-tcp.socket libvirtd-tls.socket virtlockd.service virtlockd.socket virtlogd.service virtlogd.socket virtlockd-admin.socket virtlogd-admin.socket virtproxyd.service virtproxyd.socket virtproxyd-ro.socket virtproxyd-admin.socket virtproxyd-tcp.socket virtproxyd-tls.socket %{fillup_only -n libvirtd} %{fillup_only -n virtlockd} %{fillup_only -n virtlogd} @@ -1266,7 +1262,7 @@ if test $1 -eq 0 ; then done /usr/bin/systemctl daemon-reload >/dev/null 2>&1 || : fi - %service_del_postun libvirtd.service virtlockd.service virtlockd.socket virtlogd.service virtlogd.socket virtlockd-admin.socket virtlogd-admin.socket +%service_del_postun libvirtd.service virtlockd.service virtlockd.socket virtlogd.service virtlogd.socket virtlockd-admin.socket virtlogd-admin.socket %posttrans daemon # All connection drivers should be installed post transaction. @@ -1287,12 +1283,23 @@ if test "$YAST_IS_RUNNING" != "instsys" -a "$DISABLE_RESTART_ON_UPDATE" != yes ; fi fi -%if %{with_firewalld_zone} +%pre daemon-driver-network +%service_add_pre virtnetworkd.service virtnetworkd.socket virtnetworkd-ro.socket virtnetworkd-admin.socket + %post daemon-driver-network -%firewalld_reload +%service_add_post virtnetworkd.service virtnetworkd.socket virtnetworkd-ro.socket virtnetworkd-admin.socket +%{fillup_only -n virtnetworkd} +%if %{with_firewalld_zone} + %firewalld_reload +%endif + +%preun daemon-driver-network +%service_del_preun virtnetworkd.service virtnetworkd.socket virtnetworkd-ro.socket virtnetworkd-admin.socket %postun daemon-driver-network -%firewalld_reload +%service_del_postun virtnetworkd.service virtnetworkd.socket virtnetworkd-ro.socket virtnetworkd-admin.socket +%if %{with_firewalld_zone} + %firewalld_reload %endif %post daemon-config-network @@ -1306,6 +1313,110 @@ if test $1 -eq 1 && test ! -f %{_sysconfdir}/%{name}/qemu/networks/default.xml ; chmod 0600 %{_sysconfdir}/libvirt/qemu/networks/default.xml fi +%pre daemon-driver-nwfilter +%service_add_pre virtnwfilterd.service virtnwfilterd.socket virtnwfilterd-ro.socket virtnwfilterd-admin.socket + +%post daemon-driver-nwfilter +%service_add_post virtnwfilterd.service virtnwfilterd.socket virtnwfilterd-ro.socket virtnwfilterd-admin.socket +%{fillup_only -n virtnwfilterd} + +%preun daemon-driver-nwfilter +%service_del_preun virtnwfilterd.service virtnwfilterd.socket virtnwfilterd-ro.socket virtnwfilterd-admin.socket + +%postun daemon-driver-nwfilter +%service_del_postun virtnwfilterd.service virtnwfilterd.socket virtnwfilterd-ro.socket virtnwfilterd-admin.socket + +%pre daemon-driver-storage +%service_add_pre virtstoraged.service virtstoraged.socket virtstoraged-ro.socket virtstoraged-admin.socket + +%post daemon-driver-storage +%service_add_post virtstoraged.service virtstoraged.socket virtstoraged-ro.socket virtstoraged-admin.socket +%{fillup_only -n virtstoraged} + +%preun daemon-driver-storage +%service_del_preun virtstoraged.service virtstoraged.socket virtstoraged-ro.socket virtstoraged-admin.socket + +%postun daemon-driver-storage +%service_del_postun virtstoraged.service virtstoraged.socket virtstoraged-ro.socket virtstoraged-admin.socket + +%pre daemon-driver-interface +%service_add_pre virtinterfaced.service virtinterfaced.socket virtinterfaced-ro.socket virtinterfaced-admin.socket + +%post daemon-driver-interface +%service_add_post virtinterfaced.service virtinterfaced.socket virtinterfaced-ro.socket virtinterfaced-admin.socket +%{fillup_only -n virtinterfaced} + +%preun daemon-driver-interface +%service_del_preun virtinterfaced.service virtinterfaced.socket virtinterfaced-ro.socket virtinterfaced-admin.socket + +%postun daemon-driver-interface +%service_del_postun virtinterfaced.service virtinterfaced.socket virtinterfaced-ro.socket virtinterfaced-admin.socket + +%pre daemon-driver-nodedev +%service_add_pre virtnodedevd.service virtnodedevd.socket virtnodedevd-ro.socket virtnodedevd-admin.socket + +%post daemon-driver-nodedev +%service_add_post virtnodedevd.service virtnodedevd.socket virtnodedevd-ro.socket virtnodedevd-admin.socket +%{fillup_only -n virtnodedevd} + +%preun daemon-driver-nodedev +%service_del_preun virtnodedevd.service virtnodedevd.socket virtnodedevd-ro.socket virtnodedevd-admin.socket + +%postun daemon-driver-nodedev +%service_del_postun virtnodedevd.service virtnodedevd.socket virtnodedevd-ro.socket virtnodedevd-admin.socket + +%pre daemon-driver-secret +%service_add_pre virtsecretd.service virtsecretd.socket virtsecretd-ro.socket virtsecretd-admin.socket + +%post daemon-driver-secret +%service_add_post virtsecretd.service virtsecretd.socket virtsecretd-ro.socket virtsecretd-admin.socket +%{fillup_only -n virtsecretd} + +%preun daemon-driver-secret +%service_del_preun virtsecretd.service virtsecretd.socket virtsecretd-ro.socket virtsecretd-admin.socket + +%postun daemon-driver-secret +%service_del_postun virtsecretd.service virtsecretd.socket virtsecretd-ro.socket virtsecretd-admin.socket + +%pre daemon-driver-qemu +%service_add_pre virtqemud.service virtqemud.socket virtqemud-ro.socket virtqemud-admin.socket + +%post daemon-driver-qemu +%service_add_post virtqemud.service virtqemud.socket virtqemud-ro.socket virtqemud-admin.socket +%{fillup_only -n virtqemud} + +%preun daemon-driver-qemu +%service_del_preun virtqemud.service virtqemud.socket virtqemud-ro.socket virtqemud-admin.socket + +%postun daemon-driver-qemu +%service_del_postun virtqemud.service virtqemud.socket virtqemud-ro.socket virtqemud-admin.socket + +%pre daemon-driver-lxc +%service_add_pre virtlxcd.service virtlxcd.socket virtlxcd-ro.socket virtlxcd-admin.socket + +%post daemon-driver-lxc +%service_add_post virtlxcd.service virtlxcd.socket virtlxcd-ro.socket virtlxcd-admin.socket +%{fillup_only -n virtlxcd} + +%preun daemon-driver-lxc +%service_del_preun virtlxcd.service virtlxcd.socket virtlxcd-ro.socket virtlxcd-admin.socket + +%postun daemon-driver-lxc +%service_del_postun virtlxcd.service virtlxcd.socket virtlxcd-ro.socket virtlxcd-admin.socket + +%pre daemon-driver-libxl +%service_add_pre virtxend.service virtxend.socket virtxend-ro.socket virtxend-admin.socket + +%post daemon-driver-libxl +%service_add_post virtxend.service virtxend.socket virtxend-ro.socket virtxend-admin.socket +%{fillup_only -n virtxend} + +%preun daemon-driver-libxl +%service_del_preun virtxend.service virtxend.socket virtxend-ro.socket virtxend-admin.socket + +%postun daemon-driver-libxl +%service_del_postun virtxend.service virtxend.socket virtxend-ro.socket virtxend-admin.socket + %pre client %service_add_pre libvirt-guests.service @@ -1335,6 +1446,7 @@ fi %files daemon %{_sbindir}/libvirtd +%{_sbindir}/virtproxyd %{_sbindir}/virtlogd %{_sbindir}/virtlockd %dir %{_libdir}/%{name} @@ -1349,6 +1461,12 @@ fi %{_unitdir}/libvirtd-admin.socket %{_unitdir}/libvirtd-tcp.socket %{_unitdir}/libvirtd-tls.socket +%{_unitdir}/virtproxyd.service +%{_unitdir}/virtproxyd.socket +%{_unitdir}/virtproxyd-ro.socket +%{_unitdir}/virtproxyd-admin.socket +%{_unitdir}/virtproxyd-tcp.socket +%{_unitdir}/virtproxyd-tls.socket %{_unitdir}/virt-guest-shutdown.target %{_unitdir}/virtlogd.service %{_unitdir}/virtlogd.socket @@ -1360,6 +1478,7 @@ fi %{_sbindir}/rcvirtlogd %{_sbindir}/rcvirtlockd %config(noreplace) %{_sysconfdir}/%{name}/libvirtd.conf +%config(noreplace) %{_sysconfdir}/%{name}/virtproxyd.conf %config(noreplace) %{_sysconfdir}/logrotate.d/libvirtd %config(noreplace) %{_sysconfdir}/%{name}/virtlogd.conf %config(noreplace) %{_sysconfdir}/%{name}/virtlockd.conf @@ -1374,6 +1493,8 @@ fi %{_datadir}/augeas/lenses/tests/test_virtlogd.aug %{_datadir}/augeas/lenses/virtlockd.aug %{_datadir}/augeas/lenses/tests/test_virtlockd.aug +%{_datadir}/augeas/lenses/virtproxyd.aug +%{_datadir}/augeas/lenses/tests/test_virtproxyd.aug %{_datadir}/augeas/lenses/libvirt_lockd.aug %{_datadir}/augeas/lenses/tests/test_libvirt_lockd.aug %{_datadir}/systemtap/tapset/libvirt_probes*.stp @@ -1436,10 +1557,26 @@ fi %config %{_sysconfdir}/%{name}/nwfilter/*.xml %files daemon-driver-interface +%config(noreplace) %{_sysconfdir}/%{name}/virtinterfaced.conf +%{_datadir}/augeas/lenses/virtinterfaced.aug +%{_datadir}/augeas/lenses/tests/test_virtinterfaced.aug +%{_unitdir}/virtinterfaced.service +%{_unitdir}/virtinterfaced.socket +%{_unitdir}/virtinterfaced-ro.socket +%{_unitdir}/virtinterfaced-admin.socket +%{_sbindir}/virtinterfaced %dir %{_libdir}/%{name}/connection-driver %{_libdir}/%{name}/connection-driver/libvirt_driver_interface.so %files daemon-driver-network +%config(noreplace) %{_sysconfdir}/%{name}/virtnetworkd.conf +%{_datadir}/augeas/lenses/virtnetworkd.aug +%{_datadir}/augeas/lenses/tests/test_virtnetworkd.aug +%{_unitdir}/virtnetworkd.service +%{_unitdir}/virtnetworkd.socket +%{_unitdir}/virtnetworkd-ro.socket +%{_unitdir}/virtnetworkd-admin.socket +%{_sbindir}/virtnetworkd %dir %attr(0700, root, root) %{_sysconfdir}/%{name}/qemu/ %dir %attr(0700, root, root) %{_sysconfdir}/%{name}/qemu/networks/ %dir %attr(0700, root, root) %{_sysconfdir}/%{name}/qemu/networks/autostart @@ -1453,21 +1590,53 @@ fi %endif %files daemon-driver-nodedev +%config(noreplace) %{_sysconfdir}/%{name}/virtnodedevd.conf +%{_datadir}/augeas/lenses/virtnodedevd.aug +%{_datadir}/augeas/lenses/tests/test_virtnodedevd.aug +%{_unitdir}/virtnodedevd.service +%{_unitdir}/virtnodedevd.socket +%{_unitdir}/virtnodedevd-ro.socket +%{_unitdir}/virtnodedevd-admin.socket +%{_sbindir}/virtnodedevd %dir %{_libdir}/%{name}/connection-driver %{_libdir}/%{name}/connection-driver/libvirt_driver_nodedev.so %files daemon-driver-nwfilter +%config(noreplace) %{_sysconfdir}/%{name}/virtnwfilterd.conf +%{_datadir}/augeas/lenses/virtnwfilterd.aug +%{_datadir}/augeas/lenses/tests/test_virtnwfilterd.aug +%{_unitdir}/virtnwfilterd.service +%{_unitdir}/virtnwfilterd.socket +%{_unitdir}/virtnwfilterd-ro.socket +%{_unitdir}/virtnwfilterd-admin.socket +%{_sbindir}/virtnwfilterd %dir %attr(0700, root, root) %{_sysconfdir}/%{name}/nwfilter/ %dir %{_libdir}/%{name}/connection-driver %{_libdir}/%{name}/connection-driver/libvirt_driver_nwfilter.so %files daemon-driver-secret +%config(noreplace) %{_sysconfdir}/%{name}/virtsecretd.conf +%{_datadir}/augeas/lenses/virtsecretd.aug +%{_datadir}/augeas/lenses/tests/test_virtsecretd.aug +%{_unitdir}/virtsecretd.service +%{_unitdir}/virtsecretd.socket +%{_unitdir}/virtsecretd-ro.socket +%{_unitdir}/virtsecretd-admin.socket +%{_sbindir}/virtsecretd %dir %{_libdir}/%{name}/connection-driver %{_libdir}/%{name}/connection-driver/libvirt_driver_secret.so %files daemon-driver-storage %files daemon-driver-storage-core +%config(noreplace) %{_sysconfdir}/%{name}/virtstoraged.conf +%{_datadir}/augeas/lenses/virtstoraged.aug +%{_datadir}/augeas/lenses/tests/test_virtstoraged.aug +%{_unitdir}/virtstoraged.service +%{_unitdir}/virtstoraged.socket +%{_unitdir}/virtstoraged-ro.socket +%{_unitdir}/virtstoraged-admin.socket +%{_sbindir}/virtstoraged %attr(0755, root, root) %{_libdir}/%{name}/libvirt_parthelper %dir %{_libdir}/%{name}/connection-driver %{_libdir}/%{name}/connection-driver/libvirt_driver_storage.so @@ -1515,6 +1684,14 @@ fi %if %{with_qemu} %files daemon-driver-qemu +%config(noreplace) %{_sysconfdir}/%{name}/virtqemud.conf +%{_datadir}/augeas/lenses/virtqemud.aug +%{_datadir}/augeas/lenses/tests/test_virtqemud.aug +%{_unitdir}/virtqemud.service +%{_unitdir}/virtqemud.socket +%{_unitdir}/virtqemud-ro.socket +%{_unitdir}/virtqemud-admin.socket +%{_sbindir}/virtqemud %config(noreplace) %{_sysconfdir}/%{name}/qemu.conf %config(noreplace) %{_sysconfdir}/%{name}/qemu-lockd.conf %config(noreplace) %{_sysconfdir}/logrotate.d/libvirtd.qemu @@ -1534,6 +1711,14 @@ fi %if %{with_lxc} %files daemon-driver-lxc +%config(noreplace) %{_sysconfdir}/%{name}/virtlxcd.conf +%{_datadir}/augeas/lenses/virtlxcd.aug +%{_datadir}/augeas/lenses/tests/test_virtlxcd.aug +%{_unitdir}/virtlxcd.service +%{_unitdir}/virtlxcd.socket +%{_unitdir}/virtlxcd-ro.socket +%{_unitdir}/virtlxcd-admin.socket +%{_sbindir}/virtlxcd %config(noreplace) %{_sysconfdir}/%{name}/lxc.conf %config(noreplace) %{_sysconfdir}/logrotate.d/libvirtd.lxc %dir %attr(0700, root, root) %{_localstatedir}/lib/%{name}/lxc/ @@ -1553,6 +1738,14 @@ fi %if %{with_libxl} %files daemon-driver-libxl +%config(noreplace) %{_sysconfdir}/%{name}/virtxend.conf +%{_datadir}/augeas/lenses/virtxend.aug +%{_datadir}/augeas/lenses/tests/test_virtxend.aug +%{_unitdir}/virtxend.service +%{_unitdir}/virtxend.socket +%{_unitdir}/virtxend-ro.socket +%{_unitdir}/virtxend-admin.socket +%{_sbindir}/virtxend %config(noreplace) %{_sysconfdir}/%{name}/libxl.conf %config(noreplace) %{_sysconfdir}/logrotate.d/libvirtd.libxl %config(noreplace) %{_sysconfdir}/%{name}/libxl-lockd.conf @@ -1567,6 +1760,14 @@ fi %if %{with_vbox} %files daemon-driver-vbox +%config(noreplace) %{_sysconfdir}/%{name}/virtvboxd.conf +%{_datadir}/augeas/lenses/virtvboxd.aug +%{_datadir}/augeas/lenses/tests/test_virtvboxd.aug +%{_unitdir}/virtvboxd.service +%{_unitdir}/virtvboxd.socket +%{_unitdir}/virtvboxd-ro.socket +%{_unitdir}/virtvboxd-admin.socket +%{_sbindir}/virtvboxd %{_libdir}/%{name}/connection-driver/libvirt_driver_vbox.so %endif diff --git a/libxl-dom-reset.patch b/libxl-dom-reset.patch index a3065f5..7f5b097 100644 --- a/libxl-dom-reset.patch +++ b/libxl-dom-reset.patch @@ -8,10 +8,10 @@ Date: Mon Jun 23 15:51:20 2014 -0600 option, but domainReset can be implemented in the libxl driver by forcibly destroying the domain and starting it again. -Index: libvirt-5.6.0/src/libxl/libxl_driver.c +Index: libvirt-5.7.0/src/libxl/libxl_driver.c =================================================================== ---- libvirt-5.6.0.orig/src/libxl/libxl_driver.c -+++ libvirt-5.6.0/src/libxl/libxl_driver.c +--- libvirt-5.7.0.orig/src/libxl/libxl_driver.c ++++ libvirt-5.7.0/src/libxl/libxl_driver.c @@ -1364,6 +1364,61 @@ libxlDomainReboot(virDomainPtr dom, unsi } @@ -74,7 +74,7 @@ Index: libvirt-5.6.0/src/libxl/libxl_driver.c libxlDomainDestroyFlags(virDomainPtr dom, unsigned int flags) { -@@ -6539,6 +6594,7 @@ static virHypervisorDriver libxlHypervis +@@ -6613,6 +6668,7 @@ static virHypervisorDriver libxlHypervis .domainShutdown = libxlDomainShutdown, /* 0.9.0 */ .domainShutdownFlags = libxlDomainShutdownFlags, /* 0.9.10 */ .domainReboot = libxlDomainReboot, /* 0.9.0 */ diff --git a/libxl-set-cach-mode.patch b/libxl-set-cach-mode.patch index caae44e..f968bea 100644 --- a/libxl-set-cach-mode.patch +++ b/libxl-set-cach-mode.patch @@ -3,10 +3,10 @@ https://bugzilla.novell.com/show_bug.cgi?id=879425 src/libxl/libxl_conf.c | 25 +++++++++++++++++++++++++ 1 file changed, 25 insertions(+) -Index: libvirt-5.6.0/src/libxl/libxl_conf.c +Index: libvirt-5.7.0/src/libxl/libxl_conf.c =================================================================== ---- libvirt-5.6.0.orig/src/libxl/libxl_conf.c -+++ libvirt-5.6.0/src/libxl/libxl_conf.c +--- libvirt-5.7.0.orig/src/libxl/libxl_conf.c ++++ libvirt-5.7.0/src/libxl/libxl_conf.c @@ -897,6 +897,30 @@ libxlDiskSetDiscard(libxl_device_disk *x #endif } diff --git a/libxl-set-migration-constraints.patch b/libxl-set-migration-constraints.patch index 5ba001c..0f43edb 100644 --- a/libxl-set-migration-constraints.patch +++ b/libxl-set-migration-constraints.patch @@ -16,10 +16,10 @@ Signed-off-by: Jim Fehlig tools/virsh.pod | 8 ++++++++ 6 files changed, 125 insertions(+), 6 deletions(-) -Index: libvirt-5.6.0/include/libvirt/libvirt-domain.h +Index: libvirt-5.7.0/include/libvirt/libvirt-domain.h =================================================================== ---- libvirt-5.6.0.orig/include/libvirt/libvirt-domain.h -+++ libvirt-5.6.0/include/libvirt/libvirt-domain.h +--- libvirt-5.7.0.orig/include/libvirt/libvirt-domain.h ++++ libvirt-5.7.0/include/libvirt/libvirt-domain.h @@ -1051,6 +1051,31 @@ typedef enum { */ # define VIR_MIGRATE_PARAM_PARALLEL_CONNECTIONS "parallel.connections" @@ -52,11 +52,11 @@ Index: libvirt-5.6.0/include/libvirt/libvirt-domain.h /* Domain migration. */ virDomainPtr virDomainMigrate (virDomainPtr domain, virConnectPtr dconn, unsigned long flags, const char *dname, -Index: libvirt-5.6.0/src/libxl/libxl_driver.c +Index: libvirt-5.7.0/src/libxl/libxl_driver.c =================================================================== ---- libvirt-5.6.0.orig/src/libxl/libxl_driver.c -+++ libvirt-5.6.0/src/libxl/libxl_driver.c -@@ -6146,6 +6146,9 @@ libxlDomainMigratePerform3Params(virDoma +--- libvirt-5.7.0.orig/src/libxl/libxl_driver.c ++++ libvirt-5.7.0/src/libxl/libxl_driver.c +@@ -6156,6 +6156,9 @@ libxlDomainMigratePerform3Params(virDoma const char *dname = NULL; const char *uri = NULL; int ret = -1; @@ -66,7 +66,7 @@ Index: libvirt-5.6.0/src/libxl/libxl_driver.c #ifdef LIBXL_HAVE_NO_SUSPEND_RESUME virReportUnsupportedError(); -@@ -6162,6 +6165,18 @@ libxlDomainMigratePerform3Params(virDoma +@@ -6172,6 +6175,18 @@ libxlDomainMigratePerform3Params(virDoma virTypedParamsGetString(params, nparams, VIR_MIGRATE_PARAM_DEST_NAME, &dname) < 0 || @@ -85,7 +85,7 @@ Index: libvirt-5.6.0/src/libxl/libxl_driver.c virTypedParamsGetString(params, nparams, VIR_MIGRATE_PARAM_URI, &uri) < 0) -@@ -6176,11 +6191,11 @@ libxlDomainMigratePerform3Params(virDoma +@@ -6186,11 +6201,11 @@ libxlDomainMigratePerform3Params(virDoma if ((flags & (VIR_MIGRATE_TUNNELLED | VIR_MIGRATE_PEER2PEER))) { if (libxlDomainMigrationSrcPerformP2P(driver, vm, dom->conn, dom_xml, @@ -99,10 +99,10 @@ Index: libvirt-5.6.0/src/libxl/libxl_driver.c goto cleanup; } -Index: libvirt-5.6.0/src/libxl/libxl_migration.c +Index: libvirt-5.7.0/src/libxl/libxl_migration.c =================================================================== ---- libvirt-5.6.0.orig/src/libxl/libxl_migration.c -+++ libvirt-5.6.0/src/libxl/libxl_migration.c +--- libvirt-5.7.0.orig/src/libxl/libxl_migration.c ++++ libvirt-5.7.0/src/libxl/libxl_migration.c @@ -342,18 +342,39 @@ libxlMigrateDstReceive(virNetSocketPtr s static int libxlDoMigrateSrcSend(libxlDriverPrivatePtr driver, @@ -264,10 +264,10 @@ Index: libvirt-5.6.0/src/libxl/libxl_migration.c virObjectLock(vm); if (ret < 0) { -Index: libvirt-5.6.0/src/libxl/libxl_migration.h +Index: libvirt-5.7.0/src/libxl/libxl_migration.h =================================================================== ---- libvirt-5.6.0.orig/src/libxl/libxl_migration.h -+++ libvirt-5.6.0/src/libxl/libxl_migration.h +--- libvirt-5.7.0.orig/src/libxl/libxl_migration.h ++++ libvirt-5.7.0/src/libxl/libxl_migration.h @@ -35,6 +35,10 @@ VIR_MIGRATE_PARAM_URI, VIR_TYPED_PARAM_STRING, \ VIR_MIGRATE_PARAM_DEST_NAME, VIR_TYPED_PARAM_STRING, \ @@ -312,13 +312,13 @@ Index: libvirt-5.6.0/src/libxl/libxl_migration.h virDomainPtr libxlDomainMigrationDstFinish(virConnectPtr dconn, -Index: libvirt-5.6.0/tools/virsh-domain.c +Index: libvirt-5.7.0/tools/virsh-domain.c =================================================================== ---- libvirt-5.6.0.orig/tools/virsh-domain.c -+++ libvirt-5.6.0/tools/virsh-domain.c -@@ -10587,6 +10587,22 @@ static const vshCmdOptDef opts_migrate[] +--- libvirt-5.7.0.orig/tools/virsh-domain.c ++++ libvirt-5.7.0/tools/virsh-domain.c +@@ -10591,6 +10591,22 @@ static const vshCmdOptDef opts_migrate[] .type = VSH_OT_INT, - .help = N_("number of connections for parallel migration") + .help = N_("migration bandwidth limit in MiB/s") }, + {.name = "max_iters", + .type = VSH_OT_INT, @@ -339,7 +339,7 @@ Index: libvirt-5.6.0/tools/virsh-domain.c {.name = NULL} }; -@@ -10610,6 +10626,7 @@ doMigrate(void *opaque) +@@ -10614,6 +10630,7 @@ doMigrate(void *opaque) unsigned long long ullOpt = 0; int rv; virConnectPtr dconn = data->dconn; @@ -347,7 +347,7 @@ Index: libvirt-5.6.0/tools/virsh-domain.c sigemptyset(&sigmask); sigaddset(&sigmask, SIGINT); -@@ -10729,6 +10746,27 @@ doMigrate(void *opaque) +@@ -10733,6 +10750,27 @@ doMigrate(void *opaque) goto save_error; } @@ -375,11 +375,11 @@ Index: libvirt-5.6.0/tools/virsh-domain.c if (vshCommandOptStringReq(ctl, cmd, "xml", &opt) < 0) goto out; if (opt) { -Index: libvirt-5.6.0/tools/virsh.pod +Index: libvirt-5.7.0/tools/virsh.pod =================================================================== ---- libvirt-5.6.0.orig/tools/virsh.pod -+++ libvirt-5.6.0/tools/virsh.pod -@@ -2026,6 +2026,14 @@ I<--parallel-connections>. Parallel conn +--- libvirt-5.7.0.orig/tools/virsh.pod ++++ libvirt-5.7.0/tools/virsh.pod +@@ -2254,6 +2254,14 @@ I<--parallel-connections>. Parallel conn network link between the source and the target and thus speeding up the migration. diff --git a/libxl-support-block-script.patch b/libxl-support-block-script.patch index 6eb366a..4edea6b 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-5.6.0/src/libxl/libxl_conf.c +Index: libvirt-5.7.0/src/libxl/libxl_conf.c =================================================================== ---- libvirt-5.6.0.orig/src/libxl/libxl_conf.c -+++ libvirt-5.6.0/src/libxl/libxl_conf.c +--- libvirt-5.7.0.orig/src/libxl/libxl_conf.c ++++ libvirt-5.7.0/src/libxl/libxl_conf.c @@ -897,6 +897,25 @@ libxlDiskSetDiscard(libxl_device_disk *x #endif } diff --git a/lxc-wait-after-eth-del.patch b/lxc-wait-after-eth-del.patch index 871655f..381b549 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-5.6.0/src/lxc/lxc_controller.c +Index: libvirt-5.7.0/src/lxc/lxc_controller.c =================================================================== ---- libvirt-5.6.0.orig/src/lxc/lxc_controller.c -+++ libvirt-5.6.0/src/lxc/lxc_controller.c +--- libvirt-5.7.0.orig/src/lxc/lxc_controller.c ++++ libvirt-5.7.0/src/lxc/lxc_controller.c @@ -69,6 +69,7 @@ #include "rpc/virnetdaemon.h" #include "virstring.h" @@ -33,10 +33,10 @@ Index: libvirt-5.6.0/src/lxc/lxc_controller.c return ret; } -Index: libvirt-5.6.0/src/lxc/lxc_driver.c +Index: libvirt-5.7.0/src/lxc/lxc_driver.c =================================================================== ---- libvirt-5.6.0.orig/src/lxc/lxc_driver.c -+++ libvirt-5.6.0/src/lxc/lxc_driver.c +--- libvirt-5.7.0.orig/src/lxc/lxc_driver.c ++++ libvirt-5.7.0/src/lxc/lxc_driver.c @@ -70,6 +70,7 @@ #include "virtime.h" #include "virtypedparam.h" @@ -61,10 +61,10 @@ Index: libvirt-5.6.0/src/lxc/lxc_driver.c break; /* It'd be nice to support this, but with macvlan -Index: libvirt-5.6.0/src/lxc/lxc_process.c +Index: libvirt-5.7.0/src/lxc/lxc_process.c =================================================================== ---- libvirt-5.6.0.orig/src/lxc/lxc_process.c -+++ libvirt-5.6.0/src/lxc/lxc_process.c +--- libvirt-5.7.0.orig/src/lxc/lxc_process.c ++++ libvirt-5.7.0/src/lxc/lxc_process.c @@ -51,6 +51,7 @@ #include "viratomic.h" #include "virprocess.h" diff --git a/network-don-t-use-dhcp-authoritative-on-static-netwo.patch b/network-don-t-use-dhcp-authoritative-on-static-netwo.patch index c4c76fe..8e46fdf 100644 --- a/network-don-t-use-dhcp-authoritative-on-static-netwo.patch +++ b/network-don-t-use-dhcp-authoritative-on-static-netwo.patch @@ -17,11 +17,11 @@ Signed-off-by: Martin Wilck tests/networkxml2confdata/dhcp6host-routed-network.conf | 1 - 2 files changed, 8 insertions(+), 2 deletions(-) -Index: libvirt-5.6.0/src/network/bridge_driver.c +Index: libvirt-5.7.0/src/network/bridge_driver.c =================================================================== ---- libvirt-5.6.0.orig/src/network/bridge_driver.c -+++ libvirt-5.6.0/src/network/bridge_driver.c -@@ -1528,7 +1528,14 @@ networkDnsmasqConfContents(virNetworkObj +--- libvirt-5.7.0.orig/src/network/bridge_driver.c ++++ libvirt-5.7.0/src/network/bridge_driver.c +@@ -1510,7 +1510,14 @@ networkDnsmasqConfContents(virNetworkObj if (VIR_SOCKET_ADDR_IS_FAMILY(&ipdef->address, AF_INET)) { if (ipdef->nranges || ipdef->nhosts) { virBufferAddLit(&configbuf, "dhcp-no-override\n"); @@ -37,10 +37,10 @@ Index: libvirt-5.6.0/src/network/bridge_driver.c } if (ipdef->tftproot) { -Index: libvirt-5.6.0/tests/networkxml2confdata/dhcp6host-routed-network.conf +Index: libvirt-5.7.0/tests/networkxml2confdata/dhcp6host-routed-network.conf =================================================================== ---- libvirt-5.6.0.orig/tests/networkxml2confdata/dhcp6host-routed-network.conf -+++ libvirt-5.6.0/tests/networkxml2confdata/dhcp6host-routed-network.conf +--- libvirt-5.7.0.orig/tests/networkxml2confdata/dhcp6host-routed-network.conf ++++ libvirt-5.7.0/tests/networkxml2confdata/dhcp6host-routed-network.conf @@ -10,7 +10,6 @@ bind-dynamic interface=virbr1 dhcp-range=192.168.122.1,static diff --git a/ppc64le-canonical-name.patch b/ppc64le-canonical-name.patch index 739555b..03b7243 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-5.6.0/src/util/virarch.c +Index: libvirt-5.7.0/src/util/virarch.c =================================================================== ---- libvirt-5.6.0.orig/src/util/virarch.c -+++ libvirt-5.6.0/src/util/virarch.c +--- libvirt-5.7.0.orig/src/util/virarch.c ++++ libvirt-5.7.0/src/util/virarch.c @@ -172,6 +172,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 b534d18..d90e7c9 100644 --- a/qemu-apparmor-screenshot.patch +++ b/qemu-apparmor-screenshot.patch @@ -1,7 +1,7 @@ -Index: libvirt-5.6.0/src/security/apparmor/libvirt-qemu +Index: libvirt-5.7.0/src/security/apparmor/libvirt-qemu =================================================================== ---- libvirt-5.6.0.orig/src/security/apparmor/libvirt-qemu -+++ libvirt-5.6.0/src/security/apparmor/libvirt-qemu +--- libvirt-5.7.0.orig/src/security/apparmor/libvirt-qemu ++++ libvirt-5.7.0/src/security/apparmor/libvirt-qemu @@ -228,3 +228,6 @@ # required for sasl GSSAPI plugin /etc/gss/mech.d/ r, diff --git a/support-managed-pci-xen-driver.patch b/support-managed-pci-xen-driver.patch index bd3c400..47c94cd 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-5.6.0/src/xenconfig/xen_common.c +Index: libvirt-5.7.0/src/libxl/xen_common.c =================================================================== ---- libvirt-5.6.0.orig/src/xenconfig/xen_common.c -+++ libvirt-5.6.0/src/xenconfig/xen_common.c +--- libvirt-5.7.0.orig/src/libxl/xen_common.c ++++ libvirt-5.7.0/src/libxl/xen_common.c @@ -388,12 +388,19 @@ xenParsePCI(char *entry) int busID; int slotID; diff --git a/suse-apparmor-libnl-paths.patch b/suse-apparmor-libnl-paths.patch index 99af350..74877ac 100644 --- a/suse-apparmor-libnl-paths.patch +++ b/suse-apparmor-libnl-paths.patch @@ -8,10 +8,10 @@ It was also noticed that the per-domain profiles need a libnl rule to squelch a denial when starting confined domains. Found while investigating bsc#1058847 -Index: libvirt-5.6.0/src/security/apparmor/libvirt-qemu +Index: libvirt-5.7.0/src/security/apparmor/libvirt-qemu =================================================================== ---- libvirt-5.6.0.orig/src/security/apparmor/libvirt-qemu -+++ libvirt-5.6.0/src/security/apparmor/libvirt-qemu +--- libvirt-5.7.0.orig/src/security/apparmor/libvirt-qemu ++++ libvirt-5.7.0/src/security/apparmor/libvirt-qemu @@ -63,6 +63,7 @@ #/dev/fb* rw, @@ -20,13 +20,13 @@ Index: libvirt-5.6.0/src/security/apparmor/libvirt-qemu @{HOME}/.pulse-cookie rwk, owner /root/.pulse-cookie rwk, owner /root/.pulse/ rw, -Index: libvirt-5.6.0/src/security/apparmor/usr.lib.libvirt.virt-aa-helper +Index: libvirt-5.7.0/src/security/apparmor/usr.lib.libvirt.virt-aa-helper =================================================================== ---- libvirt-5.6.0.orig/src/security/apparmor/usr.lib.libvirt.virt-aa-helper -+++ libvirt-5.6.0/src/security/apparmor/usr.lib.libvirt.virt-aa-helper -@@ -17,7 +17,7 @@ profile virt-aa-helper /usr/{lib,lib64}/ - owner @{PROC}/[0-9]*/status r, - @{PROC}/filesystems r, +--- libvirt-5.7.0.orig/src/security/apparmor/usr.lib.libvirt.virt-aa-helper ++++ libvirt-5.7.0/src/security/apparmor/usr.lib.libvirt.virt-aa-helper +@@ -20,7 +20,7 @@ profile virt-aa-helper /usr/{lib,lib64}/ + # Used when internally running another command (namely apparmor_parser) + @{PROC}/@{pid}/fd/ r, - /etc/libnl-3/classid r, + /etc/libnl*/classid r, diff --git a/suse-libvirt-guests-service.patch b/suse-libvirt-guests-service.patch index 0b40ebb..f9e12f3 100644 --- a/suse-libvirt-guests-service.patch +++ b/suse-libvirt-guests-service.patch @@ -1,9 +1,9 @@ Adjust libvirt-guests service to conform to SUSE standards -Index: libvirt-5.6.0/tools/libvirt-guests.sh.in +Index: libvirt-5.7.0/tools/libvirt-guests.sh.in =================================================================== ---- libvirt-5.6.0.orig/tools/libvirt-guests.sh.in -+++ libvirt-5.6.0/tools/libvirt-guests.sh.in +--- libvirt-5.7.0.orig/tools/libvirt-guests.sh.in ++++ libvirt-5.7.0/tools/libvirt-guests.sh.in @@ -16,14 +16,13 @@ # License along with this library. If not, see # . @@ -163,10 +163,10 @@ Index: libvirt-5.6.0/tools/libvirt-guests.sh.in esac -exit $RETVAL +rc_exit -Index: libvirt-5.6.0/tools/libvirt-guests.sysconf +Index: libvirt-5.7.0/tools/libvirt-guests.sysconf =================================================================== ---- libvirt-5.6.0.orig/tools/libvirt-guests.sysconf -+++ libvirt-5.6.0/tools/libvirt-guests.sysconf +--- libvirt-5.7.0.orig/tools/libvirt-guests.sysconf ++++ libvirt-5.7.0/tools/libvirt-guests.sysconf @@ -1,19 +1,29 @@ +## Path: System/Virtualization/libvirt-guests + diff --git a/suse-libvirtd-disable-tls.patch b/suse-libvirtd-disable-tls.patch index 06707c4..d6cc289 100644 --- a/suse-libvirtd-disable-tls.patch +++ b/suse-libvirtd-disable-tls.patch @@ -3,11 +3,24 @@ Disable TLS by default On SUSE distros, the default is for libvirtd to listen only on the Unix Domain Socket. The libvirt client still provides remote access via a SSH tunnel. -Index: libvirt-5.6.0/src/remote/libvirtd.conf +Index: libvirt-5.7.0/src/remote/remote_daemon_config.c =================================================================== ---- libvirt-5.6.0.orig/src/remote/libvirtd.conf -+++ libvirt-5.6.0/src/remote/libvirtd.conf -@@ -16,8 +16,8 @@ +--- libvirt-5.7.0.orig/src/remote/remote_daemon_config.c ++++ libvirt-5.7.0/src/remote/remote_daemon_config.c +@@ -109,7 +109,7 @@ daemonConfigNew(bool privileged ATTRIBUT + + #ifdef WITH_IP + # ifdef LIBVIRTD +- data->listen_tls = 1; /* Only honoured if --listen is set */ ++ data->listen_tls = 0; /* Only honoured if --listen is set */ + # else /* ! LIBVIRTD */ + data->listen_tls = 0; /* Always honoured, --listen doesn't exist. */ + # endif /* ! LIBVIRTD */ +Index: libvirt-5.7.0/src/remote/libvirtd.conf.in +=================================================================== +--- libvirt-5.7.0.orig/src/remote/libvirtd.conf.in ++++ libvirt-5.7.0/src/remote/libvirtd.conf.in +@@ -17,8 +17,8 @@ # It is necessary to setup a CA and issue server certificates before # using this capability. # @@ -17,30 +30,4 @@ Index: libvirt-5.6.0/src/remote/libvirtd.conf +#listen_tls = 1 # 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-5.6.0/src/remote/remote_daemon_config.c -=================================================================== ---- libvirt-5.6.0.orig/src/remote/remote_daemon_config.c -+++ libvirt-5.6.0/src/remote/remote_daemon_config.c -@@ -106,7 +106,7 @@ daemonConfigNew(bool privileged ATTRIBUT - if (VIR_ALLOC(data) < 0) - return NULL; - -- data->listen_tls = 1; -+ data->listen_tls = 0; - data->listen_tcp = 0; - - if (VIR_STRDUP(data->tls_port, LIBVIRTD_TLS_PORT) < 0 || -Index: libvirt-5.6.0/src/remote/test_libvirtd.aug.in -=================================================================== ---- libvirt-5.6.0.orig/src/remote/test_libvirtd.aug.in -+++ libvirt-5.6.0/src/remote/test_libvirtd.aug.in -@@ -2,7 +2,7 @@ module Test_libvirtd = - ::CONFIG:: - - test Libvirtd.lns get conf = -- { "listen_tls" = "0" } -+ { "listen_tls" = "1" } - { "listen_tcp" = "1" } - { "tls_port" = "16514" } - { "tcp_port" = "16509" } + # NB, must pass the --listen flag to the @DAEMON_NAME@ process for this to diff --git a/suse-libvirtd-service-xen.patch b/suse-libvirtd-service-xen.patch deleted file mode 100644 index 93f37ef..0000000 --- a/suse-libvirtd-service-xen.patch +++ /dev/null @@ -1,22 +0,0 @@ -Add support for Xen in libvirtd service file - -libvirtd should be started after the xencommons service. - -libvirtd should also conflict with the xendomains service. -On SUSE distros, we promote libvirt and all the libvirt-based -tools. If a user installs libvirt on their SUSE Xen host, then -libvirt should be king and override xendomains. See bsc#1015348 - -Index: libvirt-5.6.0/src/remote/libvirtd.service.in -=================================================================== ---- libvirt-5.6.0.orig/src/remote/libvirtd.service.in -+++ libvirt-5.6.0/src/remote/libvirtd.service.in -@@ -15,6 +15,8 @@ After=local-fs.target - After=remote-fs.target - After=systemd-logind.service - After=systemd-machined.service -+After=xencommons.service -+Conflicts=xendomains.service - Documentation=man:libvirtd(8) - Documentation=https://libvirt.org - diff --git a/suse-libvirtd-sysconfig-settings.patch b/suse-libvirtd-sysconfig-settings.patch index c5c4446..7b13a66 100644 --- a/suse-libvirtd-sysconfig-settings.patch +++ b/suse-libvirtd-sysconfig-settings.patch @@ -1,19 +1,21 @@ Adjust libvirtd sysconfig file to conform to SUSE standards -Index: libvirt-5.6.0/src/remote/libvirtd.sysconf +Index: libvirt-5.7.0/src/remote/libvirtd.sysconf =================================================================== ---- libvirt-5.6.0.orig/src/remote/libvirtd.sysconf -+++ libvirt-5.6.0/src/remote/libvirtd.sysconf -@@ -1,13 +1,18 @@ +--- libvirt-5.7.0.orig/src/remote/libvirtd.sysconf ++++ libvirt-5.7.0/src/remote/libvirtd.sysconf +@@ -1,5 +1,9 @@ +## Path: System/Virtualization/libvirt # Customizations for the libvirtd.service systemd unit --# Listen for TCP/IP connections. This is not required if using systemd --# socket activation. --# NB. must setup TLS/SSL keys prior to using this +## Type: string -+## Default: --listen ++## Default: "--timeout 120" +# Arguments to pass to libvirtd. Not required if using systemd socket activation. + # Default behaviour is for libvirtd.service to start on boot + # so that VM autostart can be performed. We then want it to + # shutdown again if nothing was started and rely on systemd +@@ -11,9 +15,13 @@ LIBVIRTD_ARGS="--timeout 120" + # can be used to listen on TCP/TLS sockets #LIBVIRTD_ARGS="--listen" +## Type: string diff --git a/suse-libxl-disable-autoballoon.patch b/suse-libxl-disable-autoballoon.patch index cc73b33..685524c 100644 --- a/suse-libxl-disable-autoballoon.patch +++ b/suse-libxl-disable-autoballoon.patch @@ -6,10 +6,10 @@ autoballooning. This patch changes libvirt to also disable autoballooning by default. It can only be enabled with the 'autoballoon' setting in libxl.conf. See jsc#SLE-3059 for more details. -Index: libvirt-5.6.0/src/libxl/libxl.conf +Index: libvirt-5.7.0/src/libxl/libxl.conf =================================================================== ---- libvirt-5.6.0.orig/src/libxl/libxl.conf -+++ libvirt-5.6.0/src/libxl/libxl.conf +--- libvirt-5.7.0.orig/src/libxl/libxl.conf ++++ libvirt-5.7.0/src/libxl/libxl.conf @@ -4,12 +4,11 @@ # Enable autoballooning of domain0 @@ -27,10 +27,10 @@ Index: libvirt-5.6.0/src/libxl/libxl.conf # In order to prevent accidentally starting two domains that -Index: libvirt-5.6.0/src/libxl/libxl_conf.c +Index: libvirt-5.7.0/src/libxl/libxl_conf.c =================================================================== ---- libvirt-5.6.0.orig/src/libxl/libxl_conf.c -+++ libvirt-5.6.0/src/libxl/libxl_conf.c +--- libvirt-5.7.0.orig/src/libxl/libxl_conf.c ++++ libvirt-5.7.0/src/libxl/libxl_conf.c @@ -22,7 +22,6 @@ #include diff --git a/suse-ovmf-paths.patch b/suse-ovmf-paths.patch index 6257fcf..2118dbd 100644 --- a/suse-ovmf-paths.patch +++ b/suse-ovmf-paths.patch @@ -1,9 +1,9 @@ Adjust paths of OVMF firmwares on SUSE distros -Index: libvirt-5.6.0/src/qemu/qemu.conf +Index: libvirt-5.7.0/src/qemu/qemu.conf =================================================================== ---- libvirt-5.6.0.orig/src/qemu/qemu.conf -+++ libvirt-5.6.0/src/qemu/qemu.conf +--- libvirt-5.7.0.orig/src/qemu/qemu.conf ++++ libvirt-5.7.0/src/qemu/qemu.conf @@ -796,10 +796,9 @@ # for x86_64 and i686, but it's AAVMF for aarch64. The libvirt default # follows this scheme. @@ -18,10 +18,10 @@ Index: libvirt-5.6.0/src/qemu/qemu.conf #] # The backend to use for handling stdout/stderr output from -Index: libvirt-5.6.0/src/qemu/qemu_conf.c +Index: libvirt-5.7.0/src/qemu/qemu_conf.c =================================================================== ---- libvirt-5.6.0.orig/src/qemu/qemu_conf.c -+++ libvirt-5.6.0/src/qemu/qemu_conf.c +--- libvirt-5.7.0.orig/src/qemu/qemu_conf.c ++++ libvirt-5.7.0/src/qemu/qemu_conf.c @@ -96,10 +96,9 @@ qemuDriverUnlock(virQEMUDriverPtr driver #ifndef DEFAULT_LOADER_NVRAM @@ -36,11 +36,11 @@ Index: libvirt-5.6.0/src/qemu/qemu_conf.c #endif -Index: libvirt-5.6.0/src/security/virt-aa-helper.c +Index: libvirt-5.7.0/src/security/virt-aa-helper.c =================================================================== ---- libvirt-5.6.0.orig/src/security/virt-aa-helper.c -+++ libvirt-5.6.0/src/security/virt-aa-helper.c -@@ -506,7 +506,8 @@ valid_path(const char *path, const bool +--- libvirt-5.7.0.orig/src/security/virt-aa-helper.c ++++ libvirt-5.7.0/src/security/virt-aa-helper.c +@@ -509,7 +509,8 @@ valid_path(const char *path, const bool "/usr/share/ovmf/", /* for OVMF images */ "/usr/share/AAVMF/", /* for AAVMF images */ "/usr/share/qemu-efi/", /* for AAVMF images */ diff --git a/suse-qemu-conf.patch b/suse-qemu-conf.patch index acc178e..a86c565 100644 --- a/suse-qemu-conf.patch +++ b/suse-qemu-conf.patch @@ -7,10 +7,10 @@ suse-qemu-conf-secdriver.patch, suse-qemu-conf-lockmgr.patch, etc.), but for now they are all lumped together in this single patch. -Index: libvirt-5.6.0/src/qemu/qemu.conf +Index: libvirt-5.7.0/src/qemu/qemu.conf =================================================================== ---- libvirt-5.6.0.orig/src/qemu/qemu.conf -+++ libvirt-5.6.0/src/qemu/qemu.conf +--- libvirt-5.7.0.orig/src/qemu/qemu.conf ++++ libvirt-5.7.0/src/qemu/qemu.conf @@ -420,10 +420,19 @@ # isolation, but it cannot appear in a list of drivers. # @@ -60,10 +60,10 @@ Index: libvirt-5.6.0/src/qemu/qemu.conf # #lock_manager = "lockd" -Index: libvirt-5.6.0/src/qemu/qemu_conf.c +Index: libvirt-5.7.0/src/qemu/qemu_conf.c =================================================================== ---- libvirt-5.6.0.orig/src/qemu/qemu_conf.c -+++ libvirt-5.6.0/src/qemu/qemu_conf.c +--- libvirt-5.7.0.orig/src/qemu/qemu_conf.c ++++ libvirt-5.7.0/src/qemu/qemu_conf.c @@ -287,7 +287,7 @@ virQEMUDriverConfigPtr virQEMUDriverConf cfg->clearEmulatorCapabilities = true; diff --git a/suse-virtlockd-sysconfig-settings.patch b/suse-virtlockd-sysconfig-settings.patch index 21b7c99..fec7d1b 100644 --- a/suse-virtlockd-sysconfig-settings.patch +++ b/suse-virtlockd-sysconfig-settings.patch @@ -1,9 +1,9 @@ Adjust virtlockd sysconfig file to conform to SUSE standards -Index: libvirt-5.6.0/src/locking/virtlockd.sysconf +Index: libvirt-5.7.0/src/locking/virtlockd.sysconf =================================================================== ---- libvirt-5.6.0.orig/src/locking/virtlockd.sysconf -+++ libvirt-5.6.0/src/locking/virtlockd.sysconf +--- libvirt-5.7.0.orig/src/locking/virtlockd.sysconf ++++ libvirt-5.7.0/src/locking/virtlockd.sysconf @@ -1,3 +1,7 @@ +## Path: System/Virtualization/virtlockd + diff --git a/suse-virtlogd-sysconfig-settings.patch b/suse-virtlogd-sysconfig-settings.patch index 531dd95..aa6364d 100644 --- a/suse-virtlogd-sysconfig-settings.patch +++ b/suse-virtlogd-sysconfig-settings.patch @@ -1,9 +1,9 @@ Adjust virtlogd sysconfig file to conform to SUSE standards -Index: libvirt-5.6.0/src/logging/virtlogd.sysconf +Index: libvirt-5.7.0/src/logging/virtlogd.sysconf =================================================================== ---- libvirt-5.6.0.orig/src/logging/virtlogd.sysconf -+++ libvirt-5.6.0/src/logging/virtlogd.sysconf +--- libvirt-5.7.0.orig/src/logging/virtlogd.sysconf ++++ libvirt-5.7.0/src/logging/virtlogd.sysconf @@ -1,3 +1,7 @@ +## Path: System/Virtualization/virtlogd + diff --git a/virt-create-rootfs.patch b/virt-create-rootfs.patch index 33ddf31..9ce1c76 100644 --- a/virt-create-rootfs.patch +++ b/virt-create-rootfs.patch @@ -1,8 +1,8 @@ -Index: libvirt-5.6.0/tools/Makefile.am +Index: libvirt-5.7.0/tools/Makefile.am =================================================================== ---- libvirt-5.6.0.orig/tools/Makefile.am -+++ libvirt-5.6.0/tools/Makefile.am -@@ -52,6 +52,7 @@ PODFILES = \ +--- libvirt-5.7.0.orig/tools/Makefile.am ++++ libvirt-5.7.0/tools/Makefile.am +@@ -59,6 +59,7 @@ PODFILES = \ virt-sanlock-cleanup.pod \ virt-xml-validate.pod \ virsh.pod \ @@ -10,7 +10,7 @@ Index: libvirt-5.6.0/tools/Makefile.am $(NULL) MANINFILES = \ -@@ -87,7 +88,7 @@ MAINTAINERCLEANFILES = +@@ -94,7 +95,7 @@ MAINTAINERCLEANFILES = confdir = $(sysconfdir)/libvirt conf_DATA = @@ -19,7 +19,7 @@ Index: libvirt-5.6.0/tools/Makefile.am bin_PROGRAMS = virsh virt-admin libexec_SCRIPTS = libvirt-guests.sh man1_MANS = \ -@@ -113,6 +114,8 @@ bin_PROGRAMS += virt-host-validate +@@ -121,6 +122,8 @@ bin_PROGRAMS += virt-host-validate man1_MANS += virt-host-validate.1 endif WITH_HOST_VALIDATE @@ -28,10 +28,10 @@ Index: libvirt-5.6.0/tools/Makefile.am virt-xml-validate: virt-xml-validate.in Makefile $(AM_V_GEN)sed -e 's|[@]schemadir@|$(pkgdatadir)/schemas|g' \ -e 's|[@]VERSION@|$(VERSION)|g' \ -Index: libvirt-5.6.0/tools/virt-create-rootfs +Index: libvirt-5.7.0/tools/virt-create-rootfs =================================================================== --- /dev/null -+++ libvirt-5.6.0/tools/virt-create-rootfs ++++ libvirt-5.7.0/tools/virt-create-rootfs @@ -0,0 +1,214 @@ +#!/bin/sh +set -e @@ -247,10 +247,10 @@ Index: libvirt-5.6.0/tools/virt-create-rootfs + echo "pts/0" >> "$ROOT/etc/securetty" + chroot "$ROOT" /usr/bin/passwd +fi -Index: libvirt-5.6.0/tools/virt-create-rootfs.pod +Index: libvirt-5.7.0/tools/virt-create-rootfs.pod =================================================================== --- /dev/null -+++ libvirt-5.6.0/tools/virt-create-rootfs.pod ++++ libvirt-5.7.0/tools/virt-create-rootfs.pod @@ -0,0 +1,77 @@ +=head1 NAME +