vitalif
/
mirror_qemu
mirror of https://github.com/proxmox/mirror_qemu
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

net/rocker: Fix the unusual macro name 

Cc: jasowang@redhat.com
Cc: jiri@resnulli.us
Cc: armbru@redhat.com
Cc: f4bug@amsat.org
Suggested-by: Markus Armbruster <armbru@redhat.com>
Signed-off-by: Mao Zhongyi <maozy.fnst@cn.fujitsu.com>
Reviewed-by: Markus Armbruster <armbru@redhat.com>
Reviewed-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
Signed-off-by: Jason Wang <jasowang@redhat.com>
master
Mao Zhongyi 2017-08-14 11:33:10 +08:00 committed by Jason Wang
parent 0c8f86ea98
commit ac7bc03140
1 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
hw/net/rocker/rocker.c
View File

@ -69,10 +69,10 @@ struct rocker {
QLIST_ENTRY(rocker) next; QLIST_ENTRY(rocker) next;
}; };
#define ROCKER "rocker" #define TYPE_ROCKER "rocker"
#define to_rocker(obj) \ #define ROCKER(obj) \
OBJECT_CHECK(Rocker, (obj), ROCKER) OBJECT_CHECK(Rocker, (obj), TYPE_ROCKER)
static QLIST_HEAD(, rocker) rockers; 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) 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 zero = { .a = { 0, 0, 0, 0, 0, 0 } };
const MACAddr dflt = { .a = { 0x52, 0x54, 0x00, 0x12, 0x35, 0x01 } }; const MACAddr dflt = { .a = { 0x52, 0x54, 0x00, 0x12, 0x35, 0x01 } };
static int sw_index; static int sw_index;
@ -1331,7 +1331,7 @@ static void pci_rocker_realize(PCIDevice *dev, Error **errp)
/* validate switch properties */ /* validate switch properties */
if (!r->name) { if (!r->name) {
r->name = g_strdup(ROCKER); r->name = g_strdup(TYPE_ROCKER);
} }
if (rocker_find(r->name)) { if (rocker_find(r->name)) {
@ -1427,7 +1427,7 @@ err_world_type_by_name:
static void pci_rocker_uninit(PCIDevice *dev) static void pci_rocker_uninit(PCIDevice *dev)
{ {
Rocker *r = to_rocker(dev); Rocker *r = ROCKER(dev);
int i; int i;
QLIST_REMOVE(r, next); QLIST_REMOVE(r, next);
@ -1460,7 +1460,7 @@ static void pci_rocker_uninit(PCIDevice *dev)
static void rocker_reset(DeviceState *dev) static void rocker_reset(DeviceState *dev)
{ {
Rocker *r = to_rocker(dev); Rocker *r = ROCKER(dev);
int i; int i;
for (i = 0; i < ROCKER_WORLD_TYPE_MAX; i++) { for (i = 0; i < ROCKER_WORLD_TYPE_MAX; i++) {
@ -1498,7 +1498,7 @@ static Property rocker_properties[] = {
}; };
static const VMStateDescription rocker_vmsd = { static const VMStateDescription rocker_vmsd = {
.name = ROCKER, .name = TYPE_ROCKER,
.unmigratable = 1, .unmigratable = 1,
}; };
@ -1521,7 +1521,7 @@ static void rocker_class_init(ObjectClass *klass, void *data)
} }
static const TypeInfo rocker_info = { static const TypeInfo rocker_info = {
.name = ROCKER, .name = TYPE_ROCKER,
.parent = TYPE_PCI_DEVICE, .parent = TYPE_PCI_DEVICE,
.instance_size = sizeof(Rocker), .instance_size = sizeof(Rocker),
.class_init = rocker_class_init, .class_init = rocker_class_init,