3:32 p.m.
Signed-off-by: Lubomir Rintel <lkundrak(a)v3.sk>
---
tests/qemuxml2argvdata/riscv64-virt.args | 31 +++++++++++++++
tests/qemuxml2argvdata/riscv64-virt.xml | 32 +++++++++++++++
tests/qemuxml2argvtest.c | 3 ++
.../riscv64-virt.xml | 39 +++++++++++++++++++
4 files changed, 105 insertions(+)
create mode 100644 tests/qemuxml2argvdata/riscv64-virt.args
create mode 100644 tests/qemuxml2argvdata/riscv64-virt.xml
create mode 100644 tests/qemuxml2startupxmloutdata/riscv64-virt.xml
diff --git a/tests/qemuxml2argvdata/riscv64-virt.args
b/tests/qemuxml2argvdata/riscv64-virt.args
new file mode 100644
index 0000000000..1833242753
--- /dev/null
+++ b/tests/qemuxml2argvdata/riscv64-virt.args
@@ -0,0 +1,31 @@
+LC_ALL=C \
+PATH=/bin \
+HOME=/home/test \
+USER=test \
+LOGNAME=test \
+QEMU_AUDIO_DRV=none \
+/usr/bin/qemu-system-riscv64 \
+-name riscv64 \
+-S \
+-machine virt,accel=tcg,usb=off,dump-guest-core=off \
+-m 2048 \
+-smp 1,sockets=1,cores=1,threads=1 \
+-uuid fd65fc03-8838-4c4d-9d8d-395802488790 \
+-display none \
+-no-user-config \
+-nodefaults \
+-chardev socket,id=charmonitor,path=/tmp/lib/domain--1-riscv64/monitor.sock,\
+server,nowait \
+-mon chardev=charmonitor,id=monitor,mode=control \
+-rtc base=utc \
+-no-shutdown \
+-boot c \
+-kernel /var/lib/libvirt/images/bbl \
+-append 'console=ttyS0 ro root=/dev/vda' \
+-usb \
+-drive file=/var/lib/libvirt/images/stage4-disk.img,format=raw,if=none,\
+id=drive-virtio-disk0 \
+-device virtio-blk-device,drive=drive-virtio-disk0,id=virtio-disk0 \
+-chardev pty,id=charserial0 \
+-serial chardev:charserial0 \
+-device virtio-balloon-device,id=balloon0
diff --git a/tests/qemuxml2argvdata/riscv64-virt.xml
b/tests/qemuxml2argvdata/riscv64-virt.xml
new file mode 100644
index 0000000000..6a2d072d3c
--- /dev/null
+++ b/tests/qemuxml2argvdata/riscv64-virt.xml
@@ -0,0 +1,32 @@
+<domain type='qemu'>
+ <name>riscv64</name>
+ <uuid>fd65fc03-8838-4c4d-9d8d-395802488790</uuid>
+ <memory unit='KiB'>2097152</memory>
+ <currentMemory unit='KiB'>2097152</currentMemory>
+ <vcpu placement='static'>1</vcpu>
+ <os>
+ <type arch='riscv64' machine='virt'>hvm</type>
+ <kernel>/var/lib/libvirt/images/bbl</kernel>
+ <cmdline>console=ttyS0 ro root=/dev/vda</cmdline>
+ <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-riscv64</emulator>
+ <disk type='file' device='disk'>
+ <driver name='qemu' type='raw'/>
+ <source file='/var/lib/libvirt/images/stage4-disk.img'/>
+ <target dev='vda' bus='virtio'/>
+ <address type='virtio-mmio'/>
+ </disk>
+ <serial type='pty'>
+ <target port='0'/>
+ </serial>
+ <console type='pty'>
+ <target type='serial' port='0'/>
+ </console>
+ </devices>
+</domain>
diff --git a/tests/qemuxml2argvtest.c b/tests/qemuxml2argvtest.c
index f44cac9fef..9c4cf1bb37 100644
--- a/tests/qemuxml2argvtest.c
+++ b/tests/qemuxml2argvtest.c
@@ -2903,6 +2903,9 @@ mymain(void)
QEMU_CAPS_KVM,
QEMU_CAPS_SEV_GUEST);
+ DO_TEST("riscv64-virt",
+ QEMU_CAPS_DEVICE_VIRTIO_MMIO);
+
if (getenv("LIBVIRT_SKIP_CLEANUP") == NULL)
virFileDeleteTree(fakerootdir);
diff --git a/tests/qemuxml2startupxmloutdata/riscv64-virt.xml
b/tests/qemuxml2startupxmloutdata/riscv64-virt.xml
new file mode 100644
index 0000000000..e23b3ffbad
--- /dev/null
+++ b/tests/qemuxml2startupxmloutdata/riscv64-virt.xml
@@ -0,0 +1,39 @@
+<domain type='qemu'>
+ <name>riscv64</name>
+ <uuid>fd65fc03-8838-4c4d-9d8d-395802488790</uuid>
+ <memory unit='KiB'>2097152</memory>
+ <currentMemory unit='KiB'>2097152</currentMemory>
+ <vcpu placement='static'>1</vcpu>
+ <os>
+ <type arch='riscv64' machine='virt'>hvm</type>
+ <kernel>/var/lib/libvirt/images/bbl</kernel>
+ <cmdline>console=ttyS0 ro root=/dev/vda</cmdline>
+ <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-riscv64</emulator>
+ <disk type='file' device='disk'>
+ <driver name='qemu' type='raw'/>
+ <source file='/var/lib/libvirt/images/stage4-disk.img'/>
+ <target dev='vda' bus='virtio'/>
+ <alias name='virtio-disk0'/>
+ <address type='virtio-mmio'/>
+ </disk>
+ <serial type='pty'>
+ <target port='0'/>
+ <alias name='serial0'/>
+ </serial>
+ <console type='pty'>
+ <target type='serial' port='0'/>
+ <alias name='serial0'/>
+ </console>
+ <memballoon model='virtio'>
+ <alias name='balloon0'/>
+ <address type='virtio-mmio'/>
+ </memballoon>
+ </devices>
+</domain>
--
2.17.1