piix: use TYPE_FOO constants than string constats

[Qemu-devel] [PATCH] piix: use TYPE_FOO constants than string constats

Posted by Li Qiang 7 years ago

Make them more QOMConventional.
Cc:qemu-trivial@nongnu.org 

Signed-off-by: Li Qiang <liq3ea@gmail.com>
---
 hw/pci-host/piix.c | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/hw/pci-host/piix.c b/hw/pci-host/piix.c
index 230d5d2ea3..5881e63364 100644
--- a/hw/pci-host/piix.c
+++ b/hw/pci-host/piix.c
@@ -95,6 +95,9 @@ typedef struct PIIX3State {
 #define I440FX_PCI_DEVICE(obj) \
     OBJECT_CHECK(PCII440FXState, (obj), TYPE_I440FX_PCI_DEVICE)
 
+#define TYPE_PIIX3_DEVICE "PIIX3"
+#define TYPE_PIIX3_XEN_DEVICE "PIIX3-xen"
+
 struct PCII440FXState {
     /*< private >*/
     PCIDevice parent_obj;
@@ -413,13 +416,13 @@ PCIBus *i440fx_init(const char *host_type, const char *pci_type,
      * These additional routes can be discovered through ACPI. */
     if (xen_enabled()) {
         PCIDevice *pci_dev = pci_create_simple_multifunction(b,
-                             -1, true, "PIIX3-xen");
+                             -1, true, TYPE_PIIX3_XEN_DEVICE);
         piix3 = PIIX3_PCI_DEVICE(pci_dev);
         pci_bus_irqs(b, xen_piix3_set_irq, xen_pci_slot_get_pirq,
                 piix3, XEN_PIIX_NUM_PIRQS);
     } else {
         PCIDevice *pci_dev = pci_create_simple_multifunction(b,
-                             -1, true, "PIIX3");
+                             -1, true, TYPE_PIIX3_DEVICE);
         piix3 = PIIX3_PCI_DEVICE(pci_dev);
         pci_bus_irqs(b, piix3_set_irq, pci_slot_get_pirq, piix3,
                 PIIX_NUM_PIRQS);
@@ -737,7 +740,7 @@ static void piix3_class_init(ObjectClass *klass, void *data)
 }
 
 static const TypeInfo piix3_info = {
-    .name          = "PIIX3",
+    .name          = TYPE_PIIX3_DEVICE,
     .parent        = TYPE_PIIX3_PCI_DEVICE,
     .class_init    = piix3_class_init,
 };
@@ -750,7 +753,7 @@ static void piix3_xen_class_init(ObjectClass *klass, void *data)
 };
 
 static const TypeInfo piix3_xen_info = {
-    .name          = "PIIX3-xen",
+    .name          = TYPE_PIIX3_XEN_DEVICE,
     .parent        = TYPE_PIIX3_PCI_DEVICE,
     .class_init    = piix3_xen_class_init,
 };
-- 
2.11.0

Re: [Qemu-devel] [PATCH] piix: use TYPE_FOO constants than string constats

Posted by Philippe Mathieu-Daudé 7 years ago

On 11/10/2018 14:38, Li Qiang wrote:
> Make them more QOMConventional.
> Cc:qemu-trivial@nongnu.org 
> 
> Signed-off-by: Li Qiang <liq3ea@gmail.com>

Reviewed-by: Philippe Mathieu-Daudé <philmd@redhat.com>

