[libvirt PATCH v2 3/3] qemu: add tests for the ISA debug console command line
Daniel P. Berrangé
berrange at redhat.com
Wed Feb 2 12:44:45 UTC 2022
The XML-to-XML test validates that we don't accidentally copy the
isa-debug <serial> into a <console>.
Signed-off-by: Daniel P. Berrangé <berrange at redhat.com>
---
.../serial-debugcon.x86_64-latest.args | 39 +++++++++++++++++
tests/qemuxml2argvdata/serial-debugcon.xml | 29 +++++++++++++
tests/qemuxml2argvtest.c | 1 +
tests/qemuxml2xmloutdata/serial-debugcon.xml | 43 +++++++++++++++++++
tests/qemuxml2xmltest.c | 1 +
5 files changed, 113 insertions(+)
create mode 100644 tests/qemuxml2argvdata/serial-debugcon.x86_64-latest.args
create mode 100644 tests/qemuxml2argvdata/serial-debugcon.xml
create mode 100644 tests/qemuxml2xmloutdata/serial-debugcon.xml
diff --git a/tests/qemuxml2argvdata/serial-debugcon.x86_64-latest.args b/tests/qemuxml2argvdata/serial-debugcon.x86_64-latest.args
new file mode 100644
index 0000000000..4e026e7afa
--- /dev/null
+++ b/tests/qemuxml2argvdata/serial-debugcon.x86_64-latest.args
@@ -0,0 +1,39 @@
+LC_ALL=C \
+PATH=/bin \
+HOME=/tmp/lib/domain--1-QEMUGuest1 \
+USER=test \
+LOGNAME=test \
+XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
+XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
+XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
+/usr/bin/qemu-system-x86_64 \
+-name guest=QEMUGuest1,debug-threads=on \
+-S \
+-object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/tmp/lib/domain--1-QEMUGuest1/master-key.aes"}' \
+-machine pc,usb=off,dump-guest-core=off,memory-backend=pc.ram \
+-accel tcg \
+-cpu qemu64 \
+-m 214 \
+-object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":224395264}' \
+-overcommit mem-lock=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=on,wait=off \
+-mon chardev=charmonitor,id=monitor,mode=control \
+-rtc base=utc \
+-no-shutdown \
+-no-acpi \
+-boot strict=on \
+-device '{"driver":"piix3-usb-uhci","id":"usb","bus":"pci.0","addr":"0x1.0x2"}' \
+-blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","node-name":"libvirt-1-storage","auto-read-only":true,"discard":"unmap"}' \
+-blockdev '{"node-name":"libvirt-1-format","read-only":false,"driver":"raw","file":"libvirt-1-storage"}' \
+-device '{"driver":"ide-hd","bus":"ide.0","unit":0,"drive":"libvirt-1-format","id":"ide0-0-0","bootindex":1}' \
+-chardev pty,id=charserial0 \
+-device '{"driver":"isa-debugcon","chardev":"charserial0","id":"serial0","iobase":1026}' \
+-audiodev '{"id":"audio1","driver":"none"}' \
+-device '{"driver":"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/serial-debugcon.xml b/tests/qemuxml2argvdata/serial-debugcon.xml
new file mode 100644
index 0000000000..a41be242d2
--- /dev/null
+++ b/tests/qemuxml2argvdata/serial-debugcon.xml
@@ -0,0 +1,29 @@
+<domain type='qemu'>
+ <name>QEMUGuest1</name>
+ <uuid>c7a5fdbd-edaf-9455-926a-d65c16db1809</uuid>
+ <memory unit='KiB'>219136</memory>
+ <currentMemory unit='KiB'>219136</currentMemory>
+ <vcpu placement='static'>1</vcpu>
+ <os>
+ <type arch='x86_64' machine='pc'>hvm</type>
+ <boot dev='hd'/>
+ </os>
+ <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>
+ <disk type='block' device='disk'>
+ <source dev='/dev/HostVG/QEMUGuest1'/>
+ <target dev='hda' bus='ide'/>
+ <address type='drive' controller='0' bus='0' target='0' unit='0'/>
+ </disk>
+ <serial type='pty'>
+ <target type='isa-debug'>
+ <model name='isa-debugcon'/>
+ </target>
+ <address type='isa' iobase='0x402'/>
+ </serial>
+ </devices>
+</domain>
diff --git a/tests/qemuxml2argvtest.c b/tests/qemuxml2argvtest.c
index 96d30f2475..b9d8885912 100644
--- a/tests/qemuxml2argvtest.c
+++ b/tests/qemuxml2argvtest.c
@@ -1717,6 +1717,7 @@ mymain(void)
DO_TEST_CAPS_LATEST("serial-file-log");
DO_TEST_CAPS_LATEST("serial-spiceport");
DO_TEST_CAPS_LATEST("serial-spiceport-nospice");
+ DO_TEST_CAPS_LATEST("serial-debugcon");
DO_TEST_CAPS_LATEST("console-compat");
DO_TEST_CAPS_LATEST("console-compat-auto");
diff --git a/tests/qemuxml2xmloutdata/serial-debugcon.xml b/tests/qemuxml2xmloutdata/serial-debugcon.xml
new file mode 100644
index 0000000000..6b6126fed1
--- /dev/null
+++ b/tests/qemuxml2xmloutdata/serial-debugcon.xml
@@ -0,0 +1,43 @@
+<domain type='qemu'>
+ <name>QEMUGuest1</name>
+ <uuid>c7a5fdbd-edaf-9455-926a-d65c16db1809</uuid>
+ <memory unit='KiB'>219136</memory>
+ <currentMemory unit='KiB'>219136</currentMemory>
+ <vcpu placement='static'>1</vcpu>
+ <os>
+ <type arch='x86_64' machine='pc'>hvm</type>
+ <boot dev='hd'/>
+ </os>
+ <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>
+ <disk type='block' device='disk'>
+ <driver name='qemu' type='raw'/>
+ <source dev='/dev/HostVG/QEMUGuest1'/>
+ <target dev='hda' bus='ide'/>
+ <address type='drive' controller='0' bus='0' target='0' unit='0'/>
+ </disk>
+ <controller type='usb' index='0'>
+ <address type='pci' domain='0x0000' bus='0x00' slot='0x01' function='0x2'/>
+ </controller>
+ <controller type='pci' index='0' model='pci-root'/>
+ <controller type='ide' index='0'>
+ <address type='pci' domain='0x0000' bus='0x00' slot='0x01' function='0x1'/>
+ </controller>
+ <serial type='pty'>
+ <target type='isa-debug' port='0'>
+ <model name='isa-debugcon'/>
+ </target>
+ <address type='isa' iobase='0x402'/>
+ </serial>
+ <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>
+ </devices>
+</domain>
diff --git a/tests/qemuxml2xmltest.c b/tests/qemuxml2xmltest.c
index 935fd955f4..007c9edacd 100644
--- a/tests/qemuxml2xmltest.c
+++ b/tests/qemuxml2xmltest.c
@@ -497,6 +497,7 @@ mymain(void)
cfg->spiceTLS = false;
DO_TEST_NOCAPS("serial-spiceport-nospice");
+ DO_TEST_NOCAPS("serial-debugcon");
DO_TEST_NOCAPS("console-compat");
DO_TEST_NOCAPS("console-compat2");
DO_TEST_NOCAPS("console-virtio-many");
--
2.34.1
More information about the libvir-list
mailing list