Suggested-by: Markus Armbruster <armbru@redhat.com>
Signed-off-by: Mao Zhongyi <maozy.fnst@cn.fujitsu.com>
---
 hw/net/rocker/rocker.c | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/hw/net/rocker/rocker.c b/hw/net/rocker/rocker.c
index 2764529..f8a32f7 100644
--- a/hw/net/rocker/rocker.c
+++ b/hw/net/rocker/rocker.c
@@ -69,10 +69,10 @@ struct rocker {
     QLIST_ENTRY(rocker) next;
 };
 
-#define ROCKER "rocker"
+#define TYPE_ROCKER "rocker"
 
-#define to_rocker(obj) \
-    OBJECT_CHECK(Rocker, (obj), ROCKER)
+#define ROCKER(obj) \
+    OBJECT_CHECK(Rocker, (obj), TYPE_ROCKER)
 
 static QLIST_HEAD(, rocker) rockers;
 
@@ -1287,7 +1287,7 @@ static World *rocker_world_type_by_name(Rocker *r, const char *name)
 
 static void pci_rocker_realize(PCIDevice *dev, Error **errp)
 {
-    Rocker *r = to_rocker(dev);
+    Rocker *r = ROCKER(dev);
     const MACAddr zero = { .a = { 0, 0, 0, 0, 0, 0 } };
     const MACAddr dflt = { .a = { 0x52, 0x54, 0x00, 0x12, 0x35, 0x01 } };
     static int sw_index;
@@ -1333,7 +1333,7 @@ static void pci_rocker_realize(PCIDevice *dev, Error **errp)
     /* validate switch properties */
 
     if (!r->name) {
-        r->name = g_strdup(ROCKER);
+        r->name = g_strdup(TYPE_ROCKER);
     }
 
     if (rocker_find(r->name)) {
@@ -1429,7 +1429,7 @@ err_world_type_by_name:
 
 static void pci_rocker_uninit(PCIDevice *dev)
 {
-    Rocker *r = to_rocker(dev);
+    Rocker *r = ROCKER(dev);
     int i;
 
     QLIST_REMOVE(r, next);
@@ -1462,7 +1462,7 @@ static void pci_rocker_uninit(PCIDevice *dev)
 
 static void rocker_reset(DeviceState *dev)
 {
-    Rocker *r = to_rocker(dev);
+    Rocker *r = ROCKER(dev);
     int i;
 
     for (i = 0; i < ROCKER_WORLD_TYPE_MAX; i++) {
@@ -1500,7 +1500,7 @@ static Property rocker_properties[] = {
 };
 
 static const VMStateDescription rocker_vmsd = {
-    .name = ROCKER,
+    .name = TYPE_ROCKER,
     .unmigratable = 1,
 };
 
@@ -1523,7 +1523,7 @@ static void rocker_class_init(ObjectClass *klass, void *data)
 }
 
 static const TypeInfo rocker_info = {
-    .name          = ROCKER,
+    .name          = TYPE_ROCKER,
     .parent        = TYPE_PCI_DEVICE,
     .instance_size = sizeof(Rocker),
     .class_init    = rocker_class_init,
-- 
2.9.3

On 05/23/2017 01:04 AM, Mao Zhongyi wrote:
> Suggested-by: Markus Armbruster <armbru@redhat.com>
> Signed-off-by: Mao Zhongyi <maozy.fnst@cn.fujitsu.com>

Reviewed-by: Philippe Mathieu-Daudé <f4bug@amsat.org>

> ---
>  hw/net/rocker/rocker.c | 18 +++++++++---------
>  1 file changed, 9 insertions(+), 9 deletions(-)
>
> diff --git a/hw/net/rocker/rocker.c b/hw/net/rocker/rocker.c
> index 2764529..f8a32f7 100644
> --- a/hw/net/rocker/rocker.c
> +++ b/hw/net/rocker/rocker.c
> @@ -69,10 +69,10 @@ struct rocker {
>      QLIST_ENTRY(rocker) next;
>  };
>
> -#define ROCKER "rocker"
> +#define TYPE_ROCKER "rocker"
>
> -#define to_rocker(obj) \
> -    OBJECT_CHECK(Rocker, (obj), ROCKER)
> +#define ROCKER(obj) \
> +    OBJECT_CHECK(Rocker, (obj), TYPE_ROCKER)
>
>  static QLIST_HEAD(, rocker) rockers;
>
> @@ -1287,7 +1287,7 @@ static World *rocker_world_type_by_name(Rocker *r, const char *name)
>
>  static void pci_rocker_realize(PCIDevice *dev, Error **errp)
>  {
> -    Rocker *r = to_rocker(dev);
> +    Rocker *r = ROCKER(dev);
>      const MACAddr zero = { .a = { 0, 0, 0, 0, 0, 0 } };
>      const MACAddr dflt = { .a = { 0x52, 0x54, 0x00, 0x12, 0x35, 0x01 } };
>      static int sw_index;
> @@ -1333,7 +1333,7 @@ static void pci_rocker_realize(PCIDevice *dev, Error **errp)
>      /* validate switch properties */
>
>      if (!r->name) {
> -        r->name = g_strdup(ROCKER);
> +        r->name = g_strdup(TYPE_ROCKER);
>      }
>
>      if (rocker_find(r->name)) {
> @@ -1429,7 +1429,7 @@ err_world_type_by_name:
>
>  static void pci_rocker_uninit(PCIDevice *dev)
>  {
> -    Rocker *r = to_rocker(dev);
> +    Rocker *r = ROCKER(dev);
>      int i;
>
>      QLIST_REMOVE(r, next);
> @@ -1462,7 +1462,7 @@ static void pci_rocker_uninit(PCIDevice *dev)
>
>  static void rocker_reset(DeviceState *dev)
>  {
> -    Rocker *r = to_rocker(dev);
> +    Rocker *r = ROCKER(dev);
>      int i;
>
>      for (i = 0; i < ROCKER_WORLD_TYPE_MAX; i++) {
> @@ -1500,7 +1500,7 @@ static Property rocker_properties[] = {
>  };
>
>  static const VMStateDescription rocker_vmsd = {
> -    .name = ROCKER,
> +    .name = TYPE_ROCKER,
>      .unmigratable = 1,
>  };
>
> @@ -1523,7 +1523,7 @@ static void rocker_class_init(ObjectClass *klass, void *data)
>  }
>
>  static const TypeInfo rocker_info = {
> -    .name          = ROCKER,
> +    .name          = TYPE_ROCKER,
>      .parent        = TYPE_PCI_DEVICE,
>      .instance_size = sizeof(Rocker),
>      .class_init    = rocker_class_init,
>