| Message ID | 20211013191755.767468-3-eric.auger@redhat.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | virtio-iommu: Name Tweaks | expand |
On Wed, Oct 13, 2021 at 03:17:55PM -0400, Eric Auger wrote: > Drop base_name and turn generic_name into > "virtio-iommu-pci". This is more in line with > other modern-only devices. > > Signed-off-by: Eric Auger <eric.auger@redhat.com> > Suggested-by: Cornelia Huck <cohuck@redhat.com> > Reviewed-by: Cornelia Huck <cohuck@redhat.com> Reviewed-by: Jean-Philippe Brucker <jean-philippe@linaro.org> > --- > hw/virtio/virtio-iommu-pci.c | 3 +-- > include/hw/virtio/virtio-iommu.h | 2 +- > 2 files changed, 2 insertions(+), 3 deletions(-) > > diff --git a/hw/virtio/virtio-iommu-pci.c b/hw/virtio/virtio-iommu-pci.c > index 86fa4e6c28..a160ae6b41 100644 > --- a/hw/virtio/virtio-iommu-pci.c > +++ b/hw/virtio/virtio-iommu-pci.c > @@ -98,8 +98,7 @@ static void virtio_iommu_pci_instance_init(Object *obj) > } > > static const VirtioPCIDeviceTypeInfo virtio_iommu_pci_info = { > - .base_name = TYPE_VIRTIO_IOMMU_PCI, > - .generic_name = "virtio-iommu-pci", > + .generic_name = TYPE_VIRTIO_IOMMU_PCI, > .instance_size = sizeof(VirtIOIOMMUPCI), > .instance_init = virtio_iommu_pci_instance_init, > .class_init = virtio_iommu_pci_class_init, > diff --git a/include/hw/virtio/virtio-iommu.h b/include/hw/virtio/virtio-iommu.h > index 273e35c04b..e2339e5b72 100644 > --- a/include/hw/virtio/virtio-iommu.h > +++ b/include/hw/virtio/virtio-iommu.h > @@ -26,7 +26,7 @@ > #include "qom/object.h" > > #define TYPE_VIRTIO_IOMMU "virtio-iommu-device" > -#define TYPE_VIRTIO_IOMMU_PCI "virtio-iommu-device-base" > +#define TYPE_VIRTIO_IOMMU_PCI "virtio-iommu-pci" > OBJECT_DECLARE_SIMPLE_TYPE(VirtIOIOMMU, VIRTIO_IOMMU) > > #define TYPE_VIRTIO_IOMMU_MEMORY_REGION "virtio-iommu-memory-region" > -- > 2.27.0 >
diff --git a/hw/virtio/virtio-iommu-pci.c b/hw/virtio/virtio-iommu-pci.c index 86fa4e6c28..a160ae6b41 100644 --- a/hw/virtio/virtio-iommu-pci.c +++ b/hw/virtio/virtio-iommu-pci.c @@ -98,8 +98,7 @@ static void virtio_iommu_pci_instance_init(Object *obj) } static const VirtioPCIDeviceTypeInfo virtio_iommu_pci_info = { - .base_name = TYPE_VIRTIO_IOMMU_PCI, - .generic_name = "virtio-iommu-pci", + .generic_name = TYPE_VIRTIO_IOMMU_PCI, .instance_size = sizeof(VirtIOIOMMUPCI), .instance_init = virtio_iommu_pci_instance_init, .class_init = virtio_iommu_pci_class_init, diff --git a/include/hw/virtio/virtio-iommu.h b/include/hw/virtio/virtio-iommu.h index 273e35c04b..e2339e5b72 100644 --- a/include/hw/virtio/virtio-iommu.h +++ b/include/hw/virtio/virtio-iommu.h @@ -26,7 +26,7 @@ #include "qom/object.h" #define TYPE_VIRTIO_IOMMU "virtio-iommu-device" -#define TYPE_VIRTIO_IOMMU_PCI "virtio-iommu-device-base" +#define TYPE_VIRTIO_IOMMU_PCI "virtio-iommu-pci" OBJECT_DECLARE_SIMPLE_TYPE(VirtIOIOMMU, VIRTIO_IOMMU) #define TYPE_VIRTIO_IOMMU_MEMORY_REGION "virtio-iommu-memory-region"