Accepting request 1039408 from home:jfehlig:branches:Virtualization

- Update to libvirt 8.10.0
  - jsc#PED-1472
  - New virt-qemu-sev-validate utility for validating the
    measurement reported for a domain launched with AMD SEV
  - Many incremental improvements and bug fixes, see
    https://libvirt.org/news.html#v8-10-0-2022-12-01

OBS-URL: https://build.opensuse.org/request/show/1039408
OBS-URL: https://build.opensuse.org/package/show/Virtualization/libvirt?expand=0&rev=958
This commit is contained in:
James Fehlig 2022-12-01 21:53:09 +00:00 committed by Git OBS Bridge
parent 277b2bec4c
commit 632ffafbbe
26 changed files with 184 additions and 267 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.9.0/src/libxl/libxl_api_wrapper.h Index: libvirt-8.10.0/src/libxl/libxl_api_wrapper.h
=================================================================== ===================================================================
--- libvirt-8.9.0.orig/src/libxl/libxl_api_wrapper.h --- libvirt-8.10.0.orig/src/libxl/libxl_api_wrapper.h
+++ libvirt-8.9.0/src/libxl/libxl_api_wrapper.h +++ libvirt-8.10.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.9.0/src/libxl/libxl_api_wrapper.h
+ +
+ return ret; + return ret;
+} +}
Index: libvirt-8.9.0/src/libxl/libxl_driver.c Index: libvirt-8.10.0/src/libxl/libxl_driver.c
=================================================================== ===================================================================
--- libvirt-8.9.0.orig/src/libxl/libxl_driver.c --- libvirt-8.10.0.orig/src/libxl/libxl_driver.c
+++ libvirt-8.9.0/src/libxl/libxl_driver.c +++ libvirt-8.10.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.9.0/src/util/virpolkit.c Index: libvirt-8.10.0/src/util/virpolkit.c
=================================================================== ===================================================================
--- libvirt-8.9.0.orig/src/util/virpolkit.c --- libvirt-8.10.0.orig/src/util/virpolkit.c
+++ libvirt-8.9.0/src/util/virpolkit.c +++ libvirt-8.10.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,99 +0,0 @@
From e0d5a7c51a70da651c98f18f188743efcff8813b Mon Sep 17 00:00:00 2001
From: Jim Fehlig <jfehlig@suse.com>
Date: Thu, 10 Nov 2022 17:55:38 -0700
Subject: [PATCH] tests: Fix libxlxml2domconfigtest
Downstream CI recently encountered failures of libxlxml2domconfigtest when
building libvirt packages against Xen 4.17 rc3 packages. The test fails on
vnuma_hvm config, where suddently the actual json produced by
libxl_domain_config_to_json() contains a 'pnode' entry in the 'vnuma_nodes'
list, which is absent in the expected json. It appears the test has thus far
passed by luck. E.g. I was able to make the test pass in the failing
environment by changing the meson buildtype from debugoptimized to debug.
When a VM config contains vnuma settings, libxlMakeVnumaList() checks if the
number of requested vnuma nodes exceeds the number of physical nodes. The
number of physical nodes is retrieved with libxl_get_physinfo(), which can
return wildly different results in the context of unit tests. This change
mocks libxl_get_physinfo() to return consistent results. All fields of the
libxl_physinfo struct are set to 0 except nr_nodes, which is set to 6 to
ensure the vnuma_hvm configuration is properly tested.
Signed-off-by: Jim Fehlig <jfehlig@suse.com>
Reviewed-by: Michal Privoznik <mprivozn@redhat.com>
(cherry picked from commit f81ee7b549242c93bead8c8772bb31047da00415)
---
tests/libxlmock.c | 15 +++++++++++++++
tests/libxlxml2domconfigdata/vnuma-hvm.json | 5 +++++
2 files changed, 20 insertions(+)
Index: libvirt-8.9.0/tests/libxlmock.c
===================================================================
--- libvirt-8.9.0.orig/tests/libxlmock.c
+++ libvirt-8.9.0/tests/libxlmock.c
@@ -70,6 +70,21 @@ VIR_MOCK_IMPL_RET_ARGS(libxl_get_version
return &info;
}
+VIR_MOCK_IMPL_RET_ARGS(libxl_get_physinfo,
+ int,
+ libxl_ctx *, ctx,
+ libxl_physinfo *, physinfo)
+{
+ memset(physinfo, 0, sizeof(*physinfo));
+ physinfo->nr_nodes = 6;
+
+ /* silence gcc warning about unused function */
+ if (0)
+ real_libxl_get_physinfo(ctx, physinfo);
+
+ return 0;
+}
+
VIR_MOCK_STUB_RET_ARGS(libxl_get_free_memory,
int, 0,
libxl_ctx *, ctx,
Index: libvirt-8.9.0/tests/libxlxml2domconfigdata/vnuma-hvm.json
===================================================================
--- libvirt-8.9.0.orig/tests/libxlxml2domconfigdata/vnuma-hvm.json
+++ libvirt-8.9.0/tests/libxlxml2domconfigdata/vnuma-hvm.json
@@ -39,6 +39,7 @@
41,
51
],
+ "pnode": 1,
"vcpus": [
1
]
@@ -53,6 +54,7 @@
31,
41
],
+ "pnode": 2,
"vcpus": [
2
]
@@ -67,6 +69,7 @@
21,
31
],
+ "pnode": 3,
"vcpus": [
3
]
@@ -81,6 +84,7 @@
10,
21
],
+ "pnode": 4,
"vcpus": [
4
]
@@ -95,6 +99,7 @@
21,
10
],
+ "pnode": 5,
"vcpus": [
5
]

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

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

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

