| 
									
										
										
										
											2020-05-22 14:25:12 +02:00
										 |  |  | /*
 | 
					
						
							|  |  |  |  * Vhost-user vsock PCI Bindings | 
					
						
							|  |  |  |  * | 
					
						
							|  |  |  |  * Copyright 2020 Red Hat, Inc. | 
					
						
							|  |  |  |  * | 
					
						
							|  |  |  |  * This work is licensed under the terms of the GNU GPL, version 2 or | 
					
						
							|  |  |  |  * (at your option) any later version.  See the COPYING file in the | 
					
						
							|  |  |  |  * top-level directory. | 
					
						
							|  |  |  |  */ | 
					
						
							|  |  |  | 
 | 
					
						
							|  |  |  | #include "qemu/osdep.h"
 | 
					
						
							|  |  |  | 
 | 
					
						
							|  |  |  | #include "virtio-pci.h"
 | 
					
						
							|  |  |  | #include "hw/qdev-properties.h"
 | 
					
						
							|  |  |  | #include "hw/virtio/vhost-user-vsock.h"
 | 
					
						
							| 
									
										
										
										
											2020-09-03 16:43:22 -04:00
										 |  |  | #include "qom/object.h"
 | 
					
						
							| 
									
										
										
										
											2020-05-22 14:25:12 +02:00
										 |  |  | 
 | 
					
						
							|  |  |  | typedef struct VHostUserVSockPCI VHostUserVSockPCI; | 
					
						
							|  |  |  | 
 | 
					
						
							|  |  |  | /*
 | 
					
						
							|  |  |  |  * vhost-user-vsock-pci: This extends VirtioPCIProxy. | 
					
						
							|  |  |  |  */ | 
					
						
							|  |  |  | #define TYPE_VHOST_USER_VSOCK_PCI "vhost-user-vsock-pci-base"
 | 
					
						
							| 
									
										
										
										
											2020-08-31 17:07:33 -04:00
										 |  |  | DECLARE_INSTANCE_CHECKER(VHostUserVSockPCI, VHOST_USER_VSOCK_PCI, | 
					
						
							|  |  |  |                          TYPE_VHOST_USER_VSOCK_PCI) | 
					
						
							| 
									
										
										
										
											2020-05-22 14:25:12 +02:00
										 |  |  | 
 | 
					
						
							|  |  |  | struct VHostUserVSockPCI { | 
					
						
							|  |  |  |     VirtIOPCIProxy parent_obj; | 
					
						
							|  |  |  |     VHostUserVSock vdev; | 
					
						
							|  |  |  | }; | 
					
						
							|  |  |  | 
 | 
					
						
							|  |  |  | /* vhost-user-vsock-pci */ | 
					
						
							|  |  |  | 
 | 
					
						
							|  |  |  | static Property vhost_user_vsock_pci_properties[] = { | 
					
						
							|  |  |  |     DEFINE_PROP_UINT32("vectors", VirtIOPCIProxy, nvectors, 3), | 
					
						
							|  |  |  |     DEFINE_PROP_END_OF_LIST(), | 
					
						
							|  |  |  | }; | 
					
						
							|  |  |  | 
 | 
					
						
							|  |  |  | static void vhost_user_vsock_pci_realize(VirtIOPCIProxy *vpci_dev, Error **errp) | 
					
						
							|  |  |  | { | 
					
						
							|  |  |  |     VHostUserVSockPCI *dev = VHOST_USER_VSOCK_PCI(vpci_dev); | 
					
						
							|  |  |  |     DeviceState *vdev = DEVICE(&dev->vdev); | 
					
						
							|  |  |  | 
 | 
					
						
							| 
									
										
										
										
											2020-09-21 14:25:05 +02:00
										 |  |  |     /* unlike vhost-vsock, we do not need to care about pre-5.1 compat */ | 
					
						
							|  |  |  |     virtio_pci_force_virtio_1(vpci_dev); | 
					
						
							|  |  |  | 
 | 
					
						
							| 
									
										
											  
											
												qdev: Convert uses of qdev_set_parent_bus() with Coccinelle
In addition to the qdev_create() patterns converted so far, we have a
qdev_set_parent_bus() pattern.  Mostly when we embed a device in a
parent device rather than allocating it on the heap.
This pattern also puts devices in the dangerous "no QOM parent, but
plugged into bus" state I explained in recent commit "qdev: New
qdev_new(), qdev_realize(), etc."
Apply same solution: convert to qdev_realize().  Coccinelle script:
    @@
    expression dev, bus, errp;
    symbol true;
    @@
    -    qdev_set_parent_bus(DEVICE(dev), bus);
         ...
    -    object_property_set_bool(OBJECT(dev), true, "realized", errp);
    +    qdev_realize(DEVICE(dev), bus, errp);
    @ depends on !(file in "qdev-monitor.c") && !(file in "hw/core/qdev.c")@
    expression dev, bus, errp;
    symbol true;
    @@
    -    qdev_set_parent_bus(dev, bus);
         ...
    -    object_property_set_bool(OBJECT(dev), true, "realized", errp);
    +    qdev_realize(dev, bus, errp);
    @@
    expression dev, bus;
    symbol true;
    @@
    -    qdev_set_parent_bus(DEVICE(dev), bus);
         ...
    -    qdev_init_nofail(DEVICE(dev));
    +    qdev_realize(DEVICE(dev), bus, &error_fatal);
Unconverted uses of qdev_set_parent_bus() remain.  They'll be
converted later in this series.
Signed-off-by: Markus Armbruster <armbru@redhat.com>
Reviewed-by: Philippe Mathieu-Daudé <philmd@redhat.com>
Reviewed-by: Paolo Bonzini <pbonzini@redhat.com>
Message-Id: <20200610053247.1583243-12-armbru@redhat.com>
[Also convert new hw/virtio/vhost-user-vsock-pci.c]
											
										 
											2020-06-10 07:32:00 +02:00
										 |  |  |     qdev_realize(vdev, BUS(&vpci_dev->bus), errp); | 
					
						
							| 
									
										
										
										
											2020-05-22 14:25:12 +02:00
										 |  |  | } | 
					
						
							|  |  |  | 
 | 
					
						
							|  |  |  | static void vhost_user_vsock_pci_class_init(ObjectClass *klass, void *data) | 
					
						
							|  |  |  | { | 
					
						
							|  |  |  |     DeviceClass *dc = DEVICE_CLASS(klass); | 
					
						
							|  |  |  |     VirtioPCIClass *k = VIRTIO_PCI_CLASS(klass); | 
					
						
							|  |  |  |     PCIDeviceClass *pcidev_k = PCI_DEVICE_CLASS(klass); | 
					
						
							|  |  |  |     k->realize = vhost_user_vsock_pci_realize; | 
					
						
							|  |  |  |     set_bit(DEVICE_CATEGORY_MISC, dc->categories); | 
					
						
							|  |  |  |     device_class_set_props(dc, vhost_user_vsock_pci_properties); | 
					
						
							|  |  |  |     pcidev_k->vendor_id = PCI_VENDOR_ID_REDHAT_QUMRANET; | 
					
						
							|  |  |  |     pcidev_k->device_id = PCI_DEVICE_ID_VIRTIO_VSOCK; | 
					
						
							|  |  |  |     pcidev_k->revision = 0x00; | 
					
						
							|  |  |  |     pcidev_k->class_id = PCI_CLASS_COMMUNICATION_OTHER; | 
					
						
							|  |  |  | } | 
					
						
							|  |  |  | 
 | 
					
						
							|  |  |  | static void vhost_user_vsock_pci_instance_init(Object *obj) | 
					
						
							|  |  |  | { | 
					
						
							|  |  |  |     VHostUserVSockPCI *dev = VHOST_USER_VSOCK_PCI(obj); | 
					
						
							|  |  |  | 
 | 
					
						
							|  |  |  |     virtio_instance_init_common(obj, &dev->vdev, sizeof(dev->vdev), | 
					
						
							|  |  |  |                                 TYPE_VHOST_USER_VSOCK); | 
					
						
							|  |  |  | } | 
					
						
							|  |  |  | 
 | 
					
						
							|  |  |  | static const VirtioPCIDeviceTypeInfo vhost_user_vsock_pci_info = { | 
					
						
							|  |  |  |     .base_name             = TYPE_VHOST_USER_VSOCK_PCI, | 
					
						
							|  |  |  |     .generic_name          = "vhost-user-vsock-pci", | 
					
						
							|  |  |  |     .non_transitional_name = "vhost-user-vsock-pci-non-transitional", | 
					
						
							|  |  |  |     .instance_size = sizeof(VHostUserVSockPCI), | 
					
						
							|  |  |  |     .instance_init = vhost_user_vsock_pci_instance_init, | 
					
						
							|  |  |  |     .class_init    = vhost_user_vsock_pci_class_init, | 
					
						
							|  |  |  | }; | 
					
						
							|  |  |  | 
 | 
					
						
							|  |  |  | static void virtio_pci_vhost_register(void) | 
					
						
							|  |  |  | { | 
					
						
							|  |  |  |     virtio_pci_types_register(&vhost_user_vsock_pci_info); | 
					
						
							|  |  |  | } | 
					
						
							|  |  |  | 
 | 
					
						
							|  |  |  | type_init(virtio_pci_vhost_register) |