From nobody Fri Apr 19 15:09:45 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 154403991564464.28171998848347; Wed, 5 Dec 2018 11:58:35 -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 4788B89AD3; Wed, 5 Dec 2018 19:58:33 +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 E0B13604DA; Wed, 5 Dec 2018 19:58:32 +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 64D843F7CD; Wed, 5 Dec 2018 19:58:32 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx07.intmail.prod.int.phx2.redhat.com [10.5.11.22]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id wB5JwVEv027449 for ; Wed, 5 Dec 2018 14:58:31 -0500 Received: by smtp.corp.redhat.com (Postfix) id 3A88F1054FDC; Wed, 5 Dec 2018 19:58:31 +0000 (UTC) Received: from localhost (ovpn-116-33.gru2.redhat.com [10.97.116.33]) by smtp.corp.redhat.com (Postfix) with ESMTP id 33EC01001F54; Wed, 5 Dec 2018 19:57:58 +0000 (UTC) From: Eduardo Habkost To: qemu-devel@nongnu.org, "Michael S. Tsirkin" Date: Wed, 5 Dec 2018 17:57:03 -0200 Message-Id: <20181205195704.17605-2-ehabkost@redhat.com> In-Reply-To: <20181205195704.17605-1-ehabkost@redhat.com> References: <20181205195704.17605-1-ehabkost@redhat.com> X-Scanned-By: MIMEDefang 2.84 on 10.5.11.22 X-loop: libvir-list@redhat.com Cc: Kevin Wolf , Fam Zheng , Marcel Apfelbaum , Amit Shah , libvir-list@redhat.com, Jason Wang , Cornelia Huck , Andrea Bolognani , Wainer dos Santos Moschetta , Max Reitz , Caio Carrara , Gonglei , Laine Stump , Gerd Hoffmann , Stefan Hajnoczi , Cleber Rosa , Paolo Bonzini , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Subject: [libvirt] [PATCH for-4.0 v4 1/2] virtio: Helper for registering virtio device types 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: , MIME-Version: 1.0 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.26]); Wed, 05 Dec 2018 19:58:34 +0000 (UTC) Content-Type: text/plain; charset="utf-8" Introduce a helper for registering different flavours of virtio devices. Convert code to use the helper, but keep only the existing generic types. Transitional and non-transitional device types will be added by another patch. Acked-by: Andrea Bolognani Reviewed-by: Cornelia Huck Signed-off-by: Eduardo Habkost --- Changes v3 -> v4: * Fix typos on comments (Cornelia Huck) Changes v2 -> v3: * Split into two separate patches (type registration helper and introduction of new types) * Rewrote comments describing each flavour * Rewrote virtio_pci_types_register() completely: * Replaced magic generation of type names with explicit fields in VirtioPCIDeviceTypeInfo * Removed modern_only field (won't be used anymore) * Don't register a separate base type unless it's required by the caller --- hw/virtio/virtio-pci.h | 54 ++++++++ hw/display/virtio-gpu-pci.c | 7 +- hw/display/virtio-vga.c | 7 +- hw/virtio/virtio-crypto-pci.c | 7 +- hw/virtio/virtio-pci.c | 231 ++++++++++++++++++++++++---------- 5 files changed, 228 insertions(+), 78 deletions(-) diff --git a/hw/virtio/virtio-pci.h b/hw/virtio/virtio-pci.h index 813082b0d7..8cd546608e 100644 --- a/hw/virtio/virtio-pci.h +++ b/hw/virtio/virtio-pci.h @@ -417,4 +417,58 @@ struct VirtIOCryptoPCI { /* Virtio ABI version, if we increment this, we break the guest driver. */ #define VIRTIO_PCI_ABI_VERSION 0 =20 +/* Input for virtio_pci_types_register() */ +typedef struct VirtioPCIDeviceTypeInfo { + /* + * Common base class for the subclasses below. + * + * Required only if transitional_name or non_transitional_name is set. + * + * We need a separate base type instead of making all types + * inherit from generic_name for two reasons: + * 1) generic_name implements INTERFACE_PCIE_DEVICE, but + * transitional_name does not. + * 2) generic_name has the "disable-legacy" and "disable-modern" + * properties, transitional_name and non_transitional name don't. + */ + const char *base_name; + /* + * Generic device type. Optional. + * + * Supports both transitional and non-transitional modes, + * using the disable-legacy and disable-modern properties. + * If disable-legacy=3Dauto, (non-)transitional mode is selected + * depending on the bus where the device is plugged. + * + * Implements both INTERFACE_PCIE_DEVICE and INTERFACE_CONVENTIONAL_PC= I_DEVICE, + * but PCI Express is supported only in non-transitional mode. + * + * The only type implemented by QEMU 3.1 and older. + */ + const char *generic_name; + /* + * The transitional device type. Optional. + * + * Implements both INTERFACE_PCIE_DEVICE and INTERFACE_CONVENTIONAL_PC= I_DEVICE. + */ + const char *transitional_name; + /* + * The non-transitional device type. Optional. + * + * Implements INTERFACE_CONVENTIONAL_PCI_DEVICE only. + */ + const char *non_transitional_name; + + /* Parent type. If NULL, TYPE_VIRTIO_PCI is used */ + const char *parent; + + /* Same as TypeInfo fields: */ + size_t instance_size; + void (*instance_init)(Object *obj); + void (*class_init)(ObjectClass *klass, void *data); +} VirtioPCIDeviceTypeInfo; + +/* Register virtio-pci type(s). @t must be static. */ +void virtio_pci_types_register(const VirtioPCIDeviceTypeInfo *t); + #endif diff --git a/hw/display/virtio-gpu-pci.c b/hw/display/virtio-gpu-pci.c index cece4aa495..faf76a8bc4 100644 --- a/hw/display/virtio-gpu-pci.c +++ b/hw/display/virtio-gpu-pci.c @@ -69,9 +69,8 @@ static void virtio_gpu_initfn(Object *obj) TYPE_VIRTIO_GPU); } =20 -static const TypeInfo virtio_gpu_pci_info =3D { - .name =3D TYPE_VIRTIO_GPU_PCI, - .parent =3D TYPE_VIRTIO_PCI, +static const VirtioPCIDeviceTypeInfo virtio_gpu_pci_info =3D { + .generic_name =3D TYPE_VIRTIO_GPU_PCI, .instance_size =3D sizeof(VirtIOGPUPCI), .instance_init =3D virtio_gpu_initfn, .class_init =3D virtio_gpu_pci_class_init, @@ -79,6 +78,6 @@ static const TypeInfo virtio_gpu_pci_info =3D { =20 static void virtio_gpu_pci_register_types(void) { - type_register_static(&virtio_gpu_pci_info); + virtio_pci_types_register(&virtio_gpu_pci_info); } type_init(virtio_gpu_pci_register_types) diff --git a/hw/display/virtio-vga.c b/hw/display/virtio-vga.c index ab2e369b28..8db4d916f2 100644 --- a/hw/display/virtio-vga.c +++ b/hw/display/virtio-vga.c @@ -207,9 +207,8 @@ static void virtio_vga_inst_initfn(Object *obj) TYPE_VIRTIO_GPU); } =20 -static TypeInfo virtio_vga_info =3D { - .name =3D TYPE_VIRTIO_VGA, - .parent =3D TYPE_VIRTIO_PCI, +static VirtioPCIDeviceTypeInfo virtio_vga_info =3D { + .generic_name =3D TYPE_VIRTIO_VGA, .instance_size =3D sizeof(struct VirtIOVGA), .instance_init =3D virtio_vga_inst_initfn, .class_init =3D virtio_vga_class_init, @@ -217,7 +216,7 @@ static TypeInfo virtio_vga_info =3D { =20 static void virtio_vga_register_types(void) { - type_register_static(&virtio_vga_info); + virtio_pci_types_register(&virtio_vga_info); } =20 type_init(virtio_vga_register_types) diff --git a/hw/virtio/virtio-crypto-pci.c b/hw/virtio/virtio-crypto-pci.c index bf64996e48..8cc3fa3ef7 100644 --- a/hw/virtio/virtio-crypto-pci.c +++ b/hw/virtio/virtio-crypto-pci.c @@ -64,9 +64,8 @@ static void virtio_crypto_initfn(Object *obj) TYPE_VIRTIO_CRYPTO); } =20 -static const TypeInfo virtio_crypto_pci_info =3D { - .name =3D TYPE_VIRTIO_CRYPTO_PCI, - .parent =3D TYPE_VIRTIO_PCI, +static const VirtioPCIDeviceTypeInfo virtio_crypto_pci_info =3D { + .generic_name =3D TYPE_VIRTIO_CRYPTO_PCI, .instance_size =3D sizeof(VirtIOCryptoPCI), .instance_init =3D virtio_crypto_initfn, .class_init =3D virtio_crypto_pci_class_init, @@ -74,6 +73,6 @@ static const TypeInfo virtio_crypto_pci_info =3D { =20 static void virtio_crypto_pci_register_types(void) { - type_register_static(&virtio_crypto_pci_info); + virtio_pci_types_register(&virtio_crypto_pci_info); } type_init(virtio_crypto_pci_register_types) diff --git a/hw/virtio/virtio-pci.c b/hw/virtio/virtio-pci.c index a954799267..f07ec55c38 100644 --- a/hw/virtio/virtio-pci.c +++ b/hw/virtio/virtio-pci.c @@ -1119,9 +1119,8 @@ static void virtio_9p_pci_instance_init(Object *obj) TYPE_VIRTIO_9P); } =20 -static const TypeInfo virtio_9p_pci_info =3D { - .name =3D TYPE_VIRTIO_9P_PCI, - .parent =3D TYPE_VIRTIO_PCI, +static const VirtioPCIDeviceTypeInfo virtio_9p_pci_info =3D { + .generic_name =3D TYPE_VIRTIO_9P_PCI, .instance_size =3D sizeof(V9fsPCIState), .instance_init =3D virtio_9p_pci_instance_init, .class_init =3D virtio_9p_pci_class_init, @@ -1877,9 +1876,6 @@ static void virtio_pci_reset(DeviceState *qdev) static Property virtio_pci_properties[] =3D { DEFINE_PROP_BIT("virtio-pci-bus-master-bug-migration", VirtIOPCIProxy,= flags, VIRTIO_PCI_FLAG_BUS_MASTER_BUG_MIGRATION_BIT, false), - DEFINE_PROP_ON_OFF_AUTO("disable-legacy", VirtIOPCIProxy, disable_lega= cy, - ON_OFF_AUTO_AUTO), - DEFINE_PROP_BOOL("disable-modern", VirtIOPCIProxy, disable_modern, fal= se), DEFINE_PROP_BIT("migrate-extra", VirtIOPCIProxy, flags, VIRTIO_PCI_FLAG_MIGRATE_EXTRA_BIT, true), DEFINE_PROP_BIT("modern-pio-notify", VirtIOPCIProxy, flags, @@ -1939,13 +1935,123 @@ static const TypeInfo virtio_pci_info =3D { .class_init =3D virtio_pci_class_init, .class_size =3D sizeof(VirtioPCIClass), .abstract =3D true, - .interfaces =3D (InterfaceInfo[]) { - { INTERFACE_PCIE_DEVICE }, - { INTERFACE_CONVENTIONAL_PCI_DEVICE }, - { } - }, }; =20 +static Property virtio_pci_generic_properties[] =3D { + DEFINE_PROP_ON_OFF_AUTO("disable-legacy", VirtIOPCIProxy, disable_lega= cy, + ON_OFF_AUTO_AUTO), + DEFINE_PROP_BOOL("disable-modern", VirtIOPCIProxy, disable_modern, fal= se), + DEFINE_PROP_END_OF_LIST(), +}; + +static void virtio_pci_base_class_init(ObjectClass *klass, void *data) +{ + const VirtioPCIDeviceTypeInfo *t =3D data; + if (t->class_init) { + t->class_init(klass, NULL); + } +} + +static void virtio_pci_generic_class_init(ObjectClass *klass, void *data) +{ + DeviceClass *dc =3D DEVICE_CLASS(klass); + + dc->props =3D virtio_pci_generic_properties; +} + +/* Used when the generic type and the base type is the same */ +static void virtio_pci_generic_base_class_init(ObjectClass *klass, void *d= ata) +{ + virtio_pci_base_class_init(klass, data); + virtio_pci_generic_class_init(klass, NULL); +} + +static void virtio_pci_transitional_instance_init(Object *obj) +{ + VirtIOPCIProxy *proxy =3D VIRTIO_PCI(obj); + + proxy->disable_legacy =3D ON_OFF_AUTO_OFF; + proxy->disable_modern =3D false; +} + +static void virtio_pci_non_transitional_instance_init(Object *obj) +{ + VirtIOPCIProxy *proxy =3D VIRTIO_PCI(obj); + + proxy->disable_legacy =3D ON_OFF_AUTO_ON; + proxy->disable_modern =3D false; +} + +void virtio_pci_types_register(const VirtioPCIDeviceTypeInfo *t) +{ + TypeInfo base_type_info =3D { + .name =3D t->base_name, + .parent =3D t->parent ? t->parent : TYPE_VIRTIO_PCI, + .instance_size =3D t->instance_size, + .instance_init =3D t->instance_init, + .class_init =3D virtio_pci_base_class_init, + .class_data =3D (void *)t, + .abstract =3D true, + }; + TypeInfo generic_type_info =3D { + .name =3D t->generic_name, + .parent =3D base_type_info.name, + .class_init =3D virtio_pci_generic_class_init, + .interfaces =3D (InterfaceInfo[]) { + { INTERFACE_PCIE_DEVICE }, + { INTERFACE_CONVENTIONAL_PCI_DEVICE }, + { } + }, + }; + + if (!base_type_info.name) { + /* No base type -> register a single generic device type */ + base_type_info.name =3D t->generic_name; + base_type_info.class_init =3D virtio_pci_generic_base_class_init; + base_type_info.interfaces =3D generic_type_info.interfaces; + base_type_info.abstract =3D false; + generic_type_info.name =3D NULL; + assert(!t->non_transitional_name); + assert(!t->transitional_name); + } + + type_register(&base_type_info); + if (generic_type_info.name) { + type_register(&generic_type_info); + } + + if (t->non_transitional_name) { + const TypeInfo non_transitional_type_info =3D { + .name =3D t->non_transitional_name, + .parent =3D base_type_info.name, + .instance_init =3D virtio_pci_non_transitional_instance_init, + .interfaces =3D (InterfaceInfo[]) { + { INTERFACE_PCIE_DEVICE }, + { INTERFACE_CONVENTIONAL_PCI_DEVICE }, + { } + }, + }; + type_register(&non_transitional_type_info); + } + + if (t->transitional_name) { + const TypeInfo transitional_type_info =3D { + .name =3D t->transitional_name, + .parent =3D base_type_info.name, + .instance_init =3D virtio_pci_transitional_instance_init, + .interfaces =3D (InterfaceInfo[]) { + /* + * Transitional virtio devices work only as Conventional P= CI + * devices because they require PIO ports. + */ + { INTERFACE_CONVENTIONAL_PCI_DEVICE }, + { } + }, + }; + type_register(&transitional_type_info); + } +} + /* virtio-blk-pci */ =20 static Property virtio_blk_pci_properties[] =3D { @@ -1995,9 +2101,8 @@ static void virtio_blk_pci_instance_init(Object *obj) "bootindex", &error_abort); } =20 -static const TypeInfo virtio_blk_pci_info =3D { - .name =3D TYPE_VIRTIO_BLK_PCI, - .parent =3D TYPE_VIRTIO_PCI, +static const VirtioPCIDeviceTypeInfo virtio_blk_pci_info =3D { + .generic_name =3D TYPE_VIRTIO_BLK_PCI, .instance_size =3D sizeof(VirtIOBlkPCI), .instance_init =3D virtio_blk_pci_instance_init, .class_init =3D virtio_blk_pci_class_init, @@ -2051,9 +2156,8 @@ static void vhost_user_blk_pci_instance_init(Object *= obj) "bootindex", &error_abort); } =20 -static const TypeInfo vhost_user_blk_pci_info =3D { - .name =3D TYPE_VHOST_USER_BLK_PCI, - .parent =3D TYPE_VIRTIO_PCI, +static const VirtioPCIDeviceTypeInfo vhost_user_blk_pci_info =3D { + .generic_name =3D TYPE_VHOST_USER_BLK_PCI, .instance_size =3D sizeof(VHostUserBlkPCI), .instance_init =3D vhost_user_blk_pci_instance_init, .class_init =3D vhost_user_blk_pci_class_init, @@ -2119,9 +2223,8 @@ static void virtio_scsi_pci_instance_init(Object *obj) TYPE_VIRTIO_SCSI); } =20 -static const TypeInfo virtio_scsi_pci_info =3D { - .name =3D TYPE_VIRTIO_SCSI_PCI, - .parent =3D TYPE_VIRTIO_PCI, +static const VirtioPCIDeviceTypeInfo virtio_scsi_pci_info =3D { + .generic_name =3D TYPE_VIRTIO_SCSI_PCI, .instance_size =3D sizeof(VirtIOSCSIPCI), .instance_init =3D virtio_scsi_pci_instance_init, .class_init =3D virtio_scsi_pci_class_init, @@ -2174,9 +2277,8 @@ static void vhost_scsi_pci_instance_init(Object *obj) "bootindex", &error_abort); } =20 -static const TypeInfo vhost_scsi_pci_info =3D { - .name =3D TYPE_VHOST_SCSI_PCI, - .parent =3D TYPE_VIRTIO_PCI, +static const VirtioPCIDeviceTypeInfo vhost_scsi_pci_info =3D { + .generic_name =3D TYPE_VHOST_SCSI_PCI, .instance_size =3D sizeof(VHostSCSIPCI), .instance_init =3D vhost_scsi_pci_instance_init, .class_init =3D vhost_scsi_pci_class_init, @@ -2229,9 +2331,8 @@ static void vhost_user_scsi_pci_instance_init(Object = *obj) "bootindex", &error_abort); } =20 -static const TypeInfo vhost_user_scsi_pci_info =3D { - .name =3D TYPE_VHOST_USER_SCSI_PCI, - .parent =3D TYPE_VIRTIO_PCI, +static const VirtioPCIDeviceTypeInfo vhost_user_scsi_pci_info =3D { + .generic_name =3D TYPE_VHOST_USER_SCSI_PCI, .instance_size =3D sizeof(VHostUserSCSIPCI), .instance_init =3D vhost_user_scsi_pci_instance_init, .class_init =3D vhost_user_scsi_pci_class_init, @@ -2277,9 +2378,8 @@ static void vhost_vsock_pci_instance_init(Object *obj) TYPE_VHOST_VSOCK); } =20 -static const TypeInfo vhost_vsock_pci_info =3D { - .name =3D TYPE_VHOST_VSOCK_PCI, - .parent =3D TYPE_VIRTIO_PCI, +static const VirtioPCIDeviceTypeInfo vhost_vsock_pci_info =3D { + .generic_name =3D TYPE_VHOST_VSOCK_PCI, .instance_size =3D sizeof(VHostVSockPCI), .instance_init =3D vhost_vsock_pci_instance_init, .class_init =3D vhost_vsock_pci_class_init, @@ -2334,9 +2434,8 @@ static void virtio_balloon_pci_instance_init(Object *= obj) "guest-stats-polling-interval", &error_abort= ); } =20 -static const TypeInfo virtio_balloon_pci_info =3D { - .name =3D TYPE_VIRTIO_BALLOON_PCI, - .parent =3D TYPE_VIRTIO_PCI, +static const VirtioPCIDeviceTypeInfo virtio_balloon_pci_info =3D { + .generic_name =3D TYPE_VIRTIO_BALLOON_PCI, .instance_size =3D sizeof(VirtIOBalloonPCI), .instance_init =3D virtio_balloon_pci_instance_init, .class_init =3D virtio_balloon_pci_class_init, @@ -2407,9 +2506,8 @@ static void virtio_serial_pci_instance_init(Object *o= bj) TYPE_VIRTIO_SERIAL); } =20 -static const TypeInfo virtio_serial_pci_info =3D { - .name =3D TYPE_VIRTIO_SERIAL_PCI, - .parent =3D TYPE_VIRTIO_PCI, +static const VirtioPCIDeviceTypeInfo virtio_serial_pci_info =3D { + .generic_name =3D TYPE_VIRTIO_SERIAL_PCI, .instance_size =3D sizeof(VirtIOSerialPCI), .instance_init =3D virtio_serial_pci_instance_init, .class_init =3D virtio_serial_pci_class_init, @@ -2462,9 +2560,8 @@ static void virtio_net_pci_instance_init(Object *obj) "bootindex", &error_abort); } =20 -static const TypeInfo virtio_net_pci_info =3D { - .name =3D TYPE_VIRTIO_NET_PCI, - .parent =3D TYPE_VIRTIO_PCI, +static const VirtioPCIDeviceTypeInfo virtio_net_pci_info =3D { + .generic_name =3D TYPE_VIRTIO_NET_PCI, .instance_size =3D sizeof(VirtIONetPCI), .instance_init =3D virtio_net_pci_instance_init, .class_init =3D virtio_net_pci_class_init, @@ -2513,9 +2610,8 @@ static void virtio_rng_initfn(Object *obj) TYPE_VIRTIO_RNG); } =20 -static const TypeInfo virtio_rng_pci_info =3D { - .name =3D TYPE_VIRTIO_RNG_PCI, - .parent =3D TYPE_VIRTIO_PCI, +static const VirtioPCIDeviceTypeInfo virtio_rng_pci_info =3D { + .generic_name =3D TYPE_VIRTIO_RNG_PCI, .instance_size =3D sizeof(VirtIORngPCI), .instance_init =3D virtio_rng_initfn, .class_init =3D virtio_rng_pci_class_init, @@ -2605,24 +2701,24 @@ static const TypeInfo virtio_input_hid_pci_info =3D= { .abstract =3D true, }; =20 -static const TypeInfo virtio_keyboard_pci_info =3D { - .name =3D TYPE_VIRTIO_KEYBOARD_PCI, +static const VirtioPCIDeviceTypeInfo virtio_keyboard_pci_info =3D { + .generic_name =3D TYPE_VIRTIO_KEYBOARD_PCI, .parent =3D TYPE_VIRTIO_INPUT_HID_PCI, .class_init =3D virtio_input_hid_kbd_pci_class_init, .instance_size =3D sizeof(VirtIOInputHIDPCI), .instance_init =3D virtio_keyboard_initfn, }; =20 -static const TypeInfo virtio_mouse_pci_info =3D { - .name =3D TYPE_VIRTIO_MOUSE_PCI, +static const VirtioPCIDeviceTypeInfo virtio_mouse_pci_info =3D { + .generic_name =3D TYPE_VIRTIO_MOUSE_PCI, .parent =3D TYPE_VIRTIO_INPUT_HID_PCI, .class_init =3D virtio_input_hid_mouse_pci_class_init, .instance_size =3D sizeof(VirtIOInputHIDPCI), .instance_init =3D virtio_mouse_initfn, }; =20 -static const TypeInfo virtio_tablet_pci_info =3D { - .name =3D TYPE_VIRTIO_TABLET_PCI, +static const VirtioPCIDeviceTypeInfo virtio_tablet_pci_info =3D { + .generic_name =3D TYPE_VIRTIO_TABLET_PCI, .parent =3D TYPE_VIRTIO_INPUT_HID_PCI, .instance_size =3D sizeof(VirtIOInputHIDPCI), .instance_init =3D virtio_tablet_initfn, @@ -2637,8 +2733,8 @@ static void virtio_host_initfn(Object *obj) TYPE_VIRTIO_INPUT_HOST); } =20 -static const TypeInfo virtio_host_pci_info =3D { - .name =3D TYPE_VIRTIO_INPUT_HOST_PCI, +static const VirtioPCIDeviceTypeInfo virtio_host_pci_info =3D { + .generic_name =3D TYPE_VIRTIO_INPUT_HOST_PCI, .parent =3D TYPE_VIRTIO_INPUT_PCI, .instance_size =3D sizeof(VirtIOInputHostPCI), .instance_init =3D virtio_host_initfn, @@ -2692,36 +2788,39 @@ static const TypeInfo virtio_pci_bus_info =3D { =20 static void virtio_pci_register_types(void) { - type_register_static(&virtio_rng_pci_info); + /* Base types: */ + type_register_static(&virtio_pci_bus_info); + type_register_static(&virtio_pci_info); type_register_static(&virtio_input_pci_info); type_register_static(&virtio_input_hid_pci_info); - type_register_static(&virtio_keyboard_pci_info); - type_register_static(&virtio_mouse_pci_info); - type_register_static(&virtio_tablet_pci_info); + + /* Implementations: */ + virtio_pci_types_register(&virtio_rng_pci_info); + virtio_pci_types_register(&virtio_keyboard_pci_info); + virtio_pci_types_register(&virtio_mouse_pci_info); + virtio_pci_types_register(&virtio_tablet_pci_info); #ifdef CONFIG_LINUX - type_register_static(&virtio_host_pci_info); + virtio_pci_types_register(&virtio_host_pci_info); #endif - type_register_static(&virtio_pci_bus_info); - type_register_static(&virtio_pci_info); #ifdef CONFIG_VIRTFS - type_register_static(&virtio_9p_pci_info); + virtio_pci_types_register(&virtio_9p_pci_info); #endif - type_register_static(&virtio_blk_pci_info); + virtio_pci_types_register(&virtio_blk_pci_info); #if defined(CONFIG_VHOST_USER) && defined(CONFIG_LINUX) - type_register_static(&vhost_user_blk_pci_info); + virtio_pci_types_register(&vhost_user_blk_pci_info); #endif - type_register_static(&virtio_scsi_pci_info); - type_register_static(&virtio_balloon_pci_info); - type_register_static(&virtio_serial_pci_info); - type_register_static(&virtio_net_pci_info); + virtio_pci_types_register(&virtio_scsi_pci_info); + virtio_pci_types_register(&virtio_balloon_pci_info); + virtio_pci_types_register(&virtio_serial_pci_info); + virtio_pci_types_register(&virtio_net_pci_info); #ifdef CONFIG_VHOST_SCSI - type_register_static(&vhost_scsi_pci_info); + virtio_pci_types_register(&vhost_scsi_pci_info); #endif #if defined(CONFIG_VHOST_USER) && defined(CONFIG_LINUX) - type_register_static(&vhost_user_scsi_pci_info); + virtio_pci_types_register(&vhost_user_scsi_pci_info); #endif #ifdef CONFIG_VHOST_VSOCK - type_register_static(&vhost_vsock_pci_info); + virtio_pci_types_register(&vhost_vsock_pci_info); #endif } =20 --=20 2.18.0.rc1.1.g3f1ff2140 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list From nobody Fri Apr 19 15:09:45 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 1544039936765871.0026971887004; Wed, 5 Dec 2018 11:58:56 -0800 (PST) Received: from smtp.corp.redhat.com (int-mx08.intmail.prod.int.phx2.redhat.com [10.5.11.23]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id B3833309702F; Wed, 5 Dec 2018 19:58:54 +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 83A131974C; Wed, 5 Dec 2018 19:58:54 +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 43211181B9E4; Wed, 5 Dec 2018 19:58:54 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx07.intmail.prod.int.phx2.redhat.com [10.5.11.22]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id wB5JwqCX027475 for ; Wed, 5 Dec 2018 14:58:53 -0500 Received: by smtp.corp.redhat.com (Postfix) id E8DD5101963E; Wed, 5 Dec 2018 19:58:52 +0000 (UTC) Received: from localhost (ovpn-116-33.gru2.redhat.com [10.97.116.33]) by smtp.corp.redhat.com (Postfix) with ESMTP id 9F592105B1E0; Wed, 5 Dec 2018 19:58:32 +0000 (UTC) From: Eduardo Habkost To: qemu-devel@nongnu.org, "Michael S. Tsirkin" Date: Wed, 5 Dec 2018 17:57:04 -0200 Message-Id: <20181205195704.17605-3-ehabkost@redhat.com> In-Reply-To: <20181205195704.17605-1-ehabkost@redhat.com> References: <20181205195704.17605-1-ehabkost@redhat.com> X-Scanned-By: MIMEDefang 2.84 on 10.5.11.22 X-loop: libvir-list@redhat.com Cc: Kevin Wolf , Fam Zheng , Marcel Apfelbaum , Amit Shah , libvir-list@redhat.com, Jason Wang , Cornelia Huck , Andrea Bolognani , Wainer dos Santos Moschetta , Max Reitz , Caio Carrara , Gonglei , Laine Stump , Gerd Hoffmann , Stefan Hajnoczi , Cleber Rosa , Paolo Bonzini , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Subject: [libvirt] [PATCH for-4.0 v4 2/2] virtio: Provide version-specific variants of virtio PCI devices 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: , MIME-Version: 1.0 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.23 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.43]); Wed, 05 Dec 2018 19:58:55 +0000 (UTC) Content-Type: text/plain; charset="utf-8" Many of the current virtio-*-pci device types actually represent 3 different types of devices: * virtio 1.0 non-transitional devices * virtio 1.0 transitional devices * virtio 0.9 ("legacy device" in virtio 1.0 terminology) That would be just an annoyance if it didn't break our device/bus compatibility QMP interfaces. With these multi-purpose device types, there's no way to tell management software that transitional devices and legacy devices require a Conventional PCI bus. The multi-purpose device types would also prevent us from telling management software what's the PCI vendor/device ID for them, because their PCI IDs change at runtime depending on the bus where they were plugged. This patch adds separate device types for each of those virtio device flavors: - virtio-*-pci: the existing multi-purpose device types - Configurable using `disable-legacy` and `disable-modern` properties - Legacy driver support is automatically enabled/disabled depending on the bus where it is plugged - Supports Conventional PCI and PCI Express buses (but Conventional PCI is incompatible with disable-legacy=3Doff) - Changes PCI vendor/device IDs at runtime - virtio-*-pci-transitional: virtio-1.0 device supporting legacy drivers - Supports Conventional PCI buses only, because it has a PIO BAR - virtio-*-pci-non-transitional: modern-only - Supports both Conventional PCI and PCI Express buses The existing TYPE_* macros for these types will point to an abstract base type, so existing casts in the code will keep working for all variants. A simple test script (tests/acceptance/virtio_version.py) is included, to check if the new device types are equivalent to using the `disable-legacy` and `disable-modern` options. Acked-by: Andrea Bolognani Reviewed-by: Cornelia Huck Signed-off-by: Eduardo Habkost Reviewed-by: Caio Carrara --- Changes v3 -> v4: * Only test code changes (Caio Carrara) * Rename get_interfaces() to get_pci_interfaces() * Use tuple instead of list at get_pci_interfaces() * Spaces after commas Changes v2 -> v3: * Split into two separate patches (type registration helper and introduction of new types) * Include full type names as literals in the code instead of generating type names automatically Changes v1 -> v2: * Removed *-0.9 devices. Nobody will want to use them, if transitional devices work with legacy drivers (Gerd Hoffmann, Michael S. Tsirkin) * Drop virtio version from name: rename -1.0-transitional to -transitional (Michael S. Tsirkin) * Renamed -1.0 to -non-transitional * Don't add any extra variants to modern-only device types (they don't need it) * Fix typo on TYPE_VIRTIO_INPUT_HOST_PCI (crash reported by Cornelia Huck) * No need to change cast macros for modern-only devices * Rename virtio_register_types() to virtio_pci_types_register() --- hw/virtio/virtio-pci.h | 24 ++-- hw/virtio/virtio-pci.c | 60 ++++++++-- tests/acceptance/virtio_version.py | 176 +++++++++++++++++++++++++++++ 3 files changed, 236 insertions(+), 24 deletions(-) create mode 100644 tests/acceptance/virtio_version.py diff --git a/hw/virtio/virtio-pci.h b/hw/virtio/virtio-pci.h index 8cd546608e..29b4216107 100644 --- a/hw/virtio/virtio-pci.h +++ b/hw/virtio/virtio-pci.h @@ -216,7 +216,7 @@ static inline void virtio_pci_disable_modern(VirtIOPCIP= roxy *proxy) /* * virtio-scsi-pci: This extends VirtioPCIProxy. */ -#define TYPE_VIRTIO_SCSI_PCI "virtio-scsi-pci" +#define TYPE_VIRTIO_SCSI_PCI "virtio-scsi-pci-base" #define VIRTIO_SCSI_PCI(obj) \ OBJECT_CHECK(VirtIOSCSIPCI, (obj), TYPE_VIRTIO_SCSI_PCI) =20 @@ -229,7 +229,7 @@ struct VirtIOSCSIPCI { /* * vhost-scsi-pci: This extends VirtioPCIProxy. */ -#define TYPE_VHOST_SCSI_PCI "vhost-scsi-pci" +#define TYPE_VHOST_SCSI_PCI "vhost-scsi-pci-base" #define VHOST_SCSI_PCI(obj) \ OBJECT_CHECK(VHostSCSIPCI, (obj), TYPE_VHOST_SCSI_PCI) =20 @@ -239,7 +239,7 @@ struct VHostSCSIPCI { }; #endif =20 -#define TYPE_VHOST_USER_SCSI_PCI "vhost-user-scsi-pci" +#define TYPE_VHOST_USER_SCSI_PCI "vhost-user-scsi-pci-base" #define VHOST_USER_SCSI_PCI(obj) \ OBJECT_CHECK(VHostUserSCSIPCI, (obj), TYPE_VHOST_USER_SCSI_PCI) =20 @@ -252,7 +252,7 @@ struct VHostUserSCSIPCI { /* * vhost-user-blk-pci: This extends VirtioPCIProxy. */ -#define TYPE_VHOST_USER_BLK_PCI "vhost-user-blk-pci" +#define TYPE_VHOST_USER_BLK_PCI "vhost-user-blk-pci-base" #define VHOST_USER_BLK_PCI(obj) \ OBJECT_CHECK(VHostUserBlkPCI, (obj), TYPE_VHOST_USER_BLK_PCI) =20 @@ -265,7 +265,7 @@ struct VHostUserBlkPCI { /* * virtio-blk-pci: This extends VirtioPCIProxy. */ -#define TYPE_VIRTIO_BLK_PCI "virtio-blk-pci" +#define TYPE_VIRTIO_BLK_PCI "virtio-blk-pci-base" #define VIRTIO_BLK_PCI(obj) \ OBJECT_CHECK(VirtIOBlkPCI, (obj), TYPE_VIRTIO_BLK_PCI) =20 @@ -277,7 +277,7 @@ struct VirtIOBlkPCI { /* * virtio-balloon-pci: This extends VirtioPCIProxy. */ -#define TYPE_VIRTIO_BALLOON_PCI "virtio-balloon-pci" +#define TYPE_VIRTIO_BALLOON_PCI "virtio-balloon-pci-base" #define VIRTIO_BALLOON_PCI(obj) \ OBJECT_CHECK(VirtIOBalloonPCI, (obj), TYPE_VIRTIO_BALLOON_PCI) =20 @@ -289,7 +289,7 @@ struct VirtIOBalloonPCI { /* * virtio-serial-pci: This extends VirtioPCIProxy. */ -#define TYPE_VIRTIO_SERIAL_PCI "virtio-serial-pci" +#define TYPE_VIRTIO_SERIAL_PCI "virtio-serial-pci-base" #define VIRTIO_SERIAL_PCI(obj) \ OBJECT_CHECK(VirtIOSerialPCI, (obj), TYPE_VIRTIO_SERIAL_PCI) =20 @@ -301,7 +301,7 @@ struct VirtIOSerialPCI { /* * virtio-net-pci: This extends VirtioPCIProxy. */ -#define TYPE_VIRTIO_NET_PCI "virtio-net-pci" +#define TYPE_VIRTIO_NET_PCI "virtio-net-pci-base" #define VIRTIO_NET_PCI(obj) \ OBJECT_CHECK(VirtIONetPCI, (obj), TYPE_VIRTIO_NET_PCI) =20 @@ -316,7 +316,7 @@ struct VirtIONetPCI { =20 #ifdef CONFIG_VIRTFS =20 -#define TYPE_VIRTIO_9P_PCI "virtio-9p-pci" +#define TYPE_VIRTIO_9P_PCI "virtio-9p-pci-base" #define VIRTIO_9P_PCI(obj) \ OBJECT_CHECK(V9fsPCIState, (obj), TYPE_VIRTIO_9P_PCI) =20 @@ -330,7 +330,7 @@ typedef struct V9fsPCIState { /* * virtio-rng-pci: This extends VirtioPCIProxy. */ -#define TYPE_VIRTIO_RNG_PCI "virtio-rng-pci" +#define TYPE_VIRTIO_RNG_PCI "virtio-rng-pci-base" #define VIRTIO_RNG_PCI(obj) \ OBJECT_CHECK(VirtIORngPCI, (obj), TYPE_VIRTIO_RNG_PCI) =20 @@ -365,7 +365,7 @@ struct VirtIOInputHIDPCI { =20 #ifdef CONFIG_LINUX =20 -#define TYPE_VIRTIO_INPUT_HOST_PCI "virtio-input-host-pci" +#define TYPE_VIRTIO_INPUT_HOST_PCI "virtio-input-host-pci-base" #define VIRTIO_INPUT_HOST_PCI(obj) \ OBJECT_CHECK(VirtIOInputHostPCI, (obj), TYPE_VIRTIO_INPUT_HOST_PCI) =20 @@ -392,7 +392,7 @@ struct VirtIOGPUPCI { /* * vhost-vsock-pci: This extends VirtioPCIProxy. */ -#define TYPE_VHOST_VSOCK_PCI "vhost-vsock-pci" +#define TYPE_VHOST_VSOCK_PCI "vhost-vsock-pci-base" #define VHOST_VSOCK_PCI(obj) \ OBJECT_CHECK(VHostVSockPCI, (obj), TYPE_VHOST_VSOCK_PCI) =20 diff --git a/hw/virtio/virtio-pci.c b/hw/virtio/virtio-pci.c index f07ec55c38..d05066deb8 100644 --- a/hw/virtio/virtio-pci.c +++ b/hw/virtio/virtio-pci.c @@ -1120,7 +1120,10 @@ static void virtio_9p_pci_instance_init(Object *obj) } =20 static const VirtioPCIDeviceTypeInfo virtio_9p_pci_info =3D { - .generic_name =3D TYPE_VIRTIO_9P_PCI, + .base_name =3D TYPE_VIRTIO_9P_PCI, + .generic_name =3D "virtio-9p-pci", + .transitional_name =3D "virtio-9p-pci-transitional", + .non_transitional_name =3D "virtio-9p-pci-non-transitional", .instance_size =3D sizeof(V9fsPCIState), .instance_init =3D virtio_9p_pci_instance_init, .class_init =3D virtio_9p_pci_class_init, @@ -2102,7 +2105,10 @@ static void virtio_blk_pci_instance_init(Object *obj) } =20 static const VirtioPCIDeviceTypeInfo virtio_blk_pci_info =3D { - .generic_name =3D TYPE_VIRTIO_BLK_PCI, + .base_name =3D TYPE_VIRTIO_BLK_PCI, + .generic_name =3D "virtio-blk-pci", + .transitional_name =3D "virtio-blk-pci-transitional", + .non_transitional_name =3D "virtio-blk-pci-non-transitional", .instance_size =3D sizeof(VirtIOBlkPCI), .instance_init =3D virtio_blk_pci_instance_init, .class_init =3D virtio_blk_pci_class_init, @@ -2157,7 +2163,10 @@ static void vhost_user_blk_pci_instance_init(Object = *obj) } =20 static const VirtioPCIDeviceTypeInfo vhost_user_blk_pci_info =3D { - .generic_name =3D TYPE_VHOST_USER_BLK_PCI, + .base_name =3D TYPE_VHOST_USER_BLK_PCI, + .generic_name =3D "vhost-user-blk-pci", + .transitional_name =3D "vhost-user-blk-pci-transitional", + .non_transitional_name =3D "vhost-user-blk-pci-non-transitional", .instance_size =3D sizeof(VHostUserBlkPCI), .instance_init =3D vhost_user_blk_pci_instance_init, .class_init =3D vhost_user_blk_pci_class_init, @@ -2224,7 +2233,10 @@ static void virtio_scsi_pci_instance_init(Object *ob= j) } =20 static const VirtioPCIDeviceTypeInfo virtio_scsi_pci_info =3D { - .generic_name =3D TYPE_VIRTIO_SCSI_PCI, + .base_name =3D TYPE_VIRTIO_SCSI_PCI, + .generic_name =3D "virtio-scsi-pci", + .transitional_name =3D "virtio-scsi-pci-transitional", + .non_transitional_name =3D "virtio-scsi-pci-non-transitional", .instance_size =3D sizeof(VirtIOSCSIPCI), .instance_init =3D virtio_scsi_pci_instance_init, .class_init =3D virtio_scsi_pci_class_init, @@ -2278,7 +2290,10 @@ static void vhost_scsi_pci_instance_init(Object *obj) } =20 static const VirtioPCIDeviceTypeInfo vhost_scsi_pci_info =3D { - .generic_name =3D TYPE_VHOST_SCSI_PCI, + .base_name =3D TYPE_VHOST_SCSI_PCI, + .generic_name =3D "vhost-scsi-pci", + .transitional_name =3D "vhost-scsi-pci-transitional", + .non_transitional_name =3D "vhost-scsi-pci-non-transitional", .instance_size =3D sizeof(VHostSCSIPCI), .instance_init =3D vhost_scsi_pci_instance_init, .class_init =3D vhost_scsi_pci_class_init, @@ -2332,7 +2347,10 @@ static void vhost_user_scsi_pci_instance_init(Object= *obj) } =20 static const VirtioPCIDeviceTypeInfo vhost_user_scsi_pci_info =3D { - .generic_name =3D TYPE_VHOST_USER_SCSI_PCI, + .base_name =3D TYPE_VHOST_USER_SCSI_PCI, + .generic_name =3D "vhost-user-scsi-pci", + .transitional_name =3D "vhost-user-scsi-pci-transitional", + .non_transitional_name =3D "vhost-user-scsi-pci-non-transitional", .instance_size =3D sizeof(VHostUserSCSIPCI), .instance_init =3D vhost_user_scsi_pci_instance_init, .class_init =3D vhost_user_scsi_pci_class_init, @@ -2379,7 +2397,10 @@ static void vhost_vsock_pci_instance_init(Object *ob= j) } =20 static const VirtioPCIDeviceTypeInfo vhost_vsock_pci_info =3D { - .generic_name =3D TYPE_VHOST_VSOCK_PCI, + .base_name =3D TYPE_VHOST_VSOCK_PCI, + .generic_name =3D "vhost-vsock-pci", + .transitional_name =3D "vhost-vsock-pci-transitional", + .non_transitional_name =3D "vhost-vsock-pci-non-transitional", .instance_size =3D sizeof(VHostVSockPCI), .instance_init =3D vhost_vsock_pci_instance_init, .class_init =3D vhost_vsock_pci_class_init, @@ -2435,7 +2456,10 @@ static void virtio_balloon_pci_instance_init(Object = *obj) } =20 static const VirtioPCIDeviceTypeInfo virtio_balloon_pci_info =3D { - .generic_name =3D TYPE_VIRTIO_BALLOON_PCI, + .base_name =3D TYPE_VIRTIO_BALLOON_PCI, + .generic_name =3D "virtio-balloon-pci", + .transitional_name =3D "virtio-balloon-pci-transitional", + .non_transitional_name =3D "virtio-balloon-pci-non-transitional", .instance_size =3D sizeof(VirtIOBalloonPCI), .instance_init =3D virtio_balloon_pci_instance_init, .class_init =3D virtio_balloon_pci_class_init, @@ -2507,7 +2531,10 @@ static void virtio_serial_pci_instance_init(Object *= obj) } =20 static const VirtioPCIDeviceTypeInfo virtio_serial_pci_info =3D { - .generic_name =3D TYPE_VIRTIO_SERIAL_PCI, + .base_name =3D TYPE_VIRTIO_SERIAL_PCI, + .generic_name =3D "virtio-serial-pci", + .transitional_name =3D "virtio-serial-pci-transitional", + .non_transitional_name =3D "virtio-serial-pci-non-transitional", .instance_size =3D sizeof(VirtIOSerialPCI), .instance_init =3D virtio_serial_pci_instance_init, .class_init =3D virtio_serial_pci_class_init, @@ -2561,7 +2588,10 @@ static void virtio_net_pci_instance_init(Object *obj) } =20 static const VirtioPCIDeviceTypeInfo virtio_net_pci_info =3D { - .generic_name =3D TYPE_VIRTIO_NET_PCI, + .base_name =3D TYPE_VIRTIO_NET_PCI, + .generic_name =3D "virtio-net-pci", + .transitional_name =3D "virtio-net-pci-transitional", + .non_transitional_name =3D "virtio-net-pci-non-transitional", .instance_size =3D sizeof(VirtIONetPCI), .instance_init =3D virtio_net_pci_instance_init, .class_init =3D virtio_net_pci_class_init, @@ -2611,7 +2641,10 @@ static void virtio_rng_initfn(Object *obj) } =20 static const VirtioPCIDeviceTypeInfo virtio_rng_pci_info =3D { - .generic_name =3D TYPE_VIRTIO_RNG_PCI, + .base_name =3D TYPE_VIRTIO_RNG_PCI, + .generic_name =3D "virtio-rng-pci", + .transitional_name =3D "virtio-rng-pci-transitional", + .non_transitional_name =3D "virtio-rng-pci-non-transitional", .instance_size =3D sizeof(VirtIORngPCI), .instance_init =3D virtio_rng_initfn, .class_init =3D virtio_rng_pci_class_init, @@ -2734,7 +2767,10 @@ static void virtio_host_initfn(Object *obj) } =20 static const VirtioPCIDeviceTypeInfo virtio_host_pci_info =3D { - .generic_name =3D TYPE_VIRTIO_INPUT_HOST_PCI, + .base_name =3D TYPE_VIRTIO_INPUT_HOST_PCI, + .generic_name =3D "virtio-input-host-pci", + .transitional_name =3D "virtio-input-host-pci-transitional", + .non_transitional_name =3D "virtio-input-host-pci-non-transitional", .parent =3D TYPE_VIRTIO_INPUT_PCI, .instance_size =3D sizeof(VirtIOInputHostPCI), .instance_init =3D virtio_host_initfn, diff --git a/tests/acceptance/virtio_version.py b/tests/acceptance/virtio_v= ersion.py new file mode 100644 index 0000000000..ce990250d8 --- /dev/null +++ b/tests/acceptance/virtio_version.py @@ -0,0 +1,176 @@ +""" +Check compatibility of virtio device types +""" +# Copyright (c) 2018 Red Hat, Inc. +# +# Author: +# Eduardo Habkost +# +# This work is licensed under the terms of the GNU GPL, version 2 or +# later. See the COPYING file in the top-level directory. +import sys +import os + +sys.path.append(os.path.join(os.path.dirname(__file__), "..", "..", "scrip= ts")) +from qemu import QEMUMachine +from avocado_qemu import Test + +# Virtio Device IDs: +VIRTIO_NET =3D 1 +VIRTIO_BLOCK =3D 2 +VIRTIO_CONSOLE =3D 3 +VIRTIO_RNG =3D 4 +VIRTIO_BALLOON =3D 5 +VIRTIO_RPMSG =3D 7 +VIRTIO_SCSI =3D 8 +VIRTIO_9P =3D 9 +VIRTIO_RPROC_SERIAL =3D 11 +VIRTIO_CAIF =3D 12 +VIRTIO_GPU =3D 16 +VIRTIO_INPUT =3D 18 +VIRTIO_VSOCK =3D 19 +VIRTIO_CRYPTO =3D 20 + +PCI_VENDOR_ID_REDHAT_QUMRANET =3D 0x1af4 + +# Device IDs for legacy/transitional devices: +PCI_LEGACY_DEVICE_IDS =3D { + VIRTIO_NET: 0x1000, + VIRTIO_BLOCK: 0x1001, + VIRTIO_BALLOON: 0x1002, + VIRTIO_CONSOLE: 0x1003, + VIRTIO_SCSI: 0x1004, + VIRTIO_RNG: 0x1005, + VIRTIO_9P: 0x1009, + VIRTIO_VSOCK: 0x1012, +} + +def pci_modern_device_id(virtio_devid): + return virtio_devid + 0x1040 + +def devtype_implements(vm, devtype, implements): + return devtype in [d['name'] for d in vm.command('qom-list-types', imp= lements=3Dimplements)] + +def get_pci_interfaces(vm, devtype): + interfaces =3D ('pci-express-device', 'conventional-pci-device') + return [i for i in interfaces if devtype_implements(vm, devtype, i)] + +class VirtioVersionCheck(Test): + """ + Check if virtio-version-specific device types result in the + same device tree created by `disable-modern` and + `disable-legacy`. + + :avocado: enable + :avocado: tags=3Dx86_64 + """ + + # just in case there are failures, show larger diff: + maxDiff =3D 4096 + + def run_device(self, devtype, opts=3DNone, machine=3D'pc'): + """ + Run QEMU with `-device DEVTYPE`, return device info from `query-pc= i` + """ + with QEMUMachine(self.qemu_bin) as vm: + vm.set_machine(machine) + if opts: + devtype +=3D ',' + opts + vm.add_args('-device', '%s,id=3Ddevfortest' % (devtype)) + vm.add_args('-S') + vm.launch() + + pcibuses =3D vm.command('query-pci') + alldevs =3D [dev for bus in pcibuses for dev in bus['devices']] + devfortest =3D [dev for dev in alldevs + if dev['qdev_id'] =3D=3D 'devfortest'] + return devfortest[0], get_pci_interfaces(vm, devtype) + + + def assert_devids(self, dev, devid, non_transitional=3DFalse): + self.assertEqual(dev['id']['vendor'], PCI_VENDOR_ID_REDHAT_QUMRANE= T) + self.assertEqual(dev['id']['device'], devid) + if non_transitional: + self.assertTrue(0x1040 <=3D dev['id']['device'] <=3D 0x107f) + self.assertGreaterEqual(dev['id']['subsystem'], 0x40) + + def check_all_variants(self, qemu_devtype, virtio_devid): + """Check if a virtio device type and its variants behave as expect= ed""" + # Force modern mode: + dev_modern, _ =3D self.run_device(qemu_devtype, + 'disable-modern=3Doff,disable-legac= y=3Don') + self.assert_devids(dev_modern, pci_modern_device_id(virtio_devid), + non_transitional=3DTrue) + + # -non-transitional device types should be 100% equivalent= to + # ,disable-modern=3Doff,disable-legacy=3Don + dev_1_0, nt_ifaces =3D self.run_device('%s-non-transitional' % (qe= mu_devtype)) + self.assertEqual(dev_modern, dev_1_0) + + # Force transitional mode: + dev_trans, _ =3D self.run_device(qemu_devtype, + 'disable-modern=3Doff,disable-legacy= =3Doff') + self.assert_devids(dev_trans, PCI_LEGACY_DEVICE_IDS[virtio_devid]) + + # Force legacy mode: + dev_legacy, _ =3D self.run_device(qemu_devtype, + 'disable-modern=3Don,disable-legacy= =3Doff') + self.assert_devids(dev_legacy, PCI_LEGACY_DEVICE_IDS[virtio_devid]) + + # No options: default to transitional on PC machine-type: + no_opts_pc, generic_ifaces =3D self.run_device(qemu_devtype) + self.assertEqual(dev_trans, no_opts_pc) + + #TODO: check if plugging on a PCI Express bus will make the + # device non-transitional + #no_opts_q35 =3D self.run_device(qemu_devtype, machine=3D'q35') + #self.assertEqual(dev_modern, no_opts_q35) + + # -transitional device types should be 100% equivalent to + # ,disable-modern=3Doff,disable-legacy=3Doff + dev_trans, trans_ifaces =3D self.run_device('%s-transitional' % (q= emu_devtype)) + self.assertEqual(dev_trans, dev_trans) + + # ensure the interface information is correct: + self.assertIn('conventional-pci-device', generic_ifaces) + self.assertIn('pci-express-device', generic_ifaces) + + self.assertIn('conventional-pci-device', nt_ifaces) + self.assertIn('pci-express-device', nt_ifaces) + + self.assertIn('conventional-pci-device', trans_ifaces) + self.assertNotIn('pci-express-device', trans_ifaces) + + + def test_conventional_devs(self): + self.check_all_variants('virtio-net-pci', VIRTIO_NET) + # virtio-blk requires 'driver' parameter + #self.check_all_variants('virtio-blk-pci', VIRTIO_BLOCK) + self.check_all_variants('virtio-serial-pci', VIRTIO_CONSOLE) + self.check_all_variants('virtio-rng-pci', VIRTIO_RNG) + self.check_all_variants('virtio-balloon-pci', VIRTIO_BALLOON) + self.check_all_variants('virtio-scsi-pci', VIRTIO_SCSI) + # virtio-9p requires 'fsdev' parameter + #self.check_all_variants('virtio-9p-pci', VIRTIO_9P) + + def check_modern_only(self, qemu_devtype, virtio_devid): + """Check if a modern-only virtio device type behaves as expected""" + # Force modern mode: + dev_modern, _ =3D self.run_device(qemu_devtype, + 'disable-modern=3Doff,disable-legac= y=3Don') + self.assert_devids(dev_modern, pci_modern_device_id(virtio_devid), + non_transitional=3DTrue) + + # No options: should be modern anyway + dev_no_opts, ifaces =3D self.run_device(qemu_devtype) + self.assertEqual(dev_modern, dev_no_opts) + + self.assertIn('conventional-pci-device', ifaces) + self.assertIn('pci-express-device', ifaces) + + def test_modern_only_devs(self): + self.check_modern_only('virtio-vga', VIRTIO_GPU) + self.check_modern_only('virtio-gpu-pci', VIRTIO_GPU) + self.check_modern_only('virtio-mouse-pci', VIRTIO_INPUT) + self.check_modern_only('virtio-tablet-pci', VIRTIO_INPUT) + self.check_modern_only('virtio-keyboard-pci', VIRTIO_INPUT) --=20 2.18.0.rc1.1.g3f1ff2140 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list