|
 |
f18889 |
From 99b40587e8cd83a136d94e208d32a80be76dc22a Mon Sep 17 00:00:00 2001
|
|
|
f18889 |
Message-Id: <99b40587e8cd83a136d94e208d32a80be76dc22a.1666875466.git.crobinso@redhat.com>
|
|
|
f18889 |
From: Cole Robinson <crobinso@redhat.com>
|
|
|
f18889 |
Date: Thu, 27 Oct 2022 08:51:25 -0400
|
|
|
f18889 |
Subject: [PATCH] tests: Fix libxlxml2domconfigtest with latest xen
|
|
|
f18889 |
Content-type: text/plain
|
|
|
f18889 |
|
|
|
f18889 |
shadow_memkb is populated from a libxl API call, and the value can
|
|
|
f18889 |
change. For example:
|
|
|
f18889 |
https://xenbits.xen.org/gitweb/?p=xen.git;a=commit;h=2c992810854a15b41be920519ce83a4a328d5168
|
|
|
f18889 |
|
|
|
f18889 |
Mock libxl_get_required_shadow_memory to give consistent output
|
|
|
f18889 |
|
|
|
f18889 |
Signed-off-by: Cole Robinson <crobinso@redhat.com>
|
|
|
f18889 |
---
|
|
|
f18889 |
tests/libxlmock.c | 11 +++++++++++
|
|
|
f18889 |
tests/libxlxml2domconfigdata/basic-hvm.json | 2 +-
|
|
|
f18889 |
tests/libxlxml2domconfigdata/basic-pv.json | 2 +-
|
|
|
f18889 |
tests/libxlxml2domconfigdata/basic-pvh.json | 2 +-
|
|
|
f18889 |
tests/libxlxml2domconfigdata/cpu-shares-hvm.json | 2 +-
|
|
|
f18889 |
tests/libxlxml2domconfigdata/fullvirt-acpi-slic.json | 2 +-
|
|
|
f18889 |
.../fullvirt-cpuid-legacy-nest.json | 2 +-
|
|
|
f18889 |
tests/libxlxml2domconfigdata/fullvirt-cpuid.json | 2 +-
|
|
|
f18889 |
.../libxlxml2domconfigdata/max-eventchannels-hvm.json | 2 +-
|
|
|
f18889 |
tests/libxlxml2domconfigdata/max-gntframes-hvm.json | 2 +-
|
|
|
f18889 |
tests/libxlxml2domconfigdata/moredevs-hvm.json | 2 +-
|
|
|
f18889 |
tests/libxlxml2domconfigdata/multiple-ip.json | 2 +-
|
|
|
f18889 |
tests/libxlxml2domconfigdata/variable-clock-hvm.json | 2 +-
|
|
|
f18889 |
.../libxlxml2domconfigdata/vnuma-hvm-legacy-nest.json | 2 +-
|
|
|
f18889 |
tests/libxlxml2domconfigdata/vnuma-hvm.json | 2 +-
|
|
|
f18889 |
15 files changed, 25 insertions(+), 14 deletions(-)
|
|
|
f18889 |
|
|
|
f18889 |
diff --git a/tests/libxlmock.c b/tests/libxlmock.c
|
|
|
f18889 |
index 0e4bf7df52..4754597e5b 100644
|
|
|
f18889 |
--- a/tests/libxlmock.c
|
|
|
f18889 |
+++ b/tests/libxlmock.c
|
|
|
f18889 |
@@ -109,6 +109,17 @@ VIR_MOCK_STUB_RET_ARGS(bind,
|
|
|
f18889 |
const struct sockaddr *, addr,
|
|
|
f18889 |
socklen_t, addrlen)
|
|
|
f18889 |
|
|
|
f18889 |
+VIR_MOCK_IMPL_RET_ARGS(libxl_get_required_shadow_memory,
|
|
|
f18889 |
+ unsigned long,
|
|
|
f18889 |
+ unsigned long, maxmem_kb,
|
|
|
f18889 |
+ unsigned int, smp_cpus)
|
|
|
f18889 |
+{
|
|
|
f18889 |
+ /* silence gcc warning about unused function */
|
|
|
f18889 |
+ if (0)
|
|
|
f18889 |
+ real_libxl_get_required_shadow_memory(maxmem_kb, smp_cpus);
|
|
|
f18889 |
+ return 1234;
|
|
|
f18889 |
+}
|
|
|
f18889 |
+
|
|
|
f18889 |
VIR_MOCK_IMPL_RET_ARGS(__xstat, int,
|
|
|
f18889 |
int, ver,
|
|
|
f18889 |
const char *, path,
|
|
|
f18889 |
diff --git a/tests/libxlxml2domconfigdata/basic-hvm.json b/tests/libxlxml2domconfigdata/basic-hvm.json
|
|
|
f18889 |
index 87f8cb7d8a..d30875420d 100644
|
|
|
f18889 |
--- a/tests/libxlxml2domconfigdata/basic-hvm.json
|
|
|
f18889 |
+++ b/tests/libxlxml2domconfigdata/basic-hvm.json
|
|
|
f18889 |
@@ -15,7 +15,7 @@
|
|
|
f18889 |
"max_memkb": 1048576,
|
|
|
f18889 |
"target_memkb": 1048576,
|
|
|
f18889 |
"video_memkb": 8192,
|
|
|
f18889 |
- "shadow_memkb": 12288,
|
|
|
f18889 |
+ "shadow_memkb": 1234,
|
|
|
f18889 |
"device_model_version": "qemu_xen",
|
|
|
f18889 |
"device_model": "/bin/true",
|
|
|
f18889 |
"sched_params": {
|
|
|
f18889 |
diff --git a/tests/libxlxml2domconfigdata/basic-pv.json b/tests/libxlxml2domconfigdata/basic-pv.json
|
|
|
f18889 |
index b71c3b0f49..32d188fabd 100644
|
|
|
f18889 |
--- a/tests/libxlxml2domconfigdata/basic-pv.json
|
|
|
f18889 |
+++ b/tests/libxlxml2domconfigdata/basic-pv.json
|
|
|
f18889 |
@@ -14,7 +14,7 @@
|
|
|
f18889 |
],
|
|
|
f18889 |
"max_memkb": 524288,
|
|
|
f18889 |
"target_memkb": 524288,
|
|
|
f18889 |
- "shadow_memkb": 8192,
|
|
|
f18889 |
+ "shadow_memkb": 1234,
|
|
|
f18889 |
"sched_params": {
|
|
|
f18889 |
|
|
|
f18889 |
},
|
|
|
f18889 |
diff --git a/tests/libxlxml2domconfigdata/basic-pvh.json b/tests/libxlxml2domconfigdata/basic-pvh.json
|
|
|
f18889 |
index 48365c9026..f51957aa85 100644
|
|
|
f18889 |
--- a/tests/libxlxml2domconfigdata/basic-pvh.json
|
|
|
f18889 |
+++ b/tests/libxlxml2domconfigdata/basic-pvh.json
|
|
|
f18889 |
@@ -14,7 +14,7 @@
|
|
|
f18889 |
],
|
|
|
f18889 |
"max_memkb": 524288,
|
|
|
f18889 |
"target_memkb": 524288,
|
|
|
f18889 |
- "shadow_memkb": 8192,
|
|
|
f18889 |
+ "shadow_memkb": 1234,
|
|
|
f18889 |
"sched_params": {
|
|
|
f18889 |
|
|
|
f18889 |
},
|
|
|
f18889 |
diff --git a/tests/libxlxml2domconfigdata/cpu-shares-hvm.json b/tests/libxlxml2domconfigdata/cpu-shares-hvm.json
|
|
|
f18889 |
index 2aa97e88c5..15105c83ad 100644
|
|
|
f18889 |
--- a/tests/libxlxml2domconfigdata/cpu-shares-hvm.json
|
|
|
f18889 |
+++ b/tests/libxlxml2domconfigdata/cpu-shares-hvm.json
|
|
|
f18889 |
@@ -15,7 +15,7 @@
|
|
|
f18889 |
"max_memkb": 1048576,
|
|
|
f18889 |
"target_memkb": 1048576,
|
|
|
f18889 |
"video_memkb": 8192,
|
|
|
f18889 |
- "shadow_memkb": 12288,
|
|
|
f18889 |
+ "shadow_memkb": 1234,
|
|
|
f18889 |
"device_model_version": "qemu_xen",
|
|
|
f18889 |
"device_model": "/bin/true",
|
|
|
f18889 |
"sched_params": {
|
|
|
f18889 |
diff --git a/tests/libxlxml2domconfigdata/fullvirt-acpi-slic.json b/tests/libxlxml2domconfigdata/fullvirt-acpi-slic.json
|
|
|
f18889 |
index a2d46797aa..26f5abefee 100644
|
|
|
f18889 |
--- a/tests/libxlxml2domconfigdata/fullvirt-acpi-slic.json
|
|
|
f18889 |
+++ b/tests/libxlxml2domconfigdata/fullvirt-acpi-slic.json
|
|
|
f18889 |
@@ -11,7 +11,7 @@
|
|
|
f18889 |
],
|
|
|
f18889 |
"max_memkb": 592896,
|
|
|
f18889 |
"target_memkb": 403456,
|
|
|
f18889 |
- "shadow_memkb": 5656,
|
|
|
f18889 |
+ "shadow_memkb": 1234,
|
|
|
f18889 |
"sched_params": {
|
|
|
f18889 |
},
|
|
|
f18889 |
"apic": "True",
|
|
|
f18889 |
diff --git a/tests/libxlxml2domconfigdata/fullvirt-cpuid-legacy-nest.json b/tests/libxlxml2domconfigdata/fullvirt-cpuid-legacy-nest.json
|
|
|
f18889 |
index 6290655c20..740b82d2e6 100644
|
|
|
f18889 |
--- a/tests/libxlxml2domconfigdata/fullvirt-cpuid-legacy-nest.json
|
|
|
f18889 |
+++ b/tests/libxlxml2domconfigdata/fullvirt-cpuid-legacy-nest.json
|
|
|
f18889 |
@@ -11,7 +11,7 @@
|
|
|
f18889 |
],
|
|
|
f18889 |
"max_memkb": 592896,
|
|
|
f18889 |
"target_memkb": 403456,
|
|
|
f18889 |
- "shadow_memkb": 5656,
|
|
|
f18889 |
+ "shadow_memkb": 1234,
|
|
|
f18889 |
"cpuid": [
|
|
|
f18889 |
{
|
|
|
f18889 |
"leaf": 1,
|
|
|
f18889 |
diff --git a/tests/libxlxml2domconfigdata/fullvirt-cpuid.json b/tests/libxlxml2domconfigdata/fullvirt-cpuid.json
|
|
|
f18889 |
index 811a4f0ac7..8bf41894a5 100644
|
|
|
f18889 |
--- a/tests/libxlxml2domconfigdata/fullvirt-cpuid.json
|
|
|
f18889 |
+++ b/tests/libxlxml2domconfigdata/fullvirt-cpuid.json
|
|
|
f18889 |
@@ -11,7 +11,7 @@
|
|
|
f18889 |
],
|
|
|
f18889 |
"max_memkb": 592896,
|
|
|
f18889 |
"target_memkb": 403456,
|
|
|
f18889 |
- "shadow_memkb": 5656,
|
|
|
f18889 |
+ "shadow_memkb": 1234,
|
|
|
f18889 |
"cpuid": [
|
|
|
f18889 |
{
|
|
|
f18889 |
"leaf": 1,
|
|
|
f18889 |
diff --git a/tests/libxlxml2domconfigdata/max-eventchannels-hvm.json b/tests/libxlxml2domconfigdata/max-eventchannels-hvm.json
|
|
|
f18889 |
index 4a5b0ca65f..6f0daa065f 100644
|
|
|
f18889 |
--- a/tests/libxlxml2domconfigdata/max-eventchannels-hvm.json
|
|
|
f18889 |
+++ b/tests/libxlxml2domconfigdata/max-eventchannels-hvm.json
|
|
|
f18889 |
@@ -15,7 +15,7 @@
|
|
|
f18889 |
"max_memkb": 1048576,
|
|
|
f18889 |
"target_memkb": 1048576,
|
|
|
f18889 |
"video_memkb": 8192,
|
|
|
f18889 |
- "shadow_memkb": 12288,
|
|
|
f18889 |
+ "shadow_memkb": 1234,
|
|
|
f18889 |
"event_channels": 2047,
|
|
|
f18889 |
"device_model_version": "qemu_xen",
|
|
|
f18889 |
"device_model": "/bin/true",
|
|
|
f18889 |
diff --git a/tests/libxlxml2domconfigdata/max-gntframes-hvm.json b/tests/libxlxml2domconfigdata/max-gntframes-hvm.json
|
|
|
f18889 |
index 2883d057ff..35de588abc 100644
|
|
|
f18889 |
--- a/tests/libxlxml2domconfigdata/max-gntframes-hvm.json
|
|
|
f18889 |
+++ b/tests/libxlxml2domconfigdata/max-gntframes-hvm.json
|
|
|
f18889 |
@@ -15,7 +15,7 @@
|
|
|
f18889 |
"max_memkb": 1048576,
|
|
|
f18889 |
"target_memkb": 1048576,
|
|
|
f18889 |
"video_memkb": 8192,
|
|
|
f18889 |
- "shadow_memkb": 12288,
|
|
|
f18889 |
+ "shadow_memkb": 1234,
|
|
|
f18889 |
"max_grant_frames": 64,
|
|
|
f18889 |
"device_model_version": "qemu_xen",
|
|
|
f18889 |
"device_model": "/bin/true",
|
|
|
f18889 |
diff --git a/tests/libxlxml2domconfigdata/moredevs-hvm.json b/tests/libxlxml2domconfigdata/moredevs-hvm.json
|
|
|
f18889 |
index 58cf32a8d4..bdc9afc29b 100644
|
|
|
f18889 |
--- a/tests/libxlxml2domconfigdata/moredevs-hvm.json
|
|
|
f18889 |
+++ b/tests/libxlxml2domconfigdata/moredevs-hvm.json
|
|
|
f18889 |
@@ -17,7 +17,7 @@
|
|
|
f18889 |
"max_memkb": 1048576,
|
|
|
f18889 |
"target_memkb": 1048576,
|
|
|
f18889 |
"video_memkb": 8192,
|
|
|
f18889 |
- "shadow_memkb": 12288,
|
|
|
f18889 |
+ "shadow_memkb": 1234,
|
|
|
f18889 |
"device_model_version": "qemu_xen",
|
|
|
f18889 |
"device_model": "/bin/true",
|
|
|
f18889 |
"sched_params": {
|
|
|
f18889 |
diff --git a/tests/libxlxml2domconfigdata/multiple-ip.json b/tests/libxlxml2domconfigdata/multiple-ip.json
|
|
|
f18889 |
index 2db98b82f6..e0b37aa795 100644
|
|
|
f18889 |
--- a/tests/libxlxml2domconfigdata/multiple-ip.json
|
|
|
f18889 |
+++ b/tests/libxlxml2domconfigdata/multiple-ip.json
|
|
|
f18889 |
@@ -14,7 +14,7 @@
|
|
|
f18889 |
],
|
|
|
f18889 |
"max_memkb": 524288,
|
|
|
f18889 |
"target_memkb": 524288,
|
|
|
f18889 |
- "shadow_memkb": 8192,
|
|
|
f18889 |
+ "shadow_memkb": 1234,
|
|
|
f18889 |
"sched_params": {
|
|
|
f18889 |
|
|
|
f18889 |
},
|
|
|
f18889 |
diff --git a/tests/libxlxml2domconfigdata/variable-clock-hvm.json b/tests/libxlxml2domconfigdata/variable-clock-hvm.json
|
|
|
f18889 |
index 9a25d51da2..3c131c603c 100644
|
|
|
f18889 |
--- a/tests/libxlxml2domconfigdata/variable-clock-hvm.json
|
|
|
f18889 |
+++ b/tests/libxlxml2domconfigdata/variable-clock-hvm.json
|
|
|
f18889 |
@@ -15,7 +15,7 @@
|
|
|
f18889 |
"max_memkb": 1048576,
|
|
|
f18889 |
"target_memkb": 1048576,
|
|
|
f18889 |
"video_memkb": 8192,
|
|
|
f18889 |
- "shadow_memkb": 12288,
|
|
|
f18889 |
+ "shadow_memkb": 1234,
|
|
|
f18889 |
"rtc_timeoffset": 3600,
|
|
|
f18889 |
"localtime": "True",
|
|
|
f18889 |
"device_model_version": "qemu_xen",
|
|
|
f18889 |
diff --git a/tests/libxlxml2domconfigdata/vnuma-hvm-legacy-nest.json b/tests/libxlxml2domconfigdata/vnuma-hvm-legacy-nest.json
|
|
|
f18889 |
index 6cda8d0252..6725df9112 100644
|
|
|
f18889 |
--- a/tests/libxlxml2domconfigdata/vnuma-hvm-legacy-nest.json
|
|
|
f18889 |
+++ b/tests/libxlxml2domconfigdata/vnuma-hvm-legacy-nest.json
|
|
|
f18889 |
@@ -103,7 +103,7 @@
|
|
|
f18889 |
"max_memkb": 1048576,
|
|
|
f18889 |
"target_memkb": 1048576,
|
|
|
f18889 |
"video_memkb": 8192,
|
|
|
f18889 |
- "shadow_memkb": 14336,
|
|
|
f18889 |
+ "shadow_memkb": 1234,
|
|
|
f18889 |
"device_model_version": "qemu_xen",
|
|
|
f18889 |
"device_model": "/bin/true",
|
|
|
f18889 |
"sched_params": {
|
|
|
f18889 |
diff --git a/tests/libxlxml2domconfigdata/vnuma-hvm.json b/tests/libxlxml2domconfigdata/vnuma-hvm.json
|
|
|
f18889 |
index f578ccd3d3..2556c82d5f 100644
|
|
|
f18889 |
--- a/tests/libxlxml2domconfigdata/vnuma-hvm.json
|
|
|
f18889 |
+++ b/tests/libxlxml2domconfigdata/vnuma-hvm.json
|
|
|
f18889 |
@@ -103,7 +103,7 @@
|
|
|
f18889 |
"max_memkb": 1048576,
|
|
|
f18889 |
"target_memkb": 1048576,
|
|
|
f18889 |
"video_memkb": 8192,
|
|
|
f18889 |
- "shadow_memkb": 14336,
|
|
|
f18889 |
+ "shadow_memkb": 1234,
|
|
|
f18889 |
"device_model_version": "qemu_xen",
|
|
|
f18889 |
"device_model": "/bin/true",
|
|
|
f18889 |
"sched_params": {
|
|
|
f18889 |
--
|
|
|
f18889 |
2.37.3
|
|
|
f18889 |
|