From 7e23f06327869c9dad50ae98da10292356eb5f0f Mon Sep 17 00:00:00 2001

Message-Id: <7e23f06327869c9dad50ae98da10292356eb5f0f@dist-git>

From: Jiri Denemark <jdenemar@redhat.com>

Date: Fri, 15 Nov 2019 17:52:33 +0100

Subject: [PATCH] qemuxml2*test: Add tests for Icelake-Server, -pconfig

MIME-Version: 1.0

Content-Type: text/plain; charset=UTF-8

Content-Transfer-Encoding: 8bit

Signed-off-by: Jiri Denemark <jdenemar@redhat.com>

Reviewed-by: Daniel P. Berrangé <berrange@redhat.com>

(cherry picked from commit ae793ecbcbd17b118ef3a876d247abb49574ab0e)

https://bugzilla.redhat.com/show_bug.cgi?id=1749672

https://bugzilla.redhat.com/show_bug.cgi?id=1756156

https://bugzilla.redhat.com/show_bug.cgi?id=1721608

Conflicts:

	tests/qemuxml2argvtest.c

            - several new tests upstream

            - test case for QEMU 3.1.0 dropped; caps data are missing

              downstream and the case is not important here

	tests/qemuxml2argvdata/cpu-Icelake-Server-pconfig.x86_64-3.1.0.args

            - test case for QEMU 3.1.0 dropped; caps data are missing

              downstream and the case is not important here

	tests/qemuxml2argvdata/cpu-Icelake-Server-pconfig.x86_64-latest.args

            - downstream generates slightly different command line

	tests/qemuxml2xmloutdata/cpu-Icelake-Server-pconfig.x86_64-3.1.0.xml

	tests/qemuxml2xmloutdata/cpu-Icelake-Server-pconfig.x86_64-latest.xml

	tests/qemuxml2xmltest.c

            - missing DO_TEST_CAPS_* macros; the change to this test was

              dropped as it is not as important as the xml2argv test

Signed-off-by: Jiri Denemark <jdenemar@redhat.com>

Message-Id: <8cbd8a44446d77a2699ca267b696cfbd05dc8bc3.1573836581.git.jdenemar@redhat.com>

Reviewed-by: Michal Privoznik <mprivozn@redhat.com>

---

 ...-Icelake-Server-pconfig.x86_64-latest.args | 31 +++++++++++++++++++

 .../cpu-Icelake-Server-pconfig.xml            | 22 +++++++++++++

 tests/qemuxml2argvtest.c                      |  2 ++

 3 files changed, 55 insertions(+)

 create mode 100644 tests/qemuxml2argvdata/cpu-Icelake-Server-pconfig.x86_64-latest.args

 create mode 100644 tests/qemuxml2argvdata/cpu-Icelake-Server-pconfig.xml

diff --git a/tests/qemuxml2argvdata/cpu-Icelake-Server-pconfig.x86_64-latest.args b/tests/qemuxml2argvdata/cpu-Icelake-Server-pconfig.x86_64-latest.args

new file mode 100644

index 0000000000..664db44e7b

--- /dev/null

+++ b/tests/qemuxml2argvdata/cpu-Icelake-Server-pconfig.x86_64-latest.args

@@ -0,0 +1,31 @@

+LC_ALL=C \

+PATH=/bin \

+HOME=/home/test \

+USER=test \

+LOGNAME=test \

+QEMU_AUDIO_DRV=none \

+/usr/bin/qemu-system-x86_64 \

+-name guest=test,debug-threads=on \

+-S \

+-object secret,id=masterKey0,format=raw,\

+file=/tmp/lib/domain--1-test/master-key.aes \

+-machine pc,accel=kvm,usb=off,dump-guest-core=off \

+-cpu Icelake-Server,pconfig=off \

+-m 214 \

+-realtime mlock=off \

+-smp 1,sockets=1,cores=1,threads=1 \

+-uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \

+-display none \

+-no-user-config \

+-nodefaults \

+-chardev socket,id=charmonitor,fd=1729,server,nowait \

+-mon chardev=charmonitor,id=monitor,mode=control \

+-rtc base=utc \

+-no-shutdown \

+-no-acpi \

+-boot strict=on \

+-device piix3-usb-uhci,id=usb,bus=pci.0,addr=0x1.0x2 \

+-device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x2 \

+-sandbox on,obsolete=deny,elevateprivileges=deny,spawn=deny,\

+resourcecontrol=deny \

+-msg timestamp=on

diff --git a/tests/qemuxml2argvdata/cpu-Icelake-Server-pconfig.xml b/tests/qemuxml2argvdata/cpu-Icelake-Server-pconfig.xml

new file mode 100644

index 0000000000..ec64e1ee51

--- /dev/null

+++ b/tests/qemuxml2argvdata/cpu-Icelake-Server-pconfig.xml

@@ -0,0 +1,22 @@

+<domain type='kvm'>

+  <name>test</name>

+  <uuid>c7a5fdbd-edaf-9455-926a-d65c16db1809</uuid>

+  <memory unit='KiB'>219100</memory>

+  <currentMemory unit='KiB'>219100</currentMemory>

+  <vcpu placement='static'>1</vcpu>

+  <os>

+    <type arch='x86_64' machine='pc'>hvm</type>

+    <boot dev='network'/>

+  </os>

+  <cpu mode='custom' match='exact' check='none'>

+    <model fallback='forbid'>Icelake-Server</model>

+    <feature name='pconfig' policy='disable'/>

+  </cpu>

+  <clock offset='utc'/>

+  <on_poweroff>destroy</on_poweroff>

+  <on_reboot>restart</on_reboot>

+  <on_crash>destroy</on_crash>

+  <devices>

+      <emulator>/usr/bin/qemu-system-x86_64</emulator>

+  </devices>

+</domain>

diff --git a/tests/qemuxml2argvtest.c b/tests/qemuxml2argvtest.c

index 03d6a60736..5aff9b6e37 100644

--- a/tests/qemuxml2argvtest.c

+++ b/tests/qemuxml2argvtest.c

@@ -3000,6 +3000,8 @@ mymain(void)

     DO_TEST_CAPS_VER("launch-security-sev", "2.12.0");

+    DO_TEST_CAPS_LATEST("cpu-Icelake-Server-pconfig");

+

     if (getenv("LIBVIRT_SKIP_CLEANUP") == NULL)

         virFileDeleteTree(fakerootdir);

-- 

2.24.0