[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 24/50] qdev: Factor qdev_create_from_info() out of q
From: |
Markus Armbruster |
Subject: |
[Qemu-devel] [PATCH 24/50] qdev: Factor qdev_create_from_info() out of qdev_create() |
Date: |
Thu, 4 Mar 2010 16:56:45 +0100 |
To make it obvious that -device and device_add can't die in
hw_error().
Signed-off-by: Markus Armbruster <address@hidden>
---
hw/qdev.c | 37 ++++++++++++++++++++++---------------
1 files changed, 22 insertions(+), 15 deletions(-)
diff --git a/hw/qdev.c b/hw/qdev.c
index 80e5c36..7bc711b 100644
--- a/hw/qdev.c
+++ b/hw/qdev.c
@@ -78,13 +78,32 @@ static DeviceInfo *qdev_find_info(BusInfo *bus_info, const
char *name)
return NULL;
}
+static DeviceState *qdev_create_from_info(BusState *bus, DeviceInfo *info)
+{
+ DeviceState *dev;
+
+ assert(bus->info == info->bus_info);
+ dev = qemu_mallocz(info->size);
+ dev->info = info;
+ dev->parent_bus = bus;
+ qdev_prop_set_defaults(dev, dev->info->props);
+ qdev_prop_set_defaults(dev, dev->parent_bus->info->props);
+ qdev_prop_set_globals(dev);
+ QLIST_INSERT_HEAD(&bus->children, dev, sibling);
+ if (qdev_hotplug) {
+ assert(bus->allow_hotplug);
+ dev->hotplugged = 1;
+ }
+ dev->state = DEV_STATE_CREATED;
+ 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;
- DeviceState *dev;
if (!bus) {
if (!main_system_bus) {
@@ -98,19 +117,7 @@ DeviceState *qdev_create(BusState *bus, const char *name)
hw_error("Unknown device '%s' for bus '%s'\n", name, bus->info->name);
}
- dev = qemu_mallocz(info->size);
- dev->info = info;
- dev->parent_bus = bus;
- qdev_prop_set_defaults(dev, dev->info->props);
- qdev_prop_set_defaults(dev, dev->parent_bus->info->props);
- qdev_prop_set_globals(dev);
- QLIST_INSERT_HEAD(&bus->children, dev, sibling);
- if (qdev_hotplug) {
- assert(bus->allow_hotplug);
- dev->hotplugged = 1;
- }
- dev->state = DEV_STATE_CREATED;
- return dev;
+ return qdev_create_from_info(bus, info);
}
static void qdev_print_devinfo(DeviceInfo *info)
@@ -224,7 +231,7 @@ DeviceState *qdev_device_add(QemuOpts *opts)
}
/* create device, set properties */
- qdev = qdev_create(bus, driver);
+ qdev = qdev_create_from_info(bus, info);
id = qemu_opts_id(opts);
if (id) {
qdev->id = id;
--
1.6.6.1
- [Qemu-devel] [PATCH 39/50] error: New QERR_BAD_BUS_FOR_DEVICE, (continued)
- [Qemu-devel] [PATCH 49/50] monitor: Use argument type 'O' for device_add, Markus Armbruster, 2010/03/04
- [Qemu-devel] [PATCH 47/50] qemu-option: Rename find_list() to qemu_find_opts() & external linkage, Markus Armbruster, 2010/03/04
- [Qemu-devel] [PATCH 16/50] error: Replace qemu_error() by error_report(), Markus Armbruster, 2010/03/04
- [Qemu-devel] [PATCH 24/50] qdev: Factor qdev_create_from_info() out of qdev_create(),
Markus Armbruster <=
- [Qemu-devel] [PATCH 19/50] error: Include the program name in error messages to stderr, Markus Armbruster, 2010/03/04
- [Qemu-devel] [PATCH 38/50] error: New error_printf_unless_qmp(), Markus Armbruster, 2010/03/04
- [Qemu-devel] [PATCH 20/50] error: Track locations in configuration files, Markus Armbruster, 2010/03/04
- [Qemu-devel] [PATCH 46/50] qemu-option: Move the implied first name into QemuOptsList, Markus Armbruster, 2010/03/04
- [Qemu-devel] [PATCH 22/50] error: Track locations on command line, Markus Armbruster, 2010/03/04
- [Qemu-devel] [PATCH 48/50] monitor: New argument type 'O', Markus Armbruster, 2010/03/04
- [Qemu-devel] [PATCH 29/50] error: Polish human-readable error descriptions, Markus Armbruster, 2010/03/04
- [Qemu-devel] [PATCH 21/50] QemuOpts: Fix qemu_config_parse() to catch file read errors, Markus Armbruster, 2010/03/04
- [Qemu-devel] [PATCH 32/50] qdev: convert setting device properties to QError, Markus Armbruster, 2010/03/04
- [Qemu-devel] [PATCH 28/50] error: Let converted handlers print in human monitor, Markus Armbruster, 2010/03/04