@ -0,0 +1,16 @@
-----BEGIN PGP SIGNATURE-----
iQIzBAABCAAdFiEERTtlMQWVVihVRxGZymi+gBAITJwFAmOIeyQACgkQymi+gBAI
TJxRMA//cgdGLkyzpoOgfMBPQ+uk5VBb4tYBS/HaZyAGU71CYNbwngsvGx4GR+6E
69AoYQXZi56yvPzyL7HMBMqn8/kadVWUKBk+gMQktTQrimkO4PyrLM2tbdfzPubE
8tWp9CIoheVlwOloyVdAtn1FAjl1yzcXbjrcJeyvGXkRBZwJpLvdgBz2NMfrLCWN
Q0stVBBDIuAOWI/6cYTqEcB2GHAK4KnQg8bHLPk5stzYMe0tbC/kDYWv7iW6qU69
N1VkUwr+DvDdexV7MGMQaZUvSMzPK5wqIpm/74RRdkXsTtItlQq+8nYa1hFdSxMP
GN0gcnQZxLui9AWX9gPRc7X5jloBNu4H5gqtuqg7GJC1wC/7EOIi9YM4hq6V/I/f
feRTb8+8wO9hGRCyy9e0x52P2qs7Bh+JQZ8lmugaRKFYq5pJaKhjXrEgw1pJGDD0
M58fTc4ZJmDK5L+GKgo6Nx8xYY93ED7n0vTNoSVWfSF9vIDI0QgwPxomskfKgSXA
6KKHkWNIeeFkRzoOVExOZrsGg/wMjkSBgTOMj/57fKPVhAdFwTCVD1qt2e1PP8T4
jPtldPQPMXaLrcBmVefnRwIMHgGyHCue4AHTpfJ+BVn4htKC7hnCO0r9LrPCj2DU
+P22UXj1UG/4bpLTONAZQ+lqxCx16I85puhU7AtZlNEb0tDqrDY=
=CbLX
-----END PGP SIGNATURE-----

View File

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

View File

@ -1,16 +0,0 @@
-----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.9.0/src/cpu_map/ppc64_POWER8.xml Index: libvirt-8.10.0/src/cpu_map/ppc64_POWER8.xml
=================================================================== ===================================================================
--- libvirt-8.9.0.orig/src/cpu_map/ppc64_POWER8.xml --- libvirt-8.10.0.orig/src/cpu_map/ppc64_POWER8.xml
+++ libvirt-8.9.0/src/cpu_map/ppc64_POWER8.xml +++ libvirt-8.10.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

