diff mbox series

[v4,19/19] hw/net/vmxnet3: Merge DeviceRealize in InstanceInit

Message ID 20250512083948.39294-20-philmd@linaro.org
State Superseded
Headers show
Series hw/i386/pc: Remove deprecated 2.4 and 2.5 PC machines | expand

Commit Message

Philippe Mathieu-Daudé May 12, 2025, 8:39 a.m. UTC 
Simplify merging vmxnet3_realize() within vmxnet3_instance_init(),
removing the need for device_class_set_parent_realize().

Signed-off-by: Philippe Mathieu-Daudé <philmd@linaro.org>
Reviewed-by: Daniel P. Berrangé <berrange@redhat.com>
Reviewed-by: Zhao Liu <zhao1.liu@intel.com>
---
 hw/net/vmxnet3.c | 15 +--------------
 1 file changed, 1 insertion(+), 14 deletions(-)

Comments

Xiaoyao Li May 28, 2025, 2:48 a.m. UTC | #1 
On 5/12/2025 4:39 PM, Philippe Mathieu-Daudé wrote:
> Simplify merging vmxnet3_realize() within vmxnet3_instance_init(),
> removing the need for device_class_set_parent_realize().
> 
> Signed-off-by: Philippe Mathieu-Daudé <philmd@linaro.org>
> Reviewed-by: Daniel P. Berrangé <berrange@redhat.com>
> Reviewed-by: Zhao Liu <zhao1.liu@intel.com>

Reviewed-by: Xiaoyao Li <xiaoyao.li@intel.com>

> ---
>   hw/net/vmxnet3.c | 15 +--------------
>   1 file changed, 1 insertion(+), 14 deletions(-)
> 
> diff --git a/hw/net/vmxnet3.c b/hw/net/vmxnet3.c
> index d080fe9b38a..7c0ca56b7c0 100644
> --- a/hw/net/vmxnet3.c
> +++ b/hw/net/vmxnet3.c
> @@ -2238,6 +2238,7 @@ static void vmxnet3_instance_init(Object *obj)
>       device_add_bootindex_property(obj, &s->conf.bootindex,
>                                     "bootindex", "/ethernet-phy@0",
>                                     DEVICE(obj));
> +    PCI_DEVICE(obj)->cap_present |= QEMU_PCI_CAP_EXPRESS;
>   }
>   
>   static void vmxnet3_pci_uninit(PCIDevice *pci_dev)
> @@ -2463,22 +2464,10 @@ static const Property vmxnet3_properties[] = {
>       DEFINE_NIC_PROPERTIES(VMXNET3State, conf),
>   };
>   
> -static void vmxnet3_realize(DeviceState *qdev, Error **errp)
> -{
> -    VMXNET3Class *vc = VMXNET3_DEVICE_GET_CLASS(qdev);
> -    PCIDevice *pci_dev = PCI_DEVICE(qdev);
> -    VMXNET3State *s = VMXNET3(qdev);
> -
> -    pci_dev->cap_present |= QEMU_PCI_CAP_EXPRESS;
> -
> -    vc->parent_dc_realize(qdev, errp);
> -}
> -
>   static void vmxnet3_class_init(ObjectClass *class, const void *data)
>   {
>       DeviceClass *dc = DEVICE_CLASS(class);
>       PCIDeviceClass *c = PCI_DEVICE_CLASS(class);
> -    VMXNET3Class *vc = VMXNET3_DEVICE_CLASS(class);
>   
>       c->realize = vmxnet3_pci_realize;
>       c->exit = vmxnet3_pci_uninit;
> @@ -2489,8 +2478,6 @@ static void vmxnet3_class_init(ObjectClass *class, const void *data)
>       c->class_id = PCI_CLASS_NETWORK_ETHERNET;
>       c->subsystem_vendor_id = PCI_VENDOR_ID_VMWARE;
>       c->subsystem_id = PCI_DEVICE_ID_VMWARE_VMXNET3;
> -    device_class_set_parent_realize(dc, vmxnet3_realize,
> -                                    &vc->parent_dc_realize);
>       dc->desc = "VMWare Paravirtualized Ethernet v3";
>       device_class_set_legacy_reset(dc, vmxnet3_qdev_reset);
>       dc->vmsd = &vmstate_vmxnet3;
diff mbox series

Patch

diff --git a/hw/net/vmxnet3.c b/hw/net/vmxnet3.c
index d080fe9b38a..7c0ca56b7c0 100644
--- a/hw/net/vmxnet3.c
+++ b/hw/net/vmxnet3.c
@@ -2238,6 +2238,7 @@  static void vmxnet3_instance_init(Object *obj)
     device_add_bootindex_property(obj, &s->conf.bootindex,
                                   "bootindex", "/ethernet-phy@0",
                                   DEVICE(obj));
+    PCI_DEVICE(obj)->cap_present |= QEMU_PCI_CAP_EXPRESS;
 }
 
 static void vmxnet3_pci_uninit(PCIDevice *pci_dev)
@@ -2463,22 +2464,10 @@  static const Property vmxnet3_properties[] = {
     DEFINE_NIC_PROPERTIES(VMXNET3State, conf),
 };
 
-static void vmxnet3_realize(DeviceState *qdev, Error **errp)
-{
-    VMXNET3Class *vc = VMXNET3_DEVICE_GET_CLASS(qdev);
-    PCIDevice *pci_dev = PCI_DEVICE(qdev);
-    VMXNET3State *s = VMXNET3(qdev);
-
-    pci_dev->cap_present |= QEMU_PCI_CAP_EXPRESS;
-
-    vc->parent_dc_realize(qdev, errp);
-}
-
 static void vmxnet3_class_init(ObjectClass *class, const void *data)
 {
     DeviceClass *dc = DEVICE_CLASS(class);
     PCIDeviceClass *c = PCI_DEVICE_CLASS(class);
-    VMXNET3Class *vc = VMXNET3_DEVICE_CLASS(class);
 
     c->realize = vmxnet3_pci_realize;
     c->exit = vmxnet3_pci_uninit;
@@ -2489,8 +2478,6 @@  static void vmxnet3_class_init(ObjectClass *class, const void *data)
     c->class_id = PCI_CLASS_NETWORK_ETHERNET;
     c->subsystem_vendor_id = PCI_VENDOR_ID_VMWARE;
     c->subsystem_id = PCI_DEVICE_ID_VMWARE_VMXNET3;
-    device_class_set_parent_realize(dc, vmxnet3_realize,
-                                    &vc->parent_dc_realize);
     dc->desc = "VMWare Paravirtualized Ethernet v3";
     device_class_set_legacy_reset(dc, vmxnet3_qdev_reset);
     dc->vmsd = &vmstate_vmxnet3;