From 48d6a5768af0d58f4175ca48350b20df11201009eeb02ab72fa7bff8e472d917 Mon Sep 17 00:00:00 2001 From: James Fehlig Date: Tue, 2 Aug 2022 22:10:49 +0000 Subject: [PATCH] Accepting request 992406 from home:jfehlig:branches:Virtualization - Update to libvirt 8.6.0 - Many incremental improvements and bug fixes, see https://libvirt.org/news.html#v8-6-0-2022-08-01 - spec: Don't redefine libexecdir boo#1201565 OBS-URL: https://build.opensuse.org/request/show/992406 OBS-URL: https://build.opensuse.org/package/show/Virtualization/libvirt?expand=0&rev=937 --- ...ibxl-add-support-for-BlockResize-API.patch | 12 +++--- ...n-pkttyagent-when-stdin-is-not-a-tty.patch | 6 +-- libvirt-8.5.0.tar.xz | 3 -- libvirt-8.5.0.tar.xz.asc | 16 ------- libvirt-8.6.0.tar.xz | 3 ++ libvirt-8.6.0.tar.xz.asc | 16 +++++++ libvirt-power8-models.patch | 6 +-- libvirt-suse-netcontrol.patch | 36 ++++++++-------- libvirt.changes | 13 ++++++ libvirt.spec | 19 ++++----- libxl-dom-reset.patch | 6 +-- libxl-set-cach-mode.patch | 6 +-- libxl-set-migration-constraints.patch | 42 +++++++++---------- libxl-support-block-script.patch | 6 +-- lxc-wait-after-eth-del.patch | 24 +++++------ ...e-dhcp-authoritative-on-static-netwo.patch | 12 +++--- ppc64le-canonical-name.patch | 6 +-- qemu-apparmor-screenshot.patch | 6 +-- suse-libvirt-guests-service.patch | 6 +-- suse-libvirtd-disable-tls.patch | 22 +++++----- suse-libxl-disable-autoballoon.patch | 18 ++++---- suse-qemu-conf.patch | 18 ++++---- suse-qemu-ovmf-paths.patch | 24 +++++------ suse-xen-ovmf-paths.patch | 6 +-- virt-create-rootfs.patch | 20 ++++----- 25 files changed, 182 insertions(+), 170 deletions(-) delete mode 100644 libvirt-8.5.0.tar.xz delete mode 100644 libvirt-8.5.0.tar.xz.asc create mode 100644 libvirt-8.6.0.tar.xz create mode 100644 libvirt-8.6.0.tar.xz.asc diff --git a/0001-libxl-add-support-for-BlockResize-API.patch b/0001-libxl-add-support-for-BlockResize-API.patch index e77e9dd..49bbd87 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-8.5.0/src/libxl/libxl_driver.c +Index: libvirt-8.6.0/src/libxl/libxl_driver.c =================================================================== ---- libvirt-8.5.0.orig/src/libxl/libxl_driver.c -+++ libvirt-8.5.0/src/libxl/libxl_driver.c +--- libvirt-8.6.0.orig/src/libxl/libxl_driver.c ++++ libvirt-8.6.0/src/libxl/libxl_driver.c @@ -5257,6 +5257,95 @@ libxlDomainMemoryStats(virDomainPtr dom, #undef LIBXL_SET_MEMSTAT @@ -127,10 +127,10 @@ Index: libvirt-8.5.0/src/libxl/libxl_driver.c .domainGetJobInfo = libxlDomainGetJobInfo, /* 1.3.1 */ .domainGetJobStats = libxlDomainGetJobStats, /* 1.3.1 */ .domainMemoryStats = libxlDomainMemoryStats, /* 1.3.0 */ -Index: libvirt-8.5.0/src/libxl/libxl_api_wrapper.h +Index: libvirt-8.6.0/src/libxl/libxl_api_wrapper.h =================================================================== ---- libvirt-8.5.0.orig/src/libxl/libxl_api_wrapper.h -+++ libvirt-8.5.0/src/libxl/libxl_api_wrapper.h +--- libvirt-8.6.0.orig/src/libxl/libxl_api_wrapper.h ++++ libvirt-8.6.0/src/libxl/libxl_api_wrapper.h @@ -215,3 +215,18 @@ libxlSetMemoryTargetWrapper(libxl_ctx *c return ret; diff --git a/0001-util-Don-t-spawn-pkttyagent-when-stdin-is-not-a-tty.patch b/0001-util-Don-t-spawn-pkttyagent-when-stdin-is-not-a-tty.patch index 04af2c2..c402751 100644 --- a/0001-util-Don-t-spawn-pkttyagent-when-stdin-is-not-a-tty.patch +++ b/0001-util-Don-t-spawn-pkttyagent-when-stdin-is-not-a-tty.patch @@ -18,10 +18,10 @@ Signed-off-by: Martin Kletzander src/util/virpolkit.c | 3 +++ 1 file changed, 3 insertions(+) -Index: libvirt-8.5.0/src/util/virpolkit.c +Index: libvirt-8.6.0/src/util/virpolkit.c =================================================================== ---- libvirt-8.5.0.orig/src/util/virpolkit.c -+++ libvirt-8.5.0/src/util/virpolkit.c +--- libvirt-8.6.0.orig/src/util/virpolkit.c ++++ libvirt-8.6.0/src/util/virpolkit.c @@ -235,6 +235,9 @@ virPolkitAgentAvailable(void) const char *termid = ctermid(NULL); VIR_AUTOCLOSE fd = -1; diff --git a/libvirt-8.5.0.tar.xz b/libvirt-8.5.0.tar.xz deleted file mode 100644 index 9466785..0000000 --- a/libvirt-8.5.0.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:401e99b5e1b83de39a86347e091a85eb4dba82a87053dfcb5aa250328f97db62 -size 8886088 diff --git a/libvirt-8.5.0.tar.xz.asc b/libvirt-8.5.0.tar.xz.asc deleted file mode 100644 index 24dde82..0000000 --- a/libvirt-8.5.0.tar.xz.asc +++ /dev/null @@ -1,16 +0,0 @@ ------BEGIN PGP SIGNATURE----- - -iQIzBAABCAAdFiEERTtlMQWVVihVRxGZymi+gBAITJwFAmK+vhYACgkQymi+gBAI -TJy1Aw//eJX8heqaQO6jcd8GcsndkN8EtgNLpsC6yptgsNQS6kZ2xaLM2jVKRIRp -V6IP8RS+VfKJJzv9BON4y9nYiPAXUGksdmRPugU7kiVVDZ3z3zKGVjACp4kQYFfL -JZf5FnhSW1Mv/Dxue7XhdqAPCgkelRw8D46KRsK5brPGKUeCsi7Em25nFIUObHUv -e9fJ6DszfPZysRLvmDr9g4RBos4pxKDw+hqNiYLVBsg56rOIgP09+2w43iaTi1SB -VEsh2nAR5dkLHnKxeUwPa5ZKegcerAjlWpS+clKfT/pV3D4fRAhXq+Ndiz1fi9rH -1hTaIQ+DloojdImtAWcVPMEuYCo25jkzvG4rIlL6n2L0OcnkqPqEftkBEYYsUoAF -kuddfebKXHfQOIXJQeHuIIGTGzBVONxwKc+0KVeRzX333hICQjGXFXZWi5qFbEih -PsGbvIcbT5RSZNdlQLBUFYsnLmU10hlmRz2UfDKT4q27RT3h2B7mymtACzB0i4i2 -AK3qsy/uWi6CXZRfqkGdfmBGb1zjTR0A6xc23iuzrJVjzF0tTCZrywyzRZ6RlntD -5U/ZKJ6Etx7Sy79iGl/kIpHFr+x8lE9k8lT/eg1TlyYmr6kaVq7/lVrHkX0u/cti -14f0ZaW1BcuqARHY7tJNLL5IqkRa4U2FQ82wR51Tc+a03xdo614= -=0dti ------END PGP SIGNATURE----- diff --git a/libvirt-8.6.0.tar.xz b/libvirt-8.6.0.tar.xz new file mode 100644 index 0000000..d3d327b --- /dev/null +++ b/libvirt-8.6.0.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:a81847c43ac9ade61b6f8447c44e8ba2cc544ab49bac5c0b18a5b105f5da3ae2 +size 8905732 diff --git a/libvirt-8.6.0.tar.xz.asc b/libvirt-8.6.0.tar.xz.asc new file mode 100644 index 0000000..e85ad49 --- /dev/null +++ b/libvirt-8.6.0.tar.xz.asc @@ -0,0 +1,16 @@ +-----BEGIN PGP SIGNATURE----- + +iQIzBAABCAAdFiEERTtlMQWVVihVRxGZymi+gBAITJwFAmLng4YACgkQymi+gBAI +TJy8BQ//QOfPFgQHE5kpPus8XUEOO3RRRdxZ22KQW+LLMnQczveC8M3IBMY9bIkj +xRpNuK+gEUR76Leg40ND7D1k7xt/FP7Z1ddve9KvuHH5KSAvVbdsL7IpGwT6apdq +hTYJtGJWgyDh6W/Tx4ZN33xbTFE4YSai/LPi9EBnZThlfjtSiCL5/AQHepZhf5LM +wbT01Ma9ZIKbfwPvgclpBzcvRjjOPMoJ1k8yjuI2bN8Ei8KysCueng63VXlrHvRc +WzO4vK9SkTzZ4wNZfPgoyPVQjhY1UVzLFppgM4dVmyOh6b86ZqMNiABtLaEC9+VO +5wUvPTI9LzvhWBdl8M8GBSNZKgfY0ZyYcrC3sEEYWiyZftho8bhzb9aDj+wVhYZY +J3agfQIFc82PuFdfA1dTVJBLdwVmQnhEiobfyN3ZwWFR4KdN2Z2iToVIL3asxPTo +KixaQzcwnDCYH1tYLR3bbRV7GmXtW7wd4wwQGEYD0gyTsqJaVlxRvnsN0PkkKbrl +EHjoWfGCFZ6f5WGhqC27FIMqJkxCskZ2wJIojki9bxbMGSRm3KV3XQ9HHjCL24Xs +moEiwJu2sJ/dWsT5ixjPPzpoTv70t7hQ69G82Y5PqQI0Da1c7+cXSuC1nCkYOame +Lg+KMnz92bNboqlrtxnZBOgu/lT1VnOjJNYA9UBWeFkIK2SsPeQ= +=E+tC +-----END PGP SIGNATURE----- diff --git a/libvirt-power8-models.patch b/libvirt-power8-models.patch index a44f9d7..ae5751e 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-8.5.0/src/cpu_map/ppc64_POWER8.xml +Index: libvirt-8.6.0/src/cpu_map/ppc64_POWER8.xml =================================================================== ---- libvirt-8.5.0.orig/src/cpu_map/ppc64_POWER8.xml -+++ libvirt-8.5.0/src/cpu_map/ppc64_POWER8.xml +--- libvirt-8.6.0.orig/src/cpu_map/ppc64_POWER8.xml ++++ libvirt-8.6.0/src/cpu_map/ppc64_POWER8.xml @@ -4,5 +4,7 @@ diff --git a/libvirt-suse-netcontrol.patch b/libvirt-suse-netcontrol.patch index 8620eff..e0b2ad7 100644 --- a/libvirt-suse-netcontrol.patch +++ b/libvirt-suse-netcontrol.patch @@ -1,7 +1,7 @@ -Index: libvirt-8.5.0/tools/virsh.c +Index: libvirt-8.6.0/tools/virsh.c =================================================================== ---- libvirt-8.5.0.orig/tools/virsh.c -+++ libvirt-8.5.0/tools/virsh.c +--- libvirt-8.6.0.orig/tools/virsh.c ++++ libvirt-8.6.0/tools/virsh.c @@ -545,6 +545,8 @@ virshShowVersion(vshControl *ctl G_GNUC_ vshPrint(ctl, " Interface"); # if defined(WITH_NETCF) @@ -11,10 +11,10 @@ Index: libvirt-8.5.0/tools/virsh.c # elif defined(WITH_UDEV) vshPrint(ctl, " udev"); # endif -Index: libvirt-8.5.0/src/interface/interface_backend_netcf.c +Index: libvirt-8.6.0/src/interface/interface_backend_netcf.c =================================================================== ---- libvirt-8.5.0.orig/src/interface/interface_backend_netcf.c -+++ libvirt-8.5.0/src/interface/interface_backend_netcf.c +--- libvirt-8.6.0.orig/src/interface/interface_backend_netcf.c ++++ libvirt-8.6.0/src/interface/interface_backend_netcf.c @@ -21,7 +21,12 @@ #include @@ -126,10 +126,10 @@ Index: libvirt-8.5.0/src/interface/interface_backend_netcf.c if (virRegisterConnectDriver(&interfaceConnectDriver, false) < 0) return -1; if (virSetSharedInterfaceDriver(&interfaceDriver) < 0) -Index: libvirt-8.5.0/src/interface/interface_driver.c +Index: libvirt-8.6.0/src/interface/interface_driver.c =================================================================== ---- libvirt-8.5.0.orig/src/interface/interface_driver.c -+++ libvirt-8.5.0/src/interface/interface_driver.c +--- libvirt-8.6.0.orig/src/interface/interface_driver.c ++++ libvirt-8.6.0/src/interface/interface_driver.c @@ -30,8 +30,15 @@ interfaceRegister(void) if (netcfIfaceRegister() == 0) return 0; @@ -147,10 +147,10 @@ Index: libvirt-8.5.0/src/interface/interface_driver.c if (udevIfaceRegister() == 0) return 0; #endif /* WITH_UDEV */ -Index: libvirt-8.5.0/meson.build +Index: libvirt-8.6.0/meson.build =================================================================== ---- libvirt-8.5.0.orig/meson.build -+++ libvirt-8.5.0/meson.build +--- libvirt-8.6.0.orig/meson.build ++++ libvirt-8.6.0/meson.build @@ -1073,6 +1073,12 @@ else netcf_dep = dependency('', required: false) endif @@ -185,10 +185,10 @@ Index: libvirt-8.5.0/meson.build 'NLS': have_gnu_gettext_tools, 'numactl': numactl_dep.found(), 'openwsman': openwsman_dep.found(), -Index: libvirt-8.5.0/src/interface/meson.build +Index: libvirt-8.6.0/src/interface/meson.build =================================================================== ---- libvirt-8.5.0.orig/src/interface/meson.build -+++ libvirt-8.5.0/src/interface/meson.build +--- libvirt-8.6.0.orig/src/interface/meson.build ++++ libvirt-8.6.0/src/interface/meson.build @@ -2,7 +2,7 @@ interface_driver_sources = [ 'interface_driver.c', ] @@ -206,10 +206,10 @@ Index: libvirt-8.5.0/src/interface/meson.build udev_dep, ], 'link_args': [ -Index: libvirt-8.5.0/meson_options.txt +Index: libvirt-8.6.0/meson_options.txt =================================================================== ---- libvirt-8.5.0.orig/meson_options.txt -+++ libvirt-8.5.0/meson_options.txt +--- libvirt-8.6.0.orig/meson_options.txt ++++ libvirt-8.6.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 c1a4cd0..219f063 100644 --- a/libvirt.changes +++ b/libvirt.changes @@ -1,3 +1,16 @@ +------------------------------------------------------------------- +Tue Aug 2 16:10:13 UTC 2022 - James Fehlig + +- Update to libvirt 8.6.0 + - Many incremental improvements and bug fixes, see + https://libvirt.org/news.html#v8-6-0-2022-08-01 + +------------------------------------------------------------------- +Tue Jul 19 23:54:51 UTC 2022 - James Fehlig + +- spec: Don't redefine libexecdir + boo#1201565 + ------------------------------------------------------------------- Tue Jul 5 20:25:19 UTC 2022 - James Fehlig diff --git a/libvirt.spec b/libvirt.spec index 13500c2..a93d8c0 100644 --- a/libvirt.spec +++ b/libvirt.spec @@ -158,7 +158,7 @@ Name: libvirt URL: http://libvirt.org/ -Version: 8.5.0 +Version: 8.6.0 Release: 0 Summary: Library providing a virtualization API License: LGPL-2.1-or-later @@ -958,7 +958,6 @@ libvirt plugin for NSS for translating domain names into IP addresses. %endif %meson \ - --libexecdir=%{_libdir}/%{name} \ -Drunstatedir=%{_rundir} \ %{?arg_qemu} \ %{?arg_openvz} \ @@ -1191,7 +1190,7 @@ if test "$DISABLE_RESTART_ON_UPDATE" != yes -a \ %{_bindir}/systemctl try-restart \ libvirtd.socket \ libvirtd-ro.socket \ - libvirtd-admin.socket >/dev/null 2>&1 || : + libvirtd-admin.socket >/dev/null 2>&1 || : %{_bindir}/systemctl start libvirtd.service >/dev/null 2>&1 || : fi @@ -1336,7 +1335,7 @@ fi %{_sbindir}/virtlogd %{_sbindir}/virtlockd %dir %{_libdir}/%{name} -%attr(0755, root, root) %{_libdir}/%{name}/libvirt-guests.sh +%attr(0755, root, root) %{_libexecdir}/libvirt-guests.sh %dir %attr(0700, root, root) %{_sysconfdir}/%{name}/hooks %{_unitdir}/libvirtd.service %{_unitdir}/libvirtd.socket @@ -1400,7 +1399,7 @@ fi %endif %{_datadir}/polkit-1/actions/org.libvirt.unix.policy %{_datadir}/polkit-1/actions/org.libvirt.api.policy -%attr(0755, root, root) %{_libdir}/%{name}/libvirt_iohelper +%attr(0755, root, root) %{_libexecdir}/libvirt_iohelper %attr(0755, root, root) %{_bindir}/virt-ssh-helper %doc %{_mandir}/man1/virt-admin.1* %doc %{_mandir}/man1/virt-host-validate.1* @@ -1422,7 +1421,7 @@ fi %config(noreplace) %{_sysconfdir}/apparmor.d/%{name}/TEMPLATE.lxc %config(noreplace) %{_sysconfdir}/apparmor.d/%{name}/TEMPLATE.qemu %config(noreplace) %{_sysconfdir}/apparmor.d/local/usr.lib.libvirt.virt-aa-helper -%{_libdir}/%{name}/virt-aa-helper +%{_libexecdir}/virt-aa-helper %endif %dir %{_prefix}/lib/firewalld %dir %{_fwdefdir} @@ -1471,7 +1470,7 @@ fi %dir %attr(0700, root, root) %{_sysconfdir}/%{name}/qemu/networks/autostart %dir %attr(0700, root, root) %{_localstatedir}/lib/%{name}/network/ %dir %attr(0755, root, root) %{_localstatedir}/lib/%{name}/dnsmasq/ -%attr(0755, root, root) %{_libdir}/%{name}/libvirt_leaseshelper +%attr(0755, root, root) %{_libexecdir}/libvirt_leaseshelper %dir %{_libdir}/%{name}/connection-driver %{_libdir}/%{name}/connection-driver/libvirt_driver_network.so %if %{with_firewalld_zone} @@ -1536,7 +1535,7 @@ fi %{_unitdir}/virtstoraged-admin.socket %{_sbindir}/virtstoraged %{_sbindir}/rcvirtstoraged -%attr(0755, root, root) %{_libdir}/%{name}/libvirt_parthelper +%attr(0755, root, root) %{_libexecdir}/libvirt_parthelper %dir %attr(0700, root, root) %{_sysconfdir}/%{name}/storage/ %dir %attr(0700, root, root) %{_sysconfdir}/%{name}/storage/autostart/ %dir %{_libdir}/%{name}/connection-driver @@ -1635,7 +1634,7 @@ fi %{logrotate_prefix} %{logrotate_dir}/libvirtd.lxc %dir %attr(0700, root, root) %{_localstatedir}/lib/%{name}/lxc/ %dir %attr(0700, root, root) %{_localstatedir}/log/%{name}/lxc/ -%attr(0755, root, root) %{_libdir}/%{name}/libvirt_lxc +%attr(0755, root, root) %{_libexecdir}/libvirt_lxc %{_datadir}/augeas/lenses/libvirtd_lxc.aug %{_datadir}/augeas/lenses/tests/test_libvirtd_lxc.aug %dir %{_libdir}/%{name}/connection-driver @@ -1786,7 +1785,7 @@ fi %{_datadir}/augeas/lenses/tests/test_libvirt_sanlock.aug %dir %attr(0700, root, sanlock) %{_localstatedir}/lib/%{name}/sanlock %{_sbindir}/virt-sanlock-cleanup -%attr(0755, root, root) %{_libdir}/%{name}/libvirt_sanlock_helper +%attr(0755, root, root) %{_libexecdir}/libvirt_sanlock_helper %endif %if %{with_wireshark} diff --git a/libxl-dom-reset.patch b/libxl-dom-reset.patch index b45f9de..2194b78 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-8.5.0/src/libxl/libxl_driver.c +Index: libvirt-8.6.0/src/libxl/libxl_driver.c =================================================================== ---- libvirt-8.5.0.orig/src/libxl/libxl_driver.c -+++ libvirt-8.5.0/src/libxl/libxl_driver.c +--- libvirt-8.6.0.orig/src/libxl/libxl_driver.c ++++ libvirt-8.6.0/src/libxl/libxl_driver.c @@ -1354,6 +1354,63 @@ libxlDomainReboot(virDomainPtr dom, unsi } diff --git a/libxl-set-cach-mode.patch b/libxl-set-cach-mode.patch index 4120fee..5bf5a9f 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-8.5.0/src/libxl/libxl_conf.c +Index: libvirt-8.6.0/src/libxl/libxl_conf.c =================================================================== ---- libvirt-8.5.0.orig/src/libxl/libxl_conf.c -+++ libvirt-8.5.0/src/libxl/libxl_conf.c +--- libvirt-8.6.0.orig/src/libxl/libxl_conf.c ++++ libvirt-8.6.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 90ec240..9e7bf7c 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-8.5.0/docs/manpages/virsh.rst +Index: libvirt-8.6.0/docs/manpages/virsh.rst =================================================================== ---- libvirt-8.5.0.orig/docs/manpages/virsh.rst -+++ libvirt-8.5.0/docs/manpages/virsh.rst +--- libvirt-8.6.0.orig/docs/manpages/virsh.rst ++++ libvirt-8.6.0/docs/manpages/virsh.rst @@ -3297,6 +3297,7 @@ migrate [--parallel [--parallel-connections connections]] [--bandwidth bandwidth] [--tls-destination hostname] @@ -41,10 +41,10 @@ Index: libvirt-8.5.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-8.5.0/include/libvirt/libvirt-domain.h +Index: libvirt-8.6.0/include/libvirt/libvirt-domain.h =================================================================== ---- libvirt-8.5.0.orig/include/libvirt/libvirt-domain.h -+++ libvirt-8.5.0/include/libvirt/libvirt-domain.h +--- libvirt-8.6.0.orig/include/libvirt/libvirt-domain.h ++++ libvirt-8.6.0/include/libvirt/libvirt-domain.h @@ -1367,6 +1367,31 @@ typedef enum { */ # define VIR_MIGRATE_PARAM_TLS_DESTINATION "tls.destination" @@ -77,10 +77,10 @@ Index: libvirt-8.5.0/include/libvirt/libvirt-domain.h /* Domain migration. */ virDomainPtr virDomainMigrate (virDomainPtr domain, virConnectPtr dconn, unsigned long flags, const char *dname, -Index: libvirt-8.5.0/src/libxl/libxl_driver.c +Index: libvirt-8.6.0/src/libxl/libxl_driver.c =================================================================== ---- libvirt-8.5.0.orig/src/libxl/libxl_driver.c -+++ libvirt-8.5.0/src/libxl/libxl_driver.c +--- libvirt-8.6.0.orig/src/libxl/libxl_driver.c ++++ libvirt-8.6.0/src/libxl/libxl_driver.c @@ -6002,6 +6002,9 @@ libxlDomainMigratePerform3Params(virDoma const char *dname = NULL; const char *uri = NULL; @@ -121,10 +121,10 @@ Index: libvirt-8.5.0/src/libxl/libxl_driver.c goto cleanup; } -Index: libvirt-8.5.0/src/libxl/libxl_migration.c +Index: libvirt-8.6.0/src/libxl/libxl_migration.c =================================================================== ---- libvirt-8.5.0.orig/src/libxl/libxl_migration.c -+++ libvirt-8.5.0/src/libxl/libxl_migration.c +--- libvirt-8.6.0.orig/src/libxl/libxl_migration.c ++++ libvirt-8.6.0/src/libxl/libxl_migration.c @@ -329,18 +329,38 @@ libxlMigrateDstReceive(virNetSocket *soc static int libxlDoMigrateSrcSend(libxlDriverPrivate *driver, @@ -285,10 +285,10 @@ Index: libvirt-8.5.0/src/libxl/libxl_migration.c virObjectLock(vm); if (ret == 0) { -Index: libvirt-8.5.0/src/libxl/libxl_migration.h +Index: libvirt-8.6.0/src/libxl/libxl_migration.h =================================================================== ---- libvirt-8.5.0.orig/src/libxl/libxl_migration.h -+++ libvirt-8.5.0/src/libxl/libxl_migration.h +--- libvirt-8.6.0.orig/src/libxl/libxl_migration.h ++++ libvirt-8.6.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, \ @@ -331,11 +331,11 @@ Index: libvirt-8.5.0/src/libxl/libxl_migration.h virDomainPtr libxlDomainMigrationDstFinish(virConnectPtr dconn, -Index: libvirt-8.5.0/tools/virsh-domain.c +Index: libvirt-8.6.0/tools/virsh-domain.c =================================================================== ---- libvirt-8.5.0.orig/tools/virsh-domain.c -+++ libvirt-8.5.0/tools/virsh-domain.c -@@ -11005,6 +11005,18 @@ static const vshCmdOptDef opts_migrate[] +--- libvirt-8.6.0.orig/tools/virsh-domain.c ++++ libvirt-8.6.0/tools/virsh-domain.c +@@ -11024,6 +11024,18 @@ static const vshCmdOptDef opts_migrate[] .completer = virshCompleteEmpty, .help = N_("override the destination host name used for TLS verification") }, @@ -354,7 +354,7 @@ Index: libvirt-8.5.0/tools/virsh-domain.c {.name = NULL} }; -@@ -11025,6 +11037,7 @@ doMigrate(void *opaque) +@@ -11044,6 +11056,7 @@ doMigrate(void *opaque) unsigned long long ullOpt = 0; int rv; virConnectPtr dconn = data->dconn; @@ -362,7 +362,7 @@ Index: libvirt-8.5.0/tools/virsh-domain.c #ifndef WIN32 sigset_t sigmask, oldsigmask; -@@ -11155,6 +11168,22 @@ doMigrate(void *opaque) +@@ -11174,6 +11187,22 @@ doMigrate(void *opaque) goto save_error; } diff --git a/libxl-support-block-script.patch b/libxl-support-block-script.patch index a344a8a..c4ebe91 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-8.5.0/src/libxl/libxl_conf.c +Index: libvirt-8.6.0/src/libxl/libxl_conf.c =================================================================== ---- libvirt-8.5.0.orig/src/libxl/libxl_conf.c -+++ libvirt-8.5.0/src/libxl/libxl_conf.c +--- libvirt-8.6.0.orig/src/libxl/libxl_conf.c ++++ libvirt-8.6.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 c76e6e5..1f31853 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-8.5.0/src/lxc/lxc_controller.c +Index: libvirt-8.6.0/src/lxc/lxc_controller.c =================================================================== ---- libvirt-8.5.0.orig/src/lxc/lxc_controller.c -+++ libvirt-8.5.0/src/lxc/lxc_controller.c +--- libvirt-8.6.0.orig/src/lxc/lxc_controller.c ++++ libvirt-8.6.0/src/lxc/lxc_controller.c @@ -1995,6 +1995,7 @@ static int virLXCControllerDeleteInterfa if (virNetDevVethDelete(ctrl->veths[i]) < 0) ret = -1; @@ -25,11 +25,11 @@ Index: libvirt-8.5.0/src/lxc/lxc_controller.c return ret; } -Index: libvirt-8.5.0/src/lxc/lxc_driver.c +Index: libvirt-8.6.0/src/lxc/lxc_driver.c =================================================================== ---- libvirt-8.5.0.orig/src/lxc/lxc_driver.c -+++ libvirt-8.5.0/src/lxc/lxc_driver.c -@@ -3502,6 +3502,7 @@ lxcDomainAttachDeviceNetLive(virLXCDrive +--- libvirt-8.6.0.orig/src/lxc/lxc_driver.c ++++ libvirt-8.6.0/src/lxc/lxc_driver.c +@@ -3505,6 +3505,7 @@ lxcDomainAttachDeviceNetLive(virLXCDrive case VIR_DOMAIN_NET_TYPE_NETWORK: case VIR_DOMAIN_NET_TYPE_ETHERNET: ignore_value(virNetDevVethDelete(veth)); @@ -37,7 +37,7 @@ Index: libvirt-8.5.0/src/lxc/lxc_driver.c break; case VIR_DOMAIN_NET_TYPE_DIRECT: -@@ -3941,6 +3942,7 @@ lxcDomainDetachDeviceNetLive(virDomainOb +@@ -3944,6 +3945,7 @@ lxcDomainDetachDeviceNetLive(virDomainOb virDomainAuditNet(vm, detach, NULL, "detach", false); goto cleanup; } @@ -45,11 +45,11 @@ Index: libvirt-8.5.0/src/lxc/lxc_driver.c break; /* It'd be nice to support this, but with macvlan -Index: libvirt-8.5.0/src/lxc/lxc_process.c +Index: libvirt-8.6.0/src/lxc/lxc_process.c =================================================================== ---- libvirt-8.5.0.orig/src/lxc/lxc_process.c -+++ libvirt-8.5.0/src/lxc/lxc_process.c -@@ -239,6 +239,7 @@ static void virLXCProcessCleanup(virLXCD +--- libvirt-8.6.0.orig/src/lxc/lxc_process.c ++++ libvirt-8.6.0/src/lxc/lxc_process.c +@@ -226,6 +226,7 @@ static void virLXCProcessCleanup(virLXCD VIR_WARN("Unable to release network device '%s'", NULLSTR(iface->ifname)); } } 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 3b560d7..d353a15 100644 --- a/network-don-t-use-dhcp-authoritative-on-static-netwo.patch +++ b/network-don-t-use-dhcp-authoritative-on-static-netwo.patch @@ -17,10 +17,10 @@ Signed-off-by: Martin Wilck tests/networkxml2confdata/dhcp6host-routed-network.conf | 1 - 2 files changed, 8 insertions(+), 2 deletions(-) -Index: libvirt-8.5.0/src/network/bridge_driver.c +Index: libvirt-8.6.0/src/network/bridge_driver.c =================================================================== ---- libvirt-8.5.0.orig/src/network/bridge_driver.c -+++ libvirt-8.5.0/src/network/bridge_driver.c +--- libvirt-8.6.0.orig/src/network/bridge_driver.c ++++ libvirt-8.6.0/src/network/bridge_driver.c @@ -1080,7 +1080,14 @@ networkDnsmasqConfDHCP(virBuffer *buf, if (VIR_SOCKET_ADDR_IS_FAMILY(&ipdef->address, AF_INET)) { if (ipdef->nranges || ipdef->nhosts) { @@ -37,10 +37,10 @@ Index: libvirt-8.5.0/src/network/bridge_driver.c } if (ipdef->bootfile) { -Index: libvirt-8.5.0/tests/networkxml2confdata/dhcp6host-routed-network.conf +Index: libvirt-8.6.0/tests/networkxml2confdata/dhcp6host-routed-network.conf =================================================================== ---- libvirt-8.5.0.orig/tests/networkxml2confdata/dhcp6host-routed-network.conf -+++ libvirt-8.5.0/tests/networkxml2confdata/dhcp6host-routed-network.conf +--- libvirt-8.6.0.orig/tests/networkxml2confdata/dhcp6host-routed-network.conf ++++ libvirt-8.6.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 5a42b79..78a7286 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-8.5.0/src/util/virarch.c +Index: libvirt-8.6.0/src/util/virarch.c =================================================================== ---- libvirt-8.5.0.orig/src/util/virarch.c -+++ libvirt-8.5.0/src/util/virarch.c +--- libvirt-8.6.0.orig/src/util/virarch.c ++++ libvirt-8.6.0/src/util/virarch.c @@ -222,6 +222,8 @@ virArch virArchFromHost(void) arch = VIR_ARCH_X86_64; } else if (STREQ(ut.machine, "arm64")) { diff --git a/qemu-apparmor-screenshot.patch b/qemu-apparmor-screenshot.patch index 540e250..495cac1 100644 --- a/qemu-apparmor-screenshot.patch +++ b/qemu-apparmor-screenshot.patch @@ -1,7 +1,7 @@ -Index: libvirt-8.5.0/src/security/apparmor/libvirt-qemu +Index: libvirt-8.6.0/src/security/apparmor/libvirt-qemu =================================================================== ---- libvirt-8.5.0.orig/src/security/apparmor/libvirt-qemu -+++ libvirt-8.5.0/src/security/apparmor/libvirt-qemu +--- libvirt-8.6.0.orig/src/security/apparmor/libvirt-qemu ++++ libvirt-8.6.0/src/security/apparmor/libvirt-qemu @@ -253,3 +253,6 @@ # required for QEMU accessing UEFI nvram variables owner /var/lib/libvirt/qemu/nvram/*_VARS.fd rwk, diff --git a/suse-libvirt-guests-service.patch b/suse-libvirt-guests-service.patch index 1a13fb4..c6fe011 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-8.5.0/tools/libvirt-guests.sh.in +Index: libvirt-8.6.0/tools/libvirt-guests.sh.in =================================================================== ---- libvirt-8.5.0.orig/tools/libvirt-guests.sh.in -+++ libvirt-8.5.0/tools/libvirt-guests.sh.in +--- libvirt-8.6.0.orig/tools/libvirt-guests.sh.in ++++ libvirt-8.6.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 28102c7..5b04a28 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-8.5.0/src/remote/remote_daemon_config.c +Index: libvirt-8.6.0/src/remote/remote_daemon_config.c =================================================================== ---- libvirt-8.5.0.orig/src/remote/remote_daemon_config.c -+++ libvirt-8.5.0/src/remote/remote_daemon_config.c +--- libvirt-8.6.0.orig/src/remote/remote_daemon_config.c ++++ libvirt-8.6.0/src/remote/remote_daemon_config.c @@ -97,7 +97,7 @@ daemonConfigNew(bool privileged G_GNUC_U #ifdef WITH_IP @@ -16,11 +16,11 @@ Index: libvirt-8.5.0/src/remote/remote_daemon_config.c # else /* ! LIBVIRTD */ data->listen_tls = false; /* Always honoured, --listen doesn't exist. */ # endif /* ! LIBVIRTD */ -Index: libvirt-8.5.0/src/remote/libvirtd.conf.in +Index: libvirt-8.6.0/src/remote/libvirtd.conf.in =================================================================== ---- libvirt-8.5.0.orig/src/remote/libvirtd.conf.in -+++ libvirt-8.5.0/src/remote/libvirtd.conf.in -@@ -17,8 +17,8 @@ +--- libvirt-8.6.0.orig/src/remote/libvirtd.conf.in ++++ libvirt-8.6.0/src/remote/libvirtd.conf.in +@@ -19,8 +19,8 @@ # It is necessary to setup a CA and issue server certificates before # using this capability. # @@ -30,11 +30,11 @@ Index: libvirt-8.5.0/src/remote/libvirtd.conf.in +#listen_tls = 1 # 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-8.5.0/src/remote/test_libvirtd.aug.in + # +Index: libvirt-8.6.0/src/remote/test_libvirtd.aug.in =================================================================== ---- libvirt-8.5.0.orig/src/remote/test_libvirtd.aug.in -+++ libvirt-8.5.0/src/remote/test_libvirtd.aug.in +--- libvirt-8.6.0.orig/src/remote/test_libvirtd.aug.in ++++ libvirt-8.6.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 183b097..9315162 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-8.5.0/src/libxl/libxl.conf +Index: libvirt-8.6.0/src/libxl/libxl.conf =================================================================== ---- libvirt-8.5.0.orig/src/libxl/libxl.conf -+++ libvirt-8.5.0/src/libxl/libxl.conf +--- libvirt-8.6.0.orig/src/libxl/libxl.conf ++++ libvirt-8.6.0/src/libxl/libxl.conf @@ -4,12 +4,11 @@ # Enable autoballooning of domain0 @@ -27,10 +27,10 @@ Index: libvirt-8.5.0/src/libxl/libxl.conf # In order to prevent accidentally starting two domains that -Index: libvirt-8.5.0/src/libxl/libxl_conf.c +Index: libvirt-8.6.0/src/libxl/libxl_conf.c =================================================================== ---- libvirt-8.5.0.orig/src/libxl/libxl_conf.c -+++ libvirt-8.5.0/src/libxl/libxl_conf.c +--- libvirt-8.6.0.orig/src/libxl/libxl_conf.c ++++ libvirt-8.6.0/src/libxl/libxl_conf.c @@ -1731,15 +1731,12 @@ libxlMakeBuildInfoVfb(virPortAllocatorRa /* * Get domain0 autoballoon configuration. Honor user-specified @@ -66,10 +66,10 @@ Index: libvirt-8.5.0/src/libxl/libxl_conf.c return 0; } -Index: libvirt-8.5.0/src/libxl/test_libvirtd_libxl.aug.in +Index: libvirt-8.6.0/src/libxl/test_libvirtd_libxl.aug.in =================================================================== ---- libvirt-8.5.0.orig/src/libxl/test_libvirtd_libxl.aug.in -+++ libvirt-8.5.0/src/libxl/test_libvirtd_libxl.aug.in +--- libvirt-8.6.0.orig/src/libxl/test_libvirtd_libxl.aug.in ++++ libvirt-8.6.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 ae78cbf..ae49a65 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-8.5.0/src/qemu/qemu_conf.c +Index: libvirt-8.6.0/src/qemu/qemu_conf.c =================================================================== ---- libvirt-8.5.0.orig/src/qemu/qemu_conf.c -+++ libvirt-8.5.0/src/qemu/qemu_conf.c +--- libvirt-8.6.0.orig/src/qemu/qemu_conf.c ++++ libvirt-8.6.0/src/qemu/qemu_conf.c @@ -256,7 +256,7 @@ virQEMUDriverConfig *virQEMUDriverConfig cfg->slirpHelperName = g_strdup(QEMU_SLIRP_HELPER); cfg->dbusDaemonName = g_strdup(QEMU_DBUS_DAEMON); @@ -20,10 +20,10 @@ Index: libvirt-8.5.0/src/qemu/qemu_conf.c cfg->securityRequireConfined = false; cfg->keepAliveInterval = 5; -Index: libvirt-8.5.0/src/qemu/test_libvirtd_qemu.aug.in +Index: libvirt-8.6.0/src/qemu/test_libvirtd_qemu.aug.in =================================================================== ---- libvirt-8.5.0.orig/src/qemu/test_libvirtd_qemu.aug.in -+++ libvirt-8.5.0/src/qemu/test_libvirtd_qemu.aug.in +--- libvirt-8.6.0.orig/src/qemu/test_libvirtd_qemu.aug.in ++++ libvirt-8.6.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" } @@ -32,10 +32,10 @@ Index: libvirt-8.5.0/src/qemu/test_libvirtd_qemu.aug.in { "security_default_confined" = "1" } { "security_require_confined" = "1" } { "user" = "@QEMU_USER@" } -Index: libvirt-8.5.0/src/qemu/qemu.conf.in +Index: libvirt-8.6.0/src/qemu/qemu.conf.in =================================================================== ---- libvirt-8.5.0.orig/src/qemu/qemu.conf.in -+++ libvirt-8.5.0/src/qemu/qemu.conf.in +--- libvirt-8.6.0.orig/src/qemu/qemu.conf.in ++++ libvirt-8.6.0/src/qemu/qemu.conf.in @@ -491,10 +491,19 @@ # isolation, but it cannot appear in a list of drivers. # diff --git a/suse-qemu-ovmf-paths.patch b/suse-qemu-ovmf-paths.patch index 74c5417..bd61652 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-8.5.0/src/qemu/qemu_conf.c +Index: libvirt-8.6.0/src/qemu/qemu_conf.c =================================================================== ---- libvirt-8.5.0.orig/src/qemu/qemu_conf.c -+++ libvirt-8.5.0/src/qemu/qemu_conf.c +--- libvirt-8.6.0.orig/src/qemu/qemu_conf.c ++++ libvirt-8.6.0/src/qemu/qemu_conf.c @@ -82,10 +82,9 @@ VIR_ONCE_GLOBAL_INIT(virQEMUConfig); #ifndef DEFAULT_LOADER_NVRAM @@ -23,10 +23,10 @@ Index: libvirt-8.5.0/src/qemu/qemu_conf.c #endif -Index: libvirt-8.5.0/src/security/virt-aa-helper.c +Index: libvirt-8.6.0/src/security/virt-aa-helper.c =================================================================== ---- libvirt-8.5.0.orig/src/security/virt-aa-helper.c -+++ libvirt-8.5.0/src/security/virt-aa-helper.c +--- libvirt-8.6.0.orig/src/security/virt-aa-helper.c ++++ libvirt-8.6.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 */ @@ -37,10 +37,10 @@ Index: libvirt-8.5.0/src/security/virt-aa-helper.c }; /* override the above with these */ const char * const override[] = { -Index: libvirt-8.5.0/src/qemu/test_libvirtd_qemu.aug.in +Index: libvirt-8.6.0/src/qemu/test_libvirtd_qemu.aug.in =================================================================== ---- libvirt-8.5.0.orig/src/qemu/test_libvirtd_qemu.aug.in -+++ libvirt-8.5.0/src/qemu/test_libvirtd_qemu.aug.in +--- libvirt-8.6.0.orig/src/qemu/test_libvirtd_qemu.aug.in ++++ libvirt-8.6.0/src/qemu/test_libvirtd_qemu.aug.in @@ -96,10 +96,9 @@ module Test_libvirtd_qemu = { "migration_port_max" = "49215" } { "log_timestamp" = "0" } @@ -55,10 +55,10 @@ Index: libvirt-8.5.0/src/qemu/test_libvirtd_qemu.aug.in } { "stdio_handler" = "logd" } { "gluster_debug_level" = "9" } -Index: libvirt-8.5.0/src/qemu/qemu.conf.in +Index: libvirt-8.6.0/src/qemu/qemu.conf.in =================================================================== ---- libvirt-8.5.0.orig/src/qemu/qemu.conf.in -+++ libvirt-8.5.0/src/qemu/qemu.conf.in +--- libvirt-8.6.0.orig/src/qemu/qemu.conf.in ++++ libvirt-8.6.0/src/qemu/qemu.conf.in @@ -857,10 +857,9 @@ # for x86_64 and i686, but it's AAVMF for aarch64. The libvirt default # follows this scheme. diff --git a/suse-xen-ovmf-paths.patch b/suse-xen-ovmf-paths.patch index 80b109f..3ba165f 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-8.5.0/src/libxl/libxl_conf.c +Index: libvirt-8.6.0/src/libxl/libxl_conf.c =================================================================== ---- libvirt-8.5.0.orig/src/libxl/libxl_conf.c -+++ libvirt-8.5.0/src/libxl/libxl_conf.c +--- libvirt-8.6.0.orig/src/libxl/libxl_conf.c ++++ libvirt-8.6.0/src/libxl/libxl_conf.c @@ -1782,7 +1782,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 f53aceb..ed42790 100644 --- a/virt-create-rootfs.patch +++ b/virt-create-rootfs.patch @@ -1,7 +1,7 @@ -Index: libvirt-8.5.0/tools/virt-create-rootfs +Index: libvirt-8.6.0/tools/virt-create-rootfs =================================================================== --- /dev/null -+++ libvirt-8.5.0/tools/virt-create-rootfs ++++ libvirt-8.6.0/tools/virt-create-rootfs @@ -0,0 +1,236 @@ +#!/bin/sh +set -e @@ -239,10 +239,10 @@ Index: libvirt-8.5.0/tools/virt-create-rootfs + echo "pts/0" >> "$ROOT/etc/securetty" + chroot "$ROOT" /usr/bin/passwd +fi -Index: libvirt-8.5.0/docs/manpages/virt-create-rootfs.rst +Index: libvirt-8.6.0/docs/manpages/virt-create-rootfs.rst =================================================================== --- /dev/null -+++ libvirt-8.5.0/docs/manpages/virt-create-rootfs.rst ++++ libvirt-8.6.0/docs/manpages/virt-create-rootfs.rst @@ -0,0 +1,88 @@ +================== +virt-create-rootfs @@ -332,10 +332,10 @@ Index: libvirt-8.5.0/docs/manpages/virt-create-rootfs.rst +======== + +virsh(1), `https://libvirt.org/ `_ -Index: libvirt-8.5.0/docs/manpages/meson.build +Index: libvirt-8.6.0/docs/manpages/meson.build =================================================================== ---- libvirt-8.5.0.orig/docs/manpages/meson.build -+++ libvirt-8.5.0/docs/manpages/meson.build +--- libvirt-8.6.0.orig/docs/manpages/meson.build ++++ libvirt-8.6.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') }, @@ -344,10 +344,10 @@ Index: libvirt-8.5.0/docs/manpages/meson.build { 'name': 'libvirt-guests', 'section': '8', 'install': conf.has('WITH_LIBVIRTD') }, { 'name': 'libvirtd', 'section': '8', 'install': conf.has('WITH_LIBVIRTD') }, -Index: libvirt-8.5.0/tools/meson.build +Index: libvirt-8.6.0/tools/meson.build =================================================================== ---- libvirt-8.5.0.orig/tools/meson.build -+++ libvirt-8.5.0/tools/meson.build +--- libvirt-8.6.0.orig/tools/meson.build ++++ libvirt-8.6.0/tools/meson.build @@ -154,6 +154,8 @@ else virsh_icon_res = [] endif