@ -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.9.0/meson.build Index: libvirt-8.10.0/meson.build
=================================================================== ===================================================================
--- libvirt-8.9.0.orig/meson.build --- libvirt-8.10.0.orig/meson.build
+++ libvirt-8.9.0/meson.build +++ libvirt-8.10.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.9.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.9.0/meson_options.txt Index: libvirt-8.10.0/meson_options.txt
=================================================================== ===================================================================
--- libvirt-8.9.0.orig/meson_options.txt --- libvirt-8.10.0.orig/meson_options.txt
+++ libvirt-8.9.0/meson_options.txt +++ libvirt-8.10.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.9.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.9.0/src/interface/interface_backend_netcf.c Index: libvirt-8.10.0/src/interface/interface_backend_netcf.c
=================================================================== ===================================================================
--- libvirt-8.9.0.orig/src/interface/interface_backend_netcf.c --- libvirt-8.10.0.orig/src/interface/interface_backend_netcf.c
+++ libvirt-8.9.0/src/interface/interface_backend_netcf.c +++ libvirt-8.10.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.9.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.9.0/src/interface/interface_driver.c Index: libvirt-8.10.0/src/interface/interface_driver.c
=================================================================== ===================================================================
--- libvirt-8.9.0.orig/src/interface/interface_driver.c --- libvirt-8.10.0.orig/src/interface/interface_driver.c
+++ libvirt-8.9.0/src/interface/interface_driver.c +++ libvirt-8.10.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.9.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.9.0/src/interface/meson.build Index: libvirt-8.10.0/src/interface/meson.build
=================================================================== ===================================================================
--- libvirt-8.9.0.orig/src/interface/meson.build --- libvirt-8.10.0.orig/src/interface/meson.build
+++ libvirt-8.9.0/src/interface/meson.build +++ libvirt-8.10.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.9.0/src/interface/meson.build
udev_dep, udev_dep,
], ],
'link_args': [ 'link_args': [
Index: libvirt-8.9.0/tools/virsh.c Index: libvirt-8.10.0/tools/virsh.c
=================================================================== ===================================================================
--- libvirt-8.9.0.orig/tools/virsh.c --- libvirt-8.10.0.orig/tools/virsh.c
+++ libvirt-8.9.0/tools/virsh.c +++ libvirt-8.10.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,13 @@
-------------------------------------------------------------------
Thu Dec 1 18:26:28 UTC 2022 - James Fehlig <jfehlig@suse.com>
- Update to libvirt 8.10.0
- jsc#PED-1472
- New virt-qemu-sev-validate utility for validating the
measurement reported for a domain launched with AMD SEV
- Many incremental improvements and bug fixes, see
https://libvirt.org/news.html#v8-10-0-2022-12-01
------------------------------------------------------------------- -------------------------------------------------------------------
Fri Nov 11 16:23:28 UTC 2022 - James Fehlig <jfehlig@suse.com> Fri Nov 11 16:23:28 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.9.0 Version: 8.10.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
@ -304,7 +304,6 @@ Source6: libvirtd-relocation-server.xml
Source99: baselibs.conf Source99: baselibs.conf
Source100: %{name}-rpmlintrc Source100: %{name}-rpmlintrc
# Upstream patches # Upstream patches
Patch0: f81ee7b5-tests-Fix-libxlxml2domconfigtest.patch
# Patches pending upstream review # Patches pending upstream review
Patch100: libxl-dom-reset.patch Patch100: libxl-dom-reset.patch
Patch101: network-don-t-use-dhcp-authoritative-on-static-netwo.patch Patch101: network-don-t-use-dhcp-authoritative-on-static-netwo.patch
@ -1622,7 +1621,12 @@ fi
%{_libdir}/%{name}/connection-driver/libvirt_driver_network.so %{_libdir}/%{name}/connection-driver/libvirt_driver_network.so
%if %{with_firewalld_zone} %if %{with_firewalld_zone}
%dir %{_prefix}/lib/firewalld/zones/ %dir %{_prefix}/lib/firewalld/zones/
%dir %{_prefix}/lib/firewalld/policies/
%{_prefix}/lib/firewalld/zones/libvirt.xml %{_prefix}/lib/firewalld/zones/libvirt.xml
%{_prefix}/lib/firewalld/zones/libvirt-routed.xml
%{_prefix}/lib/firewalld/policies/libvirt-routed-in.xml
%{_prefix}/lib/firewalld/policies/libvirt-routed-out.xml
%{_prefix}/lib/firewalld/policies/libvirt-to-host.xml
%endif %endif
%doc %{_mandir}/man8/virtnetworkd.8* %doc %{_mandir}/man8/virtnetworkd.8*
@ -1869,7 +1873,9 @@ fi
%if %{with_qemu} %if %{with_qemu}
%files client-qemu %files client-qemu
%doc %{_mandir}/man1/virt-qemu-qmp-proxy.1* %doc %{_mandir}/man1/virt-qemu-qmp-proxy.1*
%{_mandir}/man1/virt-qemu-sev-validate.1*
%{_bindir}/virt-qemu-qmp-proxy %{_bindir}/virt-qemu-qmp-proxy
%{_bindir}/virt-qemu-sev-validate
%endif %endif
%files libs -f %{name}.lang %files libs -f %{name}.lang

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.9.0/src/libxl/libxl_driver.c Index: libvirt-8.10.0/src/libxl/libxl_driver.c
=================================================================== ===================================================================
--- libvirt-8.9.0.orig/src/libxl/libxl_driver.c --- libvirt-8.10.0.orig/src/libxl/libxl_driver.c
+++ libvirt-8.9.0/src/libxl/libxl_driver.c +++ libvirt-8.10.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,11 +10,11 @@ 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.9.0/src/libxl/libxl_conf.c Index: libvirt-8.10.0/src/libxl/libxl_conf.c
=================================================================== ===================================================================
--- libvirt-8.9.0.orig/src/libxl/libxl_conf.c --- libvirt-8.10.0.orig/src/libxl/libxl_conf.c
+++ libvirt-8.9.0/src/libxl/libxl_conf.c +++ libvirt-8.10.0/src/libxl/libxl_conf.c
@@ -941,6 +941,28 @@ libxlDiskSetDiscard(libxl_device_disk *x @@ -945,6 +945,28 @@ libxlDiskSetDiscard(libxl_device_disk *x
} }
} }
@ -43,7 +43,7 @@ Index: libvirt-8.9.0/src/libxl/libxl_conf.c
static char * static char *
libxlMakeNetworkDiskSrcStr(virStorageSource *src, libxlMakeNetworkDiskSrcStr(virStorageSource *src,
const char *username, const char *username,
@@ -1180,6 +1202,7 @@ libxlMakeDisk(virDomainDiskDef *l_disk, @@ -1184,6 +1206,7 @@ libxlMakeDisk(virDomainDiskDef *l_disk,
x_disk->readwrite = !l_disk->src->readonly; x_disk->readwrite = !l_disk->src->readonly;
x_disk->is_cdrom = l_disk->device == VIR_DOMAIN_DISK_DEVICE_CDROM ? 1 : 0; x_disk->is_cdrom = l_disk->device == VIR_DOMAIN_DISK_DEVICE_CDROM ? 1 : 0;
libxlDiskSetDiscard(x_disk, l_disk->discard); libxlDiskSetDiscard(x_disk, l_disk->discard);

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.9.0/docs/manpages/virsh.rst Index: libvirt-8.10.0/docs/manpages/virsh.rst
=================================================================== ===================================================================
--- libvirt-8.9.0.orig/docs/manpages/virsh.rst --- libvirt-8.10.0.orig/docs/manpages/virsh.rst
+++ libvirt-8.9.0/docs/manpages/virsh.rst +++ libvirt-8.10.0/docs/manpages/virsh.rst
@@ -3337,6 +3337,7 @@ migrate @@ -3359,6 +3359,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.9.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*
@@ -3463,6 +3464,12 @@ parallel connections. The number of such @@ -3485,6 +3486,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.9.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.9.0/include/libvirt/libvirt-domain.h Index: libvirt-8.10.0/include/libvirt/libvirt-domain.h
=================================================================== ===================================================================
--- libvirt-8.9.0.orig/include/libvirt/libvirt-domain.h --- libvirt-8.10.0.orig/include/libvirt/libvirt-domain.h
+++ libvirt-8.9.0/include/libvirt/libvirt-domain.h +++ libvirt-8.10.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.9.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.9.0/src/libxl/libxl_driver.c Index: libvirt-8.10.0/src/libxl/libxl_driver.c
=================================================================== ===================================================================
--- libvirt-8.9.0.orig/src/libxl/libxl_driver.c --- libvirt-8.10.0.orig/src/libxl/libxl_driver.c
+++ libvirt-8.9.0/src/libxl/libxl_driver.c +++ libvirt-8.10.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.9.0/src/libxl/libxl_driver.c
goto cleanup; goto cleanup;
} }
Index: libvirt-8.9.0/src/libxl/libxl_migration.c Index: libvirt-8.10.0/src/libxl/libxl_migration.c
=================================================================== ===================================================================
--- libvirt-8.9.0.orig/src/libxl/libxl_migration.c --- libvirt-8.10.0.orig/src/libxl/libxl_migration.c
+++ libvirt-8.9.0/src/libxl/libxl_migration.c +++ libvirt-8.10.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.9.0/src/libxl/libxl_migration.c
virObjectLock(vm); virObjectLock(vm);
if (ret == 0) { if (ret == 0) {
Index: libvirt-8.9.0/src/libxl/libxl_migration.h Index: libvirt-8.10.0/src/libxl/libxl_migration.h
=================================================================== ===================================================================
--- libvirt-8.9.0.orig/src/libxl/libxl_migration.h --- libvirt-8.10.0.orig/src/libxl/libxl_migration.h
+++ libvirt-8.9.0/src/libxl/libxl_migration.h +++ libvirt-8.10.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,10 +330,10 @@ Index: libvirt-8.9.0/src/libxl/libxl_migration.h
virDomainPtr virDomainPtr
libxlDomainMigrationDstFinish(virConnectPtr dconn, libxlDomainMigrationDstFinish(virConnectPtr dconn,
Index: libvirt-8.9.0/tools/virsh-domain.c Index: libvirt-8.10.0/tools/virsh-domain.c
=================================================================== ===================================================================
--- libvirt-8.9.0.orig/tools/virsh-domain.c --- libvirt-8.10.0.orig/tools/virsh-domain.c
+++ libvirt-8.9.0/tools/virsh-domain.c +++ libvirt-8.10.0/tools/virsh-domain.c
@@ -11041,6 +11041,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")

View File

@ -13,11 +13,11 @@ 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.9.0/src/libxl/libxl_conf.c Index: libvirt-8.10.0/src/libxl/libxl_conf.c
=================================================================== ===================================================================
--- libvirt-8.9.0.orig/src/libxl/libxl_conf.c --- libvirt-8.10.0.orig/src/libxl/libxl_conf.c
+++ libvirt-8.9.0/src/libxl/libxl_conf.c +++ libvirt-8.10.0/src/libxl/libxl_conf.c
@@ -942,6 +942,20 @@ libxlDiskSetDiscard(libxl_device_disk *x @@ -946,6 +946,20 @@ libxlDiskSetDiscard(libxl_device_disk *x
} }
static void static void
@ -38,7 +38,7 @@ Index: libvirt-8.9.0/src/libxl/libxl_conf.c
libxlDiskSetCacheMode(libxl_device_disk *x_disk, int cachemode) libxlDiskSetCacheMode(libxl_device_disk *x_disk, int cachemode)
{ {
switch (cachemode) { switch (cachemode) {
@@ -1084,6 +1098,7 @@ libxlMakeNetworkDiskSrc(virStorageSource @@ -1088,6 +1102,7 @@ libxlMakeNetworkDiskSrc(virStorageSource
int int
libxlMakeDisk(virDomainDiskDef *l_disk, libxl_device_disk *x_disk) libxlMakeDisk(virDomainDiskDef *l_disk, libxl_device_disk *x_disk)
{ {
@ -46,7 +46,7 @@ Index: libvirt-8.9.0/src/libxl/libxl_conf.c
const char *driver = virDomainDiskGetDriver(l_disk); const char *driver = virDomainDiskGetDriver(l_disk);
int format = virDomainDiskGetFormat(l_disk); int format = virDomainDiskGetFormat(l_disk);
virStorageType actual_type = virStorageSourceGetActualType(l_disk->src); virStorageType actual_type = virStorageSourceGetActualType(l_disk->src);
@@ -1097,7 +1112,7 @@ libxlMakeDisk(virDomainDiskDef *l_disk, @@ -1101,7 +1116,7 @@ libxlMakeDisk(virDomainDiskDef *l_disk,
if (libxlMakeNetworkDiskSrc(l_disk->src, &x_disk->pdev_path) < 0) if (libxlMakeNetworkDiskSrc(l_disk->src, &x_disk->pdev_path) < 0)
return -1; return -1;
} else { } else {
@ -55,7 +55,7 @@ Index: libvirt-8.9.0/src/libxl/libxl_conf.c
} }
x_disk->vdev = g_strdup(l_disk->dst); x_disk->vdev = g_strdup(l_disk->dst);
@@ -1203,6 +1218,8 @@ libxlMakeDisk(virDomainDiskDef *l_disk, @@ -1207,6 +1222,8 @@ libxlMakeDisk(virDomainDiskDef *l_disk,
x_disk->is_cdrom = l_disk->device == VIR_DOMAIN_DISK_DEVICE_CDROM ? 1 : 0; x_disk->is_cdrom = l_disk->device == VIR_DOMAIN_DISK_DEVICE_CDROM ? 1 : 0;
libxlDiskSetDiscard(x_disk, l_disk->discard); libxlDiskSetDiscard(x_disk, l_disk->discard);
libxlDiskSetCacheMode(x_disk, l_disk->cachemode); libxlDiskSetCacheMode(x_disk, l_disk->cachemode);

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.9.0/src/lxc/lxc_controller.c Index: libvirt-8.10.0/src/lxc/lxc_controller.c
=================================================================== ===================================================================
--- libvirt-8.9.0.orig/src/lxc/lxc_controller.c --- libvirt-8.10.0.orig/src/lxc/lxc_controller.c
+++ libvirt-8.9.0/src/lxc/lxc_controller.c +++ libvirt-8.10.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.9.0/src/lxc/lxc_controller.c
return ret; return ret;
} }
Index: libvirt-8.9.0/src/lxc/lxc_driver.c Index: libvirt-8.10.0/src/lxc/lxc_driver.c
=================================================================== ===================================================================
--- libvirt-8.9.0.orig/src/lxc/lxc_driver.c --- libvirt-8.10.0.orig/src/lxc/lxc_driver.c
+++ libvirt-8.9.0/src/lxc/lxc_driver.c +++ libvirt-8.10.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.9.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.9.0/src/lxc/lxc_process.c Index: libvirt-8.10.0/src/lxc/lxc_process.c
=================================================================== ===================================================================
--- libvirt-8.9.0.orig/src/lxc/lxc_process.c --- libvirt-8.10.0.orig/src/lxc/lxc_process.c
+++ libvirt-8.9.0/src/lxc/lxc_process.c +++ libvirt-8.10.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.9.0/src/network/bridge_driver.c Index: libvirt-8.10.0/src/network/bridge_driver.c
=================================================================== ===================================================================
--- libvirt-8.9.0.orig/src/network/bridge_driver.c --- libvirt-8.10.0.orig/src/network/bridge_driver.c
+++ libvirt-8.9.0/src/network/bridge_driver.c +++ libvirt-8.10.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.9.0/src/network/bridge_driver.c
} }
if (ipdef->bootfile) { if (ipdef->bootfile) {
Index: libvirt-8.9.0/tests/networkxml2confdata/dhcp6host-routed-network.conf Index: libvirt-8.10.0/tests/networkxml2confdata/dhcp6host-routed-network.conf
=================================================================== ===================================================================
--- libvirt-8.9.0.orig/tests/networkxml2confdata/dhcp6host-routed-network.conf --- libvirt-8.10.0.orig/tests/networkxml2confdata/dhcp6host-routed-network.conf
+++ libvirt-8.9.0/tests/networkxml2confdata/dhcp6host-routed-network.conf +++ libvirt-8.10.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.9.0/src/util/virarch.c Index: libvirt-8.10.0/src/util/virarch.c
=================================================================== ===================================================================
--- libvirt-8.9.0.orig/src/util/virarch.c --- libvirt-8.10.0.orig/src/util/virarch.c
+++ libvirt-8.9.0/src/util/virarch.c +++ libvirt-8.10.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,11 +8,11 @@ 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.9.0/src/security/apparmor/libvirt-qemu Index: libvirt-8.10.0/src/security/apparmor/libvirt-qemu
=================================================================== ===================================================================
--- libvirt-8.9.0.orig/src/security/apparmor/libvirt-qemu --- libvirt-8.10.0.orig/src/security/apparmor/libvirt-qemu
+++ libvirt-8.9.0/src/security/apparmor/libvirt-qemu +++ libvirt-8.10.0/src/security/apparmor/libvirt-qemu
@@ -253,3 +253,6 @@ @@ -254,3 +254,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,
owner /var/lib/libvirt/qemu/nvram/*_VARS.ms.fd rwk, owner /var/lib/libvirt/qemu/nvram/*_VARS.ms.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.9.0/tools/libvirt-guests.sh.in Index: libvirt-8.10.0/tools/libvirt-guests.sh.in
=================================================================== ===================================================================
--- libvirt-8.9.0.orig/tools/libvirt-guests.sh.in --- libvirt-8.10.0.orig/tools/libvirt-guests.sh.in
+++ libvirt-8.9.0/tools/libvirt-guests.sh.in +++ libvirt-8.10.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.9.0/src/remote/libvirtd.conf.in Index: libvirt-8.10.0/src/remote/libvirtd.conf.in
=================================================================== ===================================================================
--- libvirt-8.9.0.orig/src/remote/libvirtd.conf.in --- libvirt-8.10.0.orig/src/remote/libvirtd.conf.in
+++ libvirt-8.9.0/src/remote/libvirtd.conf.in +++ libvirt-8.10.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.9.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.9.0/src/remote/remote_daemon_config.c Index: libvirt-8.10.0/src/remote/remote_daemon_config.c
=================================================================== ===================================================================
--- libvirt-8.9.0.orig/src/remote/remote_daemon_config.c --- libvirt-8.10.0.orig/src/remote/remote_daemon_config.c
+++ libvirt-8.9.0/src/remote/remote_daemon_config.c +++ libvirt-8.10.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.9.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.9.0/src/remote/test_libvirtd.aug.in Index: libvirt-8.10.0/src/remote/test_libvirtd.aug.in
=================================================================== ===================================================================
--- libvirt-8.9.0.orig/src/remote/test_libvirtd.aug.in --- libvirt-8.10.0.orig/src/remote/test_libvirtd.aug.in
+++ libvirt-8.9.0/src/remote/test_libvirtd.aug.in +++ libvirt-8.10.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.9.0/src/libxl/libxl.conf Index: libvirt-8.10.0/src/libxl/libxl.conf
=================================================================== ===================================================================
--- libvirt-8.9.0.orig/src/libxl/libxl.conf --- libvirt-8.10.0.orig/src/libxl/libxl.conf
+++ libvirt-8.9.0/src/libxl/libxl.conf +++ libvirt-8.10.0/src/libxl/libxl.conf
@@ -4,12 +4,11 @@ @@ -4,12 +4,11 @@
# Enable autoballooning of domain0 # Enable autoballooning of domain0
@ -37,11 +37,11 @@ Index: libvirt-8.9.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.9.0/src/libxl/libxl_conf.c Index: libvirt-8.10.0/src/libxl/libxl_conf.c
=================================================================== ===================================================================
--- libvirt-8.9.0.orig/src/libxl/libxl_conf.c --- libvirt-8.10.0.orig/src/libxl/libxl_conf.c
+++ libvirt-8.9.0/src/libxl/libxl_conf.c +++ libvirt-8.10.0/src/libxl/libxl_conf.c
@@ -1737,15 +1737,12 @@ libxlMakeBuildInfoVfb(virPortAllocatorRa @@ -1741,15 +1741,12 @@ libxlMakeBuildInfoVfb(virPortAllocatorRa
/* /*
* Get domain0 autoballoon configuration. Honor user-specified * Get domain0 autoballoon configuration. Honor user-specified
* setting in libxl.conf first. If not specified, autoballooning * setting in libxl.conf first. If not specified, autoballooning
@ -58,7 +58,7 @@ Index: libvirt-8.9.0/src/libxl/libxl_conf.c
int res; int res;
res = virConfGetValueBool(conf, "autoballoon", &cfg->autoballoon); res = virConfGetValueBool(conf, "autoballoon", &cfg->autoballoon);
@@ -1754,15 +1751,8 @@ libxlGetAutoballoonConf(libxlDriverConfi @@ -1758,15 +1755,8 @@ libxlGetAutoballoonConf(libxlDriverConfi
else if (res == 1) else if (res == 1)
return 0; return 0;
@ -76,10 +76,10 @@ Index: libvirt-8.9.0/src/libxl/libxl_conf.c
return 0; return 0;
} }
Index: libvirt-8.9.0/src/libxl/test_libvirtd_libxl.aug.in Index: libvirt-8.10.0/src/libxl/test_libvirtd_libxl.aug.in
=================================================================== ===================================================================
--- libvirt-8.9.0.orig/src/libxl/test_libvirtd_libxl.aug.in --- libvirt-8.10.0.orig/src/libxl/test_libvirtd_libxl.aug.in
+++ libvirt-8.9.0/src/libxl/test_libvirtd_libxl.aug.in +++ libvirt-8.10.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.9.0/src/qemu/qemu.conf.in Index: libvirt-8.10.0/src/qemu/qemu.conf.in
=================================================================== ===================================================================
--- libvirt-8.9.0.orig/src/qemu/qemu.conf.in --- libvirt-8.10.0.orig/src/qemu/qemu.conf.in
+++ libvirt-8.9.0/src/qemu/qemu.conf.in +++ libvirt-8.10.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,10 +70,10 @@ Index: libvirt-8.9.0/src/qemu/qemu.conf.in
# #
#lock_manager = "lockd" #lock_manager = "lockd"
Index: libvirt-8.9.0/src/qemu/qemu_conf.c Index: libvirt-8.10.0/src/qemu/qemu_conf.c
=================================================================== ===================================================================
--- libvirt-8.9.0.orig/src/qemu/qemu_conf.c --- libvirt-8.10.0.orig/src/qemu/qemu_conf.c
+++ libvirt-8.9.0/src/qemu/qemu_conf.c +++ libvirt-8.10.0/src/qemu/qemu_conf.c
@@ -264,7 +264,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.9.0/src/qemu/qemu_conf.c
cfg->securityRequireConfined = false; cfg->securityRequireConfined = false;
cfg->keepAliveInterval = 5; cfg->keepAliveInterval = 5;
Index: libvirt-8.9.0/src/qemu/test_libvirtd_qemu.aug.in Index: libvirt-8.10.0/src/qemu/test_libvirtd_qemu.aug.in
=================================================================== ===================================================================
--- libvirt-8.9.0.orig/src/qemu/test_libvirtd_qemu.aug.in --- libvirt-8.10.0.orig/src/qemu/test_libvirtd_qemu.aug.in
+++ libvirt-8.9.0/src/qemu/test_libvirtd_qemu.aug.in +++ libvirt-8.10.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.9.0/src/qemu/qemu.conf.in Index: libvirt-8.10.0/src/qemu/qemu.conf.in
=================================================================== ===================================================================
--- libvirt-8.9.0.orig/src/qemu/qemu.conf.in --- libvirt-8.10.0.orig/src/qemu/qemu.conf.in
+++ libvirt-8.9.0/src/qemu/qemu.conf.in +++ libvirt-8.10.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,10 +34,10 @@ Index: libvirt-8.9.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.9.0/src/qemu/qemu_conf.c Index: libvirt-8.10.0/src/qemu/qemu_conf.c
=================================================================== ===================================================================
--- libvirt-8.9.0.orig/src/qemu/qemu_conf.c --- libvirt-8.10.0.orig/src/qemu/qemu_conf.c
+++ libvirt-8.9.0/src/qemu/qemu_conf.c +++ libvirt-8.10.0/src/qemu/qemu_conf.c
@@ -90,10 +90,9 @@ VIR_ONCE_GLOBAL_INIT(virQEMUConfig); @@ -90,10 +90,9 @@ VIR_ONCE_GLOBAL_INIT(virQEMUConfig);
#ifndef DEFAULT_LOADER_NVRAM #ifndef DEFAULT_LOADER_NVRAM
@ -52,10 +52,10 @@ Index: libvirt-8.9.0/src/qemu/qemu_conf.c
#endif #endif
Index: libvirt-8.9.0/src/qemu/test_libvirtd_qemu.aug.in Index: libvirt-8.10.0/src/qemu/test_libvirtd_qemu.aug.in
=================================================================== ===================================================================
--- libvirt-8.9.0.orig/src/qemu/test_libvirtd_qemu.aug.in --- libvirt-8.10.0.orig/src/qemu/test_libvirtd_qemu.aug.in
+++ libvirt-8.9.0/src/qemu/test_libvirtd_qemu.aug.in +++ libvirt-8.10.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,10 +70,10 @@ Index: libvirt-8.9.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.9.0/src/security/virt-aa-helper.c Index: libvirt-8.10.0/src/security/virt-aa-helper.c
=================================================================== ===================================================================
--- libvirt-8.9.0.orig/src/security/virt-aa-helper.c --- libvirt-8.10.0.orig/src/security/virt-aa-helper.c
+++ libvirt-8.9.0/src/security/virt-aa-helper.c +++ libvirt-8.10.0/src/security/virt-aa-helper.c
@@ -482,7 +482,8 @@ valid_path(const char *path, const bool @@ -482,7 +482,8 @@ valid_path(const char *path, const bool
"/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 */

View File

@ -12,11 +12,11 @@ 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.9.0/src/libxl/libxl_conf.c Index: libvirt-8.10.0/src/libxl/libxl_conf.c
=================================================================== ===================================================================
--- libvirt-8.9.0.orig/src/libxl/libxl_conf.c --- libvirt-8.10.0.orig/src/libxl/libxl_conf.c
+++ libvirt-8.9.0/src/libxl/libxl_conf.c +++ libvirt-8.10.0/src/libxl/libxl_conf.c
@@ -1788,7 +1788,7 @@ libxlDriverConfigNew(void) @@ -1792,7 +1792,7 @@ libxlDriverConfigNew(void)
cfg->firmwares = g_new0(virFirmware *, 1); cfg->firmwares = g_new0(virFirmware *, 1);
cfg->nfirmwares = 1; cfg->nfirmwares = 1;
cfg->firmwares[0] = g_new0(virFirmware, 1); cfg->firmwares[0] = g_new0(virFirmware, 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.9.0/docs/manpages/meson.build Index: libvirt-8.10.0/docs/manpages/meson.build
=================================================================== ===================================================================
--- libvirt-8.9.0.orig/docs/manpages/meson.build --- libvirt-8.10.0.orig/docs/manpages/meson.build
+++ libvirt-8.9.0/docs/manpages/meson.build +++ libvirt-8.10.0/docs/manpages/meson.build
@@ -20,6 +20,7 @@ docs_man_files = [ @@ -21,6 +21,7 @@ docs_man_files = [
{ '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-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-qemu-sev-validate', 'section': '1', 'install': conf.has('WITH_QEMU') },
+ { '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.9.0/docs/manpages/virt-create-rootfs.rst Index: libvirt-8.10.0/docs/manpages/virt-create-rootfs.rst
=================================================================== ===================================================================
--- /dev/null --- /dev/null
+++ libvirt-8.9.0/docs/manpages/virt-create-rootfs.rst +++ libvirt-8.10.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.9.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.9.0/tools/meson.build Index: libvirt-8.10.0/tools/meson.build
=================================================================== ===================================================================
--- libvirt-8.9.0.orig/tools/meson.build --- libvirt-8.10.0.orig/tools/meson.build
+++ libvirt-8.9.0/tools/meson.build +++ libvirt-8.10.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.9.0/tools/meson.build
executable( executable(
'virsh', 'virsh',
[ [
Index: libvirt-8.9.0/tools/virt-create-rootfs Index: libvirt-8.10.0/tools/virt-create-rootfs
=================================================================== ===================================================================
--- /dev/null --- /dev/null
+++ libvirt-8.9.0/tools/virt-create-rootfs +++ libvirt-8.10.0/tools/virt-create-rootfs
@@ -0,0 +1,236 @@ @@ -0,0 +1,236 @@
+#!/bin/sh +#!/bin/sh
+set -e +set -e