From nobody Sun Feb 8 09:16:58 2026 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 1547747622867278.3379143324926; Thu, 17 Jan 2019 09:53:42 -0800 (PST) Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.phx2.redhat.com [10.5.11.14]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id B0DB788E67; Thu, 17 Jan 2019 17:53:40 +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 745E75ED4D; Thu, 17 Jan 2019 17:53:40 +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 2581218033A6; Thu, 17 Jan 2019 17:53:40 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id x0HHrGiE005589 for ; Thu, 17 Jan 2019 12:53:16 -0500 Received: by smtp.corp.redhat.com (Postfix) id DB176600CC; Thu, 17 Jan 2019 17:53:16 +0000 (UTC) Received: from worklaptop.redhat.com (ovpn-122-144.rdu2.redhat.com [10.10.122.144]) by smtp.corp.redhat.com (Postfix) with ESMTP id 7AE46600C6; Thu, 17 Jan 2019 17:53:16 +0000 (UTC) From: Cole Robinson To: libvirt-list@redhat.com Date: Thu, 17 Jan 2019 12:52:42 -0500 Message-Id: <39eff8fd2aef05ce62ce1650b6717c765f6e4472.1547746868.git.crobinso@redhat.com> In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.11 X-loop: libvir-list@redhat.com Subject: [libvirt] [PATCH 15/18] 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.14 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.25]); Thu, 17 Jan 2019 17:53:41 +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" Signed-off-by: Cole Robinson --- src/qemu/qemu_capabilities.c | 4 ++++ src/qemu/qemu_capabilities.h | 2 ++ src/qemu/qemu_command.c | 12 ++++++++++-- src/qemu/qemu_domain_address.c | 9 +++++++++ tests/qemucapabilitiesdata/caps_4.0.0.x86_64.xml | 2 ++ .../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 ++------- 10 files changed, 39 insertions(+), 21 deletions(-) diff --git a/src/qemu/qemu_capabilities.c b/src/qemu/qemu_capabilities.c index 954ba5a171..f5b9bc6937 100644 --- a/src/qemu/qemu_capabilities.c +++ b/src/qemu/qemu_capabilities.c @@ -540,6 +540,8 @@ VIR_ENUM_IMPL(virQEMUCaps, QEMU_CAPS_LAST, =20 /* 340 */ "vhost-vsock-pci-non-transitional", + "virtio-input-host-pci-transitional", + "virtio-input-host-pci-non-transitional", ); =20 =20 @@ -1142,6 +1144,8 @@ struct virQEMUCapsStringFlags virQEMUCapsObjectTypes[= ] =3D { {"virtio-balloon-pci-non-transitional", QEMU_CAPS_DEVICE_VIRTIO_BALLOO= N_NON_TRANSITIONAL}, {"vhost-vsock-pci-transitional", QEMU_CAPS_DEVICE_VHOST_VSOCK_TRANSITI= ONAL}, {"vhost-vsock-pci-non-transitional", QEMU_CAPS_DEVICE_VHOST_VSOCK_NON_= TRANSITIONAL}, + {"virtio-input-host-pci-transitional", QEMU_CAPS_DEVICE_VIRTIO_INPUT_H= OST_TRANSITIONAL}, + {"virtio-input-host-pci-non-transitional", QEMU_CAPS_DEVICE_VIRTIO_INP= UT_HOST_NON_TRANSITIONAL}, }; =20 static struct virQEMUCapsStringFlags virQEMUCapsDevicePropsVirtioBalloon[]= =3D { diff --git a/src/qemu/qemu_capabilities.h b/src/qemu/qemu_capabilities.h index 99e3b3c5ca..91aae8df5b 100644 --- a/src/qemu/qemu_capabilities.h +++ b/src/qemu/qemu_capabilities.h @@ -524,6 +524,8 @@ typedef enum { /* virQEMUCapsFlags grouping marker for = syntax-check */ =20 /* 340 */ QEMU_CAPS_DEVICE_VHOST_VSOCK_NON_TRANSITIONAL, /* -device vhost-vsock-= pci-non-transitional */ + QEMU_CAPS_DEVICE_VIRTIO_INPUT_HOST_TRANSITIONAL, /* -device virtio-inp= ut-host-pci-transitional */ + QEMU_CAPS_DEVICE_VIRTIO_INPUT_HOST_NON_TRANSITIONAL, /* -device virtio= -input-host-pci-non-transitional */ =20 QEMU_CAPS_LAST /* this must always be the last item */ } virQEMUCapsFlags; diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c index 67e54d42b8..4d14ac9e5d 100644 --- a/src/qemu/qemu_command.c +++ b/src/qemu/qemu_command.c @@ -501,9 +501,14 @@ qemuBuildVirtioTransitional(virBufferPtr buf, tmodel_cap =3D QEMU_CAPS_DEVICE_VHOST_VSOCK_TRANSITIONAL; ntmodel_cap =3D QEMU_CAPS_DEVICE_VHOST_VSOCK_NON_TRANSITIONAL; break; + case VIR_DOMAIN_DEVICE_INPUT: + has_tmodel =3D model =3D=3D VIR_DOMAIN_INPUT_MODEL_VIRTIO_TRAN= SITIONAL; + has_ntmodel =3D model =3D=3D VIR_DOMAIN_INPUT_MODEL_VIRTIO_NON= _TRANSITIONAL; + tmodel_cap =3D QEMU_CAPS_DEVICE_VIRTIO_INPUT_HOST_TRANSITIONAL; + ntmodel_cap =3D QEMU_CAPS_DEVICE_VIRTIO_INPUT_HOST_NON_TRANSIT= IONAL; + break; =20 case VIR_DOMAIN_DEVICE_LEASE: - case VIR_DOMAIN_DEVICE_INPUT: case VIR_DOMAIN_DEVICE_SOUND: case VIR_DOMAIN_DEVICE_VIDEO: case VIR_DOMAIN_DEVICE_WATCHDOG: @@ -4286,7 +4291,10 @@ qemuBuildVirtioInputDevStr(const virDomainDef *def, goto error; break; case VIR_DOMAIN_INPUT_TYPE_PASSTHROUGH: - if (qemuBuildVirtioDevStr(&buf, "virtio-input-host", dev->info.typ= e) < 0) + if (qemuBuildVirtioTransitional(&buf, "virtio-input-host", qemuCap= s, + dev->info.type, + dev->model, NULL, + VIR_DOMAIN_DEVICE_INPUT) < 0) goto error; break; case VIR_DOMAIN_INPUT_TYPE_LAST: diff --git a/src/qemu/qemu_domain_address.c b/src/qemu/qemu_domain_address.c index 1b476bbc15..70591dce25 100644 --- a/src/qemu/qemu_domain_address.c +++ b/src/qemu/qemu_domain_address.c @@ -917,6 +917,15 @@ qemuDomainDeviceCalculatePCIConnectFlags(virDomainDevi= ceDefPtr dev, case VIR_DOMAIN_DEVICE_INPUT: switch ((virDomainInputBus) dev->data.input->bus) { case VIR_DOMAIN_INPUT_BUS_VIRTIO: + switch ((virDomainInputModel) dev->data.input->model) { + case VIR_DOMAIN_INPUT_MODEL_VIRTIO_TRANSITIONAL: + return pciFlags; + case VIR_DOMAIN_INPUT_MODEL_VIRTIO: + case VIR_DOMAIN_INPUT_MODEL_VIRTIO_NON_TRANSITIONAL: + case VIR_DOMAIN_INPUT_MODEL_DEFAULT: + case VIR_DOMAIN_INPUT_MODEL_LAST: + break; + } return virtioFlags; =20 case VIR_DOMAIN_INPUT_BUS_PS2: diff --git a/tests/qemucapabilitiesdata/caps_4.0.0.x86_64.xml b/tests/qemuc= apabilitiesdata/caps_4.0.0.x86_64.xml index b5861b1982..d5bbbc40f7 100644 --- a/tests/qemucapabilitiesdata/caps_4.0.0.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_4.0.0.x86_64.xml @@ -226,6 +226,8 @@ + + 3001050 0 446361 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 5952008b28..fc183757b0 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 @@ bus=3Dpci.1,addr=3D0x0 \ -netdev user,id=3Dhostnet0 \ -device virtio-net-pci,disable-legacy=3Don,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,disable-legacy=3Don,id=3Dinput0,\ +evdev=3D/dev/input/event1234,bus=3Dpci.7,addr=3D0x0 \ -device vhost-scsi-pci,disable-legacy=3Don,wwpn=3Dnaa.5123456789abcde0,vho= stfd=3D3,\ id=3Dhostdev0,bus=3Dpci.4,addr=3D0x0 \ -device virtio-balloon-pci,disable-legacy=3Don,id=3Dballoon0,bus=3Dpci.5,a= ddr=3D0x0 \ 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 06fe70bb11..8046e5c102 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,scsi=3Doff,bus=3Dpci.2,addr=3D0x3,drive=3Ddrive-vir= tio-disk0,\ id=3Dvirtio-disk0,bootindex=3D1 \ @@ -36,8 +35,8 @@ id=3Dvirtio-disk0,bootindex=3D1 \ -netdev user,id=3Dhostnet0 \ -device virtio-net-pci,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,id=3Dinput0,evdev=3D/dev/input/event1234,bus= =3Dpci.2,\ +addr=3D0x7 \ -device vhost-scsi-pci,wwpn=3Dnaa.5123456789abcde0,vhostfd=3D3,id=3Dhostde= v0,\ bus=3Dpci.2,addr=3D0x4 \ -device virtio-balloon-pci,id=3Dballoon0,bus=3Dpci.2,addr=3D0x5 \ @@ -45,5 +44,5 @@ bus=3Dpci.2,addr=3D0x4 \ -device virtio-rng-pci,rng=3Dobjrng0,id=3Drng0,bus=3Dpci.2,addr=3D0x6 \ -sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,\ resourcecontrol=3Ddeny \ --device vhost-vsock-pci,id=3Dvsock0,guest-cid=3D4,vhostfd=3D6789,bus=3Dpci= .2,addr=3D0x7 \ +-device vhost-vsock-pci,id=3Dvsock0,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