Accepting request 1033076 from Virtualization

- Update to libvirt 8.9.0
  - jsc#PED-620, jsc#PED-1540
  - Add support for modular daemons to the supportconfig plugin
  - New subpackage libvirt-client-qemu providing client utilities
    to interact with QEMU-specific features of libvirt
  - Many incremental improvements and bug fixes, see
    https://libvirt.org/news.html#v8-9-0-2022-11-01

OBS-URL: https://build.opensuse.org/request/show/1033076
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/libvirt?expand=0&rev=363
This commit is contained in:
Dominique Leuenberger 2022-11-04 16:31:46 +00:00 committed by Git OBS Bridge
commit f5bcb2ab18
26 changed files with 197 additions and 171 deletions

View File

@ -12,10 +12,10 @@ Signed-off-by: Jim Fehlig <jfehlig@suse.com>
src/libxl/libxl_driver.c | 90 +++++++++++++++++++++++++++++++++++ src/libxl/libxl_driver.c | 90 +++++++++++++++++++++++++++++++++++
2 files changed, 105 insertions(+) 2 files changed, 105 insertions(+)
Index: libvirt-8.8.0/src/libxl/libxl_api_wrapper.h Index: libvirt-8.9.0/src/libxl/libxl_api_wrapper.h
=================================================================== ===================================================================
--- libvirt-8.8.0.orig/src/libxl/libxl_api_wrapper.h --- libvirt-8.9.0.orig/src/libxl/libxl_api_wrapper.h
+++ libvirt-8.8.0/src/libxl/libxl_api_wrapper.h +++ libvirt-8.9.0/src/libxl/libxl_api_wrapper.h
@@ -215,3 +215,18 @@ libxlSetMemoryTargetWrapper(libxl_ctx *c @@ -215,3 +215,18 @@ libxlSetMemoryTargetWrapper(libxl_ctx *c
return ret; return ret;
@ -35,10 +35,10 @@ Index: libvirt-8.8.0/src/libxl/libxl_api_wrapper.h
+ +
+ return ret; + return ret;
+} +}
Index: libvirt-8.8.0/src/libxl/libxl_driver.c Index: libvirt-8.9.0/src/libxl/libxl_driver.c
=================================================================== ===================================================================
--- libvirt-8.8.0.orig/src/libxl/libxl_driver.c --- libvirt-8.9.0.orig/src/libxl/libxl_driver.c
+++ libvirt-8.8.0/src/libxl/libxl_driver.c +++ libvirt-8.9.0/src/libxl/libxl_driver.c
@@ -5257,6 +5257,95 @@ libxlDomainMemoryStats(virDomainPtr dom, @@ -5257,6 +5257,95 @@ libxlDomainMemoryStats(virDomainPtr dom,
#undef LIBXL_SET_MEMSTAT #undef LIBXL_SET_MEMSTAT

View File

@ -18,10 +18,10 @@ Signed-off-by: Martin Kletzander <mkletzan@redhat.com>
src/util/virpolkit.c | 3 +++ src/util/virpolkit.c | 3 +++
1 file changed, 3 insertions(+) 1 file changed, 3 insertions(+)
Index: libvirt-8.8.0/src/util/virpolkit.c Index: libvirt-8.9.0/src/util/virpolkit.c
=================================================================== ===================================================================
--- libvirt-8.8.0.orig/src/util/virpolkit.c --- libvirt-8.9.0.orig/src/util/virpolkit.c
+++ libvirt-8.8.0/src/util/virpolkit.c +++ libvirt-8.9.0/src/util/virpolkit.c
@@ -235,6 +235,9 @@ virPolkitAgentAvailable(void) @@ -235,6 +235,9 @@ virPolkitAgentAvailable(void)
const char *termid = ctermid(NULL); const char *termid = ctermid(NULL);
VIR_AUTOCLOSE fd = -1; VIR_AUTOCLOSE fd = -1;

View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:eb0cbb6cd199e7a2f341e62f5410ca2daf65a0bf91bd522d951c1a18f0df0fa3
size 8941928

View File

@ -1,16 +0,0 @@
-----BEGIN PGP SIGNATURE-----
iQIzBAABCAAdFiEERTtlMQWVVihVRxGZymi+gBAITJwFAmM6l7cACgkQymi+gBAI
TJxNJg/6Aj40XkTtzaRpeEtVCwq4FSbSmKOYtlTi4YiNLXSGqyYLQbszMe4M/7i7
jl7x6uUVJ6JM0SeXZZzOrKtMdabfyi9PkKtKW5Ud2uQWdj1KRWIZQM8IYjdiHv0V
G1grmYy8SNNqca/uSF+FXekbngciUm0ZyioUQShiSmmHXhJcFphADLv509X2gtA6
iF4K3QAOjjW07GkuqCLKypG47k17oaHD0F5NxT3fIHI3+gH0v0h/E9NwdYkB45Uu
MrV7wGQVCYM0G/g637vYT9NcsTwErtlwbe3Ie0VJb41ewXuJiSe7SkuLzuBMBZ12
BfBuHSaIuOT3vOFw3kuIUfZDJ+ZRcTj6B/6QhWq/8ouQ6dHHoRUp/O3XcPKMzDe3
Jv8sWU4Et8QEWTYMvqBJz+KMIjPrpEogPNu8rbF/Cv/C1HzCcJxbhygDCA8VkQ3w
e+8GF0S9uR/CAw102ys2OhpxUAnfSuPbgfgHmnnYOiQuoZzirT2cXL3S5Q0UBRX8
qVUlpgK3lh9GdRUVJ4H54YhCBTfbrQ28MqWwmL446HyqzKzm/u7CWl+A9diDrkhs
PzLt7qYIbxNqrUjdZetTJeoiL4oGBHEnvTR6GT2srz/97yVtX2IGo5jXRMJNR3nK
rN6lBp3yUepHKEQLdmwFNZ5qLqW3tuYxUgGCHhMAJwInYmcbbzQ=
=IBi4
-----END PGP SIGNATURE-----

3
libvirt-8.9.0.tar.xz Normal file
View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:c213575aaa636d41a6011ef59e5f088643b721e1ab1ca3ea05c176c05e9579a2
size 8946352

16
libvirt-8.9.0.tar.xz.asc Normal file
View File

@ -0,0 +1,16 @@
-----BEGIN PGP SIGNATURE-----
iQIzBAABCAAdFiEERTtlMQWVVihVRxGZymi+gBAITJwFAmNhBQIACgkQymi+gBAI
TJymhg//UtbPTwW916MXlt0+p37YL2rO1wjgVeKUsOpoUs//SOFTY07WuRcF2k7U
Sd4PCnILCDHOw3sA/XWnEnihH0IfoKgERG9ZTvKYNPx01HidNwQjpAhrOuHw1wCp
L6BVupdTCQhrwXKeDMsJFbrs/D32SFmkNrlLJZl+hYXPKeFpRCfrX8sgUv2tZJyv
M0LYws/PxSXD+ONvEYzdRxZvg5P0z9Auj05QES6BxtTA5kgjQU4Wqj5ZkKULGrdu
o7+BnDR7jFvw/D5ktJBu7XIsll7dw6GAkea+l2Th85YR+whHQSlz7PTLCCZAkCq5
1pI28PyMCwzaMSC0trl6WAqFP81wyogENZ0MXdgRw8SCZuGkaCEvFZhDH31ywh7w
f4W2WleP781unngm/IFTpZAtOMO0kI+wKmXcuzDeio+R9wsKoAnE9g0u8aLBB2C0
25rBirgA0INiwuS74OPQvEXiD8KeJU7G8J5YpFkjOeI0cdB6v1Wd/JFUxQydtf0o
wp2qGNYVbtaFAxoYbVQ8MTvqtXtQjGRp9Iw57EDkW6AZudbdqsCWURPVRQ1JlUjE
Fo18ZsNi8eNq1Eiirtf+a/aipOoi2OcmOuNYGZQQrJTv7ebPtc1yTchOnSEROcUa
RBqThQ+U4ZZeETZAcbue2473OZKjeMUxx5YTlHAqo3lwWJQeupU=
=enbV
-----END PGP SIGNATURE-----

View File

@ -8,10 +8,10 @@ From: <ro@suse.de>
src/cpu_map/ppc64_POWER8.xml | 2 ++ src/cpu_map/ppc64_POWER8.xml | 2 ++
1 file changed, 2 insertions(+) 1 file changed, 2 insertions(+)
Index: libvirt-8.8.0/src/cpu_map/ppc64_POWER8.xml Index: libvirt-8.9.0/src/cpu_map/ppc64_POWER8.xml
=================================================================== ===================================================================
--- libvirt-8.8.0.orig/src/cpu_map/ppc64_POWER8.xml --- libvirt-8.9.0.orig/src/cpu_map/ppc64_POWER8.xml
+++ libvirt-8.8.0/src/cpu_map/ppc64_POWER8.xml +++ libvirt-8.9.0/src/cpu_map/ppc64_POWER8.xml
@@ -4,5 +4,7 @@ @@ -4,5 +4,7 @@
<pvr value='0x004b0000' mask='0xffff0000'/> <pvr value='0x004b0000' mask='0xffff0000'/>
<pvr value='0x004c0000' mask='0xffff0000'/> <pvr value='0x004c0000' mask='0xffff0000'/>

View File

@ -11,7 +11,7 @@ RCFILE="/usr/lib/supportconfig/resources/scplugin.rc"
LIBVIRTD_CONF_FILES="$(find -L /etc/libvirt/*.conf -type f | sort)" LIBVIRTD_CONF_FILES="$(find -L /etc/libvirt/*.conf -type f | sort)"
PERSISTENT_VM_CONF_FILES="" PERSISTENT_VM_CONF_FILES=""
ACTIVE_VM_CONF_FILES="" ACTIVE_VM_CONF_FILES=""
LIBVIRTD_LOG_FILES="$(find -L /var/log/libvirt/ -name libvirtd.log -type f | sort)" LIBVIRTD_LOG_FILES="$(find -L /var/log/libvirt/*.log -type f | sort)"
if [ -s $RCFILE ]; then if [ -s $RCFILE ]; then

View File

@ -13,10 +13,10 @@ Originally authored by mt@suse.de
tools/virsh.c | 2 + tools/virsh.c | 2 +
6 files changed, 80 insertions(+), 5 deletions(-) 6 files changed, 80 insertions(+), 5 deletions(-)
Index: libvirt-8.8.0/meson.build Index: libvirt-8.9.0/meson.build
=================================================================== ===================================================================
--- libvirt-8.8.0.orig/meson.build --- libvirt-8.9.0.orig/meson.build
+++ libvirt-8.8.0/meson.build +++ libvirt-8.9.0/meson.build
@@ -1060,6 +1060,12 @@ else @@ -1060,6 +1060,12 @@ else
netcf_dep = dependency('', required: false) netcf_dep = dependency('', required: false)
endif endif
@ -51,10 +51,10 @@ Index: libvirt-8.8.0/meson.build
'NLS': have_gnu_gettext_tools, 'NLS': have_gnu_gettext_tools,
'numactl': numactl_dep.found(), 'numactl': numactl_dep.found(),
'openwsman': openwsman_dep.found(), 'openwsman': openwsman_dep.found(),
Index: libvirt-8.8.0/meson_options.txt Index: libvirt-8.9.0/meson_options.txt
=================================================================== ===================================================================
--- libvirt-8.8.0.orig/meson_options.txt --- libvirt-8.9.0.orig/meson_options.txt
+++ libvirt-8.8.0/meson_options.txt +++ libvirt-8.9.0/meson_options.txt
@@ -29,6 +29,7 @@ option('libpcap', type: 'feature', value @@ -29,6 +29,7 @@ option('libpcap', type: 'feature', value
option('libssh', type: 'feature', value: 'auto', description: 'libssh support') option('libssh', type: 'feature', value: 'auto', description: 'libssh support')
option('libssh2', type: 'feature', value: 'auto', description: 'libssh2 support') option('libssh2', type: 'feature', value: 'auto', description: 'libssh2 support')
@ -63,10 +63,10 @@ Index: libvirt-8.8.0/meson_options.txt
option('nls', type: 'feature', value: 'auto', description: 'nls support') option('nls', type: 'feature', value: 'auto', description: 'nls support')
option('numactl', type: 'feature', value: 'auto', description: 'numactl support') option('numactl', type: 'feature', value: 'auto', description: 'numactl support')
option('openwsman', type: 'feature', value: 'auto', description: 'openwsman support') option('openwsman', type: 'feature', value: 'auto', description: 'openwsman support')
Index: libvirt-8.8.0/src/interface/interface_backend_netcf.c Index: libvirt-8.9.0/src/interface/interface_backend_netcf.c
=================================================================== ===================================================================
--- libvirt-8.8.0.orig/src/interface/interface_backend_netcf.c --- libvirt-8.9.0.orig/src/interface/interface_backend_netcf.c
+++ libvirt-8.8.0/src/interface/interface_backend_netcf.c +++ libvirt-8.9.0/src/interface/interface_backend_netcf.c
@@ -21,7 +21,12 @@ @@ -21,7 +21,12 @@
#include <config.h> #include <config.h>
@ -178,10 +178,10 @@ Index: libvirt-8.8.0/src/interface/interface_backend_netcf.c
if (virRegisterConnectDriver(&interfaceConnectDriver, false) < 0) if (virRegisterConnectDriver(&interfaceConnectDriver, false) < 0)
return -1; return -1;
if (virSetSharedInterfaceDriver(&interfaceDriver) < 0) if (virSetSharedInterfaceDriver(&interfaceDriver) < 0)
Index: libvirt-8.8.0/src/interface/interface_driver.c Index: libvirt-8.9.0/src/interface/interface_driver.c
=================================================================== ===================================================================
--- libvirt-8.8.0.orig/src/interface/interface_driver.c --- libvirt-8.9.0.orig/src/interface/interface_driver.c
+++ libvirt-8.8.0/src/interface/interface_driver.c +++ libvirt-8.9.0/src/interface/interface_driver.c
@@ -30,8 +30,15 @@ interfaceRegister(void) @@ -30,8 +30,15 @@ interfaceRegister(void)
if (netcfIfaceRegister() == 0) if (netcfIfaceRegister() == 0)
return 0; return 0;
@ -199,10 +199,10 @@ Index: libvirt-8.8.0/src/interface/interface_driver.c
if (udevIfaceRegister() == 0) if (udevIfaceRegister() == 0)
return 0; return 0;
#endif /* WITH_UDEV */ #endif /* WITH_UDEV */
Index: libvirt-8.8.0/src/interface/meson.build Index: libvirt-8.9.0/src/interface/meson.build
=================================================================== ===================================================================
--- libvirt-8.8.0.orig/src/interface/meson.build --- libvirt-8.9.0.orig/src/interface/meson.build
+++ libvirt-8.8.0/src/interface/meson.build +++ libvirt-8.9.0/src/interface/meson.build
@@ -2,7 +2,7 @@ interface_driver_sources = [ @@ -2,7 +2,7 @@ interface_driver_sources = [
'interface_driver.c', 'interface_driver.c',
] ]
@ -220,10 +220,10 @@ Index: libvirt-8.8.0/src/interface/meson.build
udev_dep, udev_dep,
], ],
'link_args': [ 'link_args': [
Index: libvirt-8.8.0/tools/virsh.c Index: libvirt-8.9.0/tools/virsh.c
=================================================================== ===================================================================
--- libvirt-8.8.0.orig/tools/virsh.c --- libvirt-8.9.0.orig/tools/virsh.c
+++ libvirt-8.8.0/tools/virsh.c +++ libvirt-8.9.0/tools/virsh.c
@@ -545,6 +545,8 @@ virshShowVersion(vshControl *ctl G_GNUC_ @@ -545,6 +545,8 @@ virshShowVersion(vshControl *ctl G_GNUC_
vshPrint(ctl, " Interface"); vshPrint(ctl, " Interface");
# if defined(WITH_NETCF) # if defined(WITH_NETCF)

View File

@ -1,3 +1,14 @@
-------------------------------------------------------------------
Tue Nov 1 18:49:11 UTC 2022 - James Fehlig <jfehlig@suse.com>
- Update to libvirt 8.9.0
- jsc#PED-620, jsc#PED-1540
- Add support for modular daemons to the supportconfig plugin
- New subpackage libvirt-client-qemu providing client utilities
to interact with QEMU-specific features of libvirt
- Many incremental improvements and bug fixes, see
https://libvirt.org/news.html#v8-9-0-2022-11-01
------------------------------------------------------------------- -------------------------------------------------------------------
Wed Oct 5 01:23:33 UTC 2022 - James Fehlig <jfehlig@suse.com> Wed Oct 5 01:23:33 UTC 2022 - James Fehlig <jfehlig@suse.com>

View File

@ -162,7 +162,7 @@
Name: libvirt Name: libvirt
URL: http://libvirt.org/ URL: http://libvirt.org/
Version: 8.8.0 Version: 8.9.0
Release: 0 Release: 0
Summary: Library providing a virtualization API Summary: Library providing a virtualization API
License: LGPL-2.1-or-later License: LGPL-2.1-or-later
@ -192,7 +192,7 @@ Requires: %{name}-libs = %{version}-%{release}
# All build-time requirements. Run-time requirements are # All build-time requirements. Run-time requirements are
# listed against each sub-RPM # listed against each sub-RPM
BuildRequires: gettext-tools BuildRequires: gettext-tools
BuildRequires: meson >= 0.54.0 BuildRequires: meson >= 0.56.0
BuildRequires: ninja BuildRequires: ninja
# Needed for virkmodtest in 'make check' # Needed for virkmodtest in 'make check'
BuildRequires: modutils BuildRequires: modutils
@ -760,6 +760,15 @@ Obsoletes: libvirt-bash-completion < 7.3.0
The client binaries needed to access the virtualization The client binaries needed to access the virtualization
capabilities of recent versions of Linux (and other OSes). capabilities of recent versions of Linux (and other OSes).
%package client-qemu
Summary: Additional client side utilities for QEMU
Requires: %{name}-libs = %{version}-%{release}
Requires: python3-libvirt-python >= 5.1.0
%description client-qemu
The additional client binaries are used to interact
with some QEMU specific features of libvirt.
%package libs %package libs
Summary: Client side libraries for libvirt Summary: Client side libraries for libvirt
# Not technically required, but makes 'out-of-box' config # Not technically required, but makes 'out-of-box' config
@ -1856,6 +1865,12 @@ fi
%{_datadir}/bash-completion/completions/virsh %{_datadir}/bash-completion/completions/virsh
%dir %{_libdir}/%{name} %dir %{_libdir}/%{name}
%if %{with_qemu}
%files client-qemu
%doc %{_mandir}/man1/virt-qemu-qmp-proxy.1*
%{_bindir}/virt-qemu-qmp-proxy
%endif
%files libs -f %{name}.lang %files libs -f %{name}.lang
%dir %attr(0700, root, root) %{_sysconfdir}/%{name}/ %dir %attr(0700, root, root) %{_sysconfdir}/%{name}/
%config(noreplace) %{_sysconfdir}/%{name}/libvirt.conf %config(noreplace) %{_sysconfdir}/%{name}/libvirt.conf

View File

@ -12,10 +12,10 @@ Signed-off-by: Jim Fehlig <jfehlig@suse.com>
src/libxl/libxl_driver.c | 58 ++++++++++++++++++++++++++++++++++++++++ src/libxl/libxl_driver.c | 58 ++++++++++++++++++++++++++++++++++++++++
1 file changed, 58 insertions(+) 1 file changed, 58 insertions(+)
Index: libvirt-8.8.0/src/libxl/libxl_driver.c Index: libvirt-8.9.0/src/libxl/libxl_driver.c
=================================================================== ===================================================================
--- libvirt-8.8.0.orig/src/libxl/libxl_driver.c --- libvirt-8.9.0.orig/src/libxl/libxl_driver.c
+++ libvirt-8.8.0/src/libxl/libxl_driver.c +++ libvirt-8.9.0/src/libxl/libxl_driver.c
@@ -1355,6 +1355,63 @@ libxlDomainReboot(virDomainPtr dom, unsi @@ -1355,6 +1355,63 @@ libxlDomainReboot(virDomainPtr dom, unsi
} }

View File

@ -10,10 +10,10 @@ Signed-off-by: Jim Fehlig <jfehlig@suse.com>
src/libxl/libxl_conf.c | 23 +++++++++++++++++++++++ src/libxl/libxl_conf.c | 23 +++++++++++++++++++++++
1 file changed, 23 insertions(+) 1 file changed, 23 insertions(+)
Index: libvirt-8.8.0/src/libxl/libxl_conf.c Index: libvirt-8.9.0/src/libxl/libxl_conf.c
=================================================================== ===================================================================
--- libvirt-8.8.0.orig/src/libxl/libxl_conf.c --- libvirt-8.9.0.orig/src/libxl/libxl_conf.c
+++ libvirt-8.8.0/src/libxl/libxl_conf.c +++ libvirt-8.9.0/src/libxl/libxl_conf.c
@@ -941,6 +941,28 @@ libxlDiskSetDiscard(libxl_device_disk *x @@ -941,6 +941,28 @@ libxlDiskSetDiscard(libxl_device_disk *x
} }
} }

View File

@ -15,11 +15,11 @@ Signed-off-by: Olaf Hering <olaf@aepfle.de>
tools/virsh-domain.c | 29 +++++++++++++++++ tools/virsh-domain.c | 29 +++++++++++++++++
6 files changed, 124 insertions(+), 21 deletions(-) 6 files changed, 124 insertions(+), 21 deletions(-)
Index: libvirt-8.8.0/docs/manpages/virsh.rst Index: libvirt-8.9.0/docs/manpages/virsh.rst
=================================================================== ===================================================================
--- libvirt-8.8.0.orig/docs/manpages/virsh.rst --- libvirt-8.9.0.orig/docs/manpages/virsh.rst
+++ libvirt-8.8.0/docs/manpages/virsh.rst +++ libvirt-8.9.0/docs/manpages/virsh.rst
@@ -3297,6 +3297,7 @@ migrate @@ -3337,6 +3337,7 @@ migrate
[--parallel [--parallel-connections connections]] [--parallel [--parallel-connections connections]]
[--bandwidth bandwidth] [--tls-destination hostname] [--bandwidth bandwidth] [--tls-destination hostname]
[--disks-uri URI] [--copy-storage-synchronous-writes] [--disks-uri URI] [--copy-storage-synchronous-writes]
@ -27,7 +27,7 @@ Index: libvirt-8.8.0/docs/manpages/virsh.rst
Migrate domain to another host. Add *--live* for live migration; <--p2p> Migrate domain to another host. Add *--live* for live migration; <--p2p>
for peer-2-peer migration; *--direct* for direct migration; or *--tunnelled* for peer-2-peer migration; *--direct* for direct migration; or *--tunnelled*
@@ -3423,6 +3424,12 @@ parallel connections. The number of such @@ -3463,6 +3464,12 @@ parallel connections. The number of such
network link between the source and the target and thus speeding up the network link between the source and the target and thus speeding up the
migration. migration.
@ -40,10 +40,10 @@ Index: libvirt-8.8.0/docs/manpages/virsh.rst
Running migration can be canceled by interrupting virsh (usually using Running migration can be canceled by interrupting virsh (usually using
``Ctrl-C``) or by ``domjobabort`` command sent from another virsh instance. ``Ctrl-C``) or by ``domjobabort`` command sent from another virsh instance.
Index: libvirt-8.8.0/include/libvirt/libvirt-domain.h Index: libvirt-8.9.0/include/libvirt/libvirt-domain.h
=================================================================== ===================================================================
--- libvirt-8.8.0.orig/include/libvirt/libvirt-domain.h --- libvirt-8.9.0.orig/include/libvirt/libvirt-domain.h
+++ libvirt-8.8.0/include/libvirt/libvirt-domain.h +++ libvirt-8.9.0/include/libvirt/libvirt-domain.h
@@ -1367,6 +1367,31 @@ typedef enum { @@ -1367,6 +1367,31 @@ typedef enum {
*/ */
# define VIR_MIGRATE_PARAM_TLS_DESTINATION "tls.destination" # define VIR_MIGRATE_PARAM_TLS_DESTINATION "tls.destination"
@ -76,10 +76,10 @@ Index: libvirt-8.8.0/include/libvirt/libvirt-domain.h
/* Domain migration. */ /* Domain migration. */
virDomainPtr virDomainMigrate (virDomainPtr domain, virConnectPtr dconn, virDomainPtr virDomainMigrate (virDomainPtr domain, virConnectPtr dconn,
unsigned long flags, const char *dname, unsigned long flags, const char *dname,
Index: libvirt-8.8.0/src/libxl/libxl_driver.c Index: libvirt-8.9.0/src/libxl/libxl_driver.c
=================================================================== ===================================================================
--- libvirt-8.8.0.orig/src/libxl/libxl_driver.c --- libvirt-8.9.0.orig/src/libxl/libxl_driver.c
+++ libvirt-8.8.0/src/libxl/libxl_driver.c +++ libvirt-8.9.0/src/libxl/libxl_driver.c
@@ -5996,6 +5996,9 @@ libxlDomainMigratePerform3Params(virDoma @@ -5996,6 +5996,9 @@ libxlDomainMigratePerform3Params(virDoma
const char *dname = NULL; const char *dname = NULL;
const char *uri = NULL; const char *uri = NULL;
@ -120,10 +120,10 @@ Index: libvirt-8.8.0/src/libxl/libxl_driver.c
goto cleanup; goto cleanup;
} }
Index: libvirt-8.8.0/src/libxl/libxl_migration.c Index: libvirt-8.9.0/src/libxl/libxl_migration.c
=================================================================== ===================================================================
--- libvirt-8.8.0.orig/src/libxl/libxl_migration.c --- libvirt-8.9.0.orig/src/libxl/libxl_migration.c
+++ libvirt-8.8.0/src/libxl/libxl_migration.c +++ libvirt-8.9.0/src/libxl/libxl_migration.c
@@ -329,18 +329,38 @@ libxlMigrateDstReceive(virNetSocket *soc @@ -329,18 +329,38 @@ libxlMigrateDstReceive(virNetSocket *soc
static int static int
libxlDoMigrateSrcSend(libxlDriverPrivate *driver, libxlDoMigrateSrcSend(libxlDriverPrivate *driver,
@ -284,10 +284,10 @@ Index: libvirt-8.8.0/src/libxl/libxl_migration.c
virObjectLock(vm); virObjectLock(vm);
if (ret == 0) { if (ret == 0) {
Index: libvirt-8.8.0/src/libxl/libxl_migration.h Index: libvirt-8.9.0/src/libxl/libxl_migration.h
=================================================================== ===================================================================
--- libvirt-8.8.0.orig/src/libxl/libxl_migration.h --- libvirt-8.9.0.orig/src/libxl/libxl_migration.h
+++ libvirt-8.8.0/src/libxl/libxl_migration.h +++ libvirt-8.9.0/src/libxl/libxl_migration.h
@@ -35,6 +35,9 @@ @@ -35,6 +35,9 @@
VIR_MIGRATE_PARAM_URI, VIR_TYPED_PARAM_STRING, \ VIR_MIGRATE_PARAM_URI, VIR_TYPED_PARAM_STRING, \
VIR_MIGRATE_PARAM_DEST_NAME, VIR_TYPED_PARAM_STRING, \ VIR_MIGRATE_PARAM_DEST_NAME, VIR_TYPED_PARAM_STRING, \
@ -330,11 +330,11 @@ Index: libvirt-8.8.0/src/libxl/libxl_migration.h
virDomainPtr virDomainPtr
libxlDomainMigrationDstFinish(virConnectPtr dconn, libxlDomainMigrationDstFinish(virConnectPtr dconn,
Index: libvirt-8.8.0/tools/virsh-domain.c Index: libvirt-8.9.0/tools/virsh-domain.c
=================================================================== ===================================================================
--- libvirt-8.8.0.orig/tools/virsh-domain.c --- libvirt-8.9.0.orig/tools/virsh-domain.c
+++ libvirt-8.8.0/tools/virsh-domain.c +++ libvirt-8.9.0/tools/virsh-domain.c
@@ -11026,6 +11026,18 @@ static const vshCmdOptDef opts_migrate[] @@ -11041,6 +11041,18 @@ static const vshCmdOptDef opts_migrate[]
.completer = virshCompleteEmpty, .completer = virshCompleteEmpty,
.help = N_("override the destination host name used for TLS verification") .help = N_("override the destination host name used for TLS verification")
}, },
@ -353,7 +353,7 @@ Index: libvirt-8.8.0/tools/virsh-domain.c
{.name = NULL} {.name = NULL}
}; };
@@ -11046,6 +11058,7 @@ doMigrate(void *opaque) @@ -11061,6 +11073,7 @@ doMigrate(void *opaque)
unsigned long long ullOpt = 0; unsigned long long ullOpt = 0;
int rv; int rv;
virConnectPtr dconn = data->dconn; virConnectPtr dconn = data->dconn;
@ -361,7 +361,7 @@ Index: libvirt-8.8.0/tools/virsh-domain.c
#ifndef WIN32 #ifndef WIN32
sigset_t sigmask, oldsigmask; sigset_t sigmask, oldsigmask;
@@ -11176,6 +11189,22 @@ doMigrate(void *opaque) @@ -11191,6 +11204,22 @@ doMigrate(void *opaque)
goto save_error; goto save_error;
} }

View File

@ -13,10 +13,10 @@ Signed-off-by: Jim Fehlig <jfehlig@suse.com>
src/libxl/libxl_conf.c | 19 ++++++++++++++++++- src/libxl/libxl_conf.c | 19 ++++++++++++++++++-
1 file changed, 18 insertions(+), 1 deletion(-) 1 file changed, 18 insertions(+), 1 deletion(-)
Index: libvirt-8.8.0/src/libxl/libxl_conf.c Index: libvirt-8.9.0/src/libxl/libxl_conf.c
=================================================================== ===================================================================
--- libvirt-8.8.0.orig/src/libxl/libxl_conf.c --- libvirt-8.9.0.orig/src/libxl/libxl_conf.c
+++ libvirt-8.8.0/src/libxl/libxl_conf.c +++ libvirt-8.9.0/src/libxl/libxl_conf.c
@@ -942,6 +942,20 @@ libxlDiskSetDiscard(libxl_device_disk *x @@ -942,6 +942,20 @@ libxlDiskSetDiscard(libxl_device_disk *x
} }

View File

@ -15,10 +15,10 @@ From: <cbosdonnat@suse.com>
src/lxc/lxc_process.c | 1 + src/lxc/lxc_process.c | 1 +
3 files changed, 4 insertions(+) 3 files changed, 4 insertions(+)
Index: libvirt-8.8.0/src/lxc/lxc_controller.c Index: libvirt-8.9.0/src/lxc/lxc_controller.c
=================================================================== ===================================================================
--- libvirt-8.8.0.orig/src/lxc/lxc_controller.c --- libvirt-8.9.0.orig/src/lxc/lxc_controller.c
+++ libvirt-8.8.0/src/lxc/lxc_controller.c +++ libvirt-8.9.0/src/lxc/lxc_controller.c
@@ -1997,6 +1997,7 @@ static int virLXCControllerDeleteInterfa @@ -1997,6 +1997,7 @@ static int virLXCControllerDeleteInterfa
if (virNetDevVethDelete(ctrl->veths[i]) < 0) if (virNetDevVethDelete(ctrl->veths[i]) < 0)
ret = -1; ret = -1;
@ -27,10 +27,10 @@ Index: libvirt-8.8.0/src/lxc/lxc_controller.c
return ret; return ret;
} }
Index: libvirt-8.8.0/src/lxc/lxc_driver.c Index: libvirt-8.9.0/src/lxc/lxc_driver.c
=================================================================== ===================================================================
--- libvirt-8.8.0.orig/src/lxc/lxc_driver.c --- libvirt-8.9.0.orig/src/lxc/lxc_driver.c
+++ libvirt-8.8.0/src/lxc/lxc_driver.c +++ libvirt-8.9.0/src/lxc/lxc_driver.c
@@ -3498,6 +3498,7 @@ lxcDomainAttachDeviceNetLive(virLXCDrive @@ -3498,6 +3498,7 @@ lxcDomainAttachDeviceNetLive(virLXCDrive
case VIR_DOMAIN_NET_TYPE_NETWORK: case VIR_DOMAIN_NET_TYPE_NETWORK:
case VIR_DOMAIN_NET_TYPE_ETHERNET: case VIR_DOMAIN_NET_TYPE_ETHERNET:
@ -47,10 +47,10 @@ Index: libvirt-8.8.0/src/lxc/lxc_driver.c
break; break;
/* It'd be nice to support this, but with macvlan /* It'd be nice to support this, but with macvlan
Index: libvirt-8.8.0/src/lxc/lxc_process.c Index: libvirt-8.9.0/src/lxc/lxc_process.c
=================================================================== ===================================================================
--- libvirt-8.8.0.orig/src/lxc/lxc_process.c --- libvirt-8.9.0.orig/src/lxc/lxc_process.c
+++ libvirt-8.8.0/src/lxc/lxc_process.c +++ libvirt-8.9.0/src/lxc/lxc_process.c
@@ -226,6 +226,7 @@ static void virLXCProcessCleanup(virLXCD @@ -226,6 +226,7 @@ static void virLXCProcessCleanup(virLXCD
VIR_WARN("Unable to release network device '%s'", NULLSTR(iface->ifname)); VIR_WARN("Unable to release network device '%s'", NULLSTR(iface->ifname));
} }

View File

@ -17,10 +17,10 @@ Signed-off-by: Martin Wilck <mwilck@suse.com>
tests/networkxml2confdata/dhcp6host-routed-network.conf | 1 - tests/networkxml2confdata/dhcp6host-routed-network.conf | 1 -
2 files changed, 8 insertions(+), 2 deletions(-) 2 files changed, 8 insertions(+), 2 deletions(-)
Index: libvirt-8.8.0/src/network/bridge_driver.c Index: libvirt-8.9.0/src/network/bridge_driver.c
=================================================================== ===================================================================
--- libvirt-8.8.0.orig/src/network/bridge_driver.c --- libvirt-8.9.0.orig/src/network/bridge_driver.c
+++ libvirt-8.8.0/src/network/bridge_driver.c +++ libvirt-8.9.0/src/network/bridge_driver.c
@@ -1044,7 +1044,14 @@ networkDnsmasqConfDHCP(virBuffer *buf, @@ -1044,7 +1044,14 @@ networkDnsmasqConfDHCP(virBuffer *buf,
if (VIR_SOCKET_ADDR_IS_FAMILY(&ipdef->address, AF_INET)) { if (VIR_SOCKET_ADDR_IS_FAMILY(&ipdef->address, AF_INET)) {
if (ipdef->nranges || ipdef->nhosts) { if (ipdef->nranges || ipdef->nhosts) {
@ -37,10 +37,10 @@ Index: libvirt-8.8.0/src/network/bridge_driver.c
} }
if (ipdef->bootfile) { if (ipdef->bootfile) {
Index: libvirt-8.8.0/tests/networkxml2confdata/dhcp6host-routed-network.conf Index: libvirt-8.9.0/tests/networkxml2confdata/dhcp6host-routed-network.conf
=================================================================== ===================================================================
--- libvirt-8.8.0.orig/tests/networkxml2confdata/dhcp6host-routed-network.conf --- libvirt-8.9.0.orig/tests/networkxml2confdata/dhcp6host-routed-network.conf
+++ libvirt-8.8.0/tests/networkxml2confdata/dhcp6host-routed-network.conf +++ libvirt-8.9.0/tests/networkxml2confdata/dhcp6host-routed-network.conf
@@ -10,7 +10,6 @@ bind-dynamic @@ -10,7 +10,6 @@ bind-dynamic
interface=virbr1 interface=virbr1
dhcp-range=192.168.122.1,static dhcp-range=192.168.122.1,static

View File

@ -10,10 +10,10 @@ Signed-off-by: Jim Fehlig <jfehlig@suse.com>
src/util/virarch.c | 2 ++ src/util/virarch.c | 2 ++
1 file changed, 2 insertions(+) 1 file changed, 2 insertions(+)
Index: libvirt-8.8.0/src/util/virarch.c Index: libvirt-8.9.0/src/util/virarch.c
=================================================================== ===================================================================
--- libvirt-8.8.0.orig/src/util/virarch.c --- libvirt-8.9.0.orig/src/util/virarch.c
+++ libvirt-8.8.0/src/util/virarch.c +++ libvirt-8.9.0/src/util/virarch.c
@@ -222,6 +222,8 @@ virArch virArchFromHost(void) @@ -222,6 +222,8 @@ virArch virArchFromHost(void)
arch = VIR_ARCH_X86_64; arch = VIR_ARCH_X86_64;
} else if (STREQ(ut.machine, "arm64")) { } else if (STREQ(ut.machine, "arm64")) {

View File

@ -8,10 +8,10 @@ Not sure who added this patch. See bug#904426 for possible suspects.
src/security/apparmor/libvirt-qemu | 3 +++ src/security/apparmor/libvirt-qemu | 3 +++
1 file changed, 3 insertions(+) 1 file changed, 3 insertions(+)
Index: libvirt-8.8.0/src/security/apparmor/libvirt-qemu Index: libvirt-8.9.0/src/security/apparmor/libvirt-qemu
=================================================================== ===================================================================
--- libvirt-8.8.0.orig/src/security/apparmor/libvirt-qemu --- libvirt-8.9.0.orig/src/security/apparmor/libvirt-qemu
+++ libvirt-8.8.0/src/security/apparmor/libvirt-qemu +++ libvirt-8.9.0/src/security/apparmor/libvirt-qemu
@@ -253,3 +253,6 @@ @@ -253,3 +253,6 @@
# required for QEMU accessing UEFI nvram variables # required for QEMU accessing UEFI nvram variables
owner /var/lib/libvirt/qemu/nvram/*_VARS.fd rwk, owner /var/lib/libvirt/qemu/nvram/*_VARS.fd rwk,

View File

@ -8,10 +8,10 @@ Signed-off-by: Jim Fehlig <jfehlig@suse.com>
tools/libvirt-guests.sh.in | 10 +++++----- tools/libvirt-guests.sh.in | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-) 1 file changed, 5 insertions(+), 5 deletions(-)
Index: libvirt-8.8.0/tools/libvirt-guests.sh.in Index: libvirt-8.9.0/tools/libvirt-guests.sh.in
=================================================================== ===================================================================
--- libvirt-8.8.0.orig/tools/libvirt-guests.sh.in --- libvirt-8.9.0.orig/tools/libvirt-guests.sh.in
+++ libvirt-8.8.0/tools/libvirt-guests.sh.in +++ libvirt-8.9.0/tools/libvirt-guests.sh.in
@@ -20,10 +20,6 @@ sysconfdir="@sysconfdir@" @@ -20,10 +20,6 @@ sysconfdir="@sysconfdir@"
localstatedir="@localstatedir@" localstatedir="@localstatedir@"
libvirtd="@sbindir@"/libvirtd libvirtd="@sbindir@"/libvirtd

View File

@ -14,10 +14,10 @@ Signed-off-by: Jim Fehlig <jfehlig@suse.com>
src/remote/test_libvirtd.aug.in | 2 +- src/remote/test_libvirtd.aug.in | 2 +-
3 files changed, 4 insertions(+), 4 deletions(-) 3 files changed, 4 insertions(+), 4 deletions(-)
Index: libvirt-8.8.0/src/remote/libvirtd.conf.in Index: libvirt-8.9.0/src/remote/libvirtd.conf.in
=================================================================== ===================================================================
--- libvirt-8.8.0.orig/src/remote/libvirtd.conf.in --- libvirt-8.9.0.orig/src/remote/libvirtd.conf.in
+++ libvirt-8.8.0/src/remote/libvirtd.conf.in +++ libvirt-8.9.0/src/remote/libvirtd.conf.in
@@ -19,8 +19,8 @@ @@ -19,8 +19,8 @@
# It is necessary to setup a CA and issue server certificates before # It is necessary to setup a CA and issue server certificates before
# using this capability. # using this capability.
@ -29,10 +29,10 @@ Index: libvirt-8.8.0/src/remote/libvirtd.conf.in
# Listen for unencrypted TCP connections on the public TCP/IP port. # Listen for unencrypted TCP connections on the public TCP/IP port.
# #
Index: libvirt-8.8.0/src/remote/remote_daemon_config.c Index: libvirt-8.9.0/src/remote/remote_daemon_config.c
=================================================================== ===================================================================
--- libvirt-8.8.0.orig/src/remote/remote_daemon_config.c --- libvirt-8.9.0.orig/src/remote/remote_daemon_config.c
+++ libvirt-8.8.0/src/remote/remote_daemon_config.c +++ libvirt-8.9.0/src/remote/remote_daemon_config.c
@@ -95,7 +95,7 @@ daemonConfigNew(bool privileged G_GNUC_U @@ -95,7 +95,7 @@ daemonConfigNew(bool privileged G_GNUC_U
#ifdef WITH_IP #ifdef WITH_IP
@ -42,10 +42,10 @@ Index: libvirt-8.8.0/src/remote/remote_daemon_config.c
# else /* ! LIBVIRTD */ # else /* ! LIBVIRTD */
data->listen_tls = false; /* Always honoured, --listen doesn't exist. */ data->listen_tls = false; /* Always honoured, --listen doesn't exist. */
# endif /* ! LIBVIRTD */ # endif /* ! LIBVIRTD */
Index: libvirt-8.8.0/src/remote/test_libvirtd.aug.in Index: libvirt-8.9.0/src/remote/test_libvirtd.aug.in
=================================================================== ===================================================================
--- libvirt-8.8.0.orig/src/remote/test_libvirtd.aug.in --- libvirt-8.9.0.orig/src/remote/test_libvirtd.aug.in
+++ libvirt-8.8.0/src/remote/test_libvirtd.aug.in +++ libvirt-8.9.0/src/remote/test_libvirtd.aug.in
@@ -3,7 +3,7 @@ module Test_@DAEMON_NAME@ = @@ -3,7 +3,7 @@ module Test_@DAEMON_NAME@ =
test @DAEMON_NAME_UC@.lns get conf = test @DAEMON_NAME_UC@.lns get conf =

View File

@ -16,10 +16,10 @@ Signed-off-by: Jim Fehlig <jfehlig@suse.com>
src/libxl/test_libvirtd_libxl.aug.in | 2 +- src/libxl/test_libvirtd_libxl.aug.in | 2 +-
3 files changed, 8 insertions(+), 19 deletions(-) 3 files changed, 8 insertions(+), 19 deletions(-)
Index: libvirt-8.8.0/src/libxl/libxl.conf Index: libvirt-8.9.0/src/libxl/libxl.conf
=================================================================== ===================================================================
--- libvirt-8.8.0.orig/src/libxl/libxl.conf --- libvirt-8.9.0.orig/src/libxl/libxl.conf
+++ libvirt-8.8.0/src/libxl/libxl.conf +++ libvirt-8.9.0/src/libxl/libxl.conf
@@ -4,12 +4,11 @@ @@ -4,12 +4,11 @@
# Enable autoballooning of domain0 # Enable autoballooning of domain0
@ -37,10 +37,10 @@ Index: libvirt-8.8.0/src/libxl/libxl.conf
# In order to prevent accidentally starting two domains that # In order to prevent accidentally starting two domains that
Index: libvirt-8.8.0/src/libxl/libxl_conf.c Index: libvirt-8.9.0/src/libxl/libxl_conf.c
=================================================================== ===================================================================
--- libvirt-8.8.0.orig/src/libxl/libxl_conf.c --- libvirt-8.9.0.orig/src/libxl/libxl_conf.c
+++ libvirt-8.8.0/src/libxl/libxl_conf.c +++ libvirt-8.9.0/src/libxl/libxl_conf.c
@@ -1737,15 +1737,12 @@ libxlMakeBuildInfoVfb(virPortAllocatorRa @@ -1737,15 +1737,12 @@ libxlMakeBuildInfoVfb(virPortAllocatorRa
/* /*
* Get domain0 autoballoon configuration. Honor user-specified * Get domain0 autoballoon configuration. Honor user-specified
@ -76,10 +76,10 @@ Index: libvirt-8.8.0/src/libxl/libxl_conf.c
return 0; return 0;
} }
Index: libvirt-8.8.0/src/libxl/test_libvirtd_libxl.aug.in Index: libvirt-8.9.0/src/libxl/test_libvirtd_libxl.aug.in
=================================================================== ===================================================================
--- libvirt-8.8.0.orig/src/libxl/test_libvirtd_libxl.aug.in --- libvirt-8.9.0.orig/src/libxl/test_libvirtd_libxl.aug.in
+++ libvirt-8.8.0/src/libxl/test_libvirtd_libxl.aug.in +++ libvirt-8.9.0/src/libxl/test_libvirtd_libxl.aug.in
@@ -2,7 +2,7 @@ module Test_libvirtd_libxl = @@ -2,7 +2,7 @@ module Test_libvirtd_libxl =
@CONFIG@ @CONFIG@

View File

@ -17,10 +17,10 @@ Signed-off-by: Jim Fehlig <jfehlig@suse.com>
src/qemu/test_libvirtd_qemu.aug.in | 1 + src/qemu/test_libvirtd_qemu.aug.in | 1 +
3 files changed, 28 insertions(+), 7 deletions(-) 3 files changed, 28 insertions(+), 7 deletions(-)
Index: libvirt-8.8.0/src/qemu/qemu.conf.in Index: libvirt-8.9.0/src/qemu/qemu.conf.in
=================================================================== ===================================================================
--- libvirt-8.8.0.orig/src/qemu/qemu.conf.in --- libvirt-8.9.0.orig/src/qemu/qemu.conf.in
+++ libvirt-8.8.0/src/qemu/qemu.conf.in +++ libvirt-8.9.0/src/qemu/qemu.conf.in
@@ -491,10 +491,19 @@ @@ -491,10 +491,19 @@
# isolation, but it cannot appear in a list of drivers. # isolation, but it cannot appear in a list of drivers.
# #
@ -70,11 +70,11 @@ Index: libvirt-8.8.0/src/qemu/qemu.conf.in
# #
#lock_manager = "lockd" #lock_manager = "lockd"
Index: libvirt-8.8.0/src/qemu/qemu_conf.c Index: libvirt-8.9.0/src/qemu/qemu_conf.c
=================================================================== ===================================================================
--- libvirt-8.8.0.orig/src/qemu/qemu_conf.c --- libvirt-8.9.0.orig/src/qemu/qemu_conf.c
+++ libvirt-8.8.0/src/qemu/qemu_conf.c +++ libvirt-8.9.0/src/qemu/qemu_conf.c
@@ -256,7 +256,7 @@ virQEMUDriverConfig *virQEMUDriverConfig @@ -264,7 +264,7 @@ virQEMUDriverConfig *virQEMUDriverConfig
cfg->slirpHelperName = g_strdup(QEMU_SLIRP_HELPER); cfg->slirpHelperName = g_strdup(QEMU_SLIRP_HELPER);
cfg->dbusDaemonName = g_strdup(QEMU_DBUS_DAEMON); cfg->dbusDaemonName = g_strdup(QEMU_DBUS_DAEMON);
@ -83,10 +83,10 @@ Index: libvirt-8.8.0/src/qemu/qemu_conf.c
cfg->securityRequireConfined = false; cfg->securityRequireConfined = false;
cfg->keepAliveInterval = 5; cfg->keepAliveInterval = 5;
Index: libvirt-8.8.0/src/qemu/test_libvirtd_qemu.aug.in Index: libvirt-8.9.0/src/qemu/test_libvirtd_qemu.aug.in
=================================================================== ===================================================================
--- libvirt-8.8.0.orig/src/qemu/test_libvirtd_qemu.aug.in --- libvirt-8.9.0.orig/src/qemu/test_libvirtd_qemu.aug.in
+++ libvirt-8.8.0/src/qemu/test_libvirtd_qemu.aug.in +++ libvirt-8.9.0/src/qemu/test_libvirtd_qemu.aug.in
@@ -45,6 +45,7 @@ module Test_libvirtd_qemu = @@ -45,6 +45,7 @@ module Test_libvirtd_qemu =
{ "remote_websocket_port_min" = "5700" } { "remote_websocket_port_min" = "5700" }
{ "remote_websocket_port_max" = "65535" } { "remote_websocket_port_max" = "65535" }

View File

@ -16,10 +16,10 @@ Signed-off-by: Jim Fehlig <jfehlig@suse.com>
src/security/virt-aa-helper.c | 3 ++- src/security/virt-aa-helper.c | 3 ++-
4 files changed, 11 insertions(+), 13 deletions(-) 4 files changed, 11 insertions(+), 13 deletions(-)
Index: libvirt-8.8.0/src/qemu/qemu.conf.in Index: libvirt-8.9.0/src/qemu/qemu.conf.in
=================================================================== ===================================================================
--- libvirt-8.8.0.orig/src/qemu/qemu.conf.in --- libvirt-8.9.0.orig/src/qemu/qemu.conf.in
+++ libvirt-8.8.0/src/qemu/qemu.conf.in +++ libvirt-8.9.0/src/qemu/qemu.conf.in
@@ -857,10 +857,9 @@ @@ -857,10 +857,9 @@
# for x86_64 and i686, but it's AAVMF for aarch64. The libvirt default # for x86_64 and i686, but it's AAVMF for aarch64. The libvirt default
# follows this scheme. # follows this scheme.
@ -34,11 +34,11 @@ Index: libvirt-8.8.0/src/qemu/qemu.conf.in
#] #]
# The backend to use for handling stdout/stderr output from # The backend to use for handling stdout/stderr output from
Index: libvirt-8.8.0/src/qemu/qemu_conf.c Index: libvirt-8.9.0/src/qemu/qemu_conf.c
=================================================================== ===================================================================
--- libvirt-8.8.0.orig/src/qemu/qemu_conf.c --- libvirt-8.9.0.orig/src/qemu/qemu_conf.c
+++ libvirt-8.8.0/src/qemu/qemu_conf.c +++ libvirt-8.9.0/src/qemu/qemu_conf.c
@@ -82,10 +82,9 @@ VIR_ONCE_GLOBAL_INIT(virQEMUConfig); @@ -90,10 +90,9 @@ VIR_ONCE_GLOBAL_INIT(virQEMUConfig);
#ifndef DEFAULT_LOADER_NVRAM #ifndef DEFAULT_LOADER_NVRAM
# define DEFAULT_LOADER_NVRAM \ # define DEFAULT_LOADER_NVRAM \
@ -52,10 +52,10 @@ Index: libvirt-8.8.0/src/qemu/qemu_conf.c
#endif #endif
Index: libvirt-8.8.0/src/qemu/test_libvirtd_qemu.aug.in Index: libvirt-8.9.0/src/qemu/test_libvirtd_qemu.aug.in
=================================================================== ===================================================================
--- libvirt-8.8.0.orig/src/qemu/test_libvirtd_qemu.aug.in --- libvirt-8.9.0.orig/src/qemu/test_libvirtd_qemu.aug.in
+++ libvirt-8.8.0/src/qemu/test_libvirtd_qemu.aug.in +++ libvirt-8.9.0/src/qemu/test_libvirtd_qemu.aug.in
@@ -96,10 +96,9 @@ module Test_libvirtd_qemu = @@ -96,10 +96,9 @@ module Test_libvirtd_qemu =
{ "migration_port_max" = "49215" } { "migration_port_max" = "49215" }
{ "log_timestamp" = "0" } { "log_timestamp" = "0" }
@ -70,16 +70,16 @@ Index: libvirt-8.8.0/src/qemu/test_libvirtd_qemu.aug.in
} }
{ "stdio_handler" = "logd" } { "stdio_handler" = "logd" }
{ "gluster_debug_level" = "9" } { "gluster_debug_level" = "9" }
Index: libvirt-8.8.0/src/security/virt-aa-helper.c Index: libvirt-8.9.0/src/security/virt-aa-helper.c
=================================================================== ===================================================================
--- libvirt-8.8.0.orig/src/security/virt-aa-helper.c --- libvirt-8.9.0.orig/src/security/virt-aa-helper.c
+++ libvirt-8.8.0/src/security/virt-aa-helper.c +++ libvirt-8.9.0/src/security/virt-aa-helper.c
@@ -480,7 +480,8 @@ valid_path(const char *path, const bool @@ -482,7 +482,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 */ "/usr/share/qemu-efi/", /* for AAVMF images */
- "/usr/share/qemu-efi-aarch64/" /* for AAVMF images */ "/usr/share/qemu-efi-aarch64/", /* for AAVMF images */
+ "/usr/share/qemu-efi-aarch64/", /* for AAVMF images */ "/usr/lib/u-boot/", /* u-boot loaders for qemu */
- "/usr/lib/riscv64-linux-gnu/opensbi" /* RISC-V SBI implementation */
+ "/usr/lib/riscv64-linux-gnu/opensbi", /* RISC-V SBI implementation */
+ "/usr/share/qemu/" /* SUSE path for OVMF and AAVMF images */ + "/usr/share/qemu/" /* SUSE path for OVMF and AAVMF images */
}; };
/* override the above with these */ /* override the above with these */

View File

@ -12,10 +12,10 @@ Signed-off-by: Jim Fehlig <jfehlig@suse.com>
src/libxl/libxl_conf.c | 2 +- src/libxl/libxl_conf.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-) 1 file changed, 1 insertion(+), 1 deletion(-)
Index: libvirt-8.8.0/src/libxl/libxl_conf.c Index: libvirt-8.9.0/src/libxl/libxl_conf.c
=================================================================== ===================================================================
--- libvirt-8.8.0.orig/src/libxl/libxl_conf.c --- libvirt-8.9.0.orig/src/libxl/libxl_conf.c
+++ libvirt-8.8.0/src/libxl/libxl_conf.c +++ libvirt-8.9.0/src/libxl/libxl_conf.c
@@ -1788,7 +1788,7 @@ libxlDriverConfigNew(void) @@ -1788,7 +1788,7 @@ libxlDriverConfigNew(void)
cfg->firmwares = g_new0(virFirmware *, 1); cfg->firmwares = g_new0(virFirmware *, 1);
cfg->nfirmwares = 1; cfg->nfirmwares = 1;

View File

@ -13,22 +13,22 @@ From <cbosdonnat@suse.com>
create mode 100644 docs/manpages/virt-create-rootfs.rst create mode 100644 docs/manpages/virt-create-rootfs.rst
create mode 100644 tools/virt-create-rootfs create mode 100644 tools/virt-create-rootfs
Index: libvirt-8.8.0/docs/manpages/meson.build Index: libvirt-8.9.0/docs/manpages/meson.build
=================================================================== ===================================================================
--- libvirt-8.8.0.orig/docs/manpages/meson.build --- libvirt-8.9.0.orig/docs/manpages/meson.build
+++ libvirt-8.8.0/docs/manpages/meson.build +++ libvirt-8.9.0/docs/manpages/meson.build
@@ -19,6 +19,7 @@ docs_man_files = [ @@ -20,6 +20,7 @@ docs_man_files = [
{ 'name': 'virt-pki-validate', 'section': '1', 'install': true },
{ 'name': 'virt-qemu-run', 'section': '1', 'install': conf.has('WITH_QEMU') }, { 'name': 'virt-qemu-run', 'section': '1', 'install': conf.has('WITH_QEMU') },
{ 'name': 'virt-qemu-qmp-proxy', 'section': '1', 'install': conf.has('WITH_QEMU') },
{ 'name': 'virt-xml-validate', 'section': '1', 'install': true }, { 'name': 'virt-xml-validate', 'section': '1', 'install': true },
+ { 'name': 'virt-create-rootfs', 'section': '1', 'install': true }, + { 'name': 'virt-create-rootfs', 'section': '1', 'install': true },
{ 'name': 'libvirt-guests', 'section': '8', 'install': conf.has('WITH_LIBVIRTD') }, { 'name': 'libvirt-guests', 'section': '8', 'install': conf.has('WITH_LIBVIRTD') },
{ 'name': 'libvirtd', 'section': '8', 'install': conf.has('WITH_LIBVIRTD') }, { 'name': 'libvirtd', 'section': '8', 'install': conf.has('WITH_LIBVIRTD') },
Index: libvirt-8.8.0/docs/manpages/virt-create-rootfs.rst Index: libvirt-8.9.0/docs/manpages/virt-create-rootfs.rst
=================================================================== ===================================================================
--- /dev/null --- /dev/null
+++ libvirt-8.8.0/docs/manpages/virt-create-rootfs.rst +++ libvirt-8.9.0/docs/manpages/virt-create-rootfs.rst
@@ -0,0 +1,88 @@ @@ -0,0 +1,88 @@
+================== +==================
+virt-create-rootfs +virt-create-rootfs
@ -118,10 +118,10 @@ Index: libvirt-8.8.0/docs/manpages/virt-create-rootfs.rst
+======== +========
+ +
+virsh(1), `https://libvirt.org/ <https://libvirt.org/>`_ +virsh(1), `https://libvirt.org/ <https://libvirt.org/>`_
Index: libvirt-8.8.0/tools/meson.build Index: libvirt-8.9.0/tools/meson.build
=================================================================== ===================================================================
--- libvirt-8.8.0.orig/tools/meson.build --- libvirt-8.9.0.orig/tools/meson.build
+++ libvirt-8.8.0/tools/meson.build +++ libvirt-8.9.0/tools/meson.build
@@ -154,6 +154,8 @@ else @@ -154,6 +154,8 @@ else
virsh_icon_res = [] virsh_icon_res = []
endif endif
@ -131,10 +131,10 @@ Index: libvirt-8.8.0/tools/meson.build
executable( executable(
'virsh', 'virsh',
[ [
Index: libvirt-8.8.0/tools/virt-create-rootfs Index: libvirt-8.9.0/tools/virt-create-rootfs
=================================================================== ===================================================================
--- /dev/null --- /dev/null
+++ libvirt-8.8.0/tools/virt-create-rootfs +++ libvirt-8.9.0/tools/virt-create-rootfs
@@ -0,0 +1,236 @@ @@ -0,0 +1,236 @@
+#!/bin/sh +#!/bin/sh
+set -e +set -e