[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL 05/18] net/rocker: Fix the unusual macro name
From: |
Jason Wang |
Subject: |
[Qemu-devel] [PULL 05/18] net/rocker: Fix the unusual macro name |
Date: |
Fri, 8 Sep 2017 10:05:11 +0800 |
From: Mao Zhongyi <address@hidden>
Cc: address@hidden
Cc: address@hidden
Cc: address@hidden
Cc: address@hidden
Suggested-by: Markus Armbruster <address@hidden>
Signed-off-by: Mao Zhongyi <address@hidden>
Reviewed-by: Markus Armbruster <address@hidden>
Reviewed-by: Philippe Mathieu-Daudé <address@hidden>
Signed-off-by: Jason Wang <address@hidden>
---
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 bb38cba..9273473 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;
@@ -1285,7 +1285,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;
@@ -1331,7 +1331,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)) {
@@ -1427,7 +1427,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);
@@ -1460,7 +1460,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++) {
@@ -1498,7 +1498,7 @@ static Property rocker_properties[] = {
};
static const VMStateDescription rocker_vmsd = {
- .name = ROCKER,
+ .name = TYPE_ROCKER,
.unmigratable = 1,
};
@@ -1521,7 +1521,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.7.4
- [Qemu-devel] [PULL 00/18] Net patches, Jason Wang, 2017/09/07
- [Qemu-devel] [PULL 01/18] net/filter-rewriter.c: Fix rewirter checksum bug when use virtio-net, Jason Wang, 2017/09/07
- [Qemu-devel] [PULL 02/18] net/rocker: Remove the dead error handling, Jason Wang, 2017/09/07
- [Qemu-devel] [PULL 03/18] net/rocker: Plug memory leak in pci_rocker_init(), Jason Wang, 2017/09/07
- [Qemu-devel] [PULL 04/18] net/rocker: Convert to realize(), Jason Wang, 2017/09/07
- [Qemu-devel] [PULL 05/18] net/rocker: Fix the unusual macro name,
Jason Wang <=
- [Qemu-devel] [PULL 06/18] net: rtl8139: do not use old_mmio accesses, Jason Wang, 2017/09/07
- [Qemu-devel] [PULL 07/18] MAINTAINERS: Update mail address for COLO Proxy, Jason Wang, 2017/09/07
- [Qemu-devel] [PULL 08/18] net/socket: Don't treat odd socket type as SOCK_STREAM, Jason Wang, 2017/09/07
- [Qemu-devel] [PULL 09/18] net/socket: Convert several helper functions to Error, Jason Wang, 2017/09/07
- [Qemu-devel] [PULL 10/18] net/net: Convert parse_host_port() to Error, Jason Wang, 2017/09/07
- [Qemu-devel] [PULL 12/18] e1000: Rename the SEC symbol to SEQEC, Jason Wang, 2017/09/07
- [Qemu-devel] [PULL 11/18] net/socket: Improve -net socket error reporting, Jason Wang, 2017/09/07
- [Qemu-devel] [PULL 13/18] net/colo-compare.c: Optimize unpredictable tcp options comparison, Jason Wang, 2017/09/07
- [Qemu-devel] [PULL 14/18] net/colo-compare.c: Adjust net queue pop order for performance, Jason Wang, 2017/09/07
- [Qemu-devel] [PULL 15/18] net/colo-compare.c: Fix comments and scheme, Jason Wang, 2017/09/07