We have tests for simple guests with graphics for basically all other architectures, so it makes sense to include s390x too. Signed-off-by: Andrea Bolognani <abologna@xxxxxxxxxx> --- .../s390x-ccw-graphics.s390x-latest.args | 49 +++++++++++++++++++ tests/qemuxml2argvdata/s390x-ccw-graphics.xml | 43 ++++++++++++++++ tests/qemuxml2argvtest.c | 1 + 3 files changed, 93 insertions(+) create mode 100644 tests/qemuxml2argvdata/s390x-ccw-graphics.s390x-latest.args create mode 100644 tests/qemuxml2argvdata/s390x-ccw-graphics.xml diff --git a/tests/qemuxml2argvdata/s390x-ccw-graphics.s390x-latest.args b/tests/qemuxml2argvdata/s390x-ccw-graphics.s390x-latest.args new file mode 100644 index 0000000000..f39cd14dd7 --- /dev/null +++ b/tests/qemuxml2argvdata/s390x-ccw-graphics.s390x-latest.args @@ -0,0 +1,49 @@ +LC_ALL=C \ +PATH=/bin \ +HOME=/tmp/lib/domain--1-guest \ +USER=test \ +LOGNAME=test \ +XDG_DATA_HOME=/tmp/lib/domain--1-guest/.local/share \ +XDG_CACHE_HOME=/tmp/lib/domain--1-guest/.cache \ +XDG_CONFIG_HOME=/tmp/lib/domain--1-guest/.config \ +QEMU_AUDIO_DRV=none \ +/usr/bin/qemu-system-s390x \ +-name guest=guest,debug-threads=on \ +-S \ +-object secret,id=masterKey0,format=raw,\ +file=/tmp/lib/domain--1-guest/master-key.aes \ +-machine s390-ccw,accel=tcg,usb=off,dump-guest-core=off \ +-m 4096 \ +-realtime mlock=off \ +-smp 4,sockets=4,cores=1,threads=1 \ +-uuid a7ca230a-fbe0-48b8-8ea6-25836f8cbc32 \ +-no-user-config \ +-nodefaults \ +-chardev socket,id=charmonitor,fd=1729,server,nowait \ +-mon chardev=charmonitor,id=monitor,mode=control \ +-rtc base=utc \ +-no-shutdown \ +-boot strict=on \ +-device virtio-serial-ccw,id=virtio-serial0,devno=fe.0.0003 \ +-drive file=/var/lib/libvirt/images/guest.qcow2,format=qcow2,if=none,\ +id=drive-virtio-disk0 \ +-device virtio-blk-ccw,scsi=off,devno=fe.0.0000,drive=drive-virtio-disk0,\ +id=virtio-disk0,bootindex=1 \ +-netdev user,id=hostnet0 \ +-device virtio-net-ccw,netdev=hostnet0,id=net0,mac=52:54:00:09:1a:29,\ +devno=fe.0.0001 \ +-chardev pty,id=charserial0 \ +-device sclpconsole,chardev=charserial0,id=serial0 \ +-chardev socket,id=charchannel0,fd=1729,server,nowait \ +-device virtserialport,bus=virtio-serial0.0,nr=1,chardev=charchannel0,\ +id=channel0,name=org.qemu.guest_agent.0 \ +-device virtio-tablet-ccw,id=input0,devno=fe.0.0004 \ +-device virtio-keyboard-ccw,id=input1,devno=fe.0.0005 \ +-vnc 127.0.0.1:0 \ +-device virtio-gpu-ccw,id=video0,max_outputs=1,devno=fe.0.0002 \ +-device virtio-balloon-ccw,id=balloon0,devno=fe.0.0006 \ +-object rng-random,id=objrng0,filename=/dev/urandom \ +-device virtio-rng-ccw,rng=objrng0,id=rng0,devno=fe.0.0007 \ +-sandbox on,obsolete=deny,elevateprivileges=deny,spawn=deny,\ +resourcecontrol=deny \ +-msg timestamp=on diff --git a/tests/qemuxml2argvdata/s390x-ccw-graphics.xml b/tests/qemuxml2argvdata/s390x-ccw-graphics.xml new file mode 100644 index 0000000000..3f54fdf9bd --- /dev/null +++ b/tests/qemuxml2argvdata/s390x-ccw-graphics.xml @@ -0,0 +1,43 @@ +<domain type="qemu"> + <name>guest</name> + <uuid>a7ca230a-fbe0-48b8-8ea6-25836f8cbc32</uuid> + <metadata> + <libosinfo:libosinfo xmlns:libosinfo="http://libosinfo.org/xmlns/libvirt/domain/1.0";> + <libosinfo:os id="http://fedoraproject.org/fedora/29"/> + </libosinfo:libosinfo> + </metadata> + <memory>4194304</memory> + <currentMemory>4194304</currentMemory> + <vcpu>4</vcpu> + <os> + <type arch="s390x" machine="s390-ccw">hvm</type> + <boot dev="hd"/> + </os> + <clock offset="utc"/> + <devices> + <emulator>/usr/bin/qemu-system-s390x</emulator> + <disk type="file" device="disk"> + <driver name="qemu" type="qcow2"/> + <source file="/var/lib/libvirt/images/guest.qcow2"/> + <target dev="vda" bus="virtio"/> + </disk> + <interface type="user"> + <mac address="52:54:00:09:1a:29"/> + <model type="virtio"/> + </interface> + <console type="pty"/> + <channel type="unix"> + <source mode="bind"/> + <target type="virtio" name="org.qemu.guest_agent.0"/> + </channel> + <input type="tablet" bus="virtio"/> + <input type="keyboard" bus="virtio"/> + <graphics type="vnc" port="-1"/> + <video> + <model type="virtio"/> + </video> + <rng model="virtio"> + <backend model="random">/dev/urandom</backend> + </rng> + </devices> +</domain> diff --git a/tests/qemuxml2argvtest.c b/tests/qemuxml2argvtest.c index 67c5c74ec5..22cf6b2232 100644 --- a/tests/qemuxml2argvtest.c +++ b/tests/qemuxml2argvtest.c @@ -3024,6 +3024,7 @@ mymain(void) /* Simple guests with graphics for various architectures */ DO_TEST_CAPS_ARCH_LATEST("aarch64-virt-graphics", "aarch64"); DO_TEST_CAPS_ARCH_LATEST("ppc64-pseries-graphics", "ppc64"); + DO_TEST_CAPS_ARCH_LATEST("s390x-ccw-graphics", "s390x"); DO_TEST_CAPS_ARCH_LATEST("x86_64-pc-graphics", "x86_64"); DO_TEST_CAPS_ARCH_LATEST("x86_64-q35-graphics", "x86_64"); -- 2.20.1 -- libvir-list mailing list libvir-list@xxxxxxxxxx https://www.redhat.com/mailman/listinfo/libvir-list
