[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH RFC 23/48] qdev: Factor qdev_create_from_info() out
From: |
Markus Armbruster |
Subject: |
[Qemu-devel] [PATCH RFC 23/48] qdev: Factor qdev_create_from_info() out of qdev_create() |
Date: |
Wed, 24 Feb 2010 18:55:35 +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 7def97d..e5f6820 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
- [Qemu-devel] [PATCH RFC 34/48] qdev: Convert qbus_find() to QError, (continued)
- [Qemu-devel] [PATCH RFC 34/48] qdev: Convert qbus_find() to QError, Markus Armbruster, 2010/02/24
- [Qemu-devel] [PATCH RFC 33/48] error: New QERR_DEVICE_NO_BUS, Markus Armbruster, 2010/02/24
- [Qemu-devel] [PATCH RFC 14/48] error: Don't abuse qemu_error() for non-error in scsi_hot_add(), Markus Armbruster, 2010/02/24
- [Qemu-devel] [PATCH RFC 12/48] error: New error_printf() and error_vprintf(), Markus Armbruster, 2010/02/24
- [Qemu-devel] [PATCH RFC 41/48] Revert "qdev: Use QError for 'device not found' error", Markus Armbruster, 2010/02/24
- [Qemu-devel] [PATCH RFC 20/48] QemuOpts: Fix qemu_config_parse() to catch file read errors, Markus Armbruster, 2010/02/24
- [Qemu-devel] [PATCH RFC 40/48] error: New QERR_NO_BUS_FOR_DEVICE, Markus Armbruster, 2010/02/24
- [Qemu-devel] [PATCH RFC 45/48] qemu-option: Rename find_list() to qemu_find_opts() & external linkage, Markus Armbruster, 2010/02/24
- [Qemu-devel] [PATCH RFC 37/48] error: New QERR_BAD_BUS_FOR_DEVICE, Markus Armbruster, 2010/02/24
- [Qemu-devel] [PATCH RFC 23/48] qdev: Factor qdev_create_from_info() out of qdev_create(),
Markus Armbruster <=
- [Qemu-devel] [PATCH RFC 36/48] error: New error_printf_unless_qmp(), Markus Armbruster, 2010/02/24
- [Qemu-devel] [PATCH RFC 19/48] error: Track locations in configuration files, Markus Armbruster, 2010/02/24
- [Qemu-devel] [PATCH RFC 47/48] monitor: Use argument type 'O' for device_add, Markus Armbruster, 2010/02/24
- [Qemu-devel] [PATCH RFC 31/48] error: New QERR_BUS_NOT_FOUND, Markus Armbruster, 2010/02/24
- [Qemu-devel] [PATCH RFC 27/48] error: New QERR_PROPERTY_NOT_FOUND, Markus Armbruster, 2010/02/24
- [Qemu-devel] [PATCH RFC 29/48] qdev: convert setting device properties to QError, Markus Armbruster, 2010/02/24
- [Qemu-devel] [PATCH RFC 03/48] usb: Remove disabled monitor_printf() in usb_read_file(), Markus Armbruster, 2010/02/24
- [Qemu-devel] [PATCH RFC 10/48] error: Simplify error sink setup, Markus Armbruster, 2010/02/24
- [Qemu-devel] [PATCH RFC 39/48] error: New QERR_DEVICE_INIT_FAILED, Markus Armbruster, 2010/02/24
- [Qemu-devel] [PATCH RFC 04/48] savevm: Fix -loadvm to report errors to stderr, not the monitor, Markus Armbruster, 2010/02/24