[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL v3 13/14] qdev: Deprecated qdev_init() is finally unu
From: |
Andreas Färber |
Subject: |
[Qemu-devel] [PULL v3 13/14] qdev: Deprecated qdev_init() is finally unused, drop |
Date: |
Fri, 19 Jun 2015 19:24:46 +0200 |
From: Markus Armbruster <address@hidden>
qdev_init() is a wrapper around setting property "realized" to true,
plus error handling that passes errors to qerror_report_err().
qerror_report_err() is a transitional interface to help with
converting existing monitor commands to QMP. It should not be used
elsewhere.
All code has been modernized to avoid qdev_init() and its
inappropriate error handling. We can finally drop it.
Signed-off-by: Markus Armbruster <address@hidden>
Reviewed-by: Eric Blake <address@hidden>
Signed-off-by: Andreas Färber <address@hidden>
---
hw/core/qdev.c | 47 ++++++++++++++++-------------------------------
include/hw/qdev-core.h | 3 +--
2 files changed, 17 insertions(+), 33 deletions(-)
diff --git a/hw/core/qdev.c b/hw/core/qdev.c
index d10fa5f..a6353c1 100644
--- a/hw/core/qdev.c
+++ b/hw/core/qdev.c
@@ -126,9 +126,9 @@ void qbus_set_bus_hotplug_handler(BusState *bus, Error
**errp)
qbus_set_hotplug_handler_internal(bus, OBJECT(bus), errp);
}
-/* 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. */
+/* Create a new device. This only initializes the device state
+ structure and allows properties to be set. The device still needs
+ to be realized. See qdev-core.h. */
DeviceState *qdev_create(BusState *bus, const char *name)
{
DeviceState *dev;
@@ -168,27 +168,6 @@ DeviceState *qdev_try_create(BusState *bus, const char
*type)
return dev;
}
-/* Initialize a device. Device properties should be set before calling
- this function. IRQs and MMIO regions should be connected/mapped after
- calling this function.
- On failure, destroy the device and return negative value.
- Return 0 on success. */
-int qdev_init(DeviceState *dev)
-{
- Error *local_err = NULL;
-
- assert(!dev->realized);
-
- object_property_set_bool(OBJECT(dev), true, "realized", &local_err);
- if (local_err != NULL) {
- qerror_report_err(local_err);
- error_free(local_err);
- object_unparent(OBJECT(dev));
- return -1;
- }
- return 0;
-}
-
static QTAILQ_HEAD(device_listeners, DeviceListener) device_listeners
= QTAILQ_HEAD_INITIALIZER(device_listeners);
@@ -364,13 +343,19 @@ void qdev_simple_device_unplug_cb(HotplugHandler
*hotplug_dev,
object_unparent(OBJECT(dev));
}
-/* Like qdev_init(), but terminate program via error_report() instead of
- returning an error value. This is okay during machine creation.
- Don't use for hotplug, because there callers need to recover from
- failure. Exception: if you know the device's init() callback can't
- fail, then qdev_init_nofail() can't fail either, and is therefore
- usable even then. But relying on the device implementation that
- way is somewhat unclean, and best avoided. */
+/*
+ * Realize @dev.
+ * Device properties should be set before calling this function. IRQs
+ * and MMIO regions should be connected/mapped after calling this
+ * function.
+ * On failure, report an error with error_report() and terminate the
+ * program. This is okay during machine creation. Don't use for
+ * hotplug, because there callers need to recover from failure.
+ * Exception: if you know the device's init() callback can't fail,
+ * then qdev_init_nofail() can't fail either, and is therefore usable
+ * even then. But relying on the device implementation that way is
+ * somewhat unclean, and best avoided.
+ */
void qdev_init_nofail(DeviceState *dev)
{
Error *err = NULL;
diff --git a/include/hw/qdev-core.h b/include/hw/qdev-core.h
index ad9eb89..64154a9 100644
--- a/include/hw/qdev-core.h
+++ b/include/hw/qdev-core.h
@@ -66,7 +66,7 @@ struct VMStateDescription;
* After successful realization, setting static properties will fail.
*
* As an interim step, the #DeviceState:realized property is set by deprecated
- * functions qdev_init() and qdev_init_nofail().
+ * function qdev_init_nofail().
* In the future, devices will propagate this state change to their children
* and along busses they expose.
* The point in time will be deferred to machine creation, so that values
@@ -262,7 +262,6 @@ typedef struct GlobalProperty {
DeviceState *qdev_create(BusState *bus, const char *name);
DeviceState *qdev_try_create(BusState *bus, const char *name);
-int qdev_init(DeviceState *dev) QEMU_WARN_UNUSED_RESULT;
void qdev_init_nofail(DeviceState *dev);
void qdev_set_legacy_instance_id(DeviceState *dev, int alias_id,
int required_for_version);
--
2.1.4
- [Qemu-devel] [PULL v2 00/14] QOM devices patch queue 2015-06-19, Andreas Färber, 2015/06/19
- [Qemu-devel] [PULL v3 14/14] qdev: Un-deprecate qdev_init_nofail(), Andreas Färber, 2015/06/19
- [Qemu-devel] [PULL v3 05/14] backends: Fix typename of 'policy' enum property in hostmem obj, Andreas Färber, 2015/06/19
- [Qemu-devel] [PULL v3 01/14] qom: strdup() target property name on object_property_add_alias(), Andreas Färber, 2015/06/19
- [Qemu-devel] [PULL v3 02/14] qdev: Free property names after registering gpio aliases, Andreas Färber, 2015/06/19
- [Qemu-devel] [PULL v3 12/14] qom: Don't pass string table to object_get_enum() function, Andreas Färber, 2015/06/19
- [Qemu-devel] [PULL v3 07/14] vl: Create (most) objects before creating chardev backends, Andreas Färber, 2015/06/19
- [Qemu-devel] [PULL v3 08/14] qom: Add helper function for getting user objects root, Andreas Färber, 2015/06/19
- [Qemu-devel] [PULL v3 06/14] doc: Document user creatable object types in help text, Andreas Färber, 2015/06/19
- [Qemu-devel] [PULL v3 13/14] qdev: Deprecated qdev_init() is finally unused, drop,
Andreas Färber <=
- [Qemu-devel] [PULL v3 11/14] qom: Add an object_property_add_enum() helper function, Andreas Färber, 2015/06/19
- [Qemu-devel] [PULL v3 10/14] qom: Make enum string tables const-correct, Andreas Färber, 2015/06/19
- [Qemu-devel] [PULL v3 09/14] qom: Add object_new_with_props() / object_new_withpropv() helpers, Andreas Färber, 2015/06/19
- [Qemu-devel] [PULL v3 03/14] tests: Use qtest_add_data_func() consistently, Andreas Färber, 2015/06/19
- [Qemu-devel] [PULL v3 04/14] scripts: Add support for path as argument of qom-tree, Andreas Färber, 2015/06/19
- Re: [Qemu-devel] [PULL v2 00/14] QOM devices patch queue 2015-06-19, Peter Maydell, 2015/06/22