Re: [Qemu-devel] [PATCH v2 21/22] virtio: split virtio-net bits rom virtio-pci

[Thomas Huth]

On 08/08/2018 01:48 PM, Juan Quintela wrote:
> Signed-off-by: Juan Quintela <address@hidden>
> ---
>  hw/virtio/Makefile.objs    |  1 +
>  hw/virtio/virtio-net-pci.c | 81 ++++++++++++++++++++++++++++++++++++++
>  hw/virtio/virtio-pci.c     | 56 --------------------------
>  tests/Makefile.include     |  4 +-
>  4 files changed, 84 insertions(+), 58 deletions(-)
>  create mode 100644 hw/virtio/virtio-net-pci.c
> 
> diff --git a/hw/virtio/Makefile.objs b/hw/virtio/Makefile.objs
> index c28b740dca..0810553ab8 100644
> --- a/hw/virtio/Makefile.objs
> +++ b/hw/virtio/Makefile.objs
> @@ -21,6 +21,7 @@ obj-$(CONFIG_VIRTIO_BALLOON) += virtio-balloon-pci.o
>  obj-$(CONFIG_VIRTIO_9P) += virtio-9p-pci.o
>  obj-$(CONFIG_VIRTIO_SCSI) += virtio-scsi-pci.o
>  obj-$(CONFIG_VIRTIO_BLK) += virtio-blk-pci.o
> +obj-$(CONFIG_VIRTIO_NET) += virtio-net-pci.o
>  endif
>  
>  common-obj-$(call lnot,$(call land,$(CONFIG_VIRTIO),$(CONFIG_LINUX))) += 
> vhost-stub.o
> diff --git a/hw/virtio/virtio-net-pci.c b/hw/virtio/virtio-net-pci.c
> new file mode 100644
> index 0000000000..cf8cf7535c
> --- /dev/null
> +++ b/hw/virtio/virtio-net-pci.c
> @@ -0,0 +1,81 @@
> +/*
> + * Virtio net PCI Bindings
> + *
> + * Copyright IBM, Corp. 2007
> + * Copyright (c) 2009 CodeSourcery
> + *
> + * Authors:
> + *  Anthony Liguori   <address@hidden>
> + *  Paul Brook        <address@hidden>
> + *
> + * This work is licensed under the terms of the GNU GPL, version 2.  See
> + * the COPYING file in the top-level directory.
> + *
> + * Contributions after 2012-01-13 are licensed under the terms of the
> + * GNU GPL, version 2 or (at your option) any later version.
> + */
> +
> +#include "qemu/osdep.h"
> +
> +#include "virtio-pci.h"
> +#include "qapi/error.h"
> +
> +static Property virtio_net_properties[] = {
> +    DEFINE_PROP_BIT("ioeventfd", VirtIOPCIProxy, flags,
> +                    VIRTIO_PCI_FLAG_USE_IOEVENTFD_BIT, true),
> +    DEFINE_PROP_UINT32("vectors", VirtIOPCIProxy, nvectors, 3),
> +    DEFINE_PROP_END_OF_LIST(),
> +};
> +
> +static void virtio_net_pci_realize(VirtIOPCIProxy *vpci_dev, Error **errp)
> +{
> +    DeviceState *qdev = DEVICE(vpci_dev);
> +    VirtIONetPCI *dev = VIRTIO_NET_PCI(vpci_dev);
> +    DeviceState *vdev = DEVICE(&dev->vdev);
> +
> +    virtio_net_set_netclient_name(&dev->vdev, qdev->id,
> +                                  object_get_typename(OBJECT(qdev)));
> +    qdev_set_parent_bus(vdev, BUS(&vpci_dev->bus));
> +    object_property_set_bool(OBJECT(vdev), true, "realized", errp);
> +}
> +
> +static void virtio_net_pci_class_init(ObjectClass *klass, void *data)
> +{
> +    DeviceClass *dc = DEVICE_CLASS(klass);
> +    PCIDeviceClass *k = PCI_DEVICE_CLASS(klass);
> +    VirtioPCIClass *vpciklass = VIRTIO_PCI_CLASS(klass);
> +
> +    k->romfile = "efi-virtio.rom";
> +    k->vendor_id = PCI_VENDOR_ID_REDHAT_QUMRANET;
> +    k->device_id = PCI_DEVICE_ID_VIRTIO_NET;
> +    k->revision = VIRTIO_PCI_ABI_VERSION;
> +    k->class_id = PCI_CLASS_NETWORK_ETHERNET;
> +    set_bit(DEVICE_CATEGORY_NETWORK, dc->categories);
> +    dc->props = virtio_net_properties;
> +    vpciklass->realize = virtio_net_pci_realize;
> +}
> +
> +static void virtio_net_pci_instance_init(Object *obj)
> +{
> +    VirtIONetPCI *dev = VIRTIO_NET_PCI(obj);
> +
> +    virtio_instance_init_common(obj, &dev->vdev, sizeof(dev->vdev),
> +                                TYPE_VIRTIO_NET);
> +    object_property_add_alias(obj, "bootindex", OBJECT(&dev->vdev),
> +                              "bootindex", &error_abort);
> +}
> +
> +static const TypeInfo virtio_net_pci_info = {
> +    .name          = TYPE_VIRTIO_NET_PCI,
> +    .parent        = TYPE_VIRTIO_PCI,
> +    .instance_size = sizeof(VirtIONetPCI),
> +    .instance_init = virtio_net_pci_instance_init,
> +    .class_init    = virtio_net_pci_class_init,
> +};
> +
> +static void virtio_net_pci_register(void)
> +{
> +    type_register_static(&virtio_net_pci_info);
> +}
> +
> +type_init(virtio_net_pci_register)
> diff --git a/hw/virtio/virtio-pci.c b/hw/virtio/virtio-pci.c
> index e1c6088019..589e565746 100644
> --- a/hw/virtio/virtio-pci.c
> +++ b/hw/virtio/virtio-pci.c
> @@ -1957,61 +1957,6 @@ static const TypeInfo virtio_serial_pci_info = {
>      .class_init    = virtio_serial_pci_class_init,
>  };
>  
> -/* virtio-net-pci */
> -
> -static Property virtio_net_properties[] = {
> -    DEFINE_PROP_BIT("ioeventfd", VirtIOPCIProxy, flags,
> -                    VIRTIO_PCI_FLAG_USE_IOEVENTFD_BIT, true),
> -    DEFINE_PROP_UINT32("vectors", VirtIOPCIProxy, nvectors, 3),
> -    DEFINE_PROP_END_OF_LIST(),
> -};
> -
> -static void virtio_net_pci_realize(VirtIOPCIProxy *vpci_dev, Error **errp)
> -{
> -    DeviceState *qdev = DEVICE(vpci_dev);
> -    VirtIONetPCI *dev = VIRTIO_NET_PCI(vpci_dev);
> -    DeviceState *vdev = DEVICE(&dev->vdev);
> -
> -    virtio_net_set_netclient_name(&dev->vdev, qdev->id,
> -                                  object_get_typename(OBJECT(qdev)));
> -    qdev_set_parent_bus(vdev, BUS(&vpci_dev->bus));
> -    object_property_set_bool(OBJECT(vdev), true, "realized", errp);
> -}
> -
> -static void virtio_net_pci_class_init(ObjectClass *klass, void *data)
> -{
> -    DeviceClass *dc = DEVICE_CLASS(klass);
> -    PCIDeviceClass *k = PCI_DEVICE_CLASS(klass);
> -    VirtioPCIClass *vpciklass = VIRTIO_PCI_CLASS(klass);
> -
> -    k->romfile = "efi-virtio.rom";
> -    k->vendor_id = PCI_VENDOR_ID_REDHAT_QUMRANET;
> -    k->device_id = PCI_DEVICE_ID_VIRTIO_NET;
> -    k->revision = VIRTIO_PCI_ABI_VERSION;
> -    k->class_id = PCI_CLASS_NETWORK_ETHERNET;
> -    set_bit(DEVICE_CATEGORY_NETWORK, dc->categories);
> -    dc->props = virtio_net_properties;
> -    vpciklass->realize = virtio_net_pci_realize;
> -}
> -
> -static void virtio_net_pci_instance_init(Object *obj)
> -{
> -    VirtIONetPCI *dev = VIRTIO_NET_PCI(obj);
> -
> -    virtio_instance_init_common(obj, &dev->vdev, sizeof(dev->vdev),
> -                                TYPE_VIRTIO_NET);
> -    object_property_add_alias(obj, "bootindex", OBJECT(&dev->vdev),
> -                              "bootindex", &error_abort);
> -}
> -
> -static const TypeInfo virtio_net_pci_info = {
> -    .name          = TYPE_VIRTIO_NET_PCI,
> -    .parent        = TYPE_VIRTIO_PCI,
> -    .instance_size = sizeof(VirtIONetPCI),
> -    .instance_init = virtio_net_pci_instance_init,
> -    .class_init    = virtio_net_pci_class_init,
> -};
> -
>  /* virtio-pci-bus */
>  
>  static void virtio_pci_bus_new(VirtioBusState *bus, size_t bus_size,
> @@ -2062,7 +2007,6 @@ static void virtio_pci_register_types(void)
>      type_register_static(&virtio_pci_bus_info);
>      type_register_static(&virtio_pci_info);
>      type_register_static(&virtio_serial_pci_info);
> -    type_register_static(&virtio_net_pci_info);
>  }
>  
>  type_init(virtio_pci_register_types)
> diff --git a/tests/Makefile.include b/tests/Makefile.include
> index 296e04f704..a1352ccefb 100644
> --- a/tests/Makefile.include
> +++ b/tests/Makefile.include
> @@ -189,8 +189,8 @@ check-qtest-virtioserial-y += 
> tests/virtio-console-test$(EXESUF)
>  gcov-files-virtioserial-y += hw/char/virtio-console.c
>  
>  gcov-files-virtio-y += i386-softmmu/hw/virtio/virtio.c
> -check-qtest-virtio-y += tests/virtio-net-test$(EXESUF)
> -gcov-files-virtio-y += i386-softmmu/hw/net/virtio-net.c
> +check-qtest-virtio-$(CONFIG_VIRTIO_NET) += tests/virtio-net-test$(EXESUF)
> +gcov-files-virtio-$(CONFIG_VIRTIO_NET) += i386-softmmu/hw/net/virtio-net.c
>  check-qtest-virtio-$(CONFIG_VIRTIO_BALLOON) += 
> tests/virtio-balloon-test$(EXESUF)
>  gcov-files-virtio-$(CONFIG_VIRTIO_BALLOON) += 
> i386-softmmu/hw/virtio/virtio-balloon.c
>  check-qtest-virtio-$(CONFIG_VIRTIO_BLK) += tests/virtio-blk-test$(EXESUF)
> 

Reviewed-by: Thomas Huth <address@hidden>