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

qdev: Factor qdev_create_from_info() out of qdev_create() 

To make it obvious that -device and device_add can't die in
hw_error().
This commit is contained in:
Markus Armbruster 2010-02-19 19:12:18 +01:00
parent 327867b62a
commit 0c17542d90
1 changed files with 25 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

43
hw/qdev.c
View File

@ -78,26 +78,11 @@ static DeviceInfo *qdev_find_info(BusInfo *bus_info, const char *name)
return NULL; return NULL;
} }
/* Create a new device. This only initializes the device state structure static DeviceState *qdev_create_from_info(BusState *bus, DeviceInfo *info)
and allows properties to be set. qdev_init should be called to
initialize the actual device emulation. */
DeviceState *qdev_create(BusState *bus, const char *name)
{ {
DeviceInfo *info;
DeviceState *dev; DeviceState *dev;
if (!bus) { assert(bus->info == info->bus_info);
if (!main_system_bus) {
main_system_bus = qbus_create(&system_bus_info, NULL, "main-system-bus");
}
bus = main_system_bus;
}
info = qdev_find_info(bus->info, name);
if (!info) {
hw_error("Unknown device '%s' for bus '%s'\n", name, bus->info->name);
}
dev = qemu_mallocz(info->size); dev = qemu_mallocz(info->size);
dev->info = info; dev->info = info;
dev->parent_bus = bus; dev->parent_bus = bus;
@ -113,6 +98,28 @@ DeviceState *qdev_create(BusState *bus, const char *name)
return dev; return dev;
} }
/* Create a new device. This only initializes the device state structure
and allows properties to be set. qdev_init should be called to
initialize the actual device emulation. */
DeviceState *qdev_create(BusState *bus, const char *name)
{
DeviceInfo *info;
if (!bus) {
if (!main_system_bus) {
main_system_bus = qbus_create(&system_bus_info, NULL, "main-system-bus");
}
bus = main_system_bus;
}
info = qdev_find_info(bus->info, name);
if (!info) {
hw_error("Unknown device '%s' for bus '%s'\n", name, bus->info->name);
}
return qdev_create_from_info(bus, info);
}
static void qdev_print_devinfo(DeviceInfo *info) static void qdev_print_devinfo(DeviceInfo *info)
{ {
error_printf("name \"%s\", bus %s", error_printf("name \"%s\", bus %s",
@ -224,7 +231,7 @@ DeviceState *qdev_device_add(QemuOpts *opts)
} }
/* create device, set properties */ /* create device, set properties */
qdev = qdev_create(bus, driver); qdev = qdev_create_from_info(bus, info);
id = qemu_opts_id(opts); id = qemu_opts_id(opts);
if (id) { if (id) {
qdev->id = id; qdev->id = id;