6:31 a.m.
Support the vhost-vsock-ccw device on S390.
Since v1
- adjusted vsock command line generation (Ján Tomko)
- added CAPS_LATEST test coverage to s390 (Ján Tomko)
- adjusted new vsock tests to use CAPS_LATEST
Bjoern Walk (1):
tests: qemuxml2argv: make CAPS_LATEST arch generic
Boris Fiuczynski (2):
qemu: Add ccw support for vhost-vsock
news: Update for vhost-vsock-ccw support
docs/news.xml | 8 ++
src/qemu/qemu_command.c | 8 +-
src/qemu/qemu_domain.c | 10 +-
src/qemu/qemu_domain_address.c | 7 +-
.../vhost-vsock-ccw-auto.s390x-latest.args | 32 ++++++
.../qemuxml2argvdata/vhost-vsock-ccw-auto.xml | 25 +++++
.../vhost-vsock-ccw.s390x-latest.args | 32 ++++++
tests/qemuxml2argvdata/vhost-vsock-ccw.xml | 32 ++++++
tests/qemuxml2argvtest.c | 98 +++++++++++--------
.../vhost-vsock-ccw-auto.xml | 32 ++++++
tests/qemuxml2xmloutdata/vhost-vsock-ccw.xml | 1 +
tests/qemuxml2xmltest.c | 5 +
12 files changed, 243 insertions(+), 47 deletions(-)
create mode 100644 tests/qemuxml2argvdata/vhost-vsock-ccw-auto.s390x-latest.args
create mode 100644 tests/qemuxml2argvdata/vhost-vsock-ccw-auto.xml
create mode 100644 tests/qemuxml2argvdata/vhost-vsock-ccw.s390x-latest.args
create mode 100644 tests/qemuxml2argvdata/vhost-vsock-ccw.xml
create mode 100644 tests/qemuxml2xmloutdata/vhost-vsock-ccw-auto.xml
create mode 120000 tests/qemuxml2xmloutdata/vhost-vsock-ccw.xml
--
2.17.0
6:31 a.m.
New subject: [libvirt] [PATCH v2 1/3] tests: qemuxml2argv: make CAPS_LATEST arch generic
From: Bjoern Walk <bwalk(a)linux.ibm.com>
Testing with the latest capabilities has been x86_64 centric. Let's
remove the hardcoded architecture and give the user the ability to
specify the desired architecture in the macro.
Signed-off-by: Bjoern Walk <bwalk(a)linux.ibm.com>
Reviewed-by: Boris Fiuczynski <fiuczy(a)linux.ibm.com>
---
tests/qemuxml2argvtest.c | 96 ++++++++++++++++++++++------------------
1 file changed, 54 insertions(+), 42 deletions(-)
diff --git a/tests/qemuxml2argvtest.c b/tests/qemuxml2argvtest.c
index 1a936faef1..097dc6be51 100644
--- a/tests/qemuxml2argvtest.c
+++ b/tests/qemuxml2argvtest.c
@@ -621,10 +621,11 @@ testCompareXMLToArgv(const void *data)
static int
mymain(void)
{
- int ret = 0;
+ int ret = 0, i;
char *fakerootdir;
bool skipLegacyCPUs = false;
- char *capslatest_x86_64 = NULL;
+ const char *archs[] = { "x86_64", "s390x" };
+ virHashTablePtr capslatest = NULL;
if (VIR_STRDUP_QUIET(fakerootdir, FAKEROOTDIRTEMPLATE) < 0) {
fprintf(stderr, "Out of memory\n");
@@ -693,12 +694,23 @@ mymain(void)
if (VIR_STRDUP_QUIET(driver.config->memoryBackingDir,
"/var/lib/libvirt/qemu/ram") < 0)
return EXIT_FAILURE;
- if (!(capslatest_x86_64 = testQemuGetLatestCapsForArch(abs_srcdir
"/qemucapabilitiesdata",
- "x86_64",
"xml")))
+ capslatest = virHashCreate(4, virHashValueFree);
+ if (!capslatest)
return EXIT_FAILURE;
- VIR_TEST_VERBOSE("\nlatest caps x86_64: %s\n", capslatest_x86_64);
+ VIR_TEST_VERBOSE("\n");
+ for (i = 0; i < ARRAY_CARDINALITY(archs); ++i) {
+ char *cap = testQemuGetLatestCapsForArch(abs_srcdir
"/qemucapabilitiesdata",
+ archs[i], "xml");
+
+ if (!cap || virHashAddEntry(capslatest, archs[i], cap) < 0)
+ return EXIT_FAILURE;
+
+ VIR_TEST_VERBOSE("latest caps for %s: %s\n", archs[i], cap);
+ }
+
+ VIR_TEST_VERBOSE("\n");
/**
* The following set of macros allows testing of XML -> argv conversion with a
@@ -746,9 +758,9 @@ mymain(void)
# define DO_TEST_CAPS_VER(name, ver) \
DO_TEST_CAPS_ARCH_VER(name, "x86_64", ver)
-# define DO_TEST_CAPS_LATEST(name) \
- DO_TEST_CAPS_INTERNAL(name, "x86_64-latest", NULL, 0, 0,
"x86_64", \
- capslatest_x86_64, true)
+# define DO_TEST_CAPS_LATEST(name, arch) \
+ DO_TEST_CAPS_INTERNAL(name, arch "-latest", NULL, 0, 0, arch, \
+ virHashLookup(capslatest, arch), true)
/**
* The following test macros should be used only in cases when the tests require
@@ -822,8 +834,8 @@ mymain(void)
DO_TEST_PARSE_ERROR("minimal-no-memory", NONE);
DO_TEST("minimal-msg-timestamp", QEMU_CAPS_MSG_TIMESTAMP);
- DO_TEST_CAPS_LATEST("genid");
- DO_TEST_CAPS_LATEST("genid-auto");
+ DO_TEST_CAPS_LATEST("genid", "x86_64");
+ DO_TEST_CAPS_LATEST("genid-auto", "x86_64");
DO_TEST("machine-aliases1", NONE);
DO_TEST("machine-aliases2", QEMU_CAPS_KVM);
@@ -989,15 +1001,15 @@ mymain(void)
QEMU_CAPS_VIRTIO_SCSI);
DO_TEST("nosharepages", QEMU_CAPS_MEM_MERGE);
DO_TEST("disk-cdrom", NONE);
- DO_TEST_CAPS_LATEST("disk-cdrom");
+ DO_TEST_CAPS_LATEST("disk-cdrom", "x86_64");
DO_TEST("disk-iscsi", NONE);
DO_TEST("disk-cdrom-network", QEMU_CAPS_KVM);
- DO_TEST_CAPS_LATEST("disk-cdrom-network");
+ DO_TEST_CAPS_LATEST("disk-cdrom-network", "x86_64");
DO_TEST("disk-cdrom-tray",
QEMU_CAPS_VIRTIO_TX_ALG);
- DO_TEST_CAPS_LATEST("disk-cdrom-tray");
+ DO_TEST_CAPS_LATEST("disk-cdrom-tray", "x86_64");
DO_TEST("disk-floppy", NONE);
- DO_TEST_CAPS_LATEST("disk-floppy");
+ DO_TEST_CAPS_LATEST("disk-floppy", "x86_64");
DO_TEST_FAILURE("disk-floppy-pseries",
QEMU_CAPS_DEVICE_SPAPR_PCI_HOST_BRIDGE);
DO_TEST("disk-floppy-tray", NONE);
@@ -1020,47 +1032,47 @@ mymain(void)
QEMU_CAPS_DRIVE_BOOT);
DO_TEST("floppy-drive-fat",
QEMU_CAPS_DRIVE_BOOT);
- DO_TEST_CAPS_LATEST("floppy-drive-fat");
+ DO_TEST_CAPS_LATEST("floppy-drive-fat", "x86_64");
DO_TEST("disk-readonly-disk", NONE);
- DO_TEST_CAPS_LATEST("disk-readonly-disk");
+ DO_TEST_CAPS_LATEST("disk-readonly-disk", "x86_64");
DO_TEST("disk-fmt-qcow",
QEMU_CAPS_DRIVE_BOOT);
DO_TEST_PARSE_ERROR("disk-fmt-cow", QEMU_CAPS_DRIVE_BOOT);
DO_TEST_PARSE_ERROR("disk-fmt-dir", QEMU_CAPS_DRIVE_BOOT);
DO_TEST_PARSE_ERROR("disk-fmt-iso", QEMU_CAPS_DRIVE_BOOT);
DO_TEST("disk-shared", NONE);
- DO_TEST_CAPS_LATEST("disk-shared");
+ DO_TEST_CAPS_LATEST("disk-shared", "x86_64");
DO_TEST_PARSE_ERROR("disk-shared-qcow", NONE);
DO_TEST("disk-shared-locking",
QEMU_CAPS_VIRTIO_SCSI, QEMU_CAPS_DISK_SHARE_RW);
DO_TEST("disk-error-policy", NONE);
- DO_TEST_CAPS_LATEST("disk-error-policy");
+ DO_TEST_CAPS_LATEST("disk-error-policy", "x86_64");
DO_TEST("disk-cache", QEMU_CAPS_SCSI_LSI, QEMU_CAPS_DEVICE_USB_STORAGE);
DO_TEST_CAPS_VER("disk-cache", "2.6.0");
DO_TEST_CAPS_VER("disk-cache", "2.7.0");
- DO_TEST_CAPS_LATEST("disk-cache");
+ DO_TEST_CAPS_LATEST("disk-cache", "x86_64");
DO_TEST("disk-network-nbd", NONE);
- DO_TEST_CAPS_LATEST("disk-network-nbd");
+ DO_TEST_CAPS_LATEST("disk-network-nbd", "x86_64");
DO_TEST("disk-network-iscsi", QEMU_CAPS_VIRTIO_SCSI,
QEMU_CAPS_SCSI_BLOCK);
- DO_TEST_CAPS_LATEST("disk-network-iscsi");
+ DO_TEST_CAPS_LATEST("disk-network-iscsi", "x86_64");
DO_TEST_PARSE_ERROR("disk-network-iscsi-auth-secrettype-invalid", NONE);
DO_TEST_PARSE_ERROR("disk-network-iscsi-auth-wrong-secrettype", NONE);
DO_TEST_PARSE_ERROR("disk-network-source-auth-both", NONE);
DO_TEST("disk-network-gluster",
QEMU_CAPS_GLUSTER_DEBUG_LEVEL);
- DO_TEST_CAPS_LATEST("disk-network-gluster");
+ DO_TEST_CAPS_LATEST("disk-network-gluster", "x86_64");
DO_TEST_CAPS_VER("disk-network-rbd", "2.5.0");
- DO_TEST_CAPS_LATEST("disk-network-rbd");
+ DO_TEST_CAPS_LATEST("disk-network-rbd", "x86_64");
DO_TEST_FAILURE("disk-network-rbd-no-colon", NONE);
DO_TEST("disk-network-sheepdog", NONE);
- DO_TEST_CAPS_LATEST("disk-network-sheepdog");
+ DO_TEST_CAPS_LATEST("disk-network-sheepdog", "x86_64");
DO_TEST("disk-network-source-auth", NONE);
- DO_TEST_CAPS_LATEST("disk-network-source-auth");
+ DO_TEST_CAPS_LATEST("disk-network-source-auth", "x86_64");
DO_TEST("disk-network-vxhs", QEMU_CAPS_VXHS);
driver.config->vxhsTLS = 1;
DO_TEST("disk-network-tlsx509", QEMU_CAPS_VXHS,
QEMU_CAPS_OBJECT_TLS_CREDS_X509, QEMU_CAPS_NBD_TLS);
- DO_TEST_CAPS_LATEST("disk-network-tlsx509");
+ DO_TEST_CAPS_LATEST("disk-network-tlsx509", "x86_64");
driver.config->vxhsTLS = 0;
VIR_FREE(driver.config->vxhsTLSx509certdir);
DO_TEST("disk-no-boot",
@@ -1109,7 +1121,7 @@ mymain(void)
DO_TEST("disk-sata-device",
QEMU_CAPS_ICH9_AHCI);
DO_TEST("disk-aio", NONE);
- DO_TEST_CAPS_LATEST("disk-aio");
+ DO_TEST_CAPS_LATEST("disk-aio", "x86_64");
DO_TEST("disk-source-pool", NONE);
DO_TEST("disk-source-pool-mode", NONE);
DO_TEST("disk-ioeventfd",
@@ -1119,13 +1131,13 @@ mymain(void)
DO_TEST("disk-copy_on_read",
QEMU_CAPS_VIRTIO_TX_ALG,
QEMU_CAPS_VIRTIO_BLK_SCSI);
- DO_TEST_CAPS_LATEST("disk-copy_on_read");
+ DO_TEST_CAPS_LATEST("disk-copy_on_read", "x86_64");
DO_TEST("disk-discard",
QEMU_CAPS_DRIVE_DISCARD);
DO_TEST("disk-detect-zeroes",
QEMU_CAPS_DRIVE_DISCARD,
QEMU_CAPS_DRIVE_DETECT_ZEROES);
- DO_TEST_CAPS_LATEST("disk-detect-zeroes");
+ DO_TEST_CAPS_LATEST("disk-detect-zeroes", "x86_64");
DO_TEST("disk-snapshot", NONE);
DO_TEST_PARSE_ERROR("disk-same-targets",
QEMU_CAPS_SCSI_LSI,
@@ -1191,7 +1203,7 @@ mymain(void)
driver.config->vncTLSx509verify = 1;
DO_TEST("graphics-vnc-tls", QEMU_CAPS_VNC, QEMU_CAPS_DEVICE_CIRRUS_VGA);
DO_TEST_CAPS_VER("graphics-vnc-tls", "2.4.0");
- DO_TEST_CAPS_LATEST("graphics-vnc-tls");
+ DO_TEST_CAPS_LATEST("graphics-vnc-tls", "x86_64");
driver.config->vncSASL = driver.config->vncTLSx509verify =
driver.config->vncTLS = 0;
VIR_FREE(driver.config->vncSASLdir);
VIR_FREE(driver.config->vncTLSx509certdir);
@@ -1345,7 +1357,7 @@ mymain(void)
QEMU_CAPS_CHARDEV_FILE_APPEND);
DO_TEST("serial-unix-chardev",
QEMU_CAPS_DEVICE_ISA_SERIAL);
- DO_TEST_CAPS_LATEST("serial-unix-chardev");
+ DO_TEST_CAPS_LATEST("serial-unix-chardev", "x86_64");
DO_TEST("serial-tcp-chardev",
QEMU_CAPS_DEVICE_ISA_SERIAL);
DO_TEST("serial-udp-chardev",
@@ -1584,10 +1596,10 @@ mymain(void)
QEMU_CAPS_DEVICE_VFIO_PCI);
DO_TEST_PARSE_ERROR("hostdev-mdev-invalid-target-address",
QEMU_CAPS_DEVICE_VFIO_PCI);
- DO_TEST_CAPS_LATEST("hostdev-mdev-display-spice-opengl");
- DO_TEST_CAPS_LATEST("hostdev-mdev-display-spice-egl-headless");
- DO_TEST_CAPS_LATEST("hostdev-mdev-display-vnc");
- DO_TEST_CAPS_LATEST("hostdev-mdev-display-vnc-egl-headless");
+ DO_TEST_CAPS_LATEST("hostdev-mdev-display-spice-opengl",
"x86_64");
+ DO_TEST_CAPS_LATEST("hostdev-mdev-display-spice-egl-headless",
"x86_64");
+ DO_TEST_CAPS_LATEST("hostdev-mdev-display-vnc", "x86_64");
+ DO_TEST_CAPS_LATEST("hostdev-mdev-display-vnc-egl-headless",
"x86_64");
DO_TEST_PARSE_ERROR("hostdev-mdev-display-missing-graphics",
QEMU_CAPS_DEVICE_VFIO_PCI,
QEMU_CAPS_VFIO_PCI_DISPLAY);
@@ -2066,8 +2078,8 @@ mymain(void)
QEMU_CAPS_DEVICE_TPM_PASSTHROUGH, QEMU_CAPS_DEVICE_TPM_CRB);
DO_TEST_PARSE_ERROR("tpm-no-backend-invalid",
QEMU_CAPS_DEVICE_TPM_PASSTHROUGH, QEMU_CAPS_DEVICE_TPM_TIS);
- DO_TEST_CAPS_LATEST("tpm-emulator");
- DO_TEST_CAPS_LATEST("tpm-emulator-tpm2");
+ DO_TEST_CAPS_LATEST("tpm-emulator", "x86_64");
+ DO_TEST_CAPS_LATEST("tpm-emulator-tpm2", "x86_64");
DO_TEST_PARSE_ERROR("pci-domain-invalid", NONE);
DO_TEST_PARSE_ERROR("pci-bus-invalid", NONE);
@@ -2890,9 +2902,9 @@ mymain(void)
QEMU_CAPS_PIIX_DISABLE_S3, QEMU_CAPS_PIIX_DISABLE_S4,
QEMU_CAPS_ICH9_USB_EHCI1);
- DO_TEST_CAPS_LATEST("disk-virtio-scsi-reservations");
+ DO_TEST_CAPS_LATEST("disk-virtio-scsi-reservations", "x86_64");
- DO_TEST_CAPS_LATEST("tseg-explicit-size");
+ DO_TEST_CAPS_LATEST("tseg-explicit-size", "x86_64");
DO_TEST_PARSE_ERROR("tseg-i440fx",
QEMU_CAPS_DEVICE_DMI_TO_PCI_BRIDGE,
QEMU_CAPS_DEVICE_PCI_BRIDGE,
@@ -2932,8 +2944,8 @@ mymain(void)
QEMU_CAPS_DEVICE_VIRTIO_MOUSE_CCW,
QEMU_CAPS_DEVICE_VIRTIO_TABLET_CCW);
- DO_TEST_CAPS_LATEST("vhost-vsock");
- DO_TEST_CAPS_LATEST("vhost-vsock-auto");
+ DO_TEST_CAPS_LATEST("vhost-vsock", "x86_64");
+ DO_TEST_CAPS_LATEST("vhost-vsock-auto", "x86_64");
DO_TEST("launch-security-sev",
QEMU_CAPS_KVM,
@@ -2945,7 +2957,7 @@ mymain(void)
VIR_FREE(driver.config->nbdTLSx509certdir);
qemuTestDriverFree(&driver);
VIR_FREE(fakerootdir);
- VIR_FREE(capslatest_x86_64);
+ virHashFree(capslatest);
return ret == 0 ? EXIT_SUCCESS : EXIT_FAILURE;
}
--
2.17.0
6:59 a.m.
New subject: [libvirt] [PATCH v2 1/3] tests: qemuxml2argv: make CAPS_LATEST arch generic
On Tue, Jul 24, 2018 at 13:31:04 +0200, Boris Fiuczynski wrote:
From: Bjoern Walk <bwalk(a)linux.ibm.com>
Testing with the latest capabilities has been x86_64 centric. Let's
remove the hardcoded architecture and give the user the ability to
specify the desired architecture in the macro.
Signed-off-by: Bjoern Walk <bwalk(a)linux.ibm.com>
Reviewed-by: Boris Fiuczynski <fiuczy(a)linux.ibm.com>
---
tests/qemuxml2argvtest.c | 96 ++++++++++++++++++++++------------------
1 file changed, 54 insertions(+), 42 deletions(-)
[...]
@@ -746,9 +758,9 @@ mymain(void)
# define DO_TEST_CAPS_VER(name, ver) \
DO_TEST_CAPS_ARCH_VER(name, "x86_64", ver)
-# define DO_TEST_CAPS_LATEST(name) \
- DO_TEST_CAPS_INTERNAL(name, "x86_64-latest", NULL, 0, 0,
"x86_64", \
- capslatest_x86_64, true)
+# define DO_TEST_CAPS_LATEST(name, arch) \
+ DO_TEST_CAPS_INTERNAL(name, arch "-latest", NULL, 0, 0, arch, \
+ virHashLookup(capslatest, arch), true)
Please add a DO_TEST_CAPS_LATEST_ARCH version rather than modifying all
of the calls. We have a vast majority of x86_64 tests so we should not
need to change them.
7:54 a.m.
New subject: [libvirt] [PATCH v2 1/3] tests: qemuxml2argv: make CAPS_LATEST arch generic
On 07/24/2018 01:59 PM, Peter Krempa wrote:
On Tue, Jul 24, 2018 at 13:31:04 +0200, Boris Fiuczynski wrote:
> From: Bjoern Walk <bwalk(a)linux.ibm.com>
>
> Testing with the latest capabilities has been x86_64 centric. Let's
> remove the hardcoded architecture and give the user the ability to
> specify the desired architecture in the macro.
>
> Signed-off-by: Bjoern Walk <bwalk(a)linux.ibm.com>
> Reviewed-by: Boris Fiuczynski <fiuczy(a)linux.ibm.com>
> ---
> tests/qemuxml2argvtest.c | 96 ++++++++++++++++++++++------------------
> 1 file changed, 54 insertions(+), 42 deletions(-)
[...]
> @@ -746,9 +758,9 @@ mymain(void)
> # define DO_TEST_CAPS_VER(name, ver) \
> DO_TEST_CAPS_ARCH_VER(name, "x86_64", ver)
>
> -# define DO_TEST_CAPS_LATEST(name) \
> - DO_TEST_CAPS_INTERNAL(name, "x86_64-latest", NULL, 0, 0,
"x86_64", \
> - capslatest_x86_64, true)
> +# define DO_TEST_CAPS_LATEST(name, arch) \
> + DO_TEST_CAPS_INTERNAL(name, arch "-latest", NULL, 0, 0, arch, \
> + virHashLookup(capslatest, arch), true)
Please add a DO_TEST_CAPS_LATEST_ARCH version rather than modifying all
of the calls. We have a vast majority of x86_64 tests so we should not
need to change them.
I think that too many code changes (they are already available in this
patch anyway) should not be the reason to hide the architecture x86_64
in DO_TEST_CAPS_LATEST and to introduce a new macro
DO_TEST_CAPS_LATEST_ARCH for all other architectures (including x86_64).
Would you prefer architecture specific macros instead? e.g. rename
DO_TEST_CAPS_LATEST to DO_TEST_CAPS_LATEST_X86_64 and create a new
DO_TEST_CAPS_LATEST_S390.
--
libvir-list mailing list
libvir-list(a)redhat.com
https://www.redhat.com/mailman/listinfo/libvir-list
--
Mit freundlichen Grüßen/Kind regards
Boris Fiuczynski
IBM Deutschland Research & Development GmbH
Vorsitzender des Aufsichtsrats: Martina Köderitz
Geschäftsführung: Dirk Wittkopp
Sitz der Gesellschaft: Böblingen
Registergericht: Amtsgericht Stuttgart, HRB 243294
6:31 a.m.
New subject: [libvirt] [PATCH v2 2/3] qemu: Add ccw support for vhost-vsock
Add support and tests for vhost-vsock-ccw.
Signed-off-by: Boris Fiuczynski <fiuczy(a)linux.ibm.com>
---
src/qemu/qemu_command.c | 8 +++--
src/qemu/qemu_domain.c | 10 ++++--
src/qemu/qemu_domain_address.c | 7 +++-
.../vhost-vsock-ccw-auto.s390x-latest.args | 32 +++++++++++++++++++
.../qemuxml2argvdata/vhost-vsock-ccw-auto.xml | 25 +++++++++++++++
.../vhost-vsock-ccw.s390x-latest.args | 32 +++++++++++++++++++
tests/qemuxml2argvdata/vhost-vsock-ccw.xml | 32 +++++++++++++++++++
tests/qemuxml2argvtest.c | 2 ++
.../vhost-vsock-ccw-auto.xml | 32 +++++++++++++++++++
tests/qemuxml2xmloutdata/vhost-vsock-ccw.xml | 1 +
tests/qemuxml2xmltest.c | 5 +++
11 files changed, 181 insertions(+), 5 deletions(-)
create mode 100644 tests/qemuxml2argvdata/vhost-vsock-ccw-auto.s390x-latest.args
create mode 100644 tests/qemuxml2argvdata/vhost-vsock-ccw-auto.xml
create mode 100644 tests/qemuxml2argvdata/vhost-vsock-ccw.s390x-latest.args
create mode 100644 tests/qemuxml2argvdata/vhost-vsock-ccw.xml
create mode 100644 tests/qemuxml2xmloutdata/vhost-vsock-ccw-auto.xml
create mode 120000 tests/qemuxml2xmloutdata/vhost-vsock-ccw.xml
diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c
index ae45c45b7f..fa645f3167 100644
--- a/src/qemu/qemu_command.c
+++ b/src/qemu/qemu_command.c
@@ -10217,10 +10217,14 @@ qemuBuildVsockDevStr(virDomainDefPtr def,
{
qemuDomainVsockPrivatePtr priv = (qemuDomainVsockPrivatePtr)vsock->privateData;
virBuffer buf = VIR_BUFFER_INITIALIZER;
- const char *device = "vhost-vsock-pci";
char *ret = NULL;
- virBufferAsprintf(&buf, "%s", device);
+ if (vsock->info.type == VIR_DOMAIN_DEVICE_ADDRESS_TYPE_CCW) {
+ virBufferAddLit(&buf, "vhost-vsock-ccw");
+ } else {
+ virBufferAddLit(&buf, "vhost-vsock-pci");
+ }
+
virBufferAsprintf(&buf, ",id=%s", vsock->info.alias);
virBufferAsprintf(&buf, ",guest-cid=%u", vsock->guest_cid);
virBufferAsprintf(&buf, ",vhostfd=%s%u", fdprefix, priv->vhostfd);
diff --git a/src/qemu/qemu_domain.c b/src/qemu/qemu_domain.c
index de056272e8..6b50e0c484 100644
--- a/src/qemu/qemu_domain.c
+++ b/src/qemu/qemu_domain.c
@@ -5546,7 +5546,8 @@ qemuDomainDeviceDefValidateMemory(const virDomainMemoryDef *memory
ATTRIBUTE_UNU
static int
-qemuDomainDeviceDefValidateVsock(const virDomainVsockDef *vsock ATTRIBUTE_UNUSED,
+qemuDomainDeviceDefValidateVsock(const virDomainVsockDef *vsock,
+ const virDomainDef *def,
virQEMUCapsPtr qemuCaps)
{
if (!virQEMUCapsGet(qemuCaps, QEMU_CAPS_DEVICE_VHOST_VSOCK)) {
@@ -5555,6 +5556,11 @@ qemuDomainDeviceDefValidateVsock(const virDomainVsockDef *vsock
ATTRIBUTE_UNUSED
"with this QEMU binary"));
return -1;
}
+
+ if (!qemuDomainCheckCCWS390AddressSupport(def, vsock->info, qemuCaps,
+ "vsock"))
+ return -1;
+
return 0;
}
@@ -5702,7 +5708,7 @@ qemuDomainDeviceDefValidate(const virDomainDeviceDef *dev,
break;
case VIR_DOMAIN_DEVICE_VSOCK:
- ret = qemuDomainDeviceDefValidateVsock(dev->data.vsock, qemuCaps);
+ ret = qemuDomainDeviceDefValidateVsock(dev->data.vsock, def, qemuCaps);
break;
case VIR_DOMAIN_DEVICE_TPM:
diff --git a/src/qemu/qemu_domain_address.c b/src/qemu/qemu_domain_address.c
index 1210d4acdd..67de340358 100644
--- a/src/qemu/qemu_domain_address.c
+++ b/src/qemu/qemu_domain_address.c
@@ -306,7 +306,8 @@ qemuDomainPrimeVirtioDeviceAddresses(virDomainDefPtr def,
declare address-less virtio devices to be of address type 'type'
disks, networks, videos, consoles, controllers, memballoon and rng
in this order
- if type is ccw filesystem devices are declared to be of address type ccw
+ if type is ccw filesystem and vsock devices are declared to be of
+ address type ccw
*/
size_t i;
@@ -373,6 +374,10 @@ qemuDomainPrimeVirtioDeviceAddresses(virDomainDefPtr def,
if (def->fss[i]->info.type == VIR_DOMAIN_DEVICE_ADDRESS_TYPE_NONE)
def->fss[i]->info.type = type;
}
+ if (def->vsock &&
+ def->vsock->info.type == VIR_DOMAIN_DEVICE_ADDRESS_TYPE_NONE) {
+ def->vsock->info.type = type;
+ }
}
}
diff --git a/tests/qemuxml2argvdata/vhost-vsock-ccw-auto.s390x-latest.args
b/tests/qemuxml2argvdata/vhost-vsock-ccw-auto.s390x-latest.args
new file mode 100644
index 0000000000..6092f8e85c
--- /dev/null
+++ b/tests/qemuxml2argvdata/vhost-vsock-ccw-auto.s390x-latest.args
@@ -0,0 +1,32 @@
+LC_ALL=C \
+PATH=/bin \
+HOME=/home/test \
+USER=test \
+LOGNAME=test \
+QEMU_AUDIO_DRV=none \
+/usr/bin/qemu-system-s390x \
+-name guest=QEMUGuest1,debug-threads=on \
+-S \
+-object secret,id=masterKey0,format=raw,\
+file=/tmp/lib/domain--1-QEMUGuest1/master-key.aes \
+-machine s390-ccw-virtio,accel=tcg,usb=off,dump-guest-core=off \
+-m 214 \
+-realtime mlock=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,nowait \
+-mon chardev=charmonitor,id=monitor,mode=control \
+-rtc base=utc \
+-no-shutdown \
+-boot strict=on \
+-drive file=/dev/HostVG/QEMUGuest1,format=raw,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 \
+-device virtio-balloon-ccw,id=balloon0,devno=fe.0.0001 \
+-sandbox on,obsolete=deny,elevateprivileges=deny,spawn=deny,\
+resourcecontrol=deny \
+-device vhost-vsock-ccw,id=vsock0,guest-cid=42,vhostfd=6789,devno=fe.0.0002 \
+-msg timestamp=on
diff --git a/tests/qemuxml2argvdata/vhost-vsock-ccw-auto.xml
b/tests/qemuxml2argvdata/vhost-vsock-ccw-auto.xml
new file mode 100644
index 0000000000..e5b60765ab
--- /dev/null
+++ b/tests/qemuxml2argvdata/vhost-vsock-ccw-auto.xml
@@ -0,0 +1,25 @@
+<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='s390x' machine='s390-ccw-virtio'>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-s390x</emulator>
+ <disk type='block' device='disk'>
+ <source dev='/dev/HostVG/QEMUGuest1'/>
+ <target dev='hda' bus='virtio'/>
+ </disk>
+ <vsock>
+ <cid auto='yes'/>
+ </vsock>
+ </devices>
+</domain>
diff --git a/tests/qemuxml2argvdata/vhost-vsock-ccw.s390x-latest.args
b/tests/qemuxml2argvdata/vhost-vsock-ccw.s390x-latest.args
new file mode 100644
index 0000000000..93eb3f3430
--- /dev/null
+++ b/tests/qemuxml2argvdata/vhost-vsock-ccw.s390x-latest.args
@@ -0,0 +1,32 @@
+LC_ALL=C \
+PATH=/bin \
+HOME=/home/test \
+USER=test \
+LOGNAME=test \
+QEMU_AUDIO_DRV=none \
+/usr/bin/qemu-system-s390x \
+-name guest=QEMUGuest1,debug-threads=on \
+-S \
+-object secret,id=masterKey0,format=raw,\
+file=/tmp/lib/domain--1-QEMUGuest1/master-key.aes \
+-machine s390-ccw-virtio,accel=tcg,usb=off,dump-guest-core=off \
+-m 214 \
+-realtime mlock=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,nowait \
+-mon chardev=charmonitor,id=monitor,mode=control \
+-rtc base=utc \
+-no-shutdown \
+-boot strict=on \
+-drive file=/dev/HostVG/QEMUGuest1,format=raw,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 \
+-device virtio-balloon-ccw,id=balloon0,devno=fe.0.0001 \
+-sandbox on,obsolete=deny,elevateprivileges=deny,spawn=deny,\
+resourcecontrol=deny \
+-device vhost-vsock-ccw,id=vsock0,guest-cid=4,vhostfd=6789,devno=fe.0.0003 \
+-msg timestamp=on
diff --git a/tests/qemuxml2argvdata/vhost-vsock-ccw.xml
b/tests/qemuxml2argvdata/vhost-vsock-ccw.xml
new file mode 100644
index 0000000000..083061c6cc
--- /dev/null
+++ b/tests/qemuxml2argvdata/vhost-vsock-ccw.xml
@@ -0,0 +1,32 @@
+<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='s390x' machine='s390-ccw-virtio'>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-s390x</emulator>
+ <disk type='block' device='disk'>
+ <driver name='qemu' type='raw'/>
+ <source dev='/dev/HostVG/QEMUGuest1'/>
+ <target dev='hda' bus='virtio'/>
+ <address type='ccw' cssid='0xfe' ssid='0x0'
devno='0x0000'/>
+ </disk>
+ <memballoon model='virtio'>
+ <address type='ccw' cssid='0xfe' ssid='0x0'
devno='0x0001'/>
+ </memballoon>
+ <panic model='s390'/>
+ <vsock model='virtio'>
+ <cid auto='no' address='4'/>
+ <address type='ccw' cssid='0xfe' ssid='0x0'
devno='0x0003'/>
+ </vsock>
+ </devices>
+</domain>
diff --git a/tests/qemuxml2argvtest.c b/tests/qemuxml2argvtest.c
index 097dc6be51..7fdcd9292c 100644
--- a/tests/qemuxml2argvtest.c
+++ b/tests/qemuxml2argvtest.c
@@ -2946,6 +2946,8 @@ mymain(void)
DO_TEST_CAPS_LATEST("vhost-vsock", "x86_64");
DO_TEST_CAPS_LATEST("vhost-vsock-auto", "x86_64");
+ DO_TEST_CAPS_LATEST("vhost-vsock-ccw", "s390x");
+ DO_TEST_CAPS_LATEST("vhost-vsock-ccw-auto", "s390x");
DO_TEST("launch-security-sev",
QEMU_CAPS_KVM,
diff --git a/tests/qemuxml2xmloutdata/vhost-vsock-ccw-auto.xml
b/tests/qemuxml2xmloutdata/vhost-vsock-ccw-auto.xml
new file mode 100644
index 0000000000..38a0fb3808
--- /dev/null
+++ b/tests/qemuxml2xmloutdata/vhost-vsock-ccw-auto.xml
@@ -0,0 +1,32 @@
+<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='s390x' machine='s390-ccw-virtio'>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-s390x</emulator>
+ <disk type='block' device='disk'>
+ <driver name='qemu' type='raw'/>
+ <source dev='/dev/HostVG/QEMUGuest1'/>
+ <target dev='hda' bus='virtio'/>
+ <address type='ccw' cssid='0xfe' ssid='0x0'
devno='0x0000'/>
+ </disk>
+ <memballoon model='virtio'>
+ <address type='ccw' cssid='0xfe' ssid='0x0'
devno='0x0001'/>
+ </memballoon>
+ <panic model='s390'/>
+ <vsock model='virtio'>
+ <cid auto='yes'/>
+ <address type='ccw' cssid='0xfe' ssid='0x0'
devno='0x0002'/>
+ </vsock>
+ </devices>
+</domain>
diff --git a/tests/qemuxml2xmloutdata/vhost-vsock-ccw.xml
b/tests/qemuxml2xmloutdata/vhost-vsock-ccw.xml
new file mode 120000
index 0000000000..e0fa69dba9
--- /dev/null
+++ b/tests/qemuxml2xmloutdata/vhost-vsock-ccw.xml
@@ -0,0 +1 @@
+../qemuxml2argvdata/vhost-vsock-ccw.xml
\ No newline at end of file
diff --git a/tests/qemuxml2xmltest.c b/tests/qemuxml2xmltest.c
index 795ddc7003..015cd9e38e 100644
--- a/tests/qemuxml2xmltest.c
+++ b/tests/qemuxml2xmltest.c
@@ -1209,6 +1209,11 @@ mymain(void)
DO_TEST("vhost-vsock", QEMU_CAPS_DEVICE_VHOST_VSOCK);
DO_TEST("vhost-vsock-auto", QEMU_CAPS_DEVICE_VHOST_VSOCK);
+ DO_TEST("vhost-vsock-ccw", QEMU_CAPS_DEVICE_VHOST_VSOCK,
+ QEMU_CAPS_CCW);
+ DO_TEST("vhost-vsock-ccw-auto", QEMU_CAPS_DEVICE_VHOST_VSOCK,
+ QEMU_CAPS_CCW);
+
if (getenv("LIBVIRT_SKIP_CLEANUP") == NULL)
virFileDeleteTree(fakerootdir);
--
2.17.0
6:31 a.m.
New subject: [libvirt] [PATCH v2 3/3] news: Update for vhost-vsock-ccw support
Signed-off-by: Boris Fiuczynski <fiuczy(a)linux.ibm.com>
---
docs/news.xml | 8 ++++++++
1 file changed, 8 insertions(+)
diff --git a/docs/news.xml b/docs/news.xml
index 20c2ff7a6f..4c70499d84 100644
--- a/docs/news.xml
+++ b/docs/news.xml
@@ -67,6 +67,14 @@
only rendering devices within the guest.
</description>
</change>
+ <change>
+ <summary>
+ qemu: Add ccw support for vhost-vsock
+ </summary>
+ <description>
+ Support the vhost-vsock-ccw device on S390.
+ </description>
+ </change>
</section>
<section title="Bug fixes">
</section>
--
2.17.0
2313
days inactive
2313
days old
5 comments
2 participants
participants (2)
-
Boris Fiuczynski -
Peter Krempa