[PATCH 2/2] qemuxml2xmltest: add serial append=on test
Martin Kletzander
mkletzan at redhat.com
Thu Jan 5 13:21:41 UTC 2023
On Tue, Nov 29, 2022 at 09:54:52PM +0600, Oleg Vasilev wrote:
>Previous commit has introduced the config option to enable append=on for
>serial files. Here we test it.
>
>Signed-off-by: Oleg Vasilev <oleg.vasilev at virtuozzo.com>
>---
> tests/qemuxml2argvdata/serial-append.xml | 56 +++++++++++++++++++
> .../serial-append.x86_64-latest.xml | 56 +++++++++++++++++++
> tests/qemuxml2xmltest.c | 4 ++
> 3 files changed, 116 insertions(+)
> create mode 100644 tests/qemuxml2argvdata/serial-append.xml
> create mode 100644 tests/qemuxml2xmloutdata/serial-append.x86_64-latest.xml
>
>diff --git a/tests/qemuxml2argvdata/serial-append.xml b/tests/qemuxml2argvdata/serial-append.xml
>new file mode 100644
>index 0000000000..3f2cb210e4
>--- /dev/null
>+++ b/tests/qemuxml2argvdata/serial-append.xml
>@@ -0,0 +1,56 @@
>+<domain type='qemu'>
>+ <name>machine</name>
>+ <uuid>2187c512-ff97-47d7-b67c-c02d3bdc219d</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='hd'/>
>+ </os>
>+ <cpu mode='custom' match='exact' check='none'>
>+ <model fallback='forbid'>qemu64</model>
>+ </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>
>+ <controller type='usb' index='0' model='piix3-uhci'>
>+ <address type='pci' domain='0x0000' bus='0x00' slot='0x01' function='0x2'/>
>+ </controller>
>+ <controller type='ide' index='0'>
>+ <address type='pci' domain='0x0000' bus='0x00' slot='0x01' function='0x1'/>
>+ </controller>
>+ <controller type='pci' index='0' model='pci-root'/>
>+ <serial type='file'>
>+ <source path='/tmp/serial.file'>
>+ <seclabel model='dac' relabel='no'/>
>+ </source>
>+ <target type='isa-serial' port='0'>
>+ <model name='isa-serial'/>
>+ </target>
>+ </serial>
>+ <serial type='unix'>
>+ <source mode='connect' path='/tmp/serial.sock'>
>+ <seclabel model='dac' relabel='no'/>
>+ </source>
>+ <target type='isa-serial' port='1'>
>+ <model name='isa-serial'/>
>+ </target>
>+ </serial>
>+ <console type='file'>
>+ <source path='/tmp/serial.file'>
>+ <seclabel model='dac' relabel='no'/>
>+ </source>
>+ <target type='serial' port='0'/>
>+ </console>
>+ <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/qemuxml2xmloutdata/serial-append.x86_64-latest.xml b/tests/qemuxml2xmloutdata/serial-append.x86_64-latest.xml
>new file mode 100644
>index 0000000000..0bd5f3db81
>--- /dev/null
>+++ b/tests/qemuxml2xmloutdata/serial-append.x86_64-latest.xml
>@@ -0,0 +1,56 @@
>+<domain type='qemu'>
>+ <name>machine</name>
>+ <uuid>2187c512-ff97-47d7-b67c-c02d3bdc219d</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='hd'/>
>+ </os>
>+ <cpu mode='custom' match='exact' check='none'>
>+ <model fallback='forbid'>qemu64</model>
>+ </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>
>+ <controller type='usb' index='0' model='piix3-uhci'>
>+ <address type='pci' domain='0x0000' bus='0x00' slot='0x01' function='0x2'/>
>+ </controller>
>+ <controller type='ide' index='0'>
>+ <address type='pci' domain='0x0000' bus='0x00' slot='0x01' function='0x1'/>
>+ </controller>
>+ <controller type='pci' index='0' model='pci-root'/>
>+ <serial type='file'>
>+ <source path='/tmp/serial.file' append='on'>
>+ <seclabel model='dac' relabel='no'/>
>+ </source>
>+ <target type='isa-serial' port='0'>
>+ <model name='isa-serial'/>
>+ </target>
>+ </serial>
>+ <serial type='unix'>
>+ <source mode='connect' path='/tmp/serial.sock'>
>+ <seclabel model='dac' relabel='no'/>
>+ </source>
>+ <target type='isa-serial' port='1'>
>+ <model name='isa-serial'/>
>+ </target>
>+ </serial>
>+ <console type='file'>
>+ <source path='/tmp/serial.file' append='on'>
Since there are several outcomes the previous patch could have it'd be
nicer if one XML file tested more of them. The same file then can be
ran with different config options and we'd have all the possibilities
tested with just three additional tests, which is not that much. Also
this patch should be merged into the previous one.
>+ <seclabel model='dac' relabel='no'/>
>+ </source>
>+ <target type='serial' port='0'/>
>+ </console>
>+ <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 e13da8bd2c..5502456328 100644
>--- a/tests/qemuxml2xmltest.c
>+++ b/tests/qemuxml2xmltest.c
>@@ -915,6 +915,10 @@ mymain(void)
> QEMU_CAPS_DEVICE_VIRTIO_RNG,
> QEMU_CAPS_OBJECT_RNG_EGD);
>
>+ g_free(cfg->serialFileAppend);
>+ cfg->serialFileAppend = g_strdup("on");
>+ DO_TEST_CAPS_LATEST("serial-append");
>+
> DO_TEST_NOCAPS("cpu-numa1");
> DO_TEST_NOCAPS("cpu-numa2");
> DO_TEST_NOCAPS("cpu-numa-no-memory-element");
>--
>2.38.1
>
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 833 bytes
Desc: not available
URL: <http://listman.redhat.com/archives/libvir-list/attachments/20230105/e129746b/attachment.sig>
More information about the libvir-list
mailing list