ShuriZma
/
xemu
mirror of https://github.com/xemu-project/xemu.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

qdev: remove duplication between qbus_create and qbus_create_inplace 

Move the common part to qbus_realize.

Acked-by: Andreas Färber <afaerber@suse.de>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
This commit is contained in:
Paolo Bonzini 2013-01-25 14:12:27 +01:00 committed by Anthony Liguori
parent d5286af5ef
commit 013e118247
1 changed files with 7 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
hw/qdev.c
View File

@ -390,14 +390,16 @@ DeviceState *qdev_find_recursive(BusState *bus, const char *id)
return NULL; return NULL;
} }
static void qbus_realize(BusState *bus) static void qbus_realize(BusState *bus, DeviceState *parent, const char *name)
{ {
const char *typename = object_get_typename(OBJECT(bus)); const char *typename = object_get_typename(OBJECT(bus));
char *buf; char *buf;
int i,len; int i,len;
if (bus->name) { bus->parent = parent;
/* use supplied name */
if (name) {
bus->name = g_strdup(name);
} else if (bus->parent && bus->parent->id) { } else if (bus->parent && bus->parent->id) {
/* parent device has id -> use it for bus name */ /* parent device has id -> use it for bus name */
len = strlen(bus->parent->id) + 16; len = strlen(bus->parent->id) + 16;
@ -430,10 +432,7 @@ void qbus_create_inplace(BusState *bus, const char *typename,
DeviceState *parent, const char *name) DeviceState *parent, const char *name)
{ {
object_initialize(bus, typename); object_initialize(bus, typename);
qbus_realize(bus, parent, name);
bus->parent = parent;
bus->name = name ? g_strdup(name) : NULL;
qbus_realize(bus);
} }
BusState *qbus_create(const char *typename, DeviceState *parent, const char *name) BusState *qbus_create(const char *typename, DeviceState *parent, const char *name)
@ -441,10 +440,7 @@ BusState *qbus_create(const char *typename, DeviceState *parent, const char *nam
BusState *bus; BusState *bus;
bus = BUS(object_new(typename)); bus = BUS(object_new(typename));
qbus_realize(bus, parent, name);
bus->parent = parent;
bus->name = name ? g_strdup(name) : NULL;
qbus_realize(bus);
return bus; return bus;
} }