KVM features off test cases should be tested for a KVM domain, so
keep align kvm-features-off test with kvm-features except KVM
features on/off.
Signed-off-by: zhenwei pi <pizhenwei(a)bytedance.com>
---
tests/qemuxml2argvdata/kvm-features-off.args | 4 ++--
tests/qemuxml2argvdata/kvm-features-off.xml | 5 +++--
tests/qemuxml2xmloutdata/kvm-features-off.xml | 7 +++----
3 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/tests/qemuxml2argvdata/kvm-features-off.args
b/tests/qemuxml2argvdata/kvm-features-off.args
index f6f13495e6..f7133bc0c3 100644
--- a/tests/qemuxml2argvdata/kvm-features-off.args
+++ b/tests/qemuxml2argvdata/kvm-features-off.args
@@ -11,7 +11,8 @@ QEMU_AUDIO_DRV=none \
-name guest=QEMUGuest1,debug-threads=on \
-S \
-object secret,id=masterKey0,format=raw,file=/tmp/lib/domain--1-QEMUGuest1/master-key.aes
\
--machine pc,accel=tcg,usb=off,dump-guest-core=off \
+-machine pc,accel=kvm,usb=off,dump-guest-core=off \
+-cpu host \
-m 214 \
-realtime mlock=off \
-smp 6,sockets=6,cores=1,threads=1 \
@@ -25,5 +26,4 @@ QEMU_AUDIO_DRV=none \
-no-shutdown \
-boot strict=on \
-usb \
--device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x2 \
-msg timestamp=on
diff --git a/tests/qemuxml2argvdata/kvm-features-off.xml
b/tests/qemuxml2argvdata/kvm-features-off.xml
index d63a573239..7871698f06 100644
--- a/tests/qemuxml2argvdata/kvm-features-off.xml
+++ b/tests/qemuxml2argvdata/kvm-features-off.xml
@@ -1,4 +1,4 @@
-<domain type='qemu'>
+<domain type='kvm'>
<name>QEMUGuest1</name>
<uuid>c7a5fdbd-edaf-9455-926a-d65c16db1809</uuid>
<memory unit='KiB'>219100</memory>
@@ -16,6 +16,7 @@
<poll-control state='off'/>
</kvm>
</features>
+ <cpu mode='host-passthrough' check='none'/>
<clock offset='utc'/>
<on_poweroff>destroy</on_poweroff>
<on_reboot>restart</on_reboot>
@@ -26,6 +27,6 @@
<controller type='pci' index='0' model='pci-root'/>
<input type='mouse' bus='ps2'/>
<input type='keyboard' bus='ps2'/>
- <memballoon model='virtio'/>
+ <memballoon model='none'/>
</devices>
</domain>
diff --git a/tests/qemuxml2xmloutdata/kvm-features-off.xml
b/tests/qemuxml2xmloutdata/kvm-features-off.xml
index f2e9407ac9..9c176190a5 100644
--- a/tests/qemuxml2xmloutdata/kvm-features-off.xml
+++ b/tests/qemuxml2xmloutdata/kvm-features-off.xml
@@ -1,4 +1,4 @@
-<domain type='qemu'>
+<domain type='kvm'>
<name>QEMUGuest1</name>
<uuid>c7a5fdbd-edaf-9455-926a-d65c16db1809</uuid>
<memory unit='KiB'>219100</memory>
@@ -16,6 +16,7 @@
<poll-control state='off'/>
</kvm>
</features>
+ <cpu mode='host-passthrough' check='none'
migratable='off'/>
<clock offset='utc'/>
<on_poweroff>destroy</on_poweroff>
<on_reboot>restart</on_reboot>
@@ -29,8 +30,6 @@
<input type='mouse' bus='ps2'/>
<input type='keyboard' bus='ps2'/>
<audio id='1' type='none'/>
- <memballoon model='virtio'>
- <address type='pci' domain='0x0000' bus='0x00'
slot='0x02' function='0x0'/>
- </memballoon>
+ <memballoon model='none'/>
</devices>
</domain>
--
2.25.1
Show replies by date
Since b2757b697e29fa86972a4638a5879dccc8add2ad
(qemu: support kvm-pv-ipi off), libvirt supports xml definition like:
<features>
<kvm>
<pv-ipi state='off'/>
</kvm>
</features>
Add test case for this feature.
Signed-off-by: zhenwei pi <pizhenwei(a)bytedance.com>
---
tests/qemuxml2argvdata/kvm-features-off.args | 2 +-
tests/qemuxml2argvdata/kvm-features-off.xml | 1 +
tests/qemuxml2argvdata/kvm-features.xml | 1 +
tests/qemuxml2xmloutdata/kvm-features-off.xml | 1 +
tests/qemuxml2xmloutdata/kvm-features.xml | 1 +
5 files changed, 5 insertions(+), 1 deletion(-)
diff --git a/tests/qemuxml2argvdata/kvm-features-off.args
b/tests/qemuxml2argvdata/kvm-features-off.args
index f7133bc0c3..f9962f68e7 100644
--- a/tests/qemuxml2argvdata/kvm-features-off.args
+++ b/tests/qemuxml2argvdata/kvm-features-off.args
@@ -12,7 +12,7 @@ QEMU_AUDIO_DRV=none \
-S \
-object secret,id=masterKey0,format=raw,file=/tmp/lib/domain--1-QEMUGuest1/master-key.aes
\
-machine pc,accel=kvm,usb=off,dump-guest-core=off \
--cpu host \
+-cpu host,kvm-pv-ipi=off \
-m 214 \
-realtime mlock=off \
-smp 6,sockets=6,cores=1,threads=1 \
diff --git a/tests/qemuxml2argvdata/kvm-features-off.xml
b/tests/qemuxml2argvdata/kvm-features-off.xml
index 7871698f06..a1004a206b 100644
--- a/tests/qemuxml2argvdata/kvm-features-off.xml
+++ b/tests/qemuxml2argvdata/kvm-features-off.xml
@@ -14,6 +14,7 @@
<hidden state='off'/>
<hint-dedicated state='off'/>
<poll-control state='off'/>
+ <pv-ipi state='off'/>
</kvm>
</features>
<cpu mode='host-passthrough' check='none'/>
diff --git a/tests/qemuxml2argvdata/kvm-features.xml
b/tests/qemuxml2argvdata/kvm-features.xml
index a5159254c6..51229a6c37 100644
--- a/tests/qemuxml2argvdata/kvm-features.xml
+++ b/tests/qemuxml2argvdata/kvm-features.xml
@@ -14,6 +14,7 @@
<hidden state='on'/>
<hint-dedicated state='on'/>
<poll-control state='on'/>
+ <pv-ipi state='on'/>
</kvm>
</features>
<cpu mode='host-passthrough' check='none'/>
diff --git a/tests/qemuxml2xmloutdata/kvm-features-off.xml
b/tests/qemuxml2xmloutdata/kvm-features-off.xml
index 9c176190a5..52a0ef0065 100644
--- a/tests/qemuxml2xmloutdata/kvm-features-off.xml
+++ b/tests/qemuxml2xmloutdata/kvm-features-off.xml
@@ -14,6 +14,7 @@
<hidden state='off'/>
<hint-dedicated state='off'/>
<poll-control state='off'/>
+ <pv-ipi state='off'/>
</kvm>
</features>
<cpu mode='host-passthrough' check='none'
migratable='off'/>
diff --git a/tests/qemuxml2xmloutdata/kvm-features.xml
b/tests/qemuxml2xmloutdata/kvm-features.xml
index 88ee48c873..72e66fcbf5 100644
--- a/tests/qemuxml2xmloutdata/kvm-features.xml
+++ b/tests/qemuxml2xmloutdata/kvm-features.xml
@@ -14,6 +14,7 @@
<hidden state='on'/>
<hint-dedicated state='on'/>
<poll-control state='on'/>
+ <pv-ipi state='on'/>
</kvm>
</features>
<cpu mode='host-passthrough' check='none'
migratable='off'/>
--
2.25.1
On 11/2/21 7:27 AM, zhenwei pi wrote:
Since b2757b697e29fa86972a4638a5879dccc8add2ad
(qemu: support kvm-pv-ipi off), libvirt supports xml definition like:
<features>
<kvm>
<pv-ipi state='off'/>
</kvm>
</features>
Add test case for this feature.
Signed-off-by: zhenwei pi <pizhenwei(a)bytedance.com>
---
tests/qemuxml2argvdata/kvm-features-off.args | 2 +-
tests/qemuxml2argvdata/kvm-features-off.xml | 1 +
tests/qemuxml2argvdata/kvm-features.xml | 1 +
tests/qemuxml2xmloutdata/kvm-features-off.xml | 1 +
tests/qemuxml2xmloutdata/kvm-features.xml | 1 +
5 files changed, 5 insertions(+), 1 deletion(-)
Reviewed-by: Michal Privoznik <mprivozn(a)redhat.com>
Michal
On 11/2/21 7:27 AM, zhenwei pi wrote:
KVM features off test cases should be tested for a KVM domain, so
keep align kvm-features-off test with kvm-features except KVM
features on/off.
Signed-off-by: zhenwei pi <pizhenwei(a)bytedance.com>
---
tests/qemuxml2argvdata/kvm-features-off.args | 4 ++--
tests/qemuxml2argvdata/kvm-features-off.xml | 5 +++--
tests/qemuxml2xmloutdata/kvm-features-off.xml | 7 +++----
3 files changed, 8 insertions(+), 8 deletions(-)
Reviewed-by: Michal Privoznik <mprivozn(a)redhat.com>
Michal