> ---
>  hw/pci-host/piix.c | 11 +++++++----
>  1 file changed, 7 insertions(+), 4 deletions(-)
> 
> diff --git a/hw/pci-host/piix.c b/hw/pci-host/piix.c
> index 230d5d2ea3..5881e63364 100644
> --- a/hw/pci-host/piix.c
> +++ b/hw/pci-host/piix.c
> @@ -95,6 +95,9 @@ typedef struct PIIX3State {
>  #define I440FX_PCI_DEVICE(obj) \
>      OBJECT_CHECK(PCII440FXState, (obj), TYPE_I440FX_PCI_DEVICE)
>  
> +#define TYPE_PIIX3_DEVICE "PIIX3"
> +#define TYPE_PIIX3_XEN_DEVICE "PIIX3-xen"
> +
>  struct PCII440FXState {
>      /*< private >*/
>      PCIDevice parent_obj;
> @@ -413,13 +416,13 @@ PCIBus *i440fx_init(const char *host_type, const char *pci_type,
>       * These additional routes can be discovered through ACPI. */
>      if (xen_enabled()) {
>          PCIDevice *pci_dev = pci_create_simple_multifunction(b,
> -                             -1, true, "PIIX3-xen");
> +                             -1, true, TYPE_PIIX3_XEN_DEVICE);
>          piix3 = PIIX3_PCI_DEVICE(pci_dev);
>          pci_bus_irqs(b, xen_piix3_set_irq, xen_pci_slot_get_pirq,
>                  piix3, XEN_PIIX_NUM_PIRQS);
>      } else {
>          PCIDevice *pci_dev = pci_create_simple_multifunction(b,
> -                             -1, true, "PIIX3");
> +                             -1, true, TYPE_PIIX3_DEVICE);
>          piix3 = PIIX3_PCI_DEVICE(pci_dev);
>          pci_bus_irqs(b, piix3_set_irq, pci_slot_get_pirq, piix3,
>                  PIIX_NUM_PIRQS);
> @@ -737,7 +740,7 @@ static void piix3_class_init(ObjectClass *klass, void *data)
>  }
>  
>  static const TypeInfo piix3_info = {
> -    .name          = "PIIX3",
> +    .name          = TYPE_PIIX3_DEVICE,
>      .parent        = TYPE_PIIX3_PCI_DEVICE,
>      .class_init    = piix3_class_init,
>  };
> @@ -750,7 +753,7 @@ static void piix3_xen_class_init(ObjectClass *klass, void *data)
>  };
>  
>  static const TypeInfo piix3_xen_info = {
> -    .name          = "PIIX3-xen",
> +    .name          = TYPE_PIIX3_XEN_DEVICE,
>      .parent        = TYPE_PIIX3_PCI_DEVICE,
>      .class_init    = piix3_xen_class_init,
>  };
>

Re: [Qemu-devel] [Qemu-trivial] [PATCH] piix: use TYPE_FOO constants than string constats

Posted by Laurent Vivier 7 years ago

On 11/10/2018 13:38, Li Qiang wrote:
> Make them more QOMConventional.
> Cc:qemu-trivial@nongnu.org 
> 
> Signed-off-by: Li Qiang <liq3ea@gmail.com>
> ---
>  hw/pci-host/piix.c | 11 +++++++----
>  1 file changed, 7 insertions(+), 4 deletions(-)

Applied,

Thanks,
Laurent

Re: [Qemu-devel] [Qemu-trivial] [PATCH] piix: use TYPE_FOO constants than string constats

Posted by Li Qiang 7 years ago

Hello Laurent,
Thanks,

This patch has been in Michael's pull request.
Maybe you can drop it.

Thanks,
Li Qiang



Laurent Vivier <laurent@vivier.eu> 于2018年10月25日周四 下午9:52写道：

> On 11/10/2018 13:38, Li Qiang wrote:
> > Make them more QOMConventional.
> > Cc:qemu-trivial@nongnu.org
> >
> > Signed-off-by: Li Qiang <liq3ea@gmail.com>
> > ---
> >  hw/pci-host/piix.c | 11 +++++++----
> >  1 file changed, 7 insertions(+), 4 deletions(-)
>
> Applied,
>
> Thanks,
> Laurent
>

Re: [Qemu-devel] [Qemu-trivial] [PATCH] piix: use TYPE_FOO constants than string constats

Posted by Laurent Vivier 7 years ago

On 25/10/2018 16:11, Li Qiang wrote:
> Hello Laurent,
> Thanks,
> 
> This patch has been in Michael's pull request.
> Maybe you can drop it.

Removed

Thanks,
Laurent