Package: release.debian.org
Severity: normal
Tags: bullseye
User: release.debian@packages.debian.org
Usertags: pu
X-Debbugs-Cc: libv...@packages.debian.org
Control: affects -1 + src:libvirt
This update fixes the test failures on arm64 that were
detected by the 7.0.0-3+deb11u1 build.
[ Impact ]
We can't do any further updates of libvirt in stable (unless we
disable the test suite or specific tests).
[ Risks ]
As this doesn't affect actual code in a binary packages the
risk should be fairly low.
[ Checklist ]
[x] *all* changes are documented in the d/changelog
[x] I reviewed all changes and I approve them
[x] attach debdiff against the package in (old)stable
[x] the issue is verified as fixed in unstable
[ Changes ]
Backport to upstream patches to fix libxl test failures
triggered by newer xen versions.
Cheers,
-- Guido
diff --git a/debian/changelog b/debian/changelog
index 28579ccd7e..76fb402cbc 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+libvirt (7.0.0-3+deb11u2) bullseye; urgency=medium
+
+ * [461d540] Fix libxl config test failures.
+Backports two commits from upstream to not fail with newer xen.
+
+ -- Guido Günther Mon, 06 Feb 2023 17:50:14 +0100
+
libvirt (7.0.0-3+deb11u1) bullseye; urgency=medium
[ Guido Günther ]
diff --git a/debian/patches/backport/tests-Fix-libxlxml2domconfigtest-with-latest-xen.patch b/debian/patches/backport/tests-Fix-libxlxml2domconfigtest-with-latest-xen.patch
new file mode 100644
index 00..b30cd52dc1
--- /dev/null
+++ b/debian/patches/backport/tests-Fix-libxlxml2domconfigtest-with-latest-xen.patch
@@ -0,0 +1,235 @@
+From: Cole Robinson
+Date: Thu, 27 Oct 2022 08:51:25 -0400
+Subject: tests: Fix libxlxml2domconfigtest with latest xen
+
+shadow_memkb is populated from a libxl API call, and the value can
+change. For example:
+https://xenbits.xen.org/gitweb/?p=xen.git;a=commit;h=2c992810854a15b41be920519ce83a4a328d5168
+
+Mock libxl_get_required_shadow_memory to give consistent output
+
+Reviewed-by: Michal Privoznik
+Signed-off-by: Cole Robinson
+(cherry picked from commit 72d4709ab901dd3699d342f15ca3aff9bffddf96)
+---
+ tests/libxlmock.c| 11 +++
+ tests/libxlxml2domconfigdata/basic-hvm.json | 2 +-
+ tests/libxlxml2domconfigdata/basic-pv.json | 2 +-
+ tests/libxlxml2domconfigdata/basic-pvh.json | 2 +-
+ tests/libxlxml2domconfigdata/cpu-shares-hvm.json | 2 +-
+ tests/libxlxml2domconfigdata/fullvirt-acpi-slic.json | 2 +-
+ tests/libxlxml2domconfigdata/fullvirt-cpuid-legacy-nest.json | 2 +-
+ tests/libxlxml2domconfigdata/fullvirt-cpuid.json | 2 +-
+ tests/libxlxml2domconfigdata/max-eventchannels-hvm.json | 2 +-
+ tests/libxlxml2domconfigdata/max-gntframes-hvm.json | 2 +-
+ tests/libxlxml2domconfigdata/moredevs-hvm.json | 2 +-
+ tests/libxlxml2domconfigdata/multiple-ip.json| 2 +-
+ tests/libxlxml2domconfigdata/variable-clock-hvm.json | 2 +-
+ tests/libxlxml2domconfigdata/vnuma-hvm-legacy-nest.json | 2 +-
+ tests/libxlxml2domconfigdata/vnuma-hvm.json | 2 +-
+ 15 files changed, 25 insertions(+), 14 deletions(-)
+
+diff --git a/tests/libxlmock.c b/tests/libxlmock.c
+index a36ca13..644b8ef 100644
+--- a/tests/libxlmock.c
b/tests/libxlmock.c
+@@ -95,6 +95,17 @@ VIR_MOCK_STUB_RET_ARGS(bind,
+const struct sockaddr *, addr,
+socklen_t, addrlen)
+
++VIR_MOCK_IMPL_RET_ARGS(libxl_get_required_shadow_memory,
++ unsigned long,
++ unsigned long, maxmem_kb,
++ unsigned int, smp_cpus)
++{
++/* silence gcc warning about unused function */
++if (0)
++real_libxl_get_required_shadow_memory(maxmem_kb, smp_cpus);
++return 1234;
++}
++
+ VIR_MOCK_IMPL_RET_ARGS(__xstat, int,
+int, ver,
+const char *, path,
+diff --git a/tests/libxlxml2domconfigdata/basic-hvm.json b/tests/libxlxml2domconfigdata/basic-hvm.json
+index 87f8cb7..d308754 100644
+--- a/tests/libxlxml2domconfigdata/basic-hvm.json
b/tests/libxlxml2domconfigdata/basic-hvm.json
+@@ -15,7 +15,7 @@
+ "max_memkb": 1048576,
+ "target_memkb": 1048576,
+ "video_memkb": 8192,
+-"shadow_memkb": 12288,
++"shadow_memkb": 1234,
+ "device_model_version": "qemu_xen",
+ "device_model": "/bin/true",
+ "sched_params": {
+diff --git a/tests/libxlxml2domconfigdata/basic-pv.json b/tests/libxlxml2domconfigdata/basic-pv.json
+index b71c3b0..32d188f 100644
+--- a/tests/libxlxml2domconfigdata/basic-pv.json
b/tests/libxlxml2domconfigdata/basic-pv.json
+@@ -14,7 +14,7 @@
+ ],
+ "max_memkb": 524288,
+ "target_memkb": 524288,
+-"shadow_memkb": 8192,
++"shadow_memkb": 1234,
+
