|
 |
c480ed |
From 31a61d20cc35f444b2b49deb146d667fb122668d Mon Sep 17 00:00:00 2001
|
|
|
c480ed |
Message-Id: <31a61d20cc35f444b2b49deb146d667fb122668d@dist-git>
|
|
|
c480ed |
From: Boris Fiuczynski <fiuczy@linux.ibm.com>
|
|
|
c480ed |
Date: Wed, 17 Apr 2019 14:46:01 +0200
|
|
|
c480ed |
Subject: [PATCH] qemu: Add ccw support for vhost-vsock
|
|
|
c480ed |
MIME-Version: 1.0
|
|
|
c480ed |
Content-Type: text/plain; charset=UTF-8
|
|
|
c480ed |
Content-Transfer-Encoding: 8bit
|
|
|
c480ed |
|
|
|
c480ed |
Add support and tests for vhost-vsock-ccw.
|
|
|
c480ed |
|
|
|
c480ed |
Signed-off-by: Boris Fiuczynski <fiuczy@linux.ibm.com>
|
|
|
c480ed |
(cherry picked from commit 927ef9f2a6ba22213501e99dcf5ecb5f62f8f72d)
|
|
|
c480ed |
Signed-off-by: Ján Tomko <jtomko@redhat.com>
|
|
|
c480ed |
|
|
|
c480ed |
RHEL 8.1: https://bugzilla.redhat.com/show_bug.cgi?id=1698855
|
|
|
c480ed |
Message-Id: <ec91ac8fd92152e31ce4af53b4d38725cff805a7.1555505143.git.jtomko@redhat.com>
|
|
|
c480ed |
|
|
|
c480ed |
Reviewed-by: Andrea Bolognani <abologna@redhat.com>
|
|
|
c480ed |
---
|
|
|
c480ed |
src/qemu/qemu_command.c | 8 +++--
|
|
|
c480ed |
src/qemu/qemu_domain.c | 10 ++++--
|
|
|
c480ed |
src/qemu/qemu_domain_address.c | 7 +++-
|
|
|
c480ed |
.../vhost-vsock-ccw-auto.s390x-latest.args | 32 +++++++++++++++++++
|
|
|
c480ed |
.../qemuxml2argvdata/vhost-vsock-ccw-auto.xml | 25 +++++++++++++++
|
|
|
c480ed |
.../vhost-vsock-ccw.s390x-latest.args | 32 +++++++++++++++++++
|
|
|
c480ed |
tests/qemuxml2argvdata/vhost-vsock-ccw.xml | 32 +++++++++++++++++++
|
|
|
c480ed |
tests/qemuxml2argvtest.c | 2 ++
|
|
|
c480ed |
.../vhost-vsock-ccw-auto.xml | 32 +++++++++++++++++++
|
|
|
c480ed |
tests/qemuxml2xmloutdata/vhost-vsock-ccw.xml | 1 +
|
|
|
c480ed |
tests/qemuxml2xmltest.c | 5 +++
|
|
|
c480ed |
11 files changed, 181 insertions(+), 5 deletions(-)
|
|
|
c480ed |
create mode 100644 tests/qemuxml2argvdata/vhost-vsock-ccw-auto.s390x-latest.args
|
|
|
c480ed |
create mode 100644 tests/qemuxml2argvdata/vhost-vsock-ccw-auto.xml
|
|
|
c480ed |
create mode 100644 tests/qemuxml2argvdata/vhost-vsock-ccw.s390x-latest.args
|
|
|
c480ed |
create mode 100644 tests/qemuxml2argvdata/vhost-vsock-ccw.xml
|
|
|
c480ed |
create mode 100644 tests/qemuxml2xmloutdata/vhost-vsock-ccw-auto.xml
|
|
|
c480ed |
create mode 120000 tests/qemuxml2xmloutdata/vhost-vsock-ccw.xml
|
|
|
c480ed |
|
|
|
c480ed |
diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c
|
|
|
c480ed |
index 66abd3fe86..a8c832bad8 100644
|
|
|
c480ed |
--- a/src/qemu/qemu_command.c
|
|
|
c480ed |
+++ b/src/qemu/qemu_command.c
|
|
|
c480ed |
@@ -10219,10 +10219,14 @@ qemuBuildVsockDevStr(virDomainDefPtr def,
|
|
|
c480ed |
{
|
|
|
c480ed |
qemuDomainVsockPrivatePtr priv = (qemuDomainVsockPrivatePtr)vsock->privateData;
|
|
|
c480ed |
virBuffer buf = VIR_BUFFER_INITIALIZER;
|
|
|
c480ed |
- const char *device = "vhost-vsock-pci";
|
|
|
c480ed |
char *ret = NULL;
|
|
|
c480ed |
|
|
|
c480ed |
- virBufferAsprintf(&buf, "%s", device);
|
|
|
c480ed |
+ if (vsock->info.type == VIR_DOMAIN_DEVICE_ADDRESS_TYPE_CCW) {
|
|
|
c480ed |
+ virBufferAddLit(&buf, "vhost-vsock-ccw");
|
|
|
c480ed |
+ } else {
|
|
|
c480ed |
+ virBufferAddLit(&buf, "vhost-vsock-pci");
|
|
|
c480ed |
+ }
|
|
|
c480ed |
+
|
|
|
c480ed |
virBufferAsprintf(&buf, ",id=%s", vsock->info.alias);
|
|
|
c480ed |
virBufferAsprintf(&buf, ",guest-cid=%u", vsock->guest_cid);
|
|
|
c480ed |
virBufferAsprintf(&buf, ",vhostfd=%s%u", fdprefix, priv->vhostfd);
|
|
|
c480ed |
diff --git a/src/qemu/qemu_domain.c b/src/qemu/qemu_domain.c
|
|
|
c480ed |
index c530733e97..be3477bf8a 100644
|
|
|
c480ed |
--- a/src/qemu/qemu_domain.c
|
|
|
c480ed |
+++ b/src/qemu/qemu_domain.c
|
|
|
c480ed |
@@ -5559,7 +5559,8 @@ qemuDomainDeviceDefValidateMemory(const virDomainMemoryDef *memory ATTRIBUTE_UNU
|
|
|
c480ed |
|
|
|
c480ed |
|
|
|
c480ed |
static int
|
|
|
c480ed |
-qemuDomainDeviceDefValidateVsock(const virDomainVsockDef *vsock ATTRIBUTE_UNUSED,
|
|
|
c480ed |
+qemuDomainDeviceDefValidateVsock(const virDomainVsockDef *vsock,
|
|
|
c480ed |
+ const virDomainDef *def,
|
|
|
c480ed |
virQEMUCapsPtr qemuCaps)
|
|
|
c480ed |
{
|
|
|
c480ed |
if (!virQEMUCapsGet(qemuCaps, QEMU_CAPS_DEVICE_VHOST_VSOCK)) {
|
|
|
c480ed |
@@ -5568,6 +5569,11 @@ qemuDomainDeviceDefValidateVsock(const virDomainVsockDef *vsock ATTRIBUTE_UNUSED
|
|
|
c480ed |
"with this QEMU binary"));
|
|
|
c480ed |
return -1;
|
|
|
c480ed |
}
|
|
|
c480ed |
+
|
|
|
c480ed |
+ if (!qemuDomainCheckCCWS390AddressSupport(def, vsock->info, qemuCaps,
|
|
|
c480ed |
+ "vsock"))
|
|
|
c480ed |
+ return -1;
|
|
|
c480ed |
+
|
|
|
c480ed |
return 0;
|
|
|
c480ed |
}
|
|
|
c480ed |
|
|
|
c480ed |
@@ -5715,7 +5721,7 @@ qemuDomainDeviceDefValidate(const virDomainDeviceDef *dev,
|
|
|
c480ed |
break;
|
|
|
c480ed |
|
|
|
c480ed |
case VIR_DOMAIN_DEVICE_VSOCK:
|
|
|
c480ed |
- ret = qemuDomainDeviceDefValidateVsock(dev->data.vsock, qemuCaps);
|
|
|
c480ed |
+ ret = qemuDomainDeviceDefValidateVsock(dev->data.vsock, def, qemuCaps);
|
|
|
c480ed |
break;
|
|
|
c480ed |
|
|
|
c480ed |
case VIR_DOMAIN_DEVICE_TPM:
|
|
|
c480ed |
diff --git a/src/qemu/qemu_domain_address.c b/src/qemu/qemu_domain_address.c
|
|
|
c480ed |
index 3e50521c11..79d2b9f9c4 100644
|
|
|
c480ed |
--- a/src/qemu/qemu_domain_address.c
|
|
|
c480ed |
+++ b/src/qemu/qemu_domain_address.c
|
|
|
c480ed |
@@ -310,7 +310,8 @@ qemuDomainPrimeVirtioDeviceAddresses(virDomainDefPtr def,
|
|
|
c480ed |
declare address-less virtio devices to be of address type 'type'
|
|
|
c480ed |
disks, networks, videos, consoles, controllers, memballoon and rng
|
|
|
c480ed |
in this order
|
|
|
c480ed |
- if type is ccw filesystem devices are declared to be of address type ccw
|
|
|
c480ed |
+ if type is ccw filesystem and vsock devices are declared to be of
|
|
|
c480ed |
+ address type ccw
|
|
|
c480ed |
*/
|
|
|
c480ed |
size_t i;
|
|
|
c480ed |
|
|
|
c480ed |
@@ -377,6 +378,10 @@ qemuDomainPrimeVirtioDeviceAddresses(virDomainDefPtr def,
|
|
|
c480ed |
if (def->fss[i]->info.type == VIR_DOMAIN_DEVICE_ADDRESS_TYPE_NONE)
|
|
|
c480ed |
def->fss[i]->info.type = type;
|
|
|
c480ed |
}
|
|
|
c480ed |
+ if (def->vsock &&
|
|
|
c480ed |
+ def->vsock->info.type == VIR_DOMAIN_DEVICE_ADDRESS_TYPE_NONE) {
|
|
|
c480ed |
+ def->vsock->info.type = type;
|
|
|
c480ed |
+ }
|
|
|
c480ed |
}
|
|
|
c480ed |
}
|
|
|
c480ed |
|
|
|
c480ed |
diff --git a/tests/qemuxml2argvdata/vhost-vsock-ccw-auto.s390x-latest.args b/tests/qemuxml2argvdata/vhost-vsock-ccw-auto.s390x-latest.args
|
|
|
c480ed |
new file mode 100644
|
|
|
c480ed |
index 0000000000..6092f8e85c
|
|
|
c480ed |
--- /dev/null
|
|
|
c480ed |
+++ b/tests/qemuxml2argvdata/vhost-vsock-ccw-auto.s390x-latest.args
|
|
|
c480ed |
@@ -0,0 +1,32 @@
|
|
|
c480ed |
+LC_ALL=C \
|
|
|
c480ed |
+PATH=/bin \
|
|
|
c480ed |
+HOME=/home/test \
|
|
|
c480ed |
+USER=test \
|
|
|
c480ed |
+LOGNAME=test \
|
|
|
c480ed |
+QEMU_AUDIO_DRV=none \
|
|
|
c480ed |
+/usr/bin/qemu-system-s390x \
|
|
|
c480ed |
+-name guest=QEMUGuest1,debug-threads=on \
|
|
|
c480ed |
+-S \
|
|
|
c480ed |
+-object secret,id=masterKey0,format=raw,\
|
|
|
c480ed |
+file=/tmp/lib/domain--1-QEMUGuest1/master-key.aes \
|
|
|
c480ed |
+-machine s390-ccw-virtio,accel=tcg,usb=off,dump-guest-core=off \
|
|
|
c480ed |
+-m 214 \
|
|
|
c480ed |
+-realtime mlock=off \
|
|
|
c480ed |
+-smp 1,sockets=1,cores=1,threads=1 \
|
|
|
c480ed |
+-uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
|
|
|
c480ed |
+-display none \
|
|
|
c480ed |
+-no-user-config \
|
|
|
c480ed |
+-nodefaults \
|
|
|
c480ed |
+-chardev socket,id=charmonitor,fd=1729,server,nowait \
|
|
|
c480ed |
+-mon chardev=charmonitor,id=monitor,mode=control \
|
|
|
c480ed |
+-rtc base=utc \
|
|
|
c480ed |
+-no-shutdown \
|
|
|
c480ed |
+-boot strict=on \
|
|
|
c480ed |
+-drive file=/dev/HostVG/QEMUGuest1,format=raw,if=none,id=drive-virtio-disk0 \
|
|
|
c480ed |
+-device virtio-blk-ccw,scsi=off,devno=fe.0.0000,drive=drive-virtio-disk0,\
|
|
|
c480ed |
+id=virtio-disk0,bootindex=1 \
|
|
|
c480ed |
+-device virtio-balloon-ccw,id=balloon0,devno=fe.0.0001 \
|
|
|
c480ed |
+-sandbox on,obsolete=deny,elevateprivileges=deny,spawn=deny,\
|
|
|
c480ed |
+resourcecontrol=deny \
|
|
|
c480ed |
+-device vhost-vsock-ccw,id=vsock0,guest-cid=42,vhostfd=6789,devno=fe.0.0002 \
|
|
|
c480ed |
+-msg timestamp=on
|
|
|
c480ed |
diff --git a/tests/qemuxml2argvdata/vhost-vsock-ccw-auto.xml b/tests/qemuxml2argvdata/vhost-vsock-ccw-auto.xml
|
|
|
c480ed |
new file mode 100644
|
|
|
c480ed |
index 0000000000..e5b60765ab
|
|
|
c480ed |
--- /dev/null
|
|
|
c480ed |
+++ b/tests/qemuxml2argvdata/vhost-vsock-ccw-auto.xml
|
|
|
c480ed |
@@ -0,0 +1,25 @@
|
|
|
c480ed |
+<domain type='qemu'>
|
|
|
c480ed |
+ <name>QEMUGuest1</name>
|
|
|
c480ed |
+ <uuid>c7a5fdbd-edaf-9455-926a-d65c16db1809</uuid>
|
|
|
c480ed |
+ <memory unit='KiB'>219136</memory>
|
|
|
c480ed |
+ <currentMemory unit='KiB'>219136</currentMemory>
|
|
|
c480ed |
+ <vcpu placement='static'>1</vcpu>
|
|
|
c480ed |
+ <os>
|
|
|
c480ed |
+ <type arch='s390x' machine='s390-ccw-virtio'>hvm</type>
|
|
|
c480ed |
+ <boot dev='hd'/>
|
|
|
c480ed |
+ </os>
|
|
|
c480ed |
+ <clock offset='utc'/>
|
|
|
c480ed |
+ <on_poweroff>destroy</on_poweroff>
|
|
|
c480ed |
+ <on_reboot>restart</on_reboot>
|
|
|
c480ed |
+ <on_crash>destroy</on_crash>
|
|
|
c480ed |
+ <devices>
|
|
|
c480ed |
+ <emulator>/usr/bin/qemu-system-s390x</emulator>
|
|
|
c480ed |
+ <disk type='block' device='disk'>
|
|
|
c480ed |
+ <source dev='/dev/HostVG/QEMUGuest1'/>
|
|
|
c480ed |
+ <target dev='hda' bus='virtio'/>
|
|
|
c480ed |
+ </disk>
|
|
|
c480ed |
+ <vsock>
|
|
|
c480ed |
+ <cid auto='yes'/>
|
|
|
c480ed |
+ </vsock>
|
|
|
c480ed |
+ </devices>
|
|
|
c480ed |
+</domain>
|
|
|
c480ed |
diff --git a/tests/qemuxml2argvdata/vhost-vsock-ccw.s390x-latest.args b/tests/qemuxml2argvdata/vhost-vsock-ccw.s390x-latest.args
|
|
|
c480ed |
new file mode 100644
|
|
|
c480ed |
index 0000000000..93eb3f3430
|
|
|
c480ed |
--- /dev/null
|
|
|
c480ed |
+++ b/tests/qemuxml2argvdata/vhost-vsock-ccw.s390x-latest.args
|
|
|
c480ed |
@@ -0,0 +1,32 @@
|
|
|
c480ed |
+LC_ALL=C \
|
|
|
c480ed |
+PATH=/bin \
|
|
|
c480ed |
+HOME=/home/test \
|
|
|
c480ed |
+USER=test \
|
|
|
c480ed |
+LOGNAME=test \
|
|
|
c480ed |
+QEMU_AUDIO_DRV=none \
|
|
|
c480ed |
+/usr/bin/qemu-system-s390x \
|
|
|
c480ed |
+-name guest=QEMUGuest1,debug-threads=on \
|
|
|
c480ed |
+-S \
|
|
|
c480ed |
+-object secret,id=masterKey0,format=raw,\
|
|
|
c480ed |
+file=/tmp/lib/domain--1-QEMUGuest1/master-key.aes \
|
|
|
c480ed |
+-machine s390-ccw-virtio,accel=tcg,usb=off,dump-guest-core=off \
|
|
|
c480ed |
+-m 214 \
|
|
|
c480ed |
+-realtime mlock=off \
|
|
|
c480ed |
+-smp 1,sockets=1,cores=1,threads=1 \
|
|
|
c480ed |
+-uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
|
|
|
c480ed |
+-display none \
|
|
|
c480ed |
+-no-user-config \
|
|
|
c480ed |
+-nodefaults \
|
|
|
c480ed |
+-chardev socket,id=charmonitor,fd=1729,server,nowait \
|
|
|
c480ed |
+-mon chardev=charmonitor,id=monitor,mode=control \
|
|
|
c480ed |
+-rtc base=utc \
|
|
|
c480ed |
+-no-shutdown \
|
|
|
c480ed |
+-boot strict=on \
|
|
|
c480ed |
+-drive file=/dev/HostVG/QEMUGuest1,format=raw,if=none,id=drive-virtio-disk0 \
|
|
|
c480ed |
+-device virtio-blk-ccw,scsi=off,devno=fe.0.0000,drive=drive-virtio-disk0,\
|
|
|
c480ed |
+id=virtio-disk0,bootindex=1 \
|
|
|
c480ed |
+-device virtio-balloon-ccw,id=balloon0,devno=fe.0.0001 \
|
|
|
c480ed |
+-sandbox on,obsolete=deny,elevateprivileges=deny,spawn=deny,\
|
|
|
c480ed |
+resourcecontrol=deny \
|
|
|
c480ed |
+-device vhost-vsock-ccw,id=vsock0,guest-cid=4,vhostfd=6789,devno=fe.0.0003 \
|
|
|
c480ed |
+-msg timestamp=on
|
|
|
c480ed |
diff --git a/tests/qemuxml2argvdata/vhost-vsock-ccw.xml b/tests/qemuxml2argvdata/vhost-vsock-ccw.xml
|
|
|
c480ed |
new file mode 100644
|
|
|
c480ed |
index 0000000000..083061c6cc
|
|
|
c480ed |
--- /dev/null
|
|
|
c480ed |
+++ b/tests/qemuxml2argvdata/vhost-vsock-ccw.xml
|
|
|
c480ed |
@@ -0,0 +1,32 @@
|
|
|
c480ed |
+<domain type='qemu'>
|
|
|
c480ed |
+ <name>QEMUGuest1</name>
|
|
|
c480ed |
+ <uuid>c7a5fdbd-edaf-9455-926a-d65c16db1809</uuid>
|
|
|
c480ed |
+ <memory unit='KiB'>219136</memory>
|
|
|
c480ed |
+ <currentMemory unit='KiB'>219136</currentMemory>
|
|
|
c480ed |
+ <vcpu placement='static'>1</vcpu>
|
|
|
c480ed |
+ <os>
|
|
|
c480ed |
+ <type arch='s390x' machine='s390-ccw-virtio'>hvm</type>
|
|
|
c480ed |
+ <boot dev='hd'/>
|
|
|
c480ed |
+ </os>
|
|
|
c480ed |
+ <clock offset='utc'/>
|
|
|
c480ed |
+ <on_poweroff>destroy</on_poweroff>
|
|
|
c480ed |
+ <on_reboot>restart</on_reboot>
|
|
|
c480ed |
+ <on_crash>destroy</on_crash>
|
|
|
c480ed |
+ <devices>
|
|
|
c480ed |
+ <emulator>/usr/bin/qemu-system-s390x</emulator>
|
|
|
c480ed |
+ <disk type='block' device='disk'>
|
|
|
c480ed |
+ <driver name='qemu' type='raw'/>
|
|
|
c480ed |
+ <source dev='/dev/HostVG/QEMUGuest1'/>
|
|
|
c480ed |
+ <target dev='hda' bus='virtio'/>
|
|
|
c480ed |
+ <address type='ccw' cssid='0xfe' ssid='0x0' devno='0x0000'/>
|
|
|
c480ed |
+ </disk>
|
|
|
c480ed |
+ <memballoon model='virtio'>
|
|
|
c480ed |
+ <address type='ccw' cssid='0xfe' ssid='0x0' devno='0x0001'/>
|
|
|
c480ed |
+ </memballoon>
|
|
|
c480ed |
+ <panic model='s390'/>
|
|
|
c480ed |
+ <vsock model='virtio'>
|
|
|
c480ed |
+ <cid auto='no' address='4'/>
|
|
|
c480ed |
+ <address type='ccw' cssid='0xfe' ssid='0x0' devno='0x0003'/>
|
|
|
c480ed |
+ </vsock>
|
|
|
c480ed |
+ </devices>
|
|
|
c480ed |
+</domain>
|
|
|
c480ed |
diff --git a/tests/qemuxml2argvtest.c b/tests/qemuxml2argvtest.c
|
|
|
c480ed |
index abb256c913..7f25cccf9d 100644
|
|
|
c480ed |
--- a/tests/qemuxml2argvtest.c
|
|
|
c480ed |
+++ b/tests/qemuxml2argvtest.c
|
|
|
c480ed |
@@ -2972,6 +2972,8 @@ mymain(void)
|
|
|
c480ed |
|
|
|
c480ed |
DO_TEST_CAPS_LATEST("vhost-vsock");
|
|
|
c480ed |
DO_TEST_CAPS_LATEST("vhost-vsock-auto");
|
|
|
c480ed |
+ DO_TEST_CAPS_ARCH_LATEST("vhost-vsock-ccw", "s390x");
|
|
|
c480ed |
+ DO_TEST_CAPS_ARCH_LATEST("vhost-vsock-ccw-auto", "s390x");
|
|
|
c480ed |
|
|
|
c480ed |
DO_TEST_CAPS_VER("launch-security-sev", "2.12.0");
|
|
|
c480ed |
|
|
|
c480ed |
diff --git a/tests/qemuxml2xmloutdata/vhost-vsock-ccw-auto.xml b/tests/qemuxml2xmloutdata/vhost-vsock-ccw-auto.xml
|
|
|
c480ed |
new file mode 100644
|
|
|
c480ed |
index 0000000000..38a0fb3808
|
|
|
c480ed |
--- /dev/null
|
|
|
c480ed |
+++ b/tests/qemuxml2xmloutdata/vhost-vsock-ccw-auto.xml
|
|
|
c480ed |
@@ -0,0 +1,32 @@
|
|
|
c480ed |
+<domain type='qemu'>
|
|
|
c480ed |
+ <name>QEMUGuest1</name>
|
|
|
c480ed |
+ <uuid>c7a5fdbd-edaf-9455-926a-d65c16db1809</uuid>
|
|
|
c480ed |
+ <memory unit='KiB'>219136</memory>
|
|
|
c480ed |
+ <currentMemory unit='KiB'>219136</currentMemory>
|
|
|
c480ed |
+ <vcpu placement='static'>1</vcpu>
|
|
|
c480ed |
+ <os>
|
|
|
c480ed |
+ <type arch='s390x' machine='s390-ccw-virtio'>hvm</type>
|
|
|
c480ed |
+ <boot dev='hd'/>
|
|
|
c480ed |
+ </os>
|
|
|
c480ed |
+ <clock offset='utc'/>
|
|
|
c480ed |
+ <on_poweroff>destroy</on_poweroff>
|
|
|
c480ed |
+ <on_reboot>restart</on_reboot>
|
|
|
c480ed |
+ <on_crash>destroy</on_crash>
|
|
|
c480ed |
+ <devices>
|
|
|
c480ed |
+ <emulator>/usr/bin/qemu-system-s390x</emulator>
|
|
|
c480ed |
+ <disk type='block' device='disk'>
|
|
|
c480ed |
+ <driver name='qemu' type='raw'/>
|
|
|
c480ed |
+ <source dev='/dev/HostVG/QEMUGuest1'/>
|
|
|
c480ed |
+ <target dev='hda' bus='virtio'/>
|
|
|
c480ed |
+ <address type='ccw' cssid='0xfe' ssid='0x0' devno='0x0000'/>
|
|
|
c480ed |
+ </disk>
|
|
|
c480ed |
+ <memballoon model='virtio'>
|
|
|
c480ed |
+ <address type='ccw' cssid='0xfe' ssid='0x0' devno='0x0001'/>
|
|
|
c480ed |
+ </memballoon>
|
|
|
c480ed |
+ <panic model='s390'/>
|
|
|
c480ed |
+ <vsock model='virtio'>
|
|
|
c480ed |
+ <cid auto='yes'/>
|
|
|
c480ed |
+ <address type='ccw' cssid='0xfe' ssid='0x0' devno='0x0002'/>
|
|
|
c480ed |
+ </vsock>
|
|
|
c480ed |
+ </devices>
|
|
|
c480ed |
+</domain>
|
|
|
c480ed |
diff --git a/tests/qemuxml2xmloutdata/vhost-vsock-ccw.xml b/tests/qemuxml2xmloutdata/vhost-vsock-ccw.xml
|
|
|
c480ed |
new file mode 120000
|
|
|
c480ed |
index 0000000000..e0fa69dba9
|
|
|
c480ed |
--- /dev/null
|
|
|
c480ed |
+++ b/tests/qemuxml2xmloutdata/vhost-vsock-ccw.xml
|
|
|
c480ed |
@@ -0,0 +1 @@
|
|
|
c480ed |
+../qemuxml2argvdata/vhost-vsock-ccw.xml
|
|
|
c480ed |
\ No newline at end of file
|
|
|
c480ed |
diff --git a/tests/qemuxml2xmltest.c b/tests/qemuxml2xmltest.c
|
|
|
c480ed |
index dbac863239..2a2bf01ffa 100644
|
|
|
c480ed |
--- a/tests/qemuxml2xmltest.c
|
|
|
c480ed |
+++ b/tests/qemuxml2xmltest.c
|
|
|
c480ed |
@@ -1231,6 +1231,11 @@ mymain(void)
|
|
|
c480ed |
|
|
|
c480ed |
DO_TEST("vhost-vsock", QEMU_CAPS_DEVICE_VHOST_VSOCK);
|
|
|
c480ed |
DO_TEST("vhost-vsock-auto", QEMU_CAPS_DEVICE_VHOST_VSOCK);
|
|
|
c480ed |
+ DO_TEST("vhost-vsock-ccw", QEMU_CAPS_DEVICE_VHOST_VSOCK,
|
|
|
c480ed |
+ QEMU_CAPS_CCW);
|
|
|
c480ed |
+ DO_TEST("vhost-vsock-ccw-auto", QEMU_CAPS_DEVICE_VHOST_VSOCK,
|
|
|
c480ed |
+ QEMU_CAPS_CCW);
|
|
|
c480ed |
+
|
|
|
c480ed |
|
|
|
c480ed |
if (getenv("LIBVIRT_SKIP_CLEANUP") == NULL)
|
|
|
c480ed |
virFileDeleteTree(fakerootdir);
|
|
|
c480ed |
--
|
|
|
c480ed |
2.21.0
|
|
|
c480ed |
|