[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]

[libvirt] [PATCH 3/3] tests: add tests for cpu-pm feature



Update the KVM feature tests for the cpu-pm feature

Signed-off-by: Menno Lageman <menno lageman oracle com>
---
 tests/qemuxml2argvdata/kvm-features-off.args  | 2 +-
 tests/qemuxml2argvdata/kvm-features-off.xml   | 1 +
 tests/qemuxml2argvdata/kvm-features.args      | 2 +-
 tests/qemuxml2argvdata/kvm-features.xml       | 1 +
 tests/qemuxml2argvtest.c                      | 4 ++--
 tests/qemuxml2xmloutdata/kvm-features-off.xml | 1 +
 tests/qemuxml2xmloutdata/kvm-features.xml     | 1 +
 7 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/tests/qemuxml2argvdata/kvm-features-off.args b/tests/qemuxml2argvdata/kvm-features-off.args
index 59a79376d140..5150f93986a7 100644
--- a/tests/qemuxml2argvdata/kvm-features-off.args
+++ b/tests/qemuxml2argvdata/kvm-features-off.args
@@ -12,7 +12,7 @@ QEMU_AUDIO_DRV=none \
 -S \
 -machine pc,accel=tcg,usb=off,dump-guest-core=off \
 -m 214 \
--realtime mlock=off \
+-overcommit mem-lock=off,cpu-pm=off \
 -smp 6,sockets=6,cores=1,threads=1 \
 -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
 -display none \
diff --git a/tests/qemuxml2argvdata/kvm-features-off.xml b/tests/qemuxml2argvdata/kvm-features-off.xml
index ab2c16202c3d..81970472d2f3 100644
--- a/tests/qemuxml2argvdata/kvm-features-off.xml
+++ b/tests/qemuxml2argvdata/kvm-features-off.xml
@@ -13,6 +13,7 @@
     <kvm>
       <hidden state='off'/>
       <hint-dedicated state='off'/>
+      <cpu-pm state='off'/>
     </kvm>
   </features>
   <clock offset='utc'/>
diff --git a/tests/qemuxml2argvdata/kvm-features.args b/tests/qemuxml2argvdata/kvm-features.args
index 8372ca897d8d..315e4cae853c 100644
--- a/tests/qemuxml2argvdata/kvm-features.args
+++ b/tests/qemuxml2argvdata/kvm-features.args
@@ -13,7 +13,7 @@ QEMU_AUDIO_DRV=none \
 -machine pc,accel=kvm,usb=off,dump-guest-core=off \
 -cpu host,kvm=off,kvm-hint-dedicated=on \
 -m 214 \
--realtime mlock=off \
+-overcommit mem-lock=off,cpu-pm=on \
 -smp 6,sockets=6,cores=1,threads=1 \
 -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
 -display none \
diff --git a/tests/qemuxml2argvdata/kvm-features.xml b/tests/qemuxml2argvdata/kvm-features.xml
index b942e89a9280..fd12a80a574f 100644
--- a/tests/qemuxml2argvdata/kvm-features.xml
+++ b/tests/qemuxml2argvdata/kvm-features.xml
@@ -13,6 +13,7 @@
     <kvm>
       <hidden state='on'/>
       <hint-dedicated state='on'/>
+      <cpu-pm state='on'/>
     </kvm>
   </features>
   <cpu mode='host-passthrough' check='none'/>
diff --git a/tests/qemuxml2argvtest.c b/tests/qemuxml2argvtest.c
index 26b512d24606..4c048b3e768a 100644
--- a/tests/qemuxml2argvtest.c
+++ b/tests/qemuxml2argvtest.c
@@ -915,8 +915,8 @@ mymain(void)
     DO_TEST("hyperv-off", NONE);
     DO_TEST("hyperv-panic", NONE);
 
-    DO_TEST("kvm-features", NONE);
-    DO_TEST("kvm-features-off", NONE);
+    DO_TEST("kvm-features", QEMU_CAPS_OVERCOMMIT);
+    DO_TEST("kvm-features-off", QEMU_CAPS_OVERCOMMIT);
 
     DO_TEST("pmu-feature", NONE);
     DO_TEST("pmu-feature-off", NONE);
diff --git a/tests/qemuxml2xmloutdata/kvm-features-off.xml b/tests/qemuxml2xmloutdata/kvm-features-off.xml
index a0ef9c7e9e15..31d9b586b3f8 100644
--- a/tests/qemuxml2xmloutdata/kvm-features-off.xml
+++ b/tests/qemuxml2xmloutdata/kvm-features-off.xml
@@ -13,6 +13,7 @@
     <kvm>
       <hidden state='off'/>
       <hint-dedicated state='off'/>
+      <cpu-pm state='off'/>
     </kvm>
   </features>
   <clock offset='utc'/>
diff --git a/tests/qemuxml2xmloutdata/kvm-features.xml b/tests/qemuxml2xmloutdata/kvm-features.xml
index b6f16ced1dab..7ceaf15ecf1e 100644
--- a/tests/qemuxml2xmloutdata/kvm-features.xml
+++ b/tests/qemuxml2xmloutdata/kvm-features.xml
@@ -13,6 +13,7 @@
     <kvm>
       <hidden state='on'/>
       <hint-dedicated state='on'/>
+      <cpu-pm state='on'/>
     </kvm>
   </features>
   <cpu mode='host-passthrough' check='none'/>
-- 
2.21.0


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]