summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEduardo Habkost2020-08-25 21:20:34 +0200
committerEduardo Habkost2020-08-27 20:04:55 +0200
commit8eeb6f3624e2bfd7acda5482b81c1f429f48dacb (patch)
tree8bfba3ac7026c3e518fcf43a9775fce1783d4c24
parentauxbus: Move QOM macros to header (diff)
downloadqemu-8eeb6f3624e2bfd7acda5482b81c1f429f48dacb.tar.gz
qemu-8eeb6f3624e2bfd7acda5482b81c1f429f48dacb.tar.xz
qemu-8eeb6f3624e2bfd7acda5482b81c1f429f48dacb.zip
rocker: Move QOM macros to header
This will make future conversion to OBJECT_DECLARE* easier. Reviewed-by: Daniel P. Berrangé <berrange@redhat.com> Signed-off-by: Eduardo Habkost <ehabkost@redhat.com> Tested-By: Roman Bolshakov <r.bolshakov@yadro.com> Message-Id: <20200825192110.3528606-39-ehabkost@redhat.com> Signed-off-by: Eduardo Habkost <ehabkost@redhat.com>
-rw-r--r--hw/net/rocker/rocker.c5
-rw-r--r--hw/net/rocker/rocker.h6
2 files changed, 5 insertions, 6 deletions
diff --git a/hw/net/rocker/rocker.c b/hw/net/rocker/rocker.c
index 15d66f6cbc..1af1e6fa2f 100644
--- a/hw/net/rocker/rocker.c
+++ b/hw/net/rocker/rocker.c
@@ -73,11 +73,6 @@ struct rocker {
QLIST_ENTRY(rocker) next;
};
-#define TYPE_ROCKER "rocker"
-
-#define ROCKER(obj) \
- OBJECT_CHECK(Rocker, (obj), TYPE_ROCKER)
-
static QLIST_HEAD(, rocker) rockers;
Rocker *rocker_find(const char *name)
diff --git a/hw/net/rocker/rocker.h b/hw/net/rocker/rocker.h
index 7ae0495d9e..e4c22db4ff 100644
--- a/hw/net/rocker/rocker.h
+++ b/hw/net/rocker/rocker.h
@@ -66,11 +66,15 @@ static inline bool ipv6_addr_is_multicast(const Ipv6Addr *addr)
return (addr->addr32[0] & htonl(0xFF000000)) == htonl(0xFF000000);
}
-typedef struct rocker Rocker;
typedef struct world World;
typedef struct desc_info DescInfo;
typedef struct desc_ring DescRing;
+#define TYPE_ROCKER "rocker"
+typedef struct rocker Rocker;
+#define ROCKER(obj) \
+ OBJECT_CHECK(Rocker, (obj), TYPE_ROCKER)
+
Rocker *rocker_find(const char *name);
uint32_t rocker_fp_ports(Rocker *r);
int rocker_event_link_changed(Rocker *r, uint32_t pport, bool link_up);