3:32 p.m.
<input> devices lack the model= attribute which is used by
most other device types. To eventually support
virtio-input-host-pci-{non-}traditional in qemu, let's add
a standard model= attribute. This just adds the domain_conf
wiring
Signed-off-by: Cole Robinson <crobinso(a)redhat.com>
---
docs/formatdomain.html.in | 4 +++
docs/schemas/domaincommon.rng | 9 +++++
src/conf/domain_conf.c | 35 +++++++++++++++++++
src/conf/domain_conf.h | 11 ++++++
.../virtio-non-transitional.x86_64-3.1.0.args | 5 ++-
...virtio-non-transitional.x86_64-latest.args | 5 ++-
.../virtio-non-transitional.xml | 3 ++
.../virtio-transitional.x86_64-3.1.0.args | 3 ++
.../virtio-transitional.x86_64-latest.args | 3 ++
.../qemuxml2argvdata/virtio-transitional.xml | 3 ++
.../virtio-non-transitional.xml | 11 +++++-
.../virtio-transitional.xml | 9 +++++
tests/qemuxml2xmltest.c | 6 ++--
13 files changed, 102 insertions(+), 5 deletions(-)
diff --git a/docs/formatdomain.html.in b/docs/formatdomain.html.in
index eed35ef545..6838774c74 100644
--- a/docs/formatdomain.html.in
+++ b/docs/formatdomain.html.in
@@ -6431,6 +6431,10 @@ qemu-kvm -net nic,model=? /dev/null
For type <code>passthrough</code>, the mandatory sub-element
<code>source</code>
must have an <code>evdev</code> attribute containing the absolute path
to the
event device passed through to guests. (KVM only)
+
+ <span class="since">Since 5.1.0</span>, the
<code>input</code> element
+ accepts a <code>model</code> attribute which has the values
'virtio',
+ 'virtio-transitional' and 'virtio-non-transitional'.
</p>
<p>
diff --git a/docs/schemas/domaincommon.rng b/docs/schemas/domaincommon.rng
index 1e26d5efca..ccc94a2fba 100644
--- a/docs/schemas/domaincommon.rng
+++ b/docs/schemas/domaincommon.rng
@@ -4406,6 +4406,15 @@
</element>
</group>
</choice>
+ <optional>
+ <attribute name="model">
+ <choice>
+ <value>virtio</value>
+ <value>virtio-transitional</value>
+ <value>virtio-non-transitional</value>
+ </choice>
+ </attribute>
+ </optional>
<optional>
<ref name="alias"/>
</optional>
diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c
index 55ee8da179..8169428051 100644
--- a/src/conf/domain_conf.c
+++ b/src/conf/domain_conf.c
@@ -614,6 +614,13 @@ VIR_ENUM_IMPL(virDomainInputBus, VIR_DOMAIN_INPUT_BUS_LAST,
"parallels",
"virtio")
+VIR_ENUM_IMPL(virDomainInputModel, VIR_DOMAIN_INPUT_MODEL_LAST,
+ "default",
+ "virtio",
+ "virtio-transitional",
+ "virtio-non-transitional",
+);
+
VIR_ENUM_IMPL(virDomainGraphics, VIR_DOMAIN_GRAPHICS_TYPE_LAST,
"sdl",
"vnc",
@@ -13082,6 +13089,7 @@ virDomainInputDefParseXML(virDomainXMLOptionPtr xmlopt,
char *evdev = NULL;
char *type = NULL;
char *bus = NULL;
+ char *model = NULL;
if (VIR_ALLOC(def) < 0)
return NULL;
@@ -13090,6 +13098,7 @@ virDomainInputDefParseXML(virDomainXMLOptionPtr xmlopt,
type = virXMLPropString(node, "type");
bus = virXMLPropString(node, "bus");
+ model = virXMLPropString(node, "model");
if (!type) {
virReportError(VIR_ERR_INTERNAL_ERROR,
@@ -13103,6 +13112,13 @@ virDomainInputDefParseXML(virDomainXMLOptionPtr xmlopt,
goto error;
}
+ if (model &&
+ (def->model = virDomainInputModelTypeFromString(model)) < 0) {
+ virReportError(VIR_ERR_CONFIG_UNSUPPORTED,
+ _("unknown input model '%s'"), model);
+ goto error;
+ }
+
if (bus) {
if ((def->bus = virDomainInputBusTypeFromString(bus)) < 0) {
virReportError(VIR_ERR_CONFIG_UNSUPPORTED,
@@ -13212,6 +13228,7 @@ virDomainInputDefParseXML(virDomainXMLOptionPtr xmlopt,
VIR_FREE(evdev);
VIR_FREE(type);
VIR_FREE(bus);
+ VIR_FREE(model);
ctxt->node = save;
return def;
@@ -22109,6 +22126,14 @@ virDomainInputDefCheckABIStability(virDomainInputDefPtr src,
return false;
}
+ if (src->model != dst->model) {
+ virReportError(VIR_ERR_CONFIG_UNSUPPORTED,
+ _("Target input model %s does not match source %s"),
+ virDomainInputBusTypeToString(dst->model),
+ virDomainInputBusTypeToString(src->model));
+ return false;
+ }
+
if (src->virtio && dst->virtio &&
!virDomainVirtioOptionsCheckABIStability(src->virtio, dst->virtio))
return false;
@@ -26696,6 +26721,7 @@ virDomainInputDefFormat(virBufferPtr buf,
{
const char *type = virDomainInputTypeToString(def->type);
const char *bus = virDomainInputBusTypeToString(def->bus);
+ const char *model = virDomainInputModelTypeToString(def->model);
virBuffer childbuf = VIR_BUFFER_INITIALIZER;
virBuffer driverBuf = VIR_BUFFER_INITIALIZER;
int ret = -1;
@@ -26721,6 +26747,15 @@ virDomainInputDefFormat(virBufferPtr buf,
virBufferAsprintf(buf, "<input type='%s' bus='%s'",
type, bus);
+ if (def->model) {
+ if (!model) {
+ virReportError(VIR_ERR_INTERNAL_ERROR,
+ _("unexpected input model %d"), def->model);
+ goto cleanup;
+ }
+ virBufferAsprintf(buf, " model='%s'", model);
+ }
+
virBufferSetChildIndent(&childbuf, buf);
virDomainVirtioOptionsFormat(&driverBuf, def->virtio);
if (virBufferCheckError(&driverBuf) < 0)
diff --git a/src/conf/domain_conf.h b/src/conf/domain_conf.h
index f0d41e3153..0e87d7efef 100644
--- a/src/conf/domain_conf.h
+++ b/src/conf/domain_conf.h
@@ -1376,9 +1376,19 @@ typedef enum {
VIR_DOMAIN_INPUT_BUS_LAST
} virDomainInputBus;
+typedef enum {
+ VIR_DOMAIN_INPUT_MODEL_DEFAULT,
+ VIR_DOMAIN_INPUT_MODEL_VIRTIO,
+ VIR_DOMAIN_INPUT_MODEL_VIRTIO_TRANSITIONAL,
+ VIR_DOMAIN_INPUT_MODEL_VIRTIO_NON_TRANSITIONAL,
+
+ VIR_DOMAIN_INPUT_MODEL_LAST
+} virDomainInputModel;
+
struct _virDomainInputDef {
int type;
int bus;
+ int model; /* virDomainInputModel */
struct {
char *evdev;
} source;
@@ -3496,6 +3506,7 @@ VIR_ENUM_DECL(virDomainHub)
VIR_ENUM_DECL(virDomainRedirdevBus)
VIR_ENUM_DECL(virDomainInput)
VIR_ENUM_DECL(virDomainInputBus)
+VIR_ENUM_DECL(virDomainInputModel)
VIR_ENUM_DECL(virDomainGraphics)
VIR_ENUM_DECL(virDomainGraphicsListen)
VIR_ENUM_DECL(virDomainGraphicsAuthConnected)
diff --git a/tests/qemuxml2argvdata/virtio-non-transitional.x86_64-3.1.0.args
b/tests/qemuxml2argvdata/virtio-non-transitional.x86_64-3.1.0.args
index 97df54dd77..9130572abe 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
@@ -32,6 +32,7 @@ addr=0x1 \
-device pcie-root-port,port=0xd,chassis=6,id=pci.6,bus=pcie.0,addr=0x1.0x5 \
-device pcie-root-port,port=0xe,chassis=7,id=pci.7,bus=pcie.0,addr=0x1.0x6 \
-device pcie-root-port,port=0xf,chassis=8,id=pci.8,bus=pcie.0,addr=0x1.0x7 \
+-device pcie-root-port,port=0x10,chassis=9,id=pci.9,bus=pcie.0,addr=0x2 \
-drive file=/dev/HostVG/QEMUGuest1,format=raw,if=none,id=drive-virtio-disk0 \
-device virtio-blk-pci,disable-legacy=on,disable-modern=off,scsi=off,bus=pci.3,\
addr=0x0,drive=drive-virtio-disk0,id=virtio-disk0,bootindex=1 \
@@ -41,6 +42,8 @@ fsdev=fsdev-fs0,mount_tag=fs1,bus=pci.1,addr=0x0 \
-netdev user,id=hostnet0 \
-device virtio-net-pci,disable-legacy=on,disable-modern=off,netdev=hostnet0,\
id=net0,mac=00:11:22:33:44:55,bus=pci.2,addr=0x0 \
+-device virtio-input-host-pci,id=input0,evdev=/dev/input/event1234,bus=pci.7,\
+addr=0x0 \
-device vhost-scsi-pci,disable-legacy=on,disable-modern=off,\
wwpn=naa.5123456789abcde0,vhostfd=3,id=hostdev0,bus=pci.4,addr=0x0 \
-device virtio-balloon-pci,disable-legacy=on,disable-modern=off,id=balloon0,\
@@ -51,5 +54,5 @@ id=rng0,bus=pci.6,addr=0x0 \
-sandbox on,obsolete=deny,elevateprivileges=deny,spawn=deny,\
resourcecontrol=deny \
-device vhost-vsock-pci,disable-legacy=on,disable-modern=off,id=vsock0,\
-guest-cid=4,vhostfd=6789,bus=pci.7,addr=0x0 \
+guest-cid=4,vhostfd=6789,bus=pci.8,addr=0x0 \
-msg timestamp=on
diff --git a/tests/qemuxml2argvdata/virtio-non-transitional.x86_64-latest.args
b/tests/qemuxml2argvdata/virtio-non-transitional.x86_64-latest.args
index 2a73798ee2..8e0709816b 100644
--- a/tests/qemuxml2argvdata/virtio-non-transitional.x86_64-latest.args
+++ b/tests/qemuxml2argvdata/virtio-non-transitional.x86_64-latest.args
@@ -32,6 +32,7 @@ addr=0x1 \
-device pcie-root-port,port=0xd,chassis=6,id=pci.6,bus=pcie.0,addr=0x1.0x5 \
-device pcie-root-port,port=0xe,chassis=7,id=pci.7,bus=pcie.0,addr=0x1.0x6 \
-device pcie-root-port,port=0xf,chassis=8,id=pci.8,bus=pcie.0,addr=0x1.0x7 \
+-device pcie-root-port,port=0x10,chassis=9,id=pci.9,bus=pcie.0,addr=0x2 \
-drive file=/dev/HostVG/QEMUGuest1,format=raw,if=none,id=drive-virtio-disk0 \
-device virtio-blk-pci-non-transitional,scsi=off,bus=pci.3,addr=0x0,\
drive=drive-virtio-disk0,id=virtio-disk0,bootindex=1 \
@@ -41,6 +42,8 @@ bus=pci.1,addr=0x0 \
-netdev user,id=hostnet0 \
-device virtio-net-pci-non-transitional,netdev=hostnet0,id=net0,\
mac=00:11:22:33:44:55,bus=pci.2,addr=0x0 \
+-device virtio-input-host-pci,id=input0,evdev=/dev/input/event1234,bus=pci.7,\
+addr=0x0 \
-device vhost-scsi-pci-non-transitional,wwpn=naa.5123456789abcde0,vhostfd=3,\
id=hostdev0,bus=pci.4,addr=0x0 \
-device virtio-balloon-pci-non-transitional,id=balloon0,bus=pci.5,addr=0x0 \
@@ -49,5 +52,5 @@ id=hostdev0,bus=pci.4,addr=0x0 \
-sandbox on,obsolete=deny,elevateprivileges=deny,spawn=deny,\
resourcecontrol=deny \
-device vhost-vsock-pci-non-transitional,id=vsock0,guest-cid=4,vhostfd=6789,\
-bus=pci.7,addr=0x0 \
+bus=pci.8,addr=0x0 \
-msg timestamp=on
diff --git a/tests/qemuxml2argvdata/virtio-non-transitional.xml
b/tests/qemuxml2argvdata/virtio-non-transitional.xml
index d4c07420dc..3fd32632d3 100644
--- a/tests/qemuxml2argvdata/virtio-non-transitional.xml
+++ b/tests/qemuxml2argvdata/virtio-non-transitional.xml
@@ -26,6 +26,9 @@
<source dir='/export/fs1'/>
<target dir='fs1'/>
</filesystem>
+ <input type='passthrough' bus='virtio'
model='virtio-non-transitional'>
+ <source evdev='/dev/input/event1234'/>
+ </input>
<controller type='usb' index='0' model='none'/>
<memballoon model='virtio-non-transitional'/>
<vsock model='virtio-non-transitional'>
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 d2429d2d2c..06fe70bb11 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=/tmp/lib/domain--1-QEMUGuest1/master-key.aes \
addr=0x1 \
-device pcie-pci-bridge,id=pci.2,bus=pci.1,addr=0x0 \
-device pcie-root-port,port=0x9,chassis=3,id=pci.3,bus=pcie.0,addr=0x1.0x1 \
+-device pcie-root-port,port=0xa,chassis=4,id=pci.4,bus=pcie.0,addr=0x1.0x2 \
-drive file=/dev/HostVG/QEMUGuest1,format=raw,if=none,id=drive-virtio-disk0 \
-device virtio-blk-pci,scsi=off,bus=pci.2,addr=0x3,drive=drive-virtio-disk0,\
id=virtio-disk0,bootindex=1 \
@@ -35,6 +36,8 @@ id=virtio-disk0,bootindex=1 \
-netdev user,id=hostnet0 \
-device virtio-net-pci,netdev=hostnet0,id=net0,mac=00:11:22:33:44:55,bus=pci.2,\
addr=0x2 \
+-device virtio-input-host-pci,id=input0,evdev=/dev/input/event1234,bus=pci.3,\
+addr=0x0 \
-device vhost-scsi-pci,wwpn=naa.5123456789abcde0,vhostfd=3,id=hostdev0,\
bus=pci.2,addr=0x4 \
-device virtio-balloon-pci,id=balloon0,bus=pci.2,addr=0x5 \
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=/tmp/lib/domain--1-QEMUGuest1/master-key.aes \
addr=0x1 \
-device pcie-pci-bridge,id=pci.2,bus=pci.1,addr=0x0 \
-device pcie-root-port,port=0x9,chassis=3,id=pci.3,bus=pcie.0,addr=0x1.0x1 \
+-device pcie-root-port,port=0xa,chassis=4,id=pci.4,bus=pcie.0,addr=0x1.0x2 \
-drive file=/dev/HostVG/QEMUGuest1,format=raw,if=none,id=drive-virtio-disk0 \
-device virtio-blk-pci-transitional,scsi=off,bus=pci.2,addr=0x3,\
drive=drive-virtio-disk0,id=virtio-disk0,bootindex=1 \
@@ -36,6 +37,8 @@ bus=pci.2,addr=0x1 \
-netdev user,id=hostnet0 \
-device virtio-net-pci-transitional,netdev=hostnet0,id=net0,\
mac=00:11:22:33:44:55,bus=pci.2,addr=0x2 \
+-device virtio-input-host-pci,id=input0,evdev=/dev/input/event1234,bus=pci.3,\
+addr=0x0 \
-device vhost-scsi-pci-transitional,wwpn=naa.5123456789abcde0,vhostfd=3,\
id=hostdev0,bus=pci.2,addr=0x4 \
-device virtio-balloon-pci-transitional,id=balloon0,bus=pci.2,addr=0x5 \
diff --git a/tests/qemuxml2argvdata/virtio-transitional.xml
b/tests/qemuxml2argvdata/virtio-transitional.xml
index dd33071eb9..5daea19ada 100644
--- a/tests/qemuxml2argvdata/virtio-transitional.xml
+++ b/tests/qemuxml2argvdata/virtio-transitional.xml
@@ -26,6 +26,9 @@
<source dir='/export/fs1'/>
<target dir='fs1'/>
</filesystem>
+ <input type='passthrough' bus='virtio'
model='virtio-transitional'>
+ <source evdev='/dev/input/event1234'/>
+ </input>
<controller type='usb' index='0' model='none'/>
<memballoon model='virtio-transitional'/>
<vsock model='virtio-transitional'>
diff --git a/tests/qemuxml2xmloutdata/virtio-non-transitional.xml
b/tests/qemuxml2xmloutdata/virtio-non-transitional.xml
index 5ba39ea30f..32c57a27f1 100644
--- a/tests/qemuxml2xmloutdata/virtio-non-transitional.xml
+++ b/tests/qemuxml2xmloutdata/virtio-non-transitional.xml
@@ -65,6 +65,11 @@
<target chassis='8' port='0xf'/>
<address type='pci' domain='0x0000' bus='0x00'
slot='0x01' function='0x7'/>
</controller>
+ <controller type='pci' index='9'
model='pcie-root-port'>
+ <model name='pcie-root-port'/>
+ <target chassis='9' port='0x10'/>
+ <address type='pci' domain='0x0000' bus='0x00'
slot='0x02' function='0x0'/>
+ </controller>
<filesystem type='mount' accessmode='passthrough'
model='virtio-9p-non-transitional'>
<source dir='/export/fs1'/>
<target dir='fs1'/>
@@ -75,6 +80,10 @@
<model type='virtio-non-transitional'/>
<address type='pci' domain='0x0000' bus='0x02'
slot='0x00' function='0x0'/>
</interface>
+ <input type='passthrough' bus='virtio'
model='virtio-non-transitional'>
+ <source evdev='/dev/input/event1234'/>
+ <address type='pci' domain='0x0000' bus='0x07'
slot='0x00' function='0x0'/>
+ </input>
<input type='mouse' bus='ps2'/>
<input type='keyboard' bus='ps2'/>
<hostdev mode='subsystem' type='scsi_host' managed='no'
model='virtio-non-transitional'>
@@ -90,7 +99,7 @@
</rng>
<vsock model='virtio-non-transitional'>
<cid auto='no' address='4'/>
- <address type='pci' domain='0x0000' bus='0x07'
slot='0x00' function='0x0'/>
+ <address type='pci' domain='0x0000' bus='0x08'
slot='0x00' function='0x0'/>
</vsock>
</devices>
</domain>
diff --git a/tests/qemuxml2xmloutdata/virtio-transitional.xml
b/tests/qemuxml2xmloutdata/virtio-transitional.xml
index 5cb6568cc8..b0da885c79 100644
--- a/tests/qemuxml2xmloutdata/virtio-transitional.xml
+++ b/tests/qemuxml2xmloutdata/virtio-transitional.xml
@@ -39,6 +39,11 @@
<target chassis='3' port='0x9'/>
<address type='pci' domain='0x0000' bus='0x00'
slot='0x01' function='0x1'/>
</controller>
+ <controller type='pci' index='4'
model='pcie-root-port'>
+ <model name='pcie-root-port'/>
+ <target chassis='4' port='0xa'/>
+ <address type='pci' domain='0x0000' bus='0x00'
slot='0x01' function='0x2'/>
+ </controller>
<filesystem type='mount' accessmode='passthrough'
model='virtio-9p-transitional'>
<source dir='/export/fs1'/>
<target dir='fs1'/>
@@ -49,6 +54,10 @@
<model type='virtio-transitional'/>
<address type='pci' domain='0x0000' bus='0x02'
slot='0x02' function='0x0'/>
</interface>
+ <input type='passthrough' bus='virtio'
model='virtio-transitional'>
+ <source evdev='/dev/input/event1234'/>
+ <address type='pci' domain='0x0000' bus='0x03'
slot='0x00' function='0x0'/>
+ </input>
<input type='mouse' bus='ps2'/>
<input type='keyboard' bus='ps2'/>
<hostdev mode='subsystem' type='scsi_host' managed='no'
model='virtio-transitional'>
diff --git a/tests/qemuxml2xmltest.c b/tests/qemuxml2xmltest.c
index c5ad3ba4b6..be8ef921ee 100644
--- a/tests/qemuxml2xmltest.c
+++ b/tests/qemuxml2xmltest.c
@@ -1273,13 +1273,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);
if (getenv("LIBVIRT_SKIP_CLEANUP") == NULL)
virFileDeleteTree(fakerootdir);
--
2.20.1