From nobody Fri Mar 29 14:34:17 2024
Delivered-To: importer@patchew.org
Received-SPF: pass (zoho.com: domain of redhat.com designates 209.132.183.28
as permitted sender) client-ip=209.132.183.28;
envelope-from=libvir-list-bounces@redhat.com; helo=mx1.redhat.com;
Authentication-Results: mx.zohomail.com;
spf=pass (zoho.com: domain of redhat.com designates 209.132.183.28 as
permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com;
dmarc=pass(p=none dis=none) header.from=redhat.com
Return-Path:
Received: from mx1.redhat.com (mx1.redhat.com [209.132.183.28]) by
mx.zohomail.com
with SMTPS id 1549663947873178.86659615553594;
Fri, 8 Feb 2019 14:12:27 -0800 (PST)
Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.phx2.redhat.com
[10.5.11.15])
(using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits))
(No client certificate requested)
by mx1.redhat.com (Postfix) with ESMTPS id E4E9959450;
Fri, 8 Feb 2019 22:12:25 +0000 (UTC)
Received: from colo-mx.corp.redhat.com
(colo-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.21])
by smtp.corp.redhat.com (Postfix) with ESMTPS id 2C1455B682;
Fri, 8 Feb 2019 22:12:25 +0000 (UTC)
Received: from lists01.pubmisc.prod.ext.phx2.redhat.com
(lists01.pubmisc.prod.ext.phx2.redhat.com [10.5.19.33])
by colo-mx.corp.redhat.com (Postfix) with ESMTP id 18BED3F7D0;
Fri, 8 Feb 2019 22:12:20 +0000 (UTC)
Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.phx2.redhat.com
[10.5.11.16])
by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP
id x18MCJau008383 for ;
Fri, 8 Feb 2019 17:12:19 -0500
Received: by smtp.corp.redhat.com (Postfix)
id 91E8A5C6A6; Fri, 8 Feb 2019 22:12:19 +0000 (UTC)
Received: from worklaptop.redhat.com (ovpn-123-115.rdu2.redhat.com
[10.10.123.115])
by smtp.corp.redhat.com (Postfix) with ESMTP id 1B37B5C6A5;
Fri, 8 Feb 2019 22:12:19 +0000 (UTC)
From: Cole Robinson
To: libvirt-list@redhat.com
Date: Fri, 8 Feb 2019 17:11:52 -0500
Message-Id:
<68983230e2f6aad3b1e1e9178f689de5172833b9.1549663396.git.crobinso@redhat.com>
In-Reply-To:
References:
MIME-Version: 1.0
X-Scanned-By: MIMEDefang 2.79 on 10.5.11.16
X-loop: libvir-list@redhat.com
Cc: Andrea Bolognani
Subject: [libvirt] [PATCH v3 01/17] qemu: command: Add qemuCaps to
BuildVirtioStr
X-BeenThere: libvir-list@redhat.com
X-Mailman-Version: 2.1.12
Precedence: junk
List-Id: Development discussions about the libvirt library & tools
List-Unsubscribe: ,
List-Archive:
List-Post:
List-Help:
List-Subscribe: ,
Content-Transfer-Encoding: quoted-printable
Sender: libvir-list-bounces@redhat.com
Errors-To: libvir-list-bounces@redhat.com
X-Scanned-By: MIMEDefang 2.79 on 10.5.11.15
X-Greylist: Sender IP whitelisted,
not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.39]);
Fri, 08 Feb 2019 22:12:26 +0000 (UTC)
Content-Type: text/plain; charset="utf-8"
It will be used in future patches
Reviewed-by: Andrea Bolognani
Signed-off-by: Cole Robinson
---
src/qemu/qemu_command.c | 30 ++++++++++++++++--------------
1 file changed, 16 insertions(+), 14 deletions(-)
diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c
index 572d3bc20f..a26f6291ac 100644
--- a/src/qemu/qemu_command.c
+++ b/src/qemu/qemu_command.c
@@ -409,6 +409,7 @@ qemuBuildDeviceAddressStr(virBufferPtr buf,
* qemuBuildVirtioDevStr
* @buf: virBufferPtr to append the built string
* @baseName: qemu virtio device basename string. Ex: virtio-rng for
+ * @qemuCaps: virQEMUCapPtr
* @devtype: virDomainDeviceType of the device. Ex: VIR_DOMAIN_DEVICE_TYPE=
_RNG
* @devdata: *DefPtr of the device definition
*
@@ -422,6 +423,7 @@ qemuBuildDeviceAddressStr(virBufferPtr buf,
static int
qemuBuildVirtioDevStr(virBufferPtr buf,
const char *baseName,
+ virQEMUCapsPtr qemuCaps ATTRIBUTE_UNUSED,
virDomainDeviceType devtype,
void *devdata)
{
@@ -2078,7 +2080,7 @@ qemuBuildDiskDeviceStr(const virDomainDef *def,
break;
=20
case VIR_DOMAIN_DISK_BUS_VIRTIO:
- if (qemuBuildVirtioDevStr(&opt, "virtio-blk",
+ if (qemuBuildVirtioDevStr(&opt, "virtio-blk", qemuCaps,
VIR_DOMAIN_DEVICE_DISK, disk) < 0) {
goto error;
}
@@ -2673,7 +2675,7 @@ qemuBuildFSDevStr(const virDomainDef *def,
goto error;
}
=20
- if (qemuBuildVirtioDevStr(&opt, "virtio-9p",
+ if (qemuBuildVirtioDevStr(&opt, "virtio-9p", qemuCaps,
VIR_DOMAIN_DEVICE_FS, fs) < 0) {
goto error;
}
@@ -2880,7 +2882,7 @@ qemuBuildControllerDevStr(const virDomainDef *domainD=
ef,
case VIR_DOMAIN_CONTROLLER_TYPE_SCSI:
switch ((virDomainControllerModelSCSI) def->model) {
case VIR_DOMAIN_CONTROLLER_MODEL_SCSI_VIRTIO_SCSI:
- if (qemuBuildVirtioDevStr(&buf, "virtio-scsi",
+ if (qemuBuildVirtioDevStr(&buf, "virtio-scsi", qemuCaps,
VIR_DOMAIN_DEVICE_CONTROLLER, def) <=
0) {
goto error;
}
@@ -2923,7 +2925,7 @@ qemuBuildControllerDevStr(const virDomainDef *domainD=
ef,
break;
=20
case VIR_DOMAIN_CONTROLLER_TYPE_VIRTIO_SERIAL:
- if (qemuBuildVirtioDevStr(&buf, "virtio-serial",
+ if (qemuBuildVirtioDevStr(&buf, "virtio-serial", qemuCaps,
VIR_DOMAIN_DEVICE_CONTROLLER, def) < 0) {
goto error;
}
@@ -3745,7 +3747,7 @@ qemuBuildNicDevStr(virDomainDefPtr def,
char macaddr[VIR_MAC_STRING_BUFLEN];
=20
if (virDomainNetIsVirtioModel(net)) {
- if (qemuBuildVirtioDevStr(&buf, "virtio-net",
+ if (qemuBuildVirtioDevStr(&buf, "virtio-net", qemuCaps,
VIR_DOMAIN_DEVICE_NET, net) < 0) {
goto error;
}
@@ -4141,7 +4143,7 @@ qemuBuildMemballoonCommandLine(virCommandPtr cmd,
if (!virDomainDefHasMemballoon(def))
return 0;
=20
- if (qemuBuildVirtioDevStr(&buf, "virtio-balloon",
+ if (qemuBuildVirtioDevStr(&buf, "virtio-balloon", qemuCaps,
VIR_DOMAIN_DEVICE_MEMBALLOON,
def->memballoon) < 0) {
goto error;
@@ -4241,25 +4243,25 @@ qemuBuildVirtioInputDevStr(const virDomainDef *def,
=20
switch ((virDomainInputType)dev->type) {
case VIR_DOMAIN_INPUT_TYPE_MOUSE:
- if (qemuBuildVirtioDevStr(&buf, "virtio-mouse",
+ if (qemuBuildVirtioDevStr(&buf, "virtio-mouse", qemuCaps,
VIR_DOMAIN_DEVICE_INPUT, dev) < 0) {
goto error;
}
break;
case VIR_DOMAIN_INPUT_TYPE_TABLET:
- if (qemuBuildVirtioDevStr(&buf, "virtio-tablet",
+ if (qemuBuildVirtioDevStr(&buf, "virtio-tablet", qemuCaps,
VIR_DOMAIN_DEVICE_INPUT, dev) < 0) {
goto error;
}
break;
case VIR_DOMAIN_INPUT_TYPE_KBD:
- if (qemuBuildVirtioDevStr(&buf, "virtio-keyboard",
+ if (qemuBuildVirtioDevStr(&buf, "virtio-keyboard", qemuCaps,
VIR_DOMAIN_DEVICE_INPUT, dev) < 0) {
goto error;
}
break;
case VIR_DOMAIN_INPUT_TYPE_PASSTHROUGH:
- if (qemuBuildVirtioDevStr(&buf, "virtio-input-host",
+ if (qemuBuildVirtioDevStr(&buf, "virtio-input-host", qemuCaps,
VIR_DOMAIN_DEVICE_INPUT, dev) < 0) {
goto error;
}
@@ -4580,7 +4582,7 @@ qemuBuildDeviceVideoStr(const virDomainDef *def,
}
=20
if (STREQ(model, "virtio-gpu")) {
- if (qemuBuildVirtioDevStr(&buf, "virtio-gpu",
+ if (qemuBuildVirtioDevStr(&buf, "virtio-gpu", qemuCaps,
VIR_DOMAIN_DEVICE_VIDEO, video) < 0) {
goto error;
}
@@ -5028,7 +5030,7 @@ qemuBuildSCSIVHostHostdevDevStr(const virDomainDef *d=
ef,
goto cleanup;
}
=20
- if (qemuBuildVirtioDevStr(&buf, "vhost-scsi",
+ if (qemuBuildVirtioDevStr(&buf, "vhost-scsi", qemuCaps,
VIR_DOMAIN_DEVICE_HOSTDEV, dev) < 0) {
goto cleanup;
}
@@ -5978,7 +5980,7 @@ qemuBuildRNGDevStr(const virDomainDef *def,
dev->source.file))
goto error;
=20
- if (qemuBuildVirtioDevStr(&buf, "virtio-rng",
+ if (qemuBuildVirtioDevStr(&buf, "virtio-rng", qemuCaps,
VIR_DOMAIN_DEVICE_RNG, dev) < 0) {
goto error;
}
@@ -10449,7 +10451,7 @@ qemuBuildVsockDevStr(virDomainDefPtr def,
char *ret =3D NULL;
=20
=20
- if (qemuBuildVirtioDevStr(&buf, "vhost-vsock",
+ if (qemuBuildVirtioDevStr(&buf, "vhost-vsock", qemuCaps,
VIR_DOMAIN_DEVICE_VSOCK, vsock) < 0) {
goto cleanup;
}
--=20
2.20.1
--
libvir-list mailing list
libvir-list@redhat.com
https://www.redhat.com/mailman/listinfo/libvir-list
From nobody Fri Mar 29 14:34:17 2024
Delivered-To: importer@patchew.org
Received-SPF: pass (zoho.com: domain of redhat.com designates 209.132.183.28
as permitted sender) client-ip=209.132.183.28;
envelope-from=libvir-list-bounces@redhat.com; helo=mx1.redhat.com;
Authentication-Results: mx.zohomail.com;
spf=pass (zoho.com: domain of redhat.com designates 209.132.183.28 as
permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com;
dmarc=pass(p=none dis=none) header.from=redhat.com
Return-Path:
Received: from mx1.redhat.com (mx1.redhat.com [209.132.183.28]) by
mx.zohomail.com
with SMTPS id 1549663967123466.36336337377054;
Fri, 8 Feb 2019 14:12:47 -0800 (PST)
Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com
[10.5.11.12])
(using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits))
(No client certificate requested)
by mx1.redhat.com (Postfix) with ESMTPS id 6F493C051671;
Fri, 8 Feb 2019 22:12:45 +0000 (UTC)
Received: from colo-mx.corp.redhat.com
(colo-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.20])
by smtp.corp.redhat.com (Postfix) with ESMTPS id 367836116C;
Fri, 8 Feb 2019 22:12:45 +0000 (UTC)
Received: from lists01.pubmisc.prod.ext.phx2.redhat.com
(lists01.pubmisc.prod.ext.phx2.redhat.com [10.5.19.33])
by colo-mx.corp.redhat.com (Postfix) with ESMTP id D80FB1803390;
Fri, 8 Feb 2019 22:12:44 +0000 (UTC)
Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.phx2.redhat.com
[10.5.11.16])
by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP
id x18MCKVC008388 for ;
Fri, 8 Feb 2019 17:12:20 -0500
Received: by smtp.corp.redhat.com (Postfix)
id 321975C557; Fri, 8 Feb 2019 22:12:20 +0000 (UTC)
Received: from worklaptop.redhat.com (ovpn-123-115.rdu2.redhat.com
[10.10.123.115])
by smtp.corp.redhat.com (Postfix) with ESMTP id BF2675C6A5;
Fri, 8 Feb 2019 22:12:19 +0000 (UTC)
From: Cole Robinson
To: libvirt-list@redhat.com
Date: Fri, 8 Feb 2019 17:11:53 -0500
Message-Id:
<4647912f8705da4ba81e011e0dd652e1bfdf1ee2.1549663396.git.crobinso@redhat.com>
In-Reply-To:
References:
MIME-Version: 1.0
X-Scanned-By: MIMEDefang 2.79 on 10.5.11.16
X-loop: libvir-list@redhat.com
Subject: [libvirt] [PATCH v3 02/17] qemu: capabilities: Add virtio/vhost
{non-}transitional
X-BeenThere: libvir-list@redhat.com
X-Mailman-Version: 2.1.12
Precedence: junk
List-Id: Development discussions about the libvirt library & tools
List-Unsubscribe: ,
List-Archive:
List-Post:
List-Help:
List-Subscribe: ,
Content-Transfer-Encoding: quoted-printable
Sender: libvir-list-bounces@redhat.com
Errors-To: libvir-list-bounces@redhat.com
X-Scanned-By: MIMEDefang 2.79 on 10.5.11.12
X-Greylist: Sender IP whitelisted,
not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.31]);
Fri, 08 Feb 2019 22:12:46 +0000 (UTC)
Content-Type: text/plain; charset="utf-8"
Add a single QEMU_CAPS_VIRTIO_PCI_NON_TRANSITIONAL that
will be set if any of the following qemu devices are found:
virtio-blk-pci-transitional
virtio-blk-pci-non-transitional
virtio-net-pci-transitional
virtio-net-pci-non-transitional
vhost-scsi-pci-transitional
vhost-scsi-pci-non-transitional
virtio-rng-pci-transitional
virtio-rng-pci-non-transitional
virtio-9p-pci-transitional
virtio-9p-pci-non-transitional
virtio-balloon-pci-transitional
virtio-balloon-pci-non-transitional
vhost-vsock-pci-transitional
vhost-vsock-pci-non-transitional
virtio-input-host-pci-transitional
virtio-input-host-pci-non-transitional
virtio-scsi-pci-transitional
virtio-scsi-pci-non-transitional
virtio-serial-pci-transitional
virtio-serial-pci-non-transitional
Signed-off-by: Cole Robinson
---
src/qemu/qemu_capabilities.c | 21 +++++++++++++++++++
src/qemu/qemu_capabilities.h | 1 +
.../caps_4.0.0.riscv32.xml | 1 +
.../caps_4.0.0.riscv64.xml | 1 +
.../caps_4.0.0.x86_64.xml | 1 +
5 files changed, 25 insertions(+)
diff --git a/src/qemu/qemu_capabilities.c b/src/qemu/qemu_capabilities.c
index f035e68251..8e42c1c51c 100644
--- a/src/qemu/qemu_capabilities.c
+++ b/src/qemu/qemu_capabilities.c
@@ -525,6 +525,7 @@ VIR_ENUM_IMPL(virQEMUCaps, QEMU_CAPS_LAST,
"memory-backend-file.pmem",
"nvdimm.unarmed",
"scsi-disk.device_id",
+ "virtio-pci-non-transitional",
);
=20
=20
@@ -1102,6 +1103,26 @@ struct virQEMUCapsStringFlags virQEMUCapsObjectTypes=
[] =3D {
{ "vfio-ap", QEMU_CAPS_DEVICE_VFIO_AP },
{ "zpci", QEMU_CAPS_DEVICE_ZPCI },
{ "memory-backend-memfd", QEMU_CAPS_OBJECT_MEMORY_MEMFD },
+ { "virtio-blk-pci-transitional", QEMU_CAPS_VIRTIO_PCI_NON_TRANSITIONAL=
},
+ { "virtio-blk-pci-non-transitional", QEMU_CAPS_VIRTIO_PCI_NON_TRANSITI=
ONAL },
+ { "virtio-net-pci-transitional", QEMU_CAPS_VIRTIO_PCI_NON_TRANSITIONAL=
},
+ { "virtio-net-pci-non-transitional", QEMU_CAPS_VIRTIO_PCI_NON_TRANSITI=
ONAL },
+ { "vhost-scsi-pci-transitional", QEMU_CAPS_VIRTIO_PCI_NON_TRANSITIONAL=
},
+ { "vhost-scsi-pci-non-transitional", QEMU_CAPS_VIRTIO_PCI_NON_TRANSITI=
ONAL },
+ { "virtio-rng-pci-transitional", QEMU_CAPS_VIRTIO_PCI_NON_TRANSITIONAL=
},
+ { "virtio-rng-pci-non-transitional", QEMU_CAPS_VIRTIO_PCI_NON_TRANSITI=
ONAL },
+ { "virtio-9p-pci-transitional", QEMU_CAPS_VIRTIO_PCI_NON_TRANSITIONAL =
},
+ { "virtio-9p-pci-non-transitional", QEMU_CAPS_VIRTIO_PCI_NON_TRANSITIO=
NAL },
+ { "virtio-balloon-pci-transitional", QEMU_CAPS_VIRTIO_PCI_NON_TRANSITI=
ONAL },
+ { "virtio-balloon-pci-non-transitional", QEMU_CAPS_VIRTIO_PCI_NON_TRAN=
SITIONAL },
+ { "vhost-vsock-pci-transitional", QEMU_CAPS_VIRTIO_PCI_NON_TRANSITIONA=
L },
+ { "vhost-vsock-pci-non-transitional", QEMU_CAPS_VIRTIO_PCI_NON_TRANSIT=
IONAL },
+ { "virtio-input-host-pci-transitional", QEMU_CAPS_VIRTIO_PCI_NON_TRANS=
ITIONAL },
+ { "virtio-input-host-pci-non-transitional", QEMU_CAPS_VIRTIO_PCI_NON_T=
RANSITIONAL },
+ { "virtio-scsi-pci-transitional", QEMU_CAPS_VIRTIO_PCI_NON_TRANSITIONA=
L },
+ { "virtio-scsi-pci-non-transitional", QEMU_CAPS_VIRTIO_PCI_NON_TRANSIT=
IONAL },
+ { "virtio-serial-pci-transitional", QEMU_CAPS_VIRTIO_PCI_NON_TRANSITIO=
NAL },
+ { "virtio-serial-pci-non-transitional", QEMU_CAPS_VIRTIO_PCI_NON_TRANS=
ITIONAL },
};
=20
static struct virQEMUCapsStringFlags virQEMUCapsDevicePropsVirtioBalloon[]=
=3D {
diff --git a/src/qemu/qemu_capabilities.h b/src/qemu/qemu_capabilities.h
index ba84052bca..c5e985d6b5 100644
--- a/src/qemu/qemu_capabilities.h
+++ b/src/qemu/qemu_capabilities.h
@@ -505,6 +505,7 @@ typedef enum { /* virQEMUCapsFlags grouping marker for =
syntax-check */
QEMU_CAPS_OBJECT_MEMORY_FILE_PMEM, /* -object memory-backend-file,pmem=
=3D */
QEMU_CAPS_DEVICE_NVDIMM_UNARMED, /* -device nvdimm,unarmed=3D */
QEMU_CAPS_SCSI_DISK_DEVICE_ID, /* 'device_id' property of scsi disk */
+ QEMU_CAPS_VIRTIO_PCI_NON_TRANSITIONAL, /* virtio *-pci-{non-}transitio=
nal devices */
=20
QEMU_CAPS_LAST /* this must always be the last item */
} virQEMUCapsFlags;
diff --git a/tests/qemucapabilitiesdata/caps_4.0.0.riscv32.xml b/tests/qemu=
capabilitiesdata/caps_4.0.0.riscv32.xml
index 3d958db461..20b91663bc 100644
--- a/tests/qemucapabilitiesdata/caps_4.0.0.riscv32.xml
+++ b/tests/qemucapabilitiesdata/caps_4.0.0.riscv32.xml
@@ -161,6 +161,7 @@
+ 300105000
diff --git a/tests/qemucapabilitiesdata/caps_4.0.0.riscv64.xml b/tests/qemu=
capabilitiesdata/caps_4.0.0.riscv64.xml
index 40083843f2..7f37a3709c 100644
--- a/tests/qemucapabilitiesdata/caps_4.0.0.riscv64.xml
+++ b/tests/qemucapabilitiesdata/caps_4.0.0.riscv64.xml
@@ -161,6 +161,7 @@
+ 300105000
diff --git a/tests/qemucapabilitiesdata/caps_4.0.0.x86_64.xml b/tests/qemuc=
apabilitiesdata/caps_4.0.0.x86_64.xml
index 109b1ff753..08f604385f 100644
--- a/tests/qemucapabilitiesdata/caps_4.0.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_4.0.0.x86_64.xml
@@ -206,6 +206,7 @@
+ 3001050043100758
--=20
2.20.1
--
libvir-list mailing list
libvir-list@redhat.com
https://www.redhat.com/mailman/listinfo/libvir-list
From nobody Fri Mar 29 14:34:17 2024
Delivered-To: importer@patchew.org
Received-SPF: pass (zoho.com: domain of redhat.com designates 209.132.183.28
as permitted sender) client-ip=209.132.183.28;
envelope-from=libvir-list-bounces@redhat.com; helo=mx1.redhat.com;
Authentication-Results: mx.zohomail.com;
spf=pass (zoho.com: domain of redhat.com designates 209.132.183.28 as
permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com;
dmarc=pass(p=none dis=none) header.from=redhat.com
Return-Path:
Received: from mx1.redhat.com (mx1.redhat.com [209.132.183.28]) by
mx.zohomail.com
with SMTPS id 1549663947984600.8190896091279;
Fri, 8 Feb 2019 14:12:27 -0800 (PST)
Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.phx2.redhat.com
[10.5.11.16])
(using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits))
(No client certificate requested)
by mx1.redhat.com (Postfix) with ESMTPS id D8F9C85A03;
Fri, 8 Feb 2019 22:12:25 +0000 (UTC)
Received: from colo-mx.corp.redhat.com
(colo-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.21])
by smtp.corp.redhat.com (Postfix) with ESMTPS id 323D95C6A5;
Fri, 8 Feb 2019 22:12:25 +0000 (UTC)
Received: from lists01.pubmisc.prod.ext.phx2.redhat.com
(lists01.pubmisc.prod.ext.phx2.redhat.com [10.5.19.33])
by colo-mx.corp.redhat.com (Postfix) with ESMTP id 894A93F7D5;
Fri, 8 Feb 2019 22:12:23 +0000 (UTC)
Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.phx2.redhat.com
[10.5.11.16])
by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP
id x18MCKeq008396 for ;
Fri, 8 Feb 2019 17:12:20 -0500
Received: by smtp.corp.redhat.com (Postfix)
id DB93F5C6A5; Fri, 8 Feb 2019 22:12:20 +0000 (UTC)
Received: from worklaptop.redhat.com (ovpn-123-115.rdu2.redhat.com
[10.10.123.115])
by smtp.corp.redhat.com (Postfix) with ESMTP id 54D675C557;
Fri, 8 Feb 2019 22:12:20 +0000 (UTC)
From: Cole Robinson
To: libvirt-list@redhat.com
Date: Fri, 8 Feb 2019 17:11:54 -0500
Message-Id:
<1c1384ef9b7c80c9e9c254d555e9dfd049d965c3.1549663396.git.crobinso@redhat.com>
In-Reply-To:
References:
MIME-Version: 1.0
X-Scanned-By: MIMEDefang 2.79 on 10.5.11.16
X-loop: libvir-list@redhat.com
Subject: [libvirt] [PATCH v3 03/17] conf: Add
X-BeenThere: libvir-list@redhat.com
X-Mailman-Version: 2.1.12
Precedence: junk
List-Id: Development discussions about the libvirt library & tools
List-Unsubscribe: ,
List-Archive:
List-Post:
List-Help:
List-Subscribe: ,
Content-Transfer-Encoding: quoted-printable
Sender: libvir-list-bounces@redhat.com
Errors-To: libvir-list-bounces@redhat.com
X-Scanned-By: MIMEDefang 2.79 on 10.5.11.16
X-Greylist: Sender IP whitelisted,
not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.26]);
Fri, 08 Feb 2019 22:12:26 +0000 (UTC)
Content-Type: text/plain; charset="utf-8"
devices lack the model=3D attribute which is used by
most other device types. bus=3D mostly acts as one, but it
serves other purposes too like determing what target=3D
prefix to use, and for matching against controller type=3D
values.
Extending bus=3D to handle additional virtio transitional
devices will complicate apps lives, and it isn't a clean
mapping anyways. So let's bite the bullet and add a new
attribute, and wire up common handling
for virtio and virtio-{non-}transitional
Signed-off-by: Cole Robinson
Reviewed-by: Andrea Bolognani
---
docs/formatdomain.html.in | 45 +++++++++++++++++++
docs/schemas/domaincommon.rng | 9 ++++
src/conf/domain_conf.c | 40 +++++++++++++++++
src/conf/domain_conf.h | 11 +++++
src/libvirt_private.syms | 2 +
.../virtio-non-transitional.x86_64-3.1.0.args | 34 ++++++++++++++
...virtio-non-transitional.x86_64-latest.args | 34 ++++++++++++++
.../virtio-non-transitional.xml | 17 +++++++
.../virtio-transitional.x86_64-3.1.0.args | 34 ++++++++++++++
.../virtio-transitional.x86_64-latest.args | 34 ++++++++++++++
.../qemuxml2argvdata/virtio-transitional.xml | 17 +++++++
tests/qemuxml2argvtest.c | 6 +++
.../virtio-non-transitional.xml | 42 +++++++++++++++++
.../virtio-transitional.xml | 42 +++++++++++++++++
tests/qemuxml2xmltest.c | 11 +++++
15 files changed, 378 insertions(+)
create mode 100644 tests/qemuxml2argvdata/virtio-non-transitional.x86_64-3=
.1.0.args
create mode 100644 tests/qemuxml2argvdata/virtio-non-transitional.x86_64-l=
atest.args
create mode 100644 tests/qemuxml2argvdata/virtio-non-transitional.xml
create mode 100644 tests/qemuxml2argvdata/virtio-transitional.x86_64-3.1.0=
.args
create mode 100644 tests/qemuxml2argvdata/virtio-transitional.x86_64-lates=
t.args
create mode 100644 tests/qemuxml2argvdata/virtio-transitional.xml
create mode 100644 tests/qemuxml2xmloutdata/virtio-non-transitional.xml
create mode 100644 tests/qemuxml2xmloutdata/virtio-transitional.xml
diff --git a/docs/formatdomain.html.in b/docs/formatdomain.html.in
index 2ae5006849..85bc6a9d0b 100644
--- a/docs/formatdomain.html.in
+++ b/docs/formatdomain.html.in
@@ -2922,6 +2922,17 @@
Since 0.1.4
+
model
+
+ Indicates the emulated device model of the disk. Typically
+ this is indicated solely by the bus property but
+ for bus "virtio" the model can be specified furth=
er
+ with "virtio-transitional", "virtio-non-transitional", or
+ "virtio", see
+ Virtio transitional de=
vices
+ for more details.
+ Since 5.1.0
+
rawio
Indicates whether the disk needs rawio capability. Valid
@@ -4074,6 +4085,40 @@
Since 3.5.0
=20
+
+ Since 5.1.0, some of QEMU's virtio devi=
ces,
+ when used with PCI/PCIe machine types, accept the following
+ model values:
+
+
+
+
virtio-transitional
+
This instructs libvirt to always place the device in a conventio=
nal
+ PCI slot. The device can work with a virtio 0.9 or virtio 1.0
+ guest driver.
+
+
virtio-non-transitional
+
+ The device can only work with a virtio 1.0 guest driver.
+
+
virtio
+
If the device is plugged into a PCIe slot, it acts as a
+ virtio-non-transitional device. If plugged into a conventional PCI s=
lot,
+ it will function as a virtio-transitional device. This logic only
+ applies to devices that support the transitional models; for other
+ devices, virtio behavior will be different.
+
diff --git a/docs/schemas/domaincommon.rng b/docs/schemas/domaincommon.rng
index 36531a1c24..e91eb1395e 100644
--- a/docs/schemas/domaincommon.rng
+++ b/docs/schemas/domaincommon.rng
@@ -5455,7 +5455,11 @@
- virtio
+
+ virtio
+ virtio-transitional
+ virtio-non-transitional
+
diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c
index 9f58418c89..eab70ba807 100644
--- a/src/conf/domain_conf.c
+++ b/src/conf/domain_conf.c
@@ -947,7 +947,10 @@ VIR_ENUM_IMPL(virDomainDiskTray, VIR_DOMAIN_DISK_TRAY_=
LAST,
=20
VIR_ENUM_IMPL(virDomainRNGModel,
VIR_DOMAIN_RNG_MODEL_LAST,
- "virtio");
+ "virtio",
+ "virtio-transitional",
+ "virtio-non-transitional",
+);
=20
VIR_ENUM_IMPL(virDomainRNGBackend,
VIR_DOMAIN_RNG_BACKEND_LAST,
diff --git a/src/conf/domain_conf.h b/src/conf/domain_conf.h
index dccdc42ed2..2a209a04c2 100644
--- a/src/conf/domain_conf.h
+++ b/src/conf/domain_conf.h
@@ -2127,6 +2127,8 @@ struct _virBlkioDevice {
=20
typedef enum {
VIR_DOMAIN_RNG_MODEL_VIRTIO,
+ VIR_DOMAIN_RNG_MODEL_VIRTIO_TRANSITIONAL,
+ VIR_DOMAIN_RNG_MODEL_VIRTIO_NON_TRANSITIONAL,
=20
VIR_DOMAIN_RNG_MODEL_LAST
} virDomainRNGModel;
diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c
index 15857f484a..3ef26bb494 100644
--- a/src/qemu/qemu_command.c
+++ b/src/qemu/qemu_command.c
@@ -492,6 +492,11 @@ qemuBuildVirtioDevStr(virBufferPtr buf,
has_ntmodel =3D device.data.hostdev->source.subsys.u.scsi_host=
.model =3D=3D VIR_DOMAIN_HOSTDEV_SUBSYS_SCSI_VHOST_MODEL_TYPE_VIRTIO_NON_TR=
ANSITIONAL;
break;
=20
+ case VIR_DOMAIN_DEVICE_RNG:
+ has_tmodel =3D device.data.rng->model =3D=3D VIR_DOMAIN_RNG_MO=
DEL_VIRTIO_TRANSITIONAL;
+ has_ntmodel =3D device.data.rng->model =3D=3D VIR_DOMAIN_RNG_M=
ODEL_VIRTIO_NON_TRANSITIONAL;
+ break;
+
case VIR_DOMAIN_DEVICE_LEASE:
case VIR_DOMAIN_DEVICE_FS:
case VIR_DOMAIN_DEVICE_INPUT:
@@ -510,7 +515,6 @@ qemuBuildVirtioDevStr(virBufferPtr buf,
case VIR_DOMAIN_DEVICE_SHMEM:
case VIR_DOMAIN_DEVICE_TPM:
case VIR_DOMAIN_DEVICE_PANIC:
- case VIR_DOMAIN_DEVICE_RNG:
case VIR_DOMAIN_DEVICE_MEMORY:
case VIR_DOMAIN_DEVICE_IOMMU:
case VIR_DOMAIN_DEVICE_VSOCK:
diff --git a/src/qemu/qemu_domain.c b/src/qemu/qemu_domain.c
index 801d25a44b..4e9c179db3 100644
--- a/src/qemu/qemu_domain.c
+++ b/src/qemu/qemu_domain.c
@@ -4553,6 +4553,11 @@ qemuDomainRNGDefValidate(const virDomainRNGDef *def,
modelIsSupported =3D virQEMUCapsGet(qemuCaps,
QEMU_CAPS_DEVICE_VIRTIO_RNG);
break;
+ case VIR_DOMAIN_RNG_MODEL_VIRTIO_TRANSITIONAL:
+ case VIR_DOMAIN_RNG_MODEL_VIRTIO_NON_TRANSITIONAL:
+ modelIsSupported =3D (virQEMUCapsGet(qemuCaps, QEMU_CAPS_VIRTIO_PC=
I_NON_TRANSITIONAL) ||
+ virQEMUCapsGet(qemuCaps, QEMU_CAPS_VIRTIO_PCI_=
DISABLE_LEGACY));
+ break;
case VIR_DOMAIN_RNG_MODEL_LAST:
break;
}
diff --git a/src/qemu/qemu_domain_address.c b/src/qemu/qemu_domain_address.c
index 283c3246b1..bc8829943f 100644
--- a/src/qemu/qemu_domain_address.c
+++ b/src/qemu/qemu_domain_address.c
@@ -884,7 +884,11 @@ qemuDomainDeviceCalculatePCIConnectFlags(virDomainDevi=
ceDefPtr dev,
case VIR_DOMAIN_DEVICE_RNG:
switch ((virDomainRNGModel) dev->data.rng->model) {
case VIR_DOMAIN_RNG_MODEL_VIRTIO:
+ case VIR_DOMAIN_RNG_MODEL_VIRTIO_NON_TRANSITIONAL:
return virtioFlags;
+ case VIR_DOMAIN_RNG_MODEL_VIRTIO_TRANSITIONAL:
+ /* Transitional devices only work in conventional PCI slots */
+ return pciFlags;
=20
case VIR_DOMAIN_RNG_MODEL_LAST:
return 0;
diff --git a/tests/qemuxml2argvdata/virtio-non-transitional.x86_64-3.1.0.ar=
gs b/tests/qemuxml2argvdata/virtio-non-transitional.x86_64-3.1.0.args
index 500c03bdc3..10cc6236cb 100644
--- a/tests/qemuxml2argvdata/virtio-non-transitional.x86_64-3.1.0.args
+++ b/tests/qemuxml2argvdata/virtio-non-transitional.x86_64-3.1.0.args
@@ -28,6 +28,7 @@ addr=3D0x1 \
-device pcie-root-port,port=3D0x9,chassis=3D2,id=3Dpci.2,bus=3Dpcie.0,addr=
=3D0x1.0x1 \
-device pcie-root-port,port=3D0xa,chassis=3D3,id=3Dpci.3,bus=3Dpcie.0,addr=
=3D0x1.0x2 \
-device pcie-root-port,port=3D0xb,chassis=3D4,id=3Dpci.4,bus=3Dpcie.0,addr=
=3D0x1.0x3 \
+-device pcie-root-port,port=3D0xc,chassis=3D5,id=3Dpci.5,bus=3Dpcie.0,addr=
=3D0x1.0x4 \
-drive file=3D/dev/HostVG/QEMUGuest1,format=3Draw,if=3Dnone,id=3Ddrive-vir=
tio-disk0 \
-device virtio-blk-pci,disable-legacy=3Don,disable-modern=3Doff,scsi=3Doff=
,bus=3Dpci.2,\
addr=3D0x0,drive=3Ddrive-virtio-disk0,id=3Dvirtio-disk0,bootindex=3D1 \
@@ -36,6 +37,9 @@ addr=3D0x0,drive=3Ddrive-virtio-disk0,id=3Dvirtio-disk0,b=
ootindex=3D1 \
id=3Dnet0,mac=3D00:11:22:33:44:55,bus=3Dpci.1,addr=3D0x0 \
-device vhost-scsi-pci,disable-legacy=3Don,disable-modern=3Doff,\
wwpn=3Dnaa.5123456789abcde0,vhostfd=3D3,id=3Dhostdev0,bus=3Dpci.3,addr=3D0=
x0 \
+-object rng-random,id=3Dobjrng0,filename=3D/dev/urandom \
+-device virtio-rng-pci,disable-legacy=3Don,disable-modern=3Doff,rng=3Dobjr=
ng0,\
+id=3Drng0,bus=3Dpci.4,addr=3D0x0 \
-sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,\
resourcecontrol=3Ddeny \
-msg timestamp=3Don
diff --git a/tests/qemuxml2argvdata/virtio-non-transitional.x86_64-latest.a=
rgs b/tests/qemuxml2argvdata/virtio-non-transitional.x86_64-latest.args
index c8dbffda65..a0fc475c2f 100644
--- a/tests/qemuxml2argvdata/virtio-non-transitional.x86_64-latest.args
+++ b/tests/qemuxml2argvdata/virtio-non-transitional.x86_64-latest.args
@@ -28,6 +28,7 @@ addr=3D0x1 \
-device pcie-root-port,port=3D0x9,chassis=3D2,id=3Dpci.2,bus=3Dpcie.0,addr=
=3D0x1.0x1 \
-device pcie-root-port,port=3D0xa,chassis=3D3,id=3Dpci.3,bus=3Dpcie.0,addr=
=3D0x1.0x2 \
-device pcie-root-port,port=3D0xb,chassis=3D4,id=3Dpci.4,bus=3Dpcie.0,addr=
=3D0x1.0x3 \
+-device pcie-root-port,port=3D0xc,chassis=3D5,id=3Dpci.5,bus=3Dpcie.0,addr=
=3D0x1.0x4 \
-drive file=3D/dev/HostVG/QEMUGuest1,format=3Draw,if=3Dnone,id=3Ddrive-vir=
tio-disk0 \
-device virtio-blk-pci-non-transitional,scsi=3Doff,bus=3Dpci.2,addr=3D0x0,\
drive=3Ddrive-virtio-disk0,id=3Dvirtio-disk0,bootindex=3D1 \
@@ -36,6 +37,8 @@ drive=3Ddrive-virtio-disk0,id=3Dvirtio-disk0,bootindex=3D=
1 \
mac=3D00:11:22:33:44:55,bus=3Dpci.1,addr=3D0x0 \
-device vhost-scsi-pci-non-transitional,wwpn=3Dnaa.5123456789abcde0,vhostf=
d=3D3,\
id=3Dhostdev0,bus=3Dpci.3,addr=3D0x0 \
+-object rng-random,id=3Dobjrng0,filename=3D/dev/urandom \
+-device virtio-rng-pci-non-transitional,rng=3Dobjrng0,id=3Drng0,bus=3Dpci.=
4,addr=3D0x0 \
-sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,\
resourcecontrol=3Ddeny \
-msg timestamp=3Don
diff --git a/tests/qemuxml2argvdata/virtio-non-transitional.xml b/tests/qem=
uxml2argvdata/virtio-non-transitional.xml
index 4cbf4b0893..d49d82691f 100644
--- a/tests/qemuxml2argvdata/virtio-non-transitional.xml
+++ b/tests/qemuxml2argvdata/virtio-non-transitional.xml
@@ -18,6 +18,9 @@
+
+ /dev/urandom
+
diff --git a/tests/qemuxml2argvdata/virtio-transitional.x86_64-3.1.0.args b=
/tests/qemuxml2argvdata/virtio-transitional.x86_64-3.1.0.args
index d4d2b8ec35..b21a6cadd4 100644
--- a/tests/qemuxml2argvdata/virtio-transitional.x86_64-3.1.0.args
+++ b/tests/qemuxml2argvdata/virtio-transitional.x86_64-3.1.0.args
@@ -35,6 +35,9 @@ bus=3Dpci.2,addr=3D0x2,drive=3Ddrive-virtio-disk0,id=3Dvi=
rtio-disk0,bootindex=3D1 \
id=3Dnet0,mac=3D00:11:22:33:44:55,bus=3Dpci.2,addr=3D0x1 \
-device vhost-scsi-pci,disable-legacy=3Doff,disable-modern=3Doff,\
wwpn=3Dnaa.5123456789abcde0,vhostfd=3D3,id=3Dhostdev0,bus=3Dpci.2,addr=3D0=
x3 \
+-object rng-random,id=3Dobjrng0,filename=3D/dev/urandom \
+-device virtio-rng-pci,disable-legacy=3Doff,disable-modern=3Doff,rng=3Dobj=
rng0,\
+id=3Drng0,bus=3Dpci.2,addr=3D0x4 \
-sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,\
resourcecontrol=3Ddeny \
-msg timestamp=3Don
diff --git a/tests/qemuxml2argvdata/virtio-transitional.x86_64-latest.args =
b/tests/qemuxml2argvdata/virtio-transitional.x86_64-latest.args
index ab2c35514d..64fb4153fd 100644
--- a/tests/qemuxml2argvdata/virtio-transitional.x86_64-latest.args
+++ b/tests/qemuxml2argvdata/virtio-transitional.x86_64-latest.args
@@ -35,6 +35,8 @@ drive=3Ddrive-virtio-disk0,id=3Dvirtio-disk0,bootindex=3D=
1 \
mac=3D00:11:22:33:44:55,bus=3Dpci.2,addr=3D0x1 \
-device vhost-scsi-pci-transitional,wwpn=3Dnaa.5123456789abcde0,vhostfd=3D=
3,\
id=3Dhostdev0,bus=3Dpci.2,addr=3D0x3 \
+-object rng-random,id=3Dobjrng0,filename=3D/dev/urandom \
+-device virtio-rng-pci-transitional,rng=3Dobjrng0,id=3Drng0,bus=3Dpci.2,ad=
dr=3D0x4 \
-sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,\
resourcecontrol=3Ddeny \
-msg timestamp=3Don
diff --git a/tests/qemuxml2argvdata/virtio-transitional.xml b/tests/qemuxml=
2argvdata/virtio-transitional.xml
index 591ea47952..9643788a9a 100644
--- a/tests/qemuxml2argvdata/virtio-transitional.xml
+++ b/tests/qemuxml2argvdata/virtio-transitional.xml
@@ -18,6 +18,9 @@
+
+ /dev/urandom
+
diff --git a/tests/qemuxml2xmloutdata/virtio-non-transitional.xml b/tests/q=
emuxml2xmloutdata/virtio-non-transitional.xml
index 2af5195dfd..4a315050ab 100644
--- a/tests/qemuxml2xmloutdata/virtio-non-transitional.xml
+++ b/tests/qemuxml2xmloutdata/virtio-non-transitional.xml
@@ -45,6 +45,11 @@
+
+
+
+
+
@@ -57,5 +62,9 @@
+
+ /dev/urandom
+
+
diff --git a/tests/qemuxml2xmloutdata/virtio-transitional.xml b/tests/qemux=
ml2xmloutdata/virtio-transitional.xml
index 8c1baced0e..ae3789ad93 100644
--- a/tests/qemuxml2xmloutdata/virtio-transitional.xml
+++ b/tests/qemuxml2xmloutdata/virtio-transitional.xml
@@ -51,5 +51,9 @@
+
+ /dev/urandom
+
+
--=20
2.20.1
--
libvir-list mailing list
libvir-list@redhat.com
https://www.redhat.com/mailman/listinfo/libvir-list
From nobody Fri Mar 29 14:34:17 2024
Delivered-To: importer@patchew.org
Received-SPF: pass (zoho.com: domain of redhat.com designates 209.132.183.28
as permitted sender) client-ip=209.132.183.28;
envelope-from=libvir-list-bounces@redhat.com; helo=mx1.redhat.com;
Authentication-Results: mx.zohomail.com;
spf=pass (zoho.com: domain of redhat.com designates 209.132.183.28 as
permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com;
dmarc=pass(p=none dis=none) header.from=redhat.com
Return-Path:
Received: from mx1.redhat.com (mx1.redhat.com [209.132.183.28]) by
mx.zohomail.com
with SMTPS id 1549663967051865.9151095477099;
Fri, 8 Feb 2019 14:12:47 -0800 (PST)
Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.phx2.redhat.com
[10.5.11.13])
(using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits))
(No client certificate requested)
by mx1.redhat.com (Postfix) with ESMTPS id 3368110F9E;
Fri, 8 Feb 2019 22:12:45 +0000 (UTC)
Received: from colo-mx.corp.redhat.com
(colo-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.21])
by smtp.corp.redhat.com (Postfix) with ESMTPS id F07F9611C2;
Fri, 8 Feb 2019 22:12:44 +0000 (UTC)
Received: from lists01.pubmisc.prod.ext.phx2.redhat.com
(lists01.pubmisc.prod.ext.phx2.redhat.com [10.5.19.33])
by colo-mx.corp.redhat.com (Postfix) with ESMTP id A762F3F608;
Fri, 8 Feb 2019 22:12:44 +0000 (UTC)
Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.phx2.redhat.com
[10.5.11.16])
by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP
id x18MCOtf008441 for ;
Fri, 8 Feb 2019 17:12:24 -0500
Received: by smtp.corp.redhat.com (Postfix)
id 5A4055C6A5; Fri, 8 Feb 2019 22:12:24 +0000 (UTC)
Received: from worklaptop.redhat.com (ovpn-123-115.rdu2.redhat.com
[10.10.123.115])
by smtp.corp.redhat.com (Postfix) with ESMTP id F08B75C557;
Fri, 8 Feb 2019 22:12:23 +0000 (UTC)
From: Cole Robinson
To: libvirt-list@redhat.com
Date: Fri, 8 Feb 2019 17:12:00 -0500
Message-Id:
<9a2d24aa36abe20f38cb3286c27c7d1a1b710ba3.1549663397.git.crobinso@redhat.com>
In-Reply-To:
References:
MIME-Version: 1.0
X-Scanned-By: MIMEDefang 2.79 on 10.5.11.16
X-loop: libvir-list@redhat.com
Subject: [libvirt] [PATCH v3 09/17] conf: Add
X-BeenThere: libvir-list@redhat.com
X-Mailman-Version: 2.1.12
Precedence: junk
List-Id: Development discussions about the libvirt library & tools
List-Unsubscribe: ,
List-Archive:
List-Post:
List-Help:
List-Subscribe: ,
Content-Transfer-Encoding: quoted-printable
Sender: libvir-list-bounces@redhat.com
Errors-To: libvir-list-bounces@redhat.com
X-Scanned-By: MIMEDefang 2.79 on 10.5.11.13
X-Greylist: Sender IP whitelisted,
not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.28]);
Fri, 08 Feb 2019 22:12:45 +0000 (UTC)
Content-Type: text/plain; charset="utf-8"
devices lack the model=3D attribute which is used by
most other device types. To eventually support
virtio-9p-pci-{non-}traditional in qemu, let's add a standard
model=3D attribute. The accepted values are:
- virtio
- virtio-transitional
- virtio-non-transitional
Signed-off-by: Cole Robinson
---
docs/formatdomain.html.in | 5 +++
docs/schemas/domaincommon.rng | 9 +++++
src/conf/domain_conf.c | 33 +++++++++++++++++--
src/conf/domain_conf.h | 11 +++++++
.../virtio-non-transitional.x86_64-3.1.0.args | 11 ++++---
...virtio-non-transitional.x86_64-latest.args | 11 ++++---
.../virtio-non-transitional.xml | 4 +++
.../virtio-transitional.x86_64-3.1.0.args | 15 +++++----
.../virtio-transitional.x86_64-latest.args | 15 +++++----
.../qemuxml2argvdata/virtio-transitional.xml | 4 +++
.../virtio-non-transitional.xml | 18 +++++++---
.../virtio-transitional.xml | 26 ++++++++++-----
12 files changed, 128 insertions(+), 34 deletions(-)
diff --git a/docs/formatdomain.html.in b/docs/formatdomain.html.in
index 674616f7b4..e84e71fda8 100644
--- a/docs/formatdomain.html.in
+++ b/docs/formatdomain.html.in
@@ -3881,6 +3881,11 @@
=20
+ Since 5.1.0, the filesystem element
+ has an optional attribute model with supported values
+ "virtio-transitional", "virtio-non-transitional", or "virtio".
+ See Virtio transitional devi=
ces
+ for more details.
=20
+
+
+
diff --git a/tests/qemuxml2argvdata/virtio-transitional.x86_64-3.1.0.args b=
/tests/qemuxml2argvdata/virtio-transitional.x86_64-3.1.0.args
index c3df97ca86..0286b98ece 100644
--- a/tests/qemuxml2argvdata/virtio-transitional.x86_64-3.1.0.args
+++ b/tests/qemuxml2argvdata/virtio-transitional.x86_64-3.1.0.args
@@ -27,6 +27,7 @@ file=3D/tmp/lib/domain--1-QEMUGuest1/master-key.aes \
addr=3D0x1 \
-device pcie-pci-bridge,id=3Dpci.2,bus=3Dpci.1,addr=3D0x0 \
-device pcie-root-port,port=3D0x9,chassis=3D3,id=3Dpci.3,bus=3Dpcie.0,addr=
=3D0x1.0x1 \
+-device pcie-root-port,port=3D0xa,chassis=3D4,id=3Dpci.4,bus=3Dpcie.0,addr=
=3D0x1.0x2 \
-drive file=3D/dev/HostVG/QEMUGuest1,format=3Draw,if=3Dnone,id=3Ddrive-vir=
tio-disk0 \
-device virtio-blk-pci,disable-legacy=3Doff,disable-modern=3Doff,scsi=3Dof=
f,\
bus=3Dpci.2,addr=3D0x3,drive=3Ddrive-virtio-disk0,id=3Dvirtio-disk0,bootin=
dex=3D1 \
@@ -36,6 +37,8 @@ fsdev=3Dfsdev-fs0,mount_tag=3Dfs1,bus=3Dpci.2,addr=3D0x1 \
-netdev user,id=3Dhostnet0 \
-device virtio-net-pci,disable-legacy=3Doff,disable-modern=3Doff,netdev=3D=
hostnet0,\
id=3Dnet0,mac=3D00:11:22:33:44:55,bus=3Dpci.2,addr=3D0x2 \
+-device virtio-input-host-pci,id=3Dinput0,evdev=3D/dev/input/event1234,bus=
=3Dpci.3,\
+addr=3D0x0 \
-device vhost-scsi-pci,disable-legacy=3Doff,disable-modern=3Doff,\
wwpn=3Dnaa.5123456789abcde0,vhostfd=3D3,id=3Dhostdev0,bus=3Dpci.2,addr=3D0=
x4 \
-device virtio-balloon-pci,disable-legacy=3Doff,disable-modern=3Doff,id=3D=
balloon0,\
diff --git a/tests/qemuxml2argvdata/virtio-transitional.x86_64-latest.args =
b/tests/qemuxml2argvdata/virtio-transitional.x86_64-latest.args
index f3a4e0804e..24b49e6009 100644
--- a/tests/qemuxml2argvdata/virtio-transitional.x86_64-latest.args
+++ b/tests/qemuxml2argvdata/virtio-transitional.x86_64-latest.args
@@ -27,6 +27,7 @@ file=3D/tmp/lib/domain--1-QEMUGuest1/master-key.aes \
addr=3D0x1 \
-device pcie-pci-bridge,id=3Dpci.2,bus=3Dpci.1,addr=3D0x0 \
-device pcie-root-port,port=3D0x9,chassis=3D3,id=3Dpci.3,bus=3Dpcie.0,addr=
=3D0x1.0x1 \
+-device pcie-root-port,port=3D0xa,chassis=3D4,id=3Dpci.4,bus=3Dpcie.0,addr=
=3D0x1.0x2 \
-drive file=3D/dev/HostVG/QEMUGuest1,format=3Draw,if=3Dnone,id=3Ddrive-vir=
tio-disk0 \
-device virtio-blk-pci-transitional,scsi=3Doff,bus=3Dpci.2,addr=3D0x3,\
drive=3Ddrive-virtio-disk0,id=3Dvirtio-disk0,bootindex=3D1 \
@@ -36,6 +37,8 @@ bus=3Dpci.2,addr=3D0x1 \
-netdev user,id=3Dhostnet0 \
-device virtio-net-pci-transitional,netdev=3Dhostnet0,id=3Dnet0,\
mac=3D00:11:22:33:44:55,bus=3Dpci.2,addr=3D0x2 \
+-device virtio-input-host-pci,id=3Dinput0,evdev=3D/dev/input/event1234,bus=
=3Dpci.3,\
+addr=3D0x0 \
-device vhost-scsi-pci-transitional,wwpn=3Dnaa.5123456789abcde0,vhostfd=3D=
3,\
id=3Dhostdev0,bus=3Dpci.2,addr=3D0x4 \
-device virtio-balloon-pci-transitional,id=3Dballoon0,bus=3Dpci.2,addr=3D0=
x5 \
diff --git a/tests/qemuxml2argvdata/virtio-transitional.xml b/tests/qemuxml=
2argvdata/virtio-transitional.xml
index a2ca96ed09..b60400a484 100644
--- a/tests/qemuxml2argvdata/virtio-transitional.xml
+++ b/tests/qemuxml2argvdata/virtio-transitional.xml
@@ -25,6 +25,9 @@
+
+
+
diff --git a/tests/qemuxml2xmloutdata/virtio-non-transitional.xml b/tests/q=
emuxml2xmloutdata/virtio-non-transitional.xml
index 9f05de5089..b6e762c0a7 100644
--- a/tests/qemuxml2xmloutdata/virtio-non-transitional.xml
+++ b/tests/qemuxml2xmloutdata/virtio-non-transitional.xml
@@ -65,6 +65,11 @@
+
+
+
+
+
@@ -75,6 +80,10 @@
+
+
+
+
@@ -90,7 +99,7 @@
-
+
diff --git a/tests/qemuxml2xmloutdata/virtio-transitional.xml b/tests/qemux=
ml2xmloutdata/virtio-transitional.xml
index 0d99aa2ded..490b28368a 100644
--- a/tests/qemuxml2xmloutdata/virtio-transitional.xml
+++ b/tests/qemuxml2xmloutdata/virtio-transitional.xml
@@ -39,6 +39,11 @@
+
+
+
+
+
@@ -49,6 +54,10 @@
+
+
+
+
diff --git a/tests/qemuxml2xmltest.c b/tests/qemuxml2xmltest.c
index 30954cc341..452184d84a 100644
--- a/tests/qemuxml2xmltest.c
+++ b/tests/qemuxml2xmltest.c
@@ -1259,13 +1259,15 @@ mymain(void)
QEMU_CAPS_DEVICE_PCIE_PCI_BRIDGE,
QEMU_CAPS_DEVICE_PCIE_ROOT_PORT,
QEMU_CAPS_VIRTIO_PCI_DISABLE_LEGACY,
- QEMU_CAPS_DEVICE_VHOST_VSOCK);
+ QEMU_CAPS_DEVICE_VHOST_VSOCK,
+ QEMU_CAPS_VIRTIO_INPUT_HOST);
DO_TEST("virtio-non-transitional",
QEMU_CAPS_DEVICE_VIDEO_PRIMARY,
QEMU_CAPS_DEVICE_PCIE_PCI_BRIDGE,
QEMU_CAPS_DEVICE_PCIE_ROOT_PORT,
QEMU_CAPS_VIRTIO_PCI_DISABLE_LEGACY,
- QEMU_CAPS_DEVICE_VHOST_VSOCK);
+ QEMU_CAPS_DEVICE_VHOST_VSOCK,
+ QEMU_CAPS_VIRTIO_INPUT_HOST);
=20
if (getenv("LIBVIRT_SKIP_CLEANUP") =3D=3D NULL)
virFileDeleteTree(fakerootdir);
--=20
2.20.1
--
libvir-list mailing list
libvir-list@redhat.com
https://www.redhat.com/mailman/listinfo/libvir-list
From nobody Fri Mar 29 14:34:17 2024
Delivered-To: importer@patchew.org
Received-SPF: pass (zoho.com: domain of redhat.com designates 209.132.183.28
as permitted sender) client-ip=209.132.183.28;
envelope-from=libvir-list-bounces@redhat.com; helo=mx1.redhat.com;
Authentication-Results: mx.zohomail.com;
spf=pass (zoho.com: domain of redhat.com designates 209.132.183.28 as
permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com;
dmarc=pass(p=none dis=none) header.from=redhat.com
Return-Path:
Received: from mx1.redhat.com (mx1.redhat.com [209.132.183.28]) by
mx.zohomail.com
with SMTPS id 154966399567481.20019442529508;
Fri, 8 Feb 2019 14:13:15 -0800 (PST)
Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com
[10.5.11.11])
(using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits))
(No client certificate requested)
by mx1.redhat.com (Postfix) with ESMTPS id D59006699F;
Fri, 8 Feb 2019 22:13:13 +0000 (UTC)
Received: from colo-mx.corp.redhat.com
(colo-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.20])
by smtp.corp.redhat.com (Postfix) with ESMTPS id A603D9CAC;
Fri, 8 Feb 2019 22:13:13 +0000 (UTC)
Received: from lists01.pubmisc.prod.ext.phx2.redhat.com
(lists01.pubmisc.prod.ext.phx2.redhat.com [10.5.19.33])
by colo-mx.corp.redhat.com (Postfix) with ESMTP id 6008F18033B0;
Fri, 8 Feb 2019 22:13:13 +0000 (UTC)
Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.phx2.redhat.com
[10.5.11.16])
by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP
id x18MCSeD008505 for ;
Fri, 8 Feb 2019 17:12:28 -0500
Received: by smtp.corp.redhat.com (Postfix)
id 9F1E235E4; Fri, 8 Feb 2019 22:12:28 +0000 (UTC)
Received: from worklaptop.redhat.com (ovpn-123-115.rdu2.redhat.com
[10.10.123.115])
by smtp.corp.redhat.com (Postfix) with ESMTP id 298755C557;
Fri, 8 Feb 2019 22:12:28 +0000 (UTC)
From: Cole Robinson
To: libvirt-list@redhat.com
Date: Fri, 8 Feb 2019 17:12:05 -0500
Message-Id:
<005ef112d40e58325485f47dcb86b58b4032a269.1549663397.git.crobinso@redhat.com>
In-Reply-To:
References:
MIME-Version: 1.0
X-Scanned-By: MIMEDefang 2.79 on 10.5.11.16
X-loop: libvir-list@redhat.com
Cc: Andrea Bolognani
Subject: [libvirt] [PATCH v3 14/17] qemu: Support input
model=virtio-{non-}transitional
X-BeenThere: libvir-list@redhat.com
X-Mailman-Version: 2.1.12
Precedence: junk
List-Id: Development discussions about the libvirt library & tools
List-Unsubscribe: ,
List-Archive:
List-Post:
List-Help:
List-Subscribe: ,
Content-Transfer-Encoding: quoted-printable
Sender: libvir-list-bounces@redhat.com
Errors-To: libvir-list-bounces@redhat.com
X-Scanned-By: MIMEDefang 2.79 on 10.5.11.11
X-Greylist: Sender IP whitelisted,
not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.38]);
Fri, 08 Feb 2019 22:13:14 +0000 (UTC)
Content-Type: text/plain; charset="utf-8"
Add model handling for virtio transitional devices. Ex:
...
* "virtio-transitional" maps to qemu "virtio-input-host-pci-transitional"
* "virtio-non-transitional" maps to qemu "virtio-input-host-non-transitiona=
l"
Reviewed-by: Andrea Bolognani
Signed-off-by: Cole Robinson
---
src/qemu/qemu_command.c | 8 +++++++-
src/qemu/qemu_domain_address.c | 13 ++++++++++++-
.../virtio-non-transitional.x86_64-3.1.0.args | 4 ++--
.../virtio-non-transitional.x86_64-latest.args | 4 ++--
.../virtio-transitional.x86_64-3.1.0.args | 7 +++----
.../virtio-transitional.x86_64-latest.args | 7 +++----
tests/qemuxml2xmloutdata/virtio-transitional.xml | 9 ++-------
7 files changed, 31 insertions(+), 21 deletions(-)
diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c
index 022d5a5d90..946bc8b0b3 100644
--- a/src/qemu/qemu_command.c
+++ b/src/qemu/qemu_command.c
@@ -512,8 +512,14 @@ qemuBuildVirtioDevStr(virBufferPtr buf,
has_ntmodel =3D device.data.vsock->model =3D=3D VIR_DOMAIN_VSO=
CK_MODEL_VIRTIO_NON_TRANSITIONAL;
break;
=20
- case VIR_DOMAIN_DEVICE_LEASE:
case VIR_DOMAIN_DEVICE_INPUT:
+ if (device.data.input->type !=3D VIR_DOMAIN_INPUT_TYPE_PASSTHR=
OUGH)
+ return 0;
+ has_tmodel =3D device.data.input->model =3D=3D VIR_DOMAIN_INPU=
T_MODEL_VIRTIO_TRANSITIONAL;
+ has_ntmodel =3D device.data.input->model =3D=3D VIR_DOMAIN_INP=
UT_MODEL_VIRTIO_NON_TRANSITIONAL;
+ break;
+
+ case VIR_DOMAIN_DEVICE_LEASE:
case VIR_DOMAIN_DEVICE_SOUND:
case VIR_DOMAIN_DEVICE_VIDEO:
case VIR_DOMAIN_DEVICE_WATCHDOG:
diff --git a/src/qemu/qemu_domain_address.c b/src/qemu/qemu_domain_address.c
index badf237333..8f505c90fd 100644
--- a/src/qemu/qemu_domain_address.c
+++ b/src/qemu/qemu_domain_address.c
@@ -949,7 +949,18 @@ qemuDomainDeviceCalculatePCIConnectFlags(virDomainDevi=
ceDefPtr dev,
case VIR_DOMAIN_DEVICE_INPUT:
switch ((virDomainInputBus) dev->data.input->bus) {
case VIR_DOMAIN_INPUT_BUS_VIRTIO:
- return virtioFlags;
+ switch ((virDomainInputModel) dev->data.input->model) {
+ case VIR_DOMAIN_INPUT_MODEL_VIRTIO_TRANSITIONAL:
+ /* Transitional devices only work in conventional PCI slot=
s */
+ return pciFlags;
+ case VIR_DOMAIN_INPUT_MODEL_VIRTIO:
+ case VIR_DOMAIN_INPUT_MODEL_VIRTIO_NON_TRANSITIONAL:
+ case VIR_DOMAIN_INPUT_MODEL_DEFAULT:
+ return virtioFlags;
+ case VIR_DOMAIN_INPUT_MODEL_LAST:
+ break;
+ }
+ return 0;
=20
case VIR_DOMAIN_INPUT_BUS_PS2:
case VIR_DOMAIN_INPUT_BUS_USB:
diff --git a/tests/qemuxml2argvdata/virtio-non-transitional.x86_64-3.1.0.ar=
gs b/tests/qemuxml2argvdata/virtio-non-transitional.x86_64-3.1.0.args
index 9130572abe..0f5de86315 100644
--- a/tests/qemuxml2argvdata/virtio-non-transitional.x86_64-3.1.0.args
+++ b/tests/qemuxml2argvdata/virtio-non-transitional.x86_64-3.1.0.args
@@ -42,8 +42,8 @@ fsdev=3Dfsdev-fs0,mount_tag=3Dfs1,bus=3Dpci.1,addr=3D0x0 \
-netdev user,id=3Dhostnet0 \
-device virtio-net-pci,disable-legacy=3Don,disable-modern=3Doff,netdev=3Dh=
ostnet0,\
id=3Dnet0,mac=3D00:11:22:33:44:55,bus=3Dpci.2,addr=3D0x0 \
--device virtio-input-host-pci,id=3Dinput0,evdev=3D/dev/input/event1234,bus=
=3Dpci.7,\
-addr=3D0x0 \
+-device virtio-input-host-pci,disable-legacy=3Don,disable-modern=3Doff,id=
=3Dinput0,\
+evdev=3D/dev/input/event1234,bus=3Dpci.7,addr=3D0x0 \
-device vhost-scsi-pci,disable-legacy=3Don,disable-modern=3Doff,\
wwpn=3Dnaa.5123456789abcde0,vhostfd=3D3,id=3Dhostdev0,bus=3Dpci.4,addr=3D0=
x0 \
-device virtio-balloon-pci,disable-legacy=3Don,disable-modern=3Doff,id=3Db=
alloon0,\
diff --git a/tests/qemuxml2argvdata/virtio-non-transitional.x86_64-latest.a=
rgs b/tests/qemuxml2argvdata/virtio-non-transitional.x86_64-latest.args
index 8e0709816b..383b29f629 100644
--- a/tests/qemuxml2argvdata/virtio-non-transitional.x86_64-latest.args
+++ b/tests/qemuxml2argvdata/virtio-non-transitional.x86_64-latest.args
@@ -42,8 +42,8 @@ bus=3Dpci.1,addr=3D0x0 \
-netdev user,id=3Dhostnet0 \
-device virtio-net-pci-non-transitional,netdev=3Dhostnet0,id=3Dnet0,\
mac=3D00:11:22:33:44:55,bus=3Dpci.2,addr=3D0x0 \
--device virtio-input-host-pci,id=3Dinput0,evdev=3D/dev/input/event1234,bus=
=3Dpci.7,\
-addr=3D0x0 \
+-device virtio-input-host-pci-non-transitional,id=3Dinput0,\
+evdev=3D/dev/input/event1234,bus=3Dpci.7,addr=3D0x0 \
-device vhost-scsi-pci-non-transitional,wwpn=3Dnaa.5123456789abcde0,vhostf=
d=3D3,\
id=3Dhostdev0,bus=3Dpci.4,addr=3D0x0 \
-device virtio-balloon-pci-non-transitional,id=3Dballoon0,bus=3Dpci.5,addr=
=3D0x0 \
diff --git a/tests/qemuxml2argvdata/virtio-transitional.x86_64-3.1.0.args b=
/tests/qemuxml2argvdata/virtio-transitional.x86_64-3.1.0.args
index 0286b98ece..1c851b5ec4 100644
--- a/tests/qemuxml2argvdata/virtio-transitional.x86_64-3.1.0.args
+++ b/tests/qemuxml2argvdata/virtio-transitional.x86_64-3.1.0.args
@@ -27,7 +27,6 @@ file=3D/tmp/lib/domain--1-QEMUGuest1/master-key.aes \
addr=3D0x1 \
-device pcie-pci-bridge,id=3Dpci.2,bus=3Dpci.1,addr=3D0x0 \
-device pcie-root-port,port=3D0x9,chassis=3D3,id=3Dpci.3,bus=3Dpcie.0,addr=
=3D0x1.0x1 \
--device pcie-root-port,port=3D0xa,chassis=3D4,id=3Dpci.4,bus=3Dpcie.0,addr=
=3D0x1.0x2 \
-drive file=3D/dev/HostVG/QEMUGuest1,format=3Draw,if=3Dnone,id=3Ddrive-vir=
tio-disk0 \
-device virtio-blk-pci,disable-legacy=3Doff,disable-modern=3Doff,scsi=3Dof=
f,\
bus=3Dpci.2,addr=3D0x3,drive=3Ddrive-virtio-disk0,id=3Dvirtio-disk0,bootin=
dex=3D1 \
@@ -37,8 +36,8 @@ fsdev=3Dfsdev-fs0,mount_tag=3Dfs1,bus=3Dpci.2,addr=3D0x1 \
-netdev user,id=3Dhostnet0 \
-device virtio-net-pci,disable-legacy=3Doff,disable-modern=3Doff,netdev=3D=
hostnet0,\
id=3Dnet0,mac=3D00:11:22:33:44:55,bus=3Dpci.2,addr=3D0x2 \
--device virtio-input-host-pci,id=3Dinput0,evdev=3D/dev/input/event1234,bus=
=3Dpci.3,\
-addr=3D0x0 \
+-device virtio-input-host-pci,disable-legacy=3Doff,disable-modern=3Doff,id=
=3Dinput0,\
+evdev=3D/dev/input/event1234,bus=3Dpci.2,addr=3D0x7 \
-device vhost-scsi-pci,disable-legacy=3Doff,disable-modern=3Doff,\
wwpn=3Dnaa.5123456789abcde0,vhostfd=3D3,id=3Dhostdev0,bus=3Dpci.2,addr=3D0=
x4 \
-device virtio-balloon-pci,disable-legacy=3Doff,disable-modern=3Doff,id=3D=
balloon0,\
@@ -49,5 +48,5 @@ id=3Drng0,bus=3Dpci.2,addr=3D0x6 \
-sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,\
resourcecontrol=3Ddeny \
-device vhost-vsock-pci,disable-legacy=3Doff,disable-modern=3Doff,id=3Dvso=
ck0,\
-guest-cid=3D4,vhostfd=3D6789,bus=3Dpci.2,addr=3D0x7 \
+guest-cid=3D4,vhostfd=3D6789,bus=3Dpci.2,addr=3D0x8 \
-msg timestamp=3Don
diff --git a/tests/qemuxml2argvdata/virtio-transitional.x86_64-latest.args =
b/tests/qemuxml2argvdata/virtio-transitional.x86_64-latest.args
index 24b49e6009..410eb28f0a 100644
--- a/tests/qemuxml2argvdata/virtio-transitional.x86_64-latest.args
+++ b/tests/qemuxml2argvdata/virtio-transitional.x86_64-latest.args
@@ -27,7 +27,6 @@ file=3D/tmp/lib/domain--1-QEMUGuest1/master-key.aes \
addr=3D0x1 \
-device pcie-pci-bridge,id=3Dpci.2,bus=3Dpci.1,addr=3D0x0 \
-device pcie-root-port,port=3D0x9,chassis=3D3,id=3Dpci.3,bus=3Dpcie.0,addr=
=3D0x1.0x1 \
--device pcie-root-port,port=3D0xa,chassis=3D4,id=3Dpci.4,bus=3Dpcie.0,addr=
=3D0x1.0x2 \
-drive file=3D/dev/HostVG/QEMUGuest1,format=3Draw,if=3Dnone,id=3Ddrive-vir=
tio-disk0 \
-device virtio-blk-pci-transitional,scsi=3Doff,bus=3Dpci.2,addr=3D0x3,\
drive=3Ddrive-virtio-disk0,id=3Dvirtio-disk0,bootindex=3D1 \
@@ -37,8 +36,8 @@ bus=3Dpci.2,addr=3D0x1 \
-netdev user,id=3Dhostnet0 \
-device virtio-net-pci-transitional,netdev=3Dhostnet0,id=3Dnet0,\
mac=3D00:11:22:33:44:55,bus=3Dpci.2,addr=3D0x2 \
--device virtio-input-host-pci,id=3Dinput0,evdev=3D/dev/input/event1234,bus=
=3Dpci.3,\
-addr=3D0x0 \
+-device virtio-input-host-pci-transitional,id=3Dinput0,\
+evdev=3D/dev/input/event1234,bus=3Dpci.2,addr=3D0x7 \
-device vhost-scsi-pci-transitional,wwpn=3Dnaa.5123456789abcde0,vhostfd=3D=
3,\
id=3Dhostdev0,bus=3Dpci.2,addr=3D0x4 \
-device virtio-balloon-pci-transitional,id=3Dballoon0,bus=3Dpci.2,addr=3D0=
x5 \
@@ -47,5 +46,5 @@ id=3Dhostdev0,bus=3Dpci.2,addr=3D0x4 \
-sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,\
resourcecontrol=3Ddeny \
-device vhost-vsock-pci-transitional,id=3Dvsock0,guest-cid=3D4,vhostfd=3D6=
789,\
-bus=3Dpci.2,addr=3D0x7 \
+bus=3Dpci.2,addr=3D0x8 \
-msg timestamp=3Don
diff --git a/tests/qemuxml2xmloutdata/virtio-transitional.xml b/tests/qemux=
ml2xmloutdata/virtio-transitional.xml
index 490b28368a..9fa9732c2d 100644
--- a/tests/qemuxml2xmloutdata/virtio-transitional.xml
+++ b/tests/qemuxml2xmloutdata/virtio-transitional.xml
@@ -39,11 +39,6 @@
-
-
-
-
-
@@ -56,7 +51,7 @@
-
+
@@ -73,7 +68,7 @@
-
+
--=20
2.20.1
--
libvir-list mailing list
libvir-list@redhat.com
https://www.redhat.com/mailman/listinfo/libvir-list
From nobody Fri Mar 29 14:34:17 2024
Delivered-To: importer@patchew.org
Received-SPF: pass (zoho.com: domain of redhat.com designates 209.132.183.28
as permitted sender) client-ip=209.132.183.28;
envelope-from=libvir-list-bounces@redhat.com; helo=mx1.redhat.com;
Authentication-Results: mx.zohomail.com;
spf=pass (zoho.com: domain of redhat.com designates 209.132.183.28 as
permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com;
dmarc=pass(p=none dis=none) header.from=redhat.com
Return-Path:
Received: from mx1.redhat.com (mx1.redhat.com [209.132.183.28]) by
mx.zohomail.com
with SMTPS id 1549663986645111.62489850226814;
Fri, 8 Feb 2019 14:13:06 -0800 (PST)
Received: from smtp.corp.redhat.com (int-mx07.intmail.prod.int.phx2.redhat.com
[10.5.11.22])
(using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits))
(No client certificate requested)
by mx1.redhat.com (Postfix) with ESMTPS id 860A9C057F8F;
Fri, 8 Feb 2019 22:13:04 +0000 (UTC)
Received: from colo-mx.corp.redhat.com
(colo-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.20])
by smtp.corp.redhat.com (Postfix) with ESMTPS id 4B4F410640FD;
Fri, 8 Feb 2019 22:13:04 +0000 (UTC)
Received: from lists01.pubmisc.prod.ext.phx2.redhat.com
(lists01.pubmisc.prod.ext.phx2.redhat.com [10.5.19.33])
by colo-mx.corp.redhat.com (Postfix) with ESMTP id F09C218033CC;
Fri, 8 Feb 2019 22:13:03 +0000 (UTC)
Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.phx2.redhat.com
[10.5.11.16])
by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP
id x18MCT88008512 for ;
Fri, 8 Feb 2019 17:12:29 -0500
Received: by smtp.corp.redhat.com (Postfix)
id 48D265C6A6; Fri, 8 Feb 2019 22:12:29 +0000 (UTC)
Received: from worklaptop.redhat.com (ovpn-123-115.rdu2.redhat.com
[10.10.123.115])
by smtp.corp.redhat.com (Postfix) with ESMTP id C81AC5C557;
Fri, 8 Feb 2019 22:12:28 +0000 (UTC)
From: Cole Robinson
To: libvirt-list@redhat.com
Date: Fri, 8 Feb 2019 17:12:06 -0500
Message-Id:
In-Reply-To:
References:
MIME-Version: 1.0
X-Scanned-By: MIMEDefang 2.79 on 10.5.11.16
X-loop: libvir-list@redhat.com
Cc: Andrea Bolognani
Subject: [libvirt] [PATCH v3 15/17] qemu: Support virtio-serial controller
model=virtio-{non-}transitional
X-BeenThere: libvir-list@redhat.com
X-Mailman-Version: 2.1.12
Precedence: junk
List-Id: Development discussions about the libvirt library & tools
List-Unsubscribe: ,
List-Archive:
List-Post:
List-Help:
List-Subscribe: ,
Content-Transfer-Encoding: quoted-printable
Sender: libvir-list-bounces@redhat.com
Errors-To: libvir-list-bounces@redhat.com
X-Scanned-By: MIMEDefang 2.84 on 10.5.11.22
X-Greylist: Sender IP whitelisted,
not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.32]);
Fri, 08 Feb 2019 22:13:05 +0000 (UTC)
Content-Type: text/plain; charset="utf-8"
Add controller type=3D'virtio-serial' model handling for virtio
transitional devices. Ex:
* "virtio-transitional" maps to qemu "virtio-serial-pci-transitional"
* "virtio-non-transitional" maps to qemu "virtio-serial-pci-non-transitiona=
l"
Reviewed-by: Andrea Bolognani
Signed-off-by: Cole Robinson
---
docs/formatdomain.html.in | 7 +++++-
docs/schemas/domaincommon.rng | 9 ++++++++
src/conf/domain_conf.c | 11 ++++++++++
src/conf/domain_conf.h | 10 +++++++++
src/qemu/qemu_command.c | 10 ++++++++-
src/qemu/qemu_domain_address.c | 15 ++++++++++++-
.../virtio-non-transitional.x86_64-3.1.0.args | 18 +++++++++------
...virtio-non-transitional.x86_64-latest.args | 18 +++++++++------
.../virtio-non-transitional.xml | 1 +
.../virtio-transitional.x86_64-3.1.0.args | 14 +++++++-----
.../virtio-transitional.x86_64-latest.args | 13 ++++++-----
.../qemuxml2argvdata/virtio-transitional.xml | 1 +
.../virtio-non-transitional.xml | 22 +++++++++++++------
.../virtio-transitional.xml | 15 ++++++++-----
14 files changed, 122 insertions(+), 42 deletions(-)
diff --git a/docs/formatdomain.html.in b/docs/formatdomain.html.in
index 336a28e54c..32e40e8765 100644
--- a/docs/formatdomain.html.in
+++ b/docs/formatdomain.html.in
@@ -4171,7 +4171,12 @@
The virtio-serial controller has two additional
optional attributes ports and vectors,
which control how many devices can be connected through the
- controller.
+ controller. Since 5.1.0, it
+ supports an optional attribute model which can
+ be 'virtio', 'virtio-transitional', or 'virtio-non-transitional'. =
See
+ Virtio transitional device=
s
+ for more details.
+
A scsi controller has an optional attribute
model, which is one of 'auto', 'buslogic', 'ibmvscsi',
- 'lsilogic', 'lsisas1068', 'lsisas1078', 'virtio-scsi' or
- 'vmpvscsi'.
+ 'lsilogic', 'lsisas1068', 'lsisas1078', 'virtio-scsi',
+ 'vmpvscsi', 'virtio-transitional', 'virtio-non-transitional'. See
+ Virtio transitional device=
s
+ for more details.
+