diff --git a/0001-Extract-stats-functions-from-the-qemu-driver.patch b/0001-Extract-stats-functions-from-the-qemu-driver.patch index f8007ce..ee3d3a0 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-7.8.0/src/conf/domain_stats.c +Index: libvirt-7.9.0/src/conf/domain_stats.c =================================================================== --- /dev/null -+++ libvirt-7.8.0/src/conf/domain_stats.c ++++ libvirt-7.9.0/src/conf/domain_stats.c @@ -0,0 +1,117 @@ +/* + * domain_stats.c: domain stats extraction helpers @@ -140,10 +140,10 @@ Index: libvirt-7.8.0/src/conf/domain_stats.c +} + +#undef STATS_ADD_NET_PARAM -Index: libvirt-7.8.0/src/conf/domain_stats.h +Index: libvirt-7.9.0/src/conf/domain_stats.h =================================================================== --- /dev/null -+++ libvirt-7.8.0/src/conf/domain_stats.h ++++ libvirt-7.9.0/src/conf/domain_stats.h @@ -0,0 +1,60 @@ +/* + * domain_stats.h: domain stats extraction helpers @@ -205,11 +205,11 @@ Index: libvirt-7.8.0/src/conf/domain_stats.h + virTypedParamList *params); + +#endif /* __DOMAIN_STATS_H */ -Index: libvirt-7.8.0/src/libvirt_private.syms +Index: libvirt-7.9.0/src/libvirt_private.syms =================================================================== ---- libvirt-7.8.0.orig/src/libvirt_private.syms -+++ libvirt-7.8.0/src/libvirt_private.syms -@@ -763,6 +763,11 @@ virDomainConfNWFilterTeardown; +--- libvirt-7.9.0.orig/src/libvirt_private.syms ++++ libvirt-7.9.0/src/libvirt_private.syms +@@ -768,6 +768,11 @@ virDomainConfNWFilterTeardown; virDomainConfVMNWFilterTeardown; @@ -221,7 +221,7 @@ Index: libvirt-7.8.0/src/libvirt_private.syms # conf/domain_validate.h virDomainActualNetDefValidate; virDomainDefValidate; -@@ -1939,6 +1944,7 @@ virCgroupGetMemoryUsage; +@@ -1944,6 +1949,7 @@ virCgroupGetMemoryUsage; virCgroupGetMemSwapHardLimit; virCgroupGetMemSwapUsage; virCgroupGetPercpuStats; @@ -229,10 +229,10 @@ Index: libvirt-7.8.0/src/libvirt_private.syms virCgroupHasController; virCgroupHasEmptyTasks; virCgroupKillPainfully; -Index: libvirt-7.8.0/src/qemu/qemu_driver.c +Index: libvirt-7.9.0/src/qemu/qemu_driver.c =================================================================== ---- libvirt-7.8.0.orig/src/qemu/qemu_driver.c -+++ libvirt-7.8.0/src/qemu/qemu_driver.c +--- libvirt-7.9.0.orig/src/qemu/qemu_driver.c ++++ libvirt-7.9.0/src/qemu/qemu_driver.c @@ -68,6 +68,7 @@ #include "virarptable.h" #include "viruuid.h" @@ -241,7 +241,7 @@ Index: libvirt-7.8.0/src/qemu/qemu_driver.c #include "domain_audit.h" #include "domain_cgroup.h" #include "domain_driver.h" -@@ -17323,13 +17324,7 @@ qemuDomainGetStatsState(virQEMUDriver *d +@@ -17584,13 +17585,7 @@ qemuDomainGetStatsState(virQEMUDriver *d virTypedParamList *params, unsigned int privflags G_GNUC_UNUSED) { @@ -256,7 +256,7 @@ Index: libvirt-7.8.0/src/qemu/qemu_driver.c } -@@ -17621,25 +17616,11 @@ qemuDomainGetStatsCpuCgroup(virDomainObj +@@ -17882,25 +17877,11 @@ qemuDomainGetStatsCpuCgroup(virDomainObj virTypedParamList *params) { qemuDomainObjPrivate *priv = dom->privateData; @@ -283,7 +283,7 @@ Index: libvirt-7.8.0/src/qemu/qemu_driver.c } static int -@@ -17832,76 +17813,15 @@ qemuDomainGetStatsVcpu(virQEMUDriver *dr +@@ -18093,76 +18074,15 @@ qemuDomainGetStatsVcpu(virQEMUDriver *dr return ret; } @@ -361,10 +361,10 @@ Index: libvirt-7.8.0/src/qemu/qemu_driver.c /* refresh information by opening images on the disk */ static int -Index: libvirt-7.8.0/src/util/vircgroup.c +Index: libvirt-7.9.0/src/util/vircgroup.c =================================================================== ---- libvirt-7.8.0.orig/src/util/vircgroup.c -+++ libvirt-7.8.0/src/util/vircgroup.c +--- libvirt-7.9.0.orig/src/util/vircgroup.c ++++ libvirt-7.9.0/src/util/vircgroup.c @@ -3036,6 +3036,31 @@ virCgroupGetInode(virCgroup *cgroup) return st.st_ino; } @@ -412,10 +412,10 @@ Index: libvirt-7.8.0/src/util/vircgroup.c int virCgroupNewPartition(const char *path G_GNUC_UNUSED, bool create G_GNUC_UNUSED, -Index: libvirt-7.8.0/src/util/vircgroup.h +Index: libvirt-7.9.0/src/util/vircgroup.h =================================================================== ---- libvirt-7.8.0.orig/src/util/vircgroup.h -+++ libvirt-7.8.0/src/util/vircgroup.h +--- libvirt-7.9.0.orig/src/util/vircgroup.h ++++ libvirt-7.9.0/src/util/vircgroup.h @@ -23,6 +23,7 @@ #include "virbitmap.h" @@ -432,10 +432,10 @@ Index: libvirt-7.8.0/src/util/vircgroup.h + virTypedParamList *params); + int virCgroupGetInode(virCgroup *cgroup); -Index: libvirt-7.8.0/src/conf/meson.build +Index: libvirt-7.9.0/src/conf/meson.build =================================================================== ---- libvirt-7.8.0.orig/src/conf/meson.build -+++ libvirt-7.8.0/src/conf/meson.build +--- libvirt-7.9.0.orig/src/conf/meson.build ++++ libvirt-7.9.0/src/conf/meson.build @@ -15,6 +15,7 @@ domain_conf_sources = [ 'domain_conf.c', 'domain_nwfilter.c', diff --git a/0001-libxl-add-support-for-BlockResize-API.patch b/0001-libxl-add-support-for-BlockResize-API.patch index 434e3cd..f6af6a6 100644 --- a/0001-libxl-add-support-for-BlockResize-API.patch +++ b/0001-libxl-add-support-for-BlockResize-API.patch @@ -19,10 +19,10 @@ reworking this patch and submitting it to upstream libvirt. src/libxl/libxl_driver.c | 91 ++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 91 insertions(+) -Index: libvirt-7.8.0/src/libxl/libxl_driver.c +Index: libvirt-7.9.0/src/libxl/libxl_driver.c =================================================================== ---- libvirt-7.8.0.orig/src/libxl/libxl_driver.c -+++ libvirt-7.8.0/src/libxl/libxl_driver.c +--- libvirt-7.9.0.orig/src/libxl/libxl_driver.c ++++ libvirt-7.9.0/src/libxl/libxl_driver.c @@ -5265,6 +5265,95 @@ libxlDomainMemoryStats(virDomainPtr dom, #undef LIBXL_SET_MEMSTAT @@ -127,10 +127,10 @@ Index: libvirt-7.8.0/src/libxl/libxl_driver.c .domainGetJobInfo = libxlDomainGetJobInfo, /* 1.3.1 */ .domainGetJobStats = libxlDomainGetJobStats, /* 1.3.1 */ .domainMemoryStats = libxlDomainMemoryStats, /* 1.3.0 */ -Index: libvirt-7.8.0/src/libxl/libxl_api_wrapper.h +Index: libvirt-7.9.0/src/libxl/libxl_api_wrapper.h =================================================================== ---- libvirt-7.8.0.orig/src/libxl/libxl_api_wrapper.h -+++ libvirt-7.8.0/src/libxl/libxl_api_wrapper.h +--- libvirt-7.9.0.orig/src/libxl/libxl_api_wrapper.h ++++ libvirt-7.9.0/src/libxl/libxl_api_wrapper.h @@ -215,3 +215,18 @@ libxlSetMemoryTargetWrapper(libxl_ctx *c return ret; diff --git a/0002-lxc-implement-connectGetAllDomainStats.patch b/0002-lxc-implement-connectGetAllDomainStats.patch index 1b2d69e..a4543b8 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-7.8.0/src/lxc/lxc_driver.c +Index: libvirt-7.9.0/src/lxc/lxc_driver.c =================================================================== ---- libvirt-7.8.0.orig/src/lxc/lxc_driver.c -+++ libvirt-7.8.0/src/lxc/lxc_driver.c +--- libvirt-7.9.0.orig/src/lxc/lxc_driver.c ++++ libvirt-7.9.0/src/lxc/lxc_driver.c @@ -74,6 +74,8 @@ #include "netdev_bandwidth_conf.h" #include "virsocket.h" diff --git a/1b9ce05c-lxc-fix-cgroupV1.patch b/1b9ce05c-lxc-fix-cgroupV1.patch deleted file mode 100644 index 97cb604..0000000 --- a/1b9ce05c-lxc-fix-cgroupV1.patch +++ /dev/null @@ -1,57 +0,0 @@ -commit 1b9ce05ce241a581d4e80228c92ceb0266f21f94 -Author: Cole Robinson -Date: Tue Oct 5 09:42:12 2021 -0400 - - lxc: controller: Fix container launch on cgroup v1 - - With cgroup v1 I'm seeing LXC container startup failures: - - $ sudo virt-install --connect lxc:/// --name test-container --memory 128 - --boot init=/bin/sh - - Starting install... - ERROR error from service: - GDBus.Error:org.freedesktop.machine1.NoMachineForPID: PID 2145047 does - not belong to any known machine - - libvirt 7.0.0 works but 7.1.0+ does not. The root error seems to predate - that, showing up in syslog, but commit 9c1693eff made it fatal: - - commit 9c1693eff427661616ce1bd2795688f87288a412 - Author: Pavel Hrdina - Date: Fri Feb 5 16:17:35 2021 +0100 - - vircgroup: use DBus call to systemd for some APIs - - The error comes from virSystemdGetMachineByPID. The PID that shows up in - the above error message does not match the leader PID as reported by - machinectl. - - This change fixes the error. Things seem to continue to work with - cgroupsv2 after this change. - - https://gitlab.com/libvirt/libvirt/-/issues/182 - - Tested-by: Jim Fehlig - Reviewed-by: Michal Privoznik - Signed-off-by: Cole Robinson - -Index: libvirt-7.8.0/src/lxc/lxc_controller.c -=================================================================== ---- libvirt-7.8.0.orig/src/lxc/lxc_controller.c -+++ libvirt-7.8.0/src/lxc/lxc_controller.c -@@ -865,12 +865,12 @@ static int virLXCControllerSetupCgroupLi - nodeset = virDomainNumatuneGetNodeset(ctrl->def->numa, auto_nodeset, -1); - - if (!(ctrl->cgroup = virLXCCgroupCreate(ctrl->def, -- ctrl->initpid, -+ getpid(), - ctrl->nnicindexes, - ctrl->nicindexes))) - goto cleanup; - -- if (virCgroupAddMachineProcess(ctrl->cgroup, getpid()) < 0) -+ if (virCgroupAddMachineProcess(ctrl->cgroup, ctrl->initpid) < 0) - goto cleanup; - - /* Add all qemu-nbd tasks to the cgroup */ diff --git a/2703b0b5-qemu-dont-report-eof.patch b/2703b0b5-qemu-dont-report-eof.patch deleted file mode 100644 index e29d072..0000000 --- a/2703b0b5-qemu-dont-report-eof.patch +++ /dev/null @@ -1,123 +0,0 @@ -commit 2703b0b5bf2751d523a4d8d61901e473c92ba198 -Author: Jim Fehlig -Date: Tue Oct 5 22:23:51 2021 -0600 - - qemu: Do not report eof when processing monitor IO - - There have been countless reports from users concerned about the following - error reported by libvirtd when qemu domains are shutdown - - internal error: End of file from qemu monitor - - While the error is harmless, users often mistaken it for real problem with - their deployments. EOF from the monitor can't be entirely ignored since - other threads may be using the monitor and must be able to detect the EOF - condition. - - One potential fix is to delay reporting EOF until the monitor is used - after EOF is detected. This patch adds a 'goteof' member to the - qemuMonitor structure, which is set when EOF is detected on the monitor - socket. If another thread later tries to send data on the monitor, the - EOF error is reported. - - Signed-off-by: Jim Fehlig - Reviewed-by: Michal Privoznik - -Index: libvirt-7.8.0/src/qemu/qemu_monitor.c -=================================================================== ---- libvirt-7.8.0.orig/src/qemu/qemu_monitor.c -+++ libvirt-7.8.0/src/qemu/qemu_monitor.c -@@ -98,6 +98,9 @@ struct _qemuMonitor { - * the next monitor msg */ - virError lastError; - -+ /* Set to true when EOF is detected on the monitor */ -+ bool goteof; -+ - int nextSerial; - - bool waitGreeting; -@@ -526,7 +529,6 @@ qemuMonitorIO(GSocket *socket G_GNUC_UNU - { - qemuMonitor *mon = opaque; - bool error = false; -- bool eof = false; - bool hangup = false; - - virObjectRef(mon); -@@ -544,7 +546,7 @@ qemuMonitorIO(GSocket *socket G_GNUC_UNU - - if (mon->lastError.code != VIR_ERR_OK) { - if (cond & (G_IO_HUP | G_IO_ERR)) -- eof = true; -+ mon->goteof = true; - error = true; - } else { - if (cond & G_IO_OUT) { -@@ -562,7 +564,7 @@ qemuMonitorIO(GSocket *socket G_GNUC_UNU - if (errno == ECONNRESET) - hangup = true; - } else if (got == 0) { -- eof = true; -+ mon->goteof = true; - } else { - /* Ignore hangup/error cond if we read some data, to - * give time for that data to be consumed */ -@@ -575,22 +577,19 @@ qemuMonitorIO(GSocket *socket G_GNUC_UNU - - if (cond & G_IO_HUP) { - hangup = true; -- if (!error) { -- virReportError(VIR_ERR_INTERNAL_ERROR, "%s", -- _("End of file from qemu monitor")); -- eof = true; -- } -+ if (!error) -+ mon->goteof = true; - } - -- if (!error && !eof && -+ if (!error && !mon->goteof && - cond & G_IO_ERR) { - virReportError(VIR_ERR_INTERNAL_ERROR, "%s", - _("Invalid file descriptor while waiting for monitor")); -- eof = true; -+ mon->goteof = true; - } - } - -- if (error || eof) { -+ if (error || mon->goteof) { - if (hangup && mon->logFunc != NULL) { - /* Check if an error message from qemu is available and if so, use - * it to overwrite the actual message. It's done only in early -@@ -609,7 +608,7 @@ qemuMonitorIO(GSocket *socket G_GNUC_UNU - /* Already have an error, so clear any new error */ - virResetLastError(); - } else { -- if (virGetLastErrorCode() == VIR_ERR_OK) -+ if (virGetLastErrorCode() == VIR_ERR_OK && !mon->goteof) - virReportError(VIR_ERR_INTERNAL_ERROR, "%s", - _("Error while processing monitor IO")); - virCopyLastError(&mon->lastError); -@@ -630,7 +629,7 @@ qemuMonitorIO(GSocket *socket G_GNUC_UNU - /* We have to unlock to avoid deadlock against command thread, - * but is this safe ? I think it is, because the callback - * will try to acquire the virDomainObj *mutex next */ -- if (eof) { -+ if (mon->goteof) { - qemuMonitorEofNotifyCallback eofNotify = mon->cb->eofNotify; - virDomainObj *vm = mon->vm; - -@@ -949,6 +948,11 @@ qemuMonitorSend(qemuMonitor *mon, - virSetError(&mon->lastError); - return -1; - } -+ if (mon->goteof) { -+ virReportError(VIR_ERR_INTERNAL_ERROR, "%s", -+ _("End of file from qemu monitor")); -+ return -1; -+ } - - mon->msg = msg; - qemuMonitorUpdateWatch(mon); diff --git a/3f9c1a4b-fix-host-validate-sev.patch b/3f9c1a4b-fix-host-validate-sev.patch deleted file mode 100644 index fe09099..0000000 --- a/3f9c1a4b-fix-host-validate-sev.patch +++ /dev/null @@ -1,30 +0,0 @@ -commit 3f9c1a4bb8416dafdaa89358498233aa6684377c -Author: Jim Fehlig -Date: Tue Oct 5 22:34:57 2021 -0600 - - tools: Fix virt-host-validate SEV detection - - virt-host-validate checks if AMD SEV is enabled by verifying - /sys/module/kvm_amd/parameters/sev is set to '1'. On a system - running kernel 5.13, the parameter is reported as 'Y'. To be - extra paranoid, add a check for 'y' along with 'Y' to complement - the existing check for '1'. - - Fixes: https://bugzilla.opensuse.org/show_bug.cgi?id=1188715 - - Signed-off-by: Jim Fehlig - Reviewed-by: Andrea Bolognani - -Index: libvirt-7.8.0/tools/virt-host-validate-common.c -=================================================================== ---- libvirt-7.8.0.orig/tools/virt-host-validate-common.c -+++ libvirt-7.8.0/tools/virt-host-validate-common.c -@@ -501,7 +501,7 @@ int virHostValidateSecureGuests(const ch - return VIR_HOST_VALIDATE_FAILURE(level); - } - -- if (mod_value[0] != '1') { -+ if (mod_value[0] != '1' && mod_value[0] != 'Y' && mod_value[0] != 'y') { - virHostMsgFail(level, - "AMD Secure Encrypted Virtualization appears to be " - "disabled in kernel. Add kvm_amd.sev=1 " diff --git a/libvirt-7.8.0.tar.xz b/libvirt-7.8.0.tar.xz deleted file mode 100644 index 12fe7c9..0000000 --- a/libvirt-7.8.0.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:a727cd0a47bfa24fa7de2874d23f3a9f9f02ceb6b49ba15288f6d9a098b19921 -size 8735184 diff --git a/libvirt-7.8.0.tar.xz.asc b/libvirt-7.8.0.tar.xz.asc deleted file mode 100644 index 4c1d916..0000000 --- a/libvirt-7.8.0.tar.xz.asc +++ /dev/null @@ -1,16 +0,0 @@ ------BEGIN PGP SIGNATURE----- - -iQIzBAABCAAdFiEERTtlMQWVVihVRxGZymi+gBAITJwFAmFWyW0ACgkQymi+gBAI -TJxSiA/+Lt9iZo/y8WIlIToXz9al62I+cInoQpUUFx8xIntn1Ubs5Gu8bltL7R24 -1jwrHZDj33obR2IH2CzRbIXyu9ehW8/fP0mO5fusJozZOW3n8oJh4p1yIoq8AVkC -WVIS0JZci7GTKjBqpA2vkea2mDmIRzK1oi0p2JoMdpIrhPuSfWwcj4SKPurQ7gEa -sjc3wsG6dj+m6p2v5T5Kzf5eD4/XUbIRovfFUohAODkBczNyyUyxVEG4vS6Ug3U7 -5mNNNjHeX6lB0nvY5KiWDKR2clvgA6OXIWhnZAZk6jF4Szhgh5cBCFSZ35r1FEWN -Dg6o/UT9I0q2fU13Cnx1KHpAOHbiJt0ZdmM8GwJrBB/kbtunikDwdR4nYZ3TN3QU -jcHtDkKJspXSwY7Szi+bOry8LzyH8NUcQeYF4Yrr+ywhMp/gkK9OGj1EkKbBWWIB -LlQIqmmwigJcqd3DzopKGbO/87CQvQwAWjxCG2v5IXtTk2s9MtMshEQfsuqM0FOr -HEBQUzUcMpSAHxycnia4mznXE4xUyGOXIbbHOG33Oelk0bVBIrC0unmwKMZiIkwX -DbOGy86cTQb7pIDlOo+Z2RNK9IJkNXEoDg0Qq9UgrZL/3MDjTw0j4sxGzSjeqpC9 -6JcjtIXCwVnQbsBpVBK5DRO0widgkU6yCfIOI7u4ZM62fndgWY4= -=g05u ------END PGP SIGNATURE----- diff --git a/libvirt-7.9.0.tar.xz b/libvirt-7.9.0.tar.xz new file mode 100644 index 0000000..b4dc054 --- /dev/null +++ b/libvirt-7.9.0.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:829cf2b5f574279c40f0446e1168815d3f36b89710560263ca2ce70256f72e8c +size 8785056 diff --git a/libvirt-7.9.0.tar.xz.asc b/libvirt-7.9.0.tar.xz.asc new file mode 100644 index 0000000..9c4618b --- /dev/null +++ b/libvirt-7.9.0.tar.xz.asc @@ -0,0 +1,16 @@ +-----BEGIN PGP SIGNATURE----- + +iQIzBAABCAAdFiEERTtlMQWVVihVRxGZymi+gBAITJwFAmF/3D8ACgkQymi+gBAI +TJxZ0A/+JsPIFw7IojexlMES00ouI7j/Zi0tmmFyCVmkWqy9qWui8lgte9i6AA0r +c8lsOldHxdhyYePPbiiV0J+CFN4h474+Ia/li9P1xMleLrcpM05B6Lhy8rLyW8Yz +VjUk0/iRJm3OOudIRJSEKjVZfxJsPIERMyL3MmVxRQhy3ShUphAiuZkzfsrzfa8D +hhYtJfEpn05oICOmZelkdnmSd+1595MYcseLJHPMIUBxmDaaEiRntT8P8MOOFlHG +YkcMcwdeFtOqUCo732HLS4OdOJF0yaM1nuY7ohrDAlERX6+XCqbJEdHnodwhIfiO +CPKLYMTX292+6EOggT4H0DZ9xxfoC06tT39EKn2uby6ggO3765hcx8rXyzz+3oUx +bC4zGsLHMNDmOg33mg8zGtos6ahUYBJa/acT4BuJ3fFirAXPNIBuGsl3S08jOolb +n/xdNGsC/pg6gPQ0M6BKuxVxIXA4DqBtf5AhKoivjx8AVlohgOX/2872wOJkuMJE +5GrhC09gk5cRvoFmkAo+iJvdqtlGFbzMmruvjc+2d6ud2DRxo1yApQO3IRHAXoL3 ++COpiuGkoGYC8AMlhrgN0Gh+NWkR0Etj0vFUStFkzUmSLk37X+fDEoKPFaNQvf61 +aXxl4gE1/ez6gc/2vA/3jrZjQOHet1G1ezoh3sGEKZiiSkTMRMo= +=PkBb +-----END PGP SIGNATURE----- diff --git a/libvirt-power8-models.patch b/libvirt-power8-models.patch index 4c3a132..3ed5212 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-7.8.0/src/cpu_map/ppc64_POWER8.xml +Index: libvirt-7.9.0/src/cpu_map/ppc64_POWER8.xml =================================================================== ---- libvirt-7.8.0.orig/src/cpu_map/ppc64_POWER8.xml -+++ libvirt-7.8.0/src/cpu_map/ppc64_POWER8.xml +--- libvirt-7.9.0.orig/src/cpu_map/ppc64_POWER8.xml ++++ libvirt-7.9.0/src/cpu_map/ppc64_POWER8.xml @@ -4,5 +4,7 @@ diff --git a/libvirt-supportconfig b/libvirt-supportconfig index 118a8ae..8c6a655 100644 --- a/libvirt-supportconfig +++ b/libvirt-supportconfig @@ -9,7 +9,8 @@ RCFILE="/usr/lib/supportconfig/resources/scplugin.rc" LIBVIRTD_CONF_FILES="$(find -L /etc/libvirt/*.conf -type f | sort)" -VM_CONF_FILES="" +PERSISTENT_VM_CONF_FILES="" +ACTIVE_VM_CONF_FILES="" LIBVIRTD_LOG_FILES="$(find -L /var/log/libvirt/ -name libvirtd.log -type f | sort)" @@ -52,17 +53,20 @@ rpm_verify() { } if rpm_installed libvirt-daemon-driver-libxl; then - test -d /etc/libvirt/libxl && VM_CONF_FILES="$VM_CONF_FILES $(find -L /etc/libvirt/libxl/ -type f | sort)" + test -d /etc/libvirt/libxl && PERSISTENT_VM_CONF_FILES="$PERSISTENT_VM_CONF_FILES $(find -L /etc/libvirt/libxl/ -type f | sort)" + test -d /run/libvirt/libxl && ACTIVE_VM_CONF_FILES="$ACTIVE_VM_CONF_FILES $(find -L /run/libvirt/libxl/ -type f | sort)" test -d /var/log/libvirt/libxl && LIBVIRTD_LOG_FILES="$LIBVIRTD_LOG_FILES $(find -L /var/log/libvirt/libxl/ -type f | sort)" fi if rpm_installed libvirt-daemon-driver-qemu; then - test -d /etc/libvirt/qemu && VM_CONF_FILES="$VM_CONF_FILES $(find -L /etc/libvirt/qemu/ -type f | sort)" + test -d /etc/libvirt/qemu && PERSISTENT_VM_CONF_FILES="$PERSISTENT_VM_CONF_FILES $(find -L /etc/libvirt/qemu/ -type f | sort)" + test -d /run/libvirt/qemu && ACTIVE_VM_CONF_FILES="$ACTIVE_VM_CONF_FILES $(find -L /run/libvirt/qemu/ -type f | sort)" test -d /var/log/libvirt/qemu && LIBVIRTD_LOG_FILES="$LIBVIRTD_LOG_FILES $(find -L /var/log/libvirt/qemu/ -type f | sort)" fi if rpm_installed libvirt-daemon-driver-lxc; then - test -d /etc/libvirt/lxc && VM_CONF_FILES="$VM_CONF_FILES $(find -L /etc/libvirt/lxc/ -type f | sort)" + test -d /etc/libvirt/lxc && PERSISTENT_VM_CONF_FILES="$PERSISTENT_VM_CONF_FILES $(find -L /etc/libvirt/lxc/ -type f | sort)" + test -d /run/libvirt/lxc && ACTIVE_VM_CONF_FILES="$ACTIVE_VM_CONF_FILES $(find -L /run/libvirt/lxc/ -type f | sort)" test -d /var/log/libvirt/lxc && LIBVIRTD_LOG_FILES="$LIBVIRTD_LOG_FILES $(find -L /var/log/libvirt/lxc/ -type f | sort)" fi @@ -99,7 +103,7 @@ if systemctl is-active --quiet libvirtd.service; then echo done # for LXC domains we have to explicitly specify the URI - if rpm_installed libvirt-daemon-lxc; then + if rpm_installed libvirt-daemon-driver-lxc; then for DOM in $(virsh -c lxc:/// list --name --all); do plugin_command "virsh -c lxc:/// dumpxml $DOM" plugin_command "virsh -c lxc:/// dominfo $DOM" @@ -116,8 +120,11 @@ fi # dump libvirtd-related conf files pconf_files "$LIBVIRTD_CONF_FILES" -# dump VM-related conf files -pconf_files "$VM_CONF_FILES" +# dump persistent VM-related conf files +pconf_files "$PERSISTENT_VM_CONF_FILES" + +# dump active VM-related conf files +pconf_files "$ACTIVE_VM_CONF_FILES" # dump hook conf files test -d /etc/libvirt/hooks && FILES="$(find -L /etc/libvirt/hooks/ -type f | sort)" diff --git a/libvirt-suse-netcontrol.patch b/libvirt-suse-netcontrol.patch index dfdb3c4..67b4526 100644 --- a/libvirt-suse-netcontrol.patch +++ b/libvirt-suse-netcontrol.patch @@ -1,7 +1,7 @@ -Index: libvirt-7.8.0/tools/virsh.c +Index: libvirt-7.9.0/tools/virsh.c =================================================================== ---- libvirt-7.8.0.orig/tools/virsh.c -+++ libvirt-7.8.0/tools/virsh.c +--- libvirt-7.9.0.orig/tools/virsh.c ++++ libvirt-7.9.0/tools/virsh.c @@ -546,6 +546,8 @@ virshShowVersion(vshControl *ctl G_GNUC_ vshPrint(ctl, " Interface"); # if defined(WITH_NETCF) @@ -11,10 +11,10 @@ Index: libvirt-7.8.0/tools/virsh.c # elif defined(WITH_UDEV) vshPrint(ctl, " udev"); # endif -Index: libvirt-7.8.0/src/interface/interface_backend_netcf.c +Index: libvirt-7.9.0/src/interface/interface_backend_netcf.c =================================================================== ---- libvirt-7.8.0.orig/src/interface/interface_backend_netcf.c -+++ libvirt-7.8.0/src/interface/interface_backend_netcf.c +--- libvirt-7.9.0.orig/src/interface/interface_backend_netcf.c ++++ libvirt-7.9.0/src/interface/interface_backend_netcf.c @@ -21,7 +21,12 @@ #include @@ -126,10 +126,10 @@ Index: libvirt-7.8.0/src/interface/interface_backend_netcf.c if (virRegisterConnectDriver(&interfaceConnectDriver, false) < 0) return -1; if (virSetSharedInterfaceDriver(&interfaceDriver) < 0) -Index: libvirt-7.8.0/src/interface/interface_driver.c +Index: libvirt-7.9.0/src/interface/interface_driver.c =================================================================== ---- libvirt-7.8.0.orig/src/interface/interface_driver.c -+++ libvirt-7.8.0/src/interface/interface_driver.c +--- libvirt-7.9.0.orig/src/interface/interface_driver.c ++++ libvirt-7.9.0/src/interface/interface_driver.c @@ -30,8 +30,15 @@ interfaceRegister(void) if (netcfIfaceRegister() == 0) return 0; @@ -147,10 +147,10 @@ Index: libvirt-7.8.0/src/interface/interface_driver.c if (udevIfaceRegister() == 0) return 0; #endif /* WITH_UDEV */ -Index: libvirt-7.8.0/meson.build +Index: libvirt-7.9.0/meson.build =================================================================== ---- libvirt-7.8.0.orig/meson.build -+++ libvirt-7.8.0/meson.build +--- libvirt-7.9.0.orig/meson.build ++++ libvirt-7.9.0/meson.build @@ -1086,6 +1086,12 @@ else netcf_dep = dependency('', required: false) endif @@ -185,10 +185,10 @@ Index: libvirt-7.8.0/meson.build 'NLS': have_gnu_gettext_tools, 'numactl': numactl_dep.found(), 'openwsman': openwsman_dep.found(), -Index: libvirt-7.8.0/src/interface/meson.build +Index: libvirt-7.9.0/src/interface/meson.build =================================================================== ---- libvirt-7.8.0.orig/src/interface/meson.build -+++ libvirt-7.8.0/src/interface/meson.build +--- libvirt-7.9.0.orig/src/interface/meson.build ++++ libvirt-7.9.0/src/interface/meson.build @@ -2,7 +2,7 @@ interface_driver_sources = [ 'interface_driver.c', ] @@ -206,10 +206,10 @@ Index: libvirt-7.8.0/src/interface/meson.build udev_dep, ], 'link_args': [ -Index: libvirt-7.8.0/meson_options.txt +Index: libvirt-7.9.0/meson_options.txt =================================================================== ---- libvirt-7.8.0.orig/meson_options.txt -+++ libvirt-7.8.0/meson_options.txt +--- libvirt-7.9.0.orig/meson_options.txt ++++ libvirt-7.9.0/meson_options.txt @@ -29,6 +29,7 @@ option('libpcap', type: 'feature', value option('libssh', type: 'feature', value: 'auto', description: 'libssh support') option('libssh2', type: 'feature', value: 'auto', description: 'libssh2 support') diff --git a/libvirt.changes b/libvirt.changes index 4a919e7..c874776 100644 --- a/libvirt.changes +++ b/libvirt.changes @@ -1,3 +1,17 @@ +------------------------------------------------------------------- +Thu Nov 4 16:29:03 UTC 2021 - James Fehlig + +- Update to libvirt 7.9.0 + - jsc#SLE-19264 + - Many incremental improvements and bug fixes, see + https://libvirt.org/news.html + - Dropped patches: + 3f9c1a4b-fix-host-validate-sev.patch, + 2703b0b5-qemu-dont-report-eof.patch, + 1b9ce05c-lxc-fix-cgroupV1.patch +- Include collection of active VM config files in the + supportconfig plugin + ------------------------------------------------------------------- Mon Oct 18 15:44:15 UTC 2021 - James Fehlig diff --git a/libvirt.spec b/libvirt.spec index b584cc9..3f5f0dd 100644 --- a/libvirt.spec +++ b/libvirt.spec @@ -136,7 +136,7 @@ Name: libvirt URL: http://libvirt.org/ -Version: 7.8.0 +Version: 7.9.0 Release: 0 Summary: Library providing a virtualization API License: LGPL-2.1-or-later @@ -282,9 +282,6 @@ Source6: libvirtd-relocation-server.xml Source99: baselibs.conf Source100: %{name}-rpmlintrc # Upstream patches -Patch0: 3f9c1a4b-fix-host-validate-sev.patch -Patch1: 1b9ce05c-lxc-fix-cgroupV1.patch -Patch2: 2703b0b5-qemu-dont-report-eof.patch # Patches pending upstream review Patch100: libxl-dom-reset.patch Patch101: network-don-t-use-dhcp-authoritative-on-static-netwo.patch @@ -1631,8 +1628,8 @@ fi %config(noreplace) %{_sysconfdir}/%{name}/qemu.conf %config(noreplace) %{_sysconfdir}/%{name}/qemu-lockd.conf %config(noreplace) %{_sysconfdir}/logrotate.d/libvirtd.qemu -%dir %attr(0750, %{qemu_user}, %{qemu_group}) %{_localstatedir}/lib/%{name}/qemu/ -%dir %attr(0750, %{qemu_user}, %{qemu_group}) %{_localstatedir}/cache/%{name}/qemu/ +%dir %attr(0751, %{qemu_user}, %{qemu_group}) %{_localstatedir}/lib/%{name}/qemu/ +%dir %attr(0750, root, root) %{_localstatedir}/cache/%{name}/qemu/ %dir %attr(0700, root, root) %{_localstatedir}/log/%{name}/qemu/ %{_datadir}/augeas/lenses/libvirtd_qemu.aug %{_datadir}/augeas/lenses/tests/test_libvirtd_qemu.aug @@ -1641,7 +1638,7 @@ fi %dir %attr(0711, root, root) %{_localstatedir}/lib/%{name}/swtpm/ %dir %attr(0711, root, root) %{_localstatedir}/log/swtpm/ %dir %attr(0711, root, root) %{_localstatedir}/log/swtpm/%{name}/ -%dir %attr(0731, tss, tss) %{_localstatedir}/log/swtpm/%{name}/qemu/ +%dir %attr(0730, tss, tss) %{_localstatedir}/log/swtpm/%{name}/qemu/ %{_bindir}/virt-qemu-run %doc %{_mandir}/man1/virt-qemu-run.1* %doc %{_mandir}/man8/virtqemud.8* diff --git a/libxl-dom-reset.patch b/libxl-dom-reset.patch index 9a913df..5dcd1d6 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-7.8.0/src/libxl/libxl_driver.c +Index: libvirt-7.9.0/src/libxl/libxl_driver.c =================================================================== ---- libvirt-7.8.0.orig/src/libxl/libxl_driver.c -+++ libvirt-7.8.0/src/libxl/libxl_driver.c +--- libvirt-7.9.0.orig/src/libxl/libxl_driver.c ++++ libvirt-7.9.0/src/libxl/libxl_driver.c @@ -1343,6 +1343,63 @@ libxlDomainReboot(virDomainPtr dom, unsi } diff --git a/libxl-set-cach-mode.patch b/libxl-set-cach-mode.patch index 00d40ee..d15503f 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-7.8.0/src/libxl/libxl_conf.c +Index: libvirt-7.9.0/src/libxl/libxl_conf.c =================================================================== ---- libvirt-7.8.0.orig/src/libxl/libxl_conf.c -+++ libvirt-7.8.0/src/libxl/libxl_conf.c +--- libvirt-7.9.0.orig/src/libxl/libxl_conf.c ++++ libvirt-7.9.0/src/libxl/libxl_conf.c @@ -941,6 +941,28 @@ libxlDiskSetDiscard(libxl_device_disk *x } } diff --git a/libxl-set-migration-constraints.patch b/libxl-set-migration-constraints.patch index e9df858..6e16bef 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-7.8.0/docs/manpages/virsh.rst +Index: libvirt-7.9.0/docs/manpages/virsh.rst =================================================================== ---- libvirt-7.8.0.orig/docs/manpages/virsh.rst -+++ libvirt-7.8.0/docs/manpages/virsh.rst +--- libvirt-7.9.0.orig/docs/manpages/virsh.rst ++++ libvirt-7.9.0/docs/manpages/virsh.rst @@ -3167,7 +3167,8 @@ migrate [--postcopy-bandwidth bandwidth] [--parallel [--parallel-connections connections]] @@ -43,10 +43,10 @@ Index: libvirt-7.8.0/docs/manpages/virsh.rst Running migration can be canceled by interrupting virsh (usually using ``Ctrl-C``) or by ``domjobabort`` command sent from another virsh instance. -Index: libvirt-7.8.0/include/libvirt/libvirt-domain.h +Index: libvirt-7.9.0/include/libvirt/libvirt-domain.h =================================================================== ---- libvirt-7.8.0.orig/include/libvirt/libvirt-domain.h -+++ libvirt-7.8.0/include/libvirt/libvirt-domain.h +--- libvirt-7.9.0.orig/include/libvirt/libvirt-domain.h ++++ libvirt-7.9.0/include/libvirt/libvirt-domain.h @@ -1079,6 +1079,25 @@ typedef enum { */ # define VIR_MIGRATE_PARAM_TLS_DESTINATION "tls.destination" @@ -73,10 +73,10 @@ Index: libvirt-7.8.0/include/libvirt/libvirt-domain.h /* Domain migration. */ virDomainPtr virDomainMigrate (virDomainPtr domain, virConnectPtr dconn, unsigned long flags, const char *dname, -Index: libvirt-7.8.0/src/libxl/libxl_driver.c +Index: libvirt-7.9.0/src/libxl/libxl_driver.c =================================================================== ---- libvirt-7.8.0.orig/src/libxl/libxl_driver.c -+++ libvirt-7.8.0/src/libxl/libxl_driver.c +--- libvirt-7.9.0.orig/src/libxl/libxl_driver.c ++++ libvirt-7.9.0/src/libxl/libxl_driver.c @@ -6005,6 +6005,9 @@ libxlDomainMigratePerform3Params(virDoma const char *dname = NULL; const char *uri = NULL; @@ -117,10 +117,10 @@ Index: libvirt-7.8.0/src/libxl/libxl_driver.c goto cleanup; } -Index: libvirt-7.8.0/src/libxl/libxl_migration.c +Index: libvirt-7.9.0/src/libxl/libxl_migration.c =================================================================== ---- libvirt-7.8.0.orig/src/libxl/libxl_migration.c -+++ libvirt-7.8.0/src/libxl/libxl_migration.c +--- libvirt-7.9.0.orig/src/libxl/libxl_migration.c ++++ libvirt-7.9.0/src/libxl/libxl_migration.c @@ -334,18 +334,38 @@ libxlMigrateDstReceive(virNetSocket *soc static int libxlDoMigrateSrcSend(libxlDriverPrivate *driver, @@ -281,10 +281,10 @@ Index: libvirt-7.8.0/src/libxl/libxl_migration.c virObjectLock(vm); if (ret == 0) { -Index: libvirt-7.8.0/src/libxl/libxl_migration.h +Index: libvirt-7.9.0/src/libxl/libxl_migration.h =================================================================== ---- libvirt-7.8.0.orig/src/libxl/libxl_migration.h -+++ libvirt-7.8.0/src/libxl/libxl_migration.h +--- libvirt-7.9.0.orig/src/libxl/libxl_migration.h ++++ libvirt-7.9.0/src/libxl/libxl_migration.h @@ -35,6 +35,9 @@ VIR_MIGRATE_PARAM_URI, VIR_TYPED_PARAM_STRING, \ VIR_MIGRATE_PARAM_DEST_NAME, VIR_TYPED_PARAM_STRING, \ @@ -327,11 +327,11 @@ Index: libvirt-7.8.0/src/libxl/libxl_migration.h virDomainPtr libxlDomainMigrationDstFinish(virConnectPtr dconn, -Index: libvirt-7.8.0/tools/virsh-domain.c +Index: libvirt-7.9.0/tools/virsh-domain.c =================================================================== ---- libvirt-7.8.0.orig/tools/virsh-domain.c -+++ libvirt-7.8.0/tools/virsh-domain.c -@@ -10457,6 +10457,18 @@ static const vshCmdOptDef opts_migrate[] +--- libvirt-7.9.0.orig/tools/virsh-domain.c ++++ libvirt-7.9.0/tools/virsh-domain.c +@@ -10685,6 +10685,18 @@ static const vshCmdOptDef opts_migrate[] .completer = virshCompleteEmpty, .help = N_("override the destination host name used for TLS verification") }, @@ -350,7 +350,7 @@ Index: libvirt-7.8.0/tools/virsh-domain.c {.name = NULL} }; -@@ -10477,6 +10489,7 @@ doMigrate(void *opaque) +@@ -10705,6 +10717,7 @@ doMigrate(void *opaque) unsigned long long ullOpt = 0; int rv; virConnectPtr dconn = data->dconn; @@ -358,7 +358,7 @@ Index: libvirt-7.8.0/tools/virsh-domain.c #ifndef WIN32 sigset_t sigmask, oldsigmask; -@@ -10607,6 +10620,22 @@ doMigrate(void *opaque) +@@ -10835,6 +10848,22 @@ doMigrate(void *opaque) goto save_error; } diff --git a/libxl-support-block-script.patch b/libxl-support-block-script.patch index b462184..77bf3e5 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-7.8.0/src/libxl/libxl_conf.c +Index: libvirt-7.9.0/src/libxl/libxl_conf.c =================================================================== ---- libvirt-7.8.0.orig/src/libxl/libxl_conf.c -+++ libvirt-7.8.0/src/libxl/libxl_conf.c +--- libvirt-7.9.0.orig/src/libxl/libxl_conf.c ++++ libvirt-7.9.0/src/libxl/libxl_conf.c @@ -942,6 +942,20 @@ libxlDiskSetDiscard(libxl_device_disk *x } diff --git a/lxc-wait-after-eth-del.patch b/lxc-wait-after-eth-del.patch index 1128a86..0c185bc 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-7.8.0/src/lxc/lxc_controller.c +Index: libvirt-7.9.0/src/lxc/lxc_controller.c =================================================================== ---- libvirt-7.8.0.orig/src/lxc/lxc_controller.c -+++ libvirt-7.8.0/src/lxc/lxc_controller.c +--- libvirt-7.9.0.orig/src/lxc/lxc_controller.c ++++ libvirt-7.9.0/src/lxc/lxc_controller.c @@ -2012,6 +2012,7 @@ static int virLXCControllerDeleteInterfa if (virNetDevVethDelete(ctrl->veths[i]) < 0) ret = -1; @@ -25,10 +25,10 @@ Index: libvirt-7.8.0/src/lxc/lxc_controller.c return ret; } -Index: libvirt-7.8.0/src/lxc/lxc_driver.c +Index: libvirt-7.9.0/src/lxc/lxc_driver.c =================================================================== ---- libvirt-7.8.0.orig/src/lxc/lxc_driver.c -+++ libvirt-7.8.0/src/lxc/lxc_driver.c +--- libvirt-7.9.0.orig/src/lxc/lxc_driver.c ++++ libvirt-7.9.0/src/lxc/lxc_driver.c @@ -67,6 +67,7 @@ #include "virtime.h" #include "virtypedparam.h" @@ -53,10 +53,10 @@ Index: libvirt-7.8.0/src/lxc/lxc_driver.c break; /* It'd be nice to support this, but with macvlan -Index: libvirt-7.8.0/src/lxc/lxc_process.c +Index: libvirt-7.9.0/src/lxc/lxc_process.c =================================================================== ---- libvirt-7.8.0.orig/src/lxc/lxc_process.c -+++ libvirt-7.8.0/src/lxc/lxc_process.c +--- libvirt-7.9.0.orig/src/lxc/lxc_process.c ++++ libvirt-7.9.0/src/lxc/lxc_process.c @@ -51,6 +51,7 @@ #include "virstring.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 adc359e..04d042c 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-7.8.0/src/network/bridge_driver.c +Index: libvirt-7.9.0/src/network/bridge_driver.c =================================================================== ---- libvirt-7.8.0.orig/src/network/bridge_driver.c -+++ libvirt-7.8.0/src/network/bridge_driver.c -@@ -1480,7 +1480,14 @@ networkDnsmasqConfContents(virNetworkObj +--- libvirt-7.9.0.orig/src/network/bridge_driver.c ++++ libvirt-7.9.0/src/network/bridge_driver.c +@@ -1463,7 +1463,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-7.8.0/src/network/bridge_driver.c } if (ipdef->tftproot) { -Index: libvirt-7.8.0/tests/networkxml2confdata/dhcp6host-routed-network.conf +Index: libvirt-7.9.0/tests/networkxml2confdata/dhcp6host-routed-network.conf =================================================================== ---- libvirt-7.8.0.orig/tests/networkxml2confdata/dhcp6host-routed-network.conf -+++ libvirt-7.8.0/tests/networkxml2confdata/dhcp6host-routed-network.conf +--- libvirt-7.9.0.orig/tests/networkxml2confdata/dhcp6host-routed-network.conf ++++ libvirt-7.9.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 68a4efa..7127163 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-7.8.0/src/util/virarch.c +Index: libvirt-7.9.0/src/util/virarch.c =================================================================== ---- libvirt-7.8.0.orig/src/util/virarch.c -+++ libvirt-7.8.0/src/util/virarch.c +--- libvirt-7.9.0.orig/src/util/virarch.c ++++ libvirt-7.9.0/src/util/virarch.c @@ -220,6 +220,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 0397a37..15b2325 100644 --- a/qemu-apparmor-screenshot.patch +++ b/qemu-apparmor-screenshot.patch @@ -1,7 +1,7 @@ -Index: libvirt-7.8.0/src/security/apparmor/libvirt-qemu +Index: libvirt-7.9.0/src/security/apparmor/libvirt-qemu =================================================================== ---- libvirt-7.8.0.orig/src/security/apparmor/libvirt-qemu -+++ libvirt-7.8.0/src/security/apparmor/libvirt-qemu +--- libvirt-7.9.0.orig/src/security/apparmor/libvirt-qemu ++++ libvirt-7.9.0/src/security/apparmor/libvirt-qemu @@ -248,3 +248,6 @@ # /sys/bus/nd/devices / r, # harmless on any lsb compliant system diff --git a/suse-libvirt-guests-service.patch b/suse-libvirt-guests-service.patch index 080f8dc..165d137 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-7.8.0/tools/libvirt-guests.sh.in +Index: libvirt-7.9.0/tools/libvirt-guests.sh.in =================================================================== ---- libvirt-7.8.0.orig/tools/libvirt-guests.sh.in -+++ libvirt-7.8.0/tools/libvirt-guests.sh.in +--- libvirt-7.9.0.orig/tools/libvirt-guests.sh.in ++++ libvirt-7.9.0/tools/libvirt-guests.sh.in @@ -20,10 +20,6 @@ sysconfdir="@sysconfdir@" localstatedir="@localstatedir@" libvirtd="@sbindir@"/libvirtd diff --git a/suse-libvirtd-disable-tls.patch b/suse-libvirtd-disable-tls.patch index 03dc074..a89d7fe 100644 --- a/suse-libvirtd-disable-tls.patch +++ b/suse-libvirtd-disable-tls.patch @@ -3,10 +3,10 @@ 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-7.8.0/src/remote/remote_daemon_config.c +Index: libvirt-7.9.0/src/remote/remote_daemon_config.c =================================================================== ---- libvirt-7.8.0.orig/src/remote/remote_daemon_config.c -+++ libvirt-7.8.0/src/remote/remote_daemon_config.c +--- libvirt-7.9.0.orig/src/remote/remote_daemon_config.c ++++ libvirt-7.9.0/src/remote/remote_daemon_config.c @@ -98,7 +98,7 @@ daemonConfigNew(bool privileged G_GNUC_U #ifdef WITH_IP @@ -16,10 +16,10 @@ Index: libvirt-7.8.0/src/remote/remote_daemon_config.c # else /* ! LIBVIRTD */ data->listen_tls = false; /* Always honoured, --listen doesn't exist. */ # endif /* ! LIBVIRTD */ -Index: libvirt-7.8.0/src/remote/libvirtd.conf.in +Index: libvirt-7.9.0/src/remote/libvirtd.conf.in =================================================================== ---- libvirt-7.8.0.orig/src/remote/libvirtd.conf.in -+++ libvirt-7.8.0/src/remote/libvirtd.conf.in +--- libvirt-7.9.0.orig/src/remote/libvirtd.conf.in ++++ libvirt-7.9.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. @@ -31,10 +31,10 @@ Index: libvirt-7.8.0/src/remote/libvirtd.conf.in # Listen for unencrypted TCP connections on the public TCP/IP port. # NB, must pass the --listen flag to the @DAEMON_NAME@ process for this to -Index: libvirt-7.8.0/src/remote/test_libvirtd.aug.in +Index: libvirt-7.9.0/src/remote/test_libvirtd.aug.in =================================================================== ---- libvirt-7.8.0.orig/src/remote/test_libvirtd.aug.in -+++ libvirt-7.8.0/src/remote/test_libvirtd.aug.in +--- libvirt-7.9.0.orig/src/remote/test_libvirtd.aug.in ++++ libvirt-7.9.0/src/remote/test_libvirtd.aug.in @@ -3,7 +3,7 @@ module Test_@DAEMON_NAME@ = test @DAEMON_NAME_UC@.lns get conf = diff --git a/suse-libxl-disable-autoballoon.patch b/suse-libxl-disable-autoballoon.patch index 907bfb6..70c0938 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-7.8.0/src/libxl/libxl.conf +Index: libvirt-7.9.0/src/libxl/libxl.conf =================================================================== ---- libvirt-7.8.0.orig/src/libxl/libxl.conf -+++ libvirt-7.8.0/src/libxl/libxl.conf +--- libvirt-7.9.0.orig/src/libxl/libxl.conf ++++ libvirt-7.9.0/src/libxl/libxl.conf @@ -4,12 +4,11 @@ # Enable autoballooning of domain0 @@ -27,10 +27,10 @@ Index: libvirt-7.8.0/src/libxl/libxl.conf # In order to prevent accidentally starting two domains that -Index: libvirt-7.8.0/src/libxl/libxl_conf.c +Index: libvirt-7.9.0/src/libxl/libxl_conf.c =================================================================== ---- libvirt-7.8.0.orig/src/libxl/libxl_conf.c -+++ libvirt-7.8.0/src/libxl/libxl_conf.c +--- libvirt-7.9.0.orig/src/libxl/libxl_conf.c ++++ libvirt-7.9.0/src/libxl/libxl_conf.c @@ -1746,15 +1746,12 @@ libxlMakeBuildInfoVfb(virPortAllocatorRa /* * Get domain0 autoballoon configuration. Honor user-specified @@ -66,10 +66,10 @@ Index: libvirt-7.8.0/src/libxl/libxl_conf.c return 0; } -Index: libvirt-7.8.0/src/libxl/test_libvirtd_libxl.aug.in +Index: libvirt-7.9.0/src/libxl/test_libvirtd_libxl.aug.in =================================================================== ---- libvirt-7.8.0.orig/src/libxl/test_libvirtd_libxl.aug.in -+++ libvirt-7.8.0/src/libxl/test_libvirtd_libxl.aug.in +--- libvirt-7.9.0.orig/src/libxl/test_libvirtd_libxl.aug.in ++++ libvirt-7.9.0/src/libxl/test_libvirtd_libxl.aug.in @@ -2,7 +2,7 @@ module Test_libvirtd_libxl = @CONFIG@ diff --git a/suse-qemu-conf.patch b/suse-qemu-conf.patch index c618418..eed17be 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-7.8.0/src/qemu/qemu.conf +Index: libvirt-7.9.0/src/qemu/qemu.conf =================================================================== ---- libvirt-7.8.0.orig/src/qemu/qemu.conf -+++ libvirt-7.8.0/src/qemu/qemu.conf +--- libvirt-7.9.0.orig/src/qemu/qemu.conf ++++ libvirt-7.9.0/src/qemu/qemu.conf @@ -491,10 +491,19 @@ # isolation, but it cannot appear in a list of drivers. # @@ -60,10 +60,10 @@ Index: libvirt-7.8.0/src/qemu/qemu.conf # #lock_manager = "lockd" -Index: libvirt-7.8.0/src/qemu/qemu_conf.c +Index: libvirt-7.9.0/src/qemu/qemu_conf.c =================================================================== ---- libvirt-7.8.0.orig/src/qemu/qemu_conf.c -+++ libvirt-7.8.0/src/qemu/qemu_conf.c +--- libvirt-7.9.0.orig/src/qemu/qemu_conf.c ++++ libvirt-7.9.0/src/qemu/qemu_conf.c @@ -272,7 +272,7 @@ virQEMUDriverConfig *virQEMUDriverConfig cfg->slirpHelperName = g_strdup(QEMU_SLIRP_HELPER); cfg->dbusDaemonName = g_strdup(QEMU_DBUS_DAEMON); @@ -73,10 +73,10 @@ Index: libvirt-7.8.0/src/qemu/qemu_conf.c cfg->securityRequireConfined = false; cfg->keepAliveInterval = 5; -Index: libvirt-7.8.0/src/qemu/test_libvirtd_qemu.aug.in +Index: libvirt-7.9.0/src/qemu/test_libvirtd_qemu.aug.in =================================================================== ---- libvirt-7.8.0.orig/src/qemu/test_libvirtd_qemu.aug.in -+++ libvirt-7.8.0/src/qemu/test_libvirtd_qemu.aug.in +--- libvirt-7.9.0.orig/src/qemu/test_libvirtd_qemu.aug.in ++++ libvirt-7.9.0/src/qemu/test_libvirtd_qemu.aug.in @@ -45,6 +45,7 @@ module Test_libvirtd_qemu = { "remote_websocket_port_min" = "5700" } { "remote_websocket_port_max" = "65535" } diff --git a/suse-qemu-ovmf-paths.patch b/suse-qemu-ovmf-paths.patch index af9806b..721028e 100644 --- a/suse-qemu-ovmf-paths.patch +++ b/suse-qemu-ovmf-paths.patch @@ -5,10 +5,10 @@ advertised and used by libvirt are automatically detected. Until upstream removes the old DEFAULT_LOADER_NVRAM approach and associated code, this patch will stay. -Index: libvirt-7.8.0/src/qemu/qemu.conf +Index: libvirt-7.9.0/src/qemu/qemu.conf =================================================================== ---- libvirt-7.8.0.orig/src/qemu/qemu.conf -+++ libvirt-7.8.0/src/qemu/qemu.conf +--- libvirt-7.9.0.orig/src/qemu/qemu.conf ++++ libvirt-7.9.0/src/qemu/qemu.conf @@ -857,10 +857,9 @@ # for x86_64 and i686, but it's AAVMF for aarch64. The libvirt default # follows this scheme. @@ -23,10 +23,10 @@ Index: libvirt-7.8.0/src/qemu/qemu.conf #] # The backend to use for handling stdout/stderr output from -Index: libvirt-7.8.0/src/qemu/qemu_conf.c +Index: libvirt-7.9.0/src/qemu/qemu_conf.c =================================================================== ---- libvirt-7.8.0.orig/src/qemu/qemu_conf.c -+++ libvirt-7.8.0/src/qemu/qemu_conf.c +--- libvirt-7.9.0.orig/src/qemu/qemu_conf.c ++++ libvirt-7.9.0/src/qemu/qemu_conf.c @@ -98,10 +98,9 @@ qemuDriverUnlock(virQEMUDriver *driver) #ifndef DEFAULT_LOADER_NVRAM @@ -41,10 +41,10 @@ Index: libvirt-7.8.0/src/qemu/qemu_conf.c #endif -Index: libvirt-7.8.0/src/security/virt-aa-helper.c +Index: libvirt-7.9.0/src/security/virt-aa-helper.c =================================================================== ---- libvirt-7.8.0.orig/src/security/virt-aa-helper.c -+++ libvirt-7.8.0/src/security/virt-aa-helper.c +--- libvirt-7.9.0.orig/src/security/virt-aa-helper.c ++++ libvirt-7.9.0/src/security/virt-aa-helper.c @@ -480,7 +480,8 @@ valid_path(const char *path, const bool "/usr/share/ovmf/", /* for OVMF images */ "/usr/share/AAVMF/", /* for AAVMF images */ @@ -55,10 +55,10 @@ Index: libvirt-7.8.0/src/security/virt-aa-helper.c }; /* override the above with these */ const char * const override[] = { -Index: libvirt-7.8.0/src/qemu/test_libvirtd_qemu.aug.in +Index: libvirt-7.9.0/src/qemu/test_libvirtd_qemu.aug.in =================================================================== ---- libvirt-7.8.0.orig/src/qemu/test_libvirtd_qemu.aug.in -+++ libvirt-7.8.0/src/qemu/test_libvirtd_qemu.aug.in +--- libvirt-7.9.0.orig/src/qemu/test_libvirtd_qemu.aug.in ++++ libvirt-7.9.0/src/qemu/test_libvirtd_qemu.aug.in @@ -96,10 +96,9 @@ module Test_libvirtd_qemu = { "migration_port_max" = "49215" } { "log_timestamp" = "0" } diff --git a/suse-xen-ovmf-paths.patch b/suse-xen-ovmf-paths.patch index 50f27d6..fa0e4c0 100644 --- a/suse-xen-ovmf-paths.patch +++ b/suse-xen-ovmf-paths.patch @@ -5,10 +5,10 @@ June 2021 ovmf only supports one firmware for Xen. This patch adjusts the firmware path to match the one provided by the ovmf package. -Index: libvirt-7.8.0/src/libxl/libxl_conf.c +Index: libvirt-7.9.0/src/libxl/libxl_conf.c =================================================================== ---- libvirt-7.8.0.orig/src/libxl/libxl_conf.c -+++ libvirt-7.8.0/src/libxl/libxl_conf.c +--- libvirt-7.9.0.orig/src/libxl/libxl_conf.c ++++ libvirt-7.9.0/src/libxl/libxl_conf.c @@ -1797,7 +1797,7 @@ libxlDriverConfigNew(void) cfg->firmwares = g_new0(virFirmware *, 1); cfg->nfirmwares = 1; diff --git a/virt-create-rootfs.patch b/virt-create-rootfs.patch index 97f1ca4..262e009 100644 --- a/virt-create-rootfs.patch +++ b/virt-create-rootfs.patch @@ -1,7 +1,7 @@ -Index: libvirt-7.8.0/tools/virt-create-rootfs +Index: libvirt-7.9.0/tools/virt-create-rootfs =================================================================== --- /dev/null -+++ libvirt-7.8.0/tools/virt-create-rootfs ++++ libvirt-7.9.0/tools/virt-create-rootfs @@ -0,0 +1,231 @@ +#!/bin/sh +set -e @@ -234,10 +234,10 @@ Index: libvirt-7.8.0/tools/virt-create-rootfs + echo "pts/0" >> "$ROOT/etc/securetty" + chroot "$ROOT" /usr/bin/passwd +fi -Index: libvirt-7.8.0/docs/manpages/virt-create-rootfs.rst +Index: libvirt-7.9.0/docs/manpages/virt-create-rootfs.rst =================================================================== --- /dev/null -+++ libvirt-7.8.0/docs/manpages/virt-create-rootfs.rst ++++ libvirt-7.9.0/docs/manpages/virt-create-rootfs.rst @@ -0,0 +1,88 @@ +================== +virt-create-rootfs @@ -327,10 +327,10 @@ Index: libvirt-7.8.0/docs/manpages/virt-create-rootfs.rst +======== + +virsh(1), `https://libvirt.org/ `_ -Index: libvirt-7.8.0/docs/manpages/meson.build +Index: libvirt-7.9.0/docs/manpages/meson.build =================================================================== ---- libvirt-7.8.0.orig/docs/manpages/meson.build -+++ libvirt-7.8.0/docs/manpages/meson.build +--- libvirt-7.9.0.orig/docs/manpages/meson.build ++++ libvirt-7.9.0/docs/manpages/meson.build @@ -19,6 +19,7 @@ docs_man_files = [ { 'name': 'virt-pki-validate', 'section': '1', 'install': true }, { 'name': 'virt-qemu-run', 'section': '1', 'install': conf.has('WITH_QEMU') }, @@ -339,11 +339,11 @@ Index: libvirt-7.8.0/docs/manpages/meson.build { 'name': 'libvirtd', 'section': '8', 'install': conf.has('WITH_LIBVIRTD') }, { 'name': 'virt-sanlock-cleanup', 'section': '8', 'install': conf.has('WITH_SANLOCK') }, -Index: libvirt-7.8.0/tools/meson.build +Index: libvirt-7.9.0/tools/meson.build =================================================================== ---- libvirt-7.8.0.orig/tools/meson.build -+++ libvirt-7.8.0/tools/meson.build -@@ -149,6 +149,8 @@ else +--- libvirt-7.9.0.orig/tools/meson.build ++++ libvirt-7.9.0/tools/meson.build +@@ -154,6 +154,8 @@ else virsh_icon_res = [] endif