[libvirt] [PATCH 4/5] tests: Add capabilities for QEMU 4.0.0 on aarch64

[Andrea Bolognani]

Signed-off-by: Andrea Bolognani <abologna at redhat.com>
---
The changes in the .args file seem entirely justified by the fact
that those for aarch64-virt-headless and aarch64-virt-graphics use
the new command line option too.

 .../caps_4.0.0.aarch64.replies                | 19997 ++++++++++++++++
 .../caps_4.0.0.aarch64.xml                    |   310 +
 ...arch64-os-firmware-efi.aarch64-latest.args |     2 +-
 .../aarch64-virt-graphics.aarch64-latest.args |     2 +-
 .../aarch64-virt-headless.aarch64-latest.args |     2 +-
 5 files changed, 20310 insertions(+), 3 deletions(-)
 create mode 100644 tests/qemucapabilitiesdata/caps_4.0.0.aarch64.replies
 create mode 100644 tests/qemucapabilitiesdata/caps_4.0.0.aarch64.xml

diff --git a/tests/qemucapabilitiesdata/caps_4.0.0.aarch64.replies b/tests/qemucapabilitiesdata/caps_4.0.0.aarch64.replies
new file mode 100644
index 0000000000..fa092a409e
--- /dev/null
+++ b/tests/qemucapabilitiesdata/caps_4.0.0.aarch64.replies
@@ -0,0 +1,19997 @@
+{
+  "execute": "qmp_capabilities",
+  "id": "libvirt-1"
+}
+
+{
+  "return": {
+  },
+  "id": "libvirt-1"
+}
+
+{
+  "execute": "query-version",
+  "id": "libvirt-2"
+}
+
+{
+  "return": {
+    "qemu": {
+      "micro": 0,
+      "minor": 0,
+      "major": 4
+    },
+    "package": "v4.0.0"
+  },
+  "id": "libvirt-2"
+}
[...]
diff --git a/tests/qemucapabilitiesdata/caps_4.0.0.aarch64.xml b/tests/qemucapabilitiesdata/caps_4.0.0.aarch64.xml
new file mode 100644
index 0000000000..7bcda0b402
--- /dev/null
+++ b/tests/qemucapabilitiesdata/caps_4.0.0.aarch64.xml
@@ -0,0 +1,310 @@
+<qemuCaps>
[...]
+  <version>4000000</version>
+  <kvmVersion>0</kvmVersion>
+  <microcodeVersion>61700758</microcodeVersion>
+  <package>v4.0.0</package>
+  <arch>aarch64</arch>
[...]
diff --git a/tests/qemuxml2argvdata/aarch64-os-firmware-efi.aarch64-latest.args b/tests/qemuxml2argvdata/aarch64-os-firmware-efi.aarch64-latest.args
index c9f38e4796..9821e28358 100644
--- a/tests/qemuxml2argvdata/aarch64-os-firmware-efi.aarch64-latest.args
+++ b/tests/qemuxml2argvdata/aarch64-os-firmware-efi.aarch64-latest.args
@@ -19,7 +19,7 @@ readonly=on \
 -drive file=/var/lib/libvirt/qemu/nvram/aarch64test_VARS.fd,if=pflash,\
 format=raw,unit=1 \
 -m 1024 \
--realtime mlock=off \
+-overcommit mem-lock=off \
 -smp 1,sockets=1,cores=1,threads=1 \
 -uuid 496d7ea8-9739-544b-4ebd-ef08be936e8b \
 -display none \
diff --git a/tests/qemuxml2argvdata/aarch64-virt-graphics.aarch64-latest.args b/tests/qemuxml2argvdata/aarch64-virt-graphics.aarch64-latest.args
index b61eb56a1f..7f18f5e9e8 100644
--- a/tests/qemuxml2argvdata/aarch64-virt-graphics.aarch64-latest.args
+++ b/tests/qemuxml2argvdata/aarch64-virt-graphics.aarch64-latest.args
@@ -18,7 +18,7 @@ readonly=on \
 -drive file=/var/lib/libvirt/qemu/nvram/guest_VARS.fd,if=pflash,format=raw,\
 unit=1 \
 -m 4096 \
--realtime mlock=off \
+-overcommit mem-lock=off \
 -smp 4,sockets=4,cores=1,threads=1 \
 -uuid 33844184-97c0-4cc0-aa7d-206f5803530b \
 -no-user-config \
diff --git a/tests/qemuxml2argvdata/aarch64-virt-headless.aarch64-latest.args b/tests/qemuxml2argvdata/aarch64-virt-headless.aarch64-latest.args
index 62471e7f4b..cc1189031a 100644
--- a/tests/qemuxml2argvdata/aarch64-virt-headless.aarch64-latest.args
+++ b/tests/qemuxml2argvdata/aarch64-virt-headless.aarch64-latest.args
@@ -14,7 +14,7 @@ QEMU_AUDIO_DRV=none \
 file=/tmp/lib/domain--1-guest/master-key.aes \
 -machine virt,accel=tcg,usb=off,dump-guest-core=off,gic-version=2 \
 -m 1024 \
--realtime mlock=off \
+-overcommit mem-lock=off \
 -smp 1,sockets=1,cores=1,threads=1 \
 -uuid 1ccfd97d-5eb4-478a-bbe6-88d254c16db7 \
 -display none \
-- 
2.20.1