[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH v2 57/58] qdev: qdev_init_nofail() is now unused, drop
From: |
Markus Armbruster |
Subject: |
[PATCH v2 57/58] qdev: qdev_init_nofail() is now unused, drop |
Date: |
Fri, 29 May 2020 15:45:22 +0200 |
Signed-off-by: Markus Armbruster <armbru@redhat.com>
---
include/hw/qdev-core.h | 3 +--
hw/core/qdev.c | 29 -----------------------------
2 files changed, 1 insertion(+), 31 deletions(-)
diff --git a/include/hw/qdev-core.h b/include/hw/qdev-core.h
index ef6137b6a8..7dc10be46f 100644
--- a/include/hw/qdev-core.h
+++ b/include/hw/qdev-core.h
@@ -57,7 +57,7 @@ typedef void (*BusUnrealize)(BusState *bus);
* After successful realization, setting static properties will fail.
*
* As an interim step, the #DeviceState:realized property can also be
- * set with qdev_realize() or qdev_init_nofail().
+ * set with qdev_realize().
* 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
@@ -322,7 +322,6 @@ compat_props_add(GPtrArray *arr,
DeviceState *qdev_new(const char *name);
DeviceState *qdev_try_new(const char *name);
-void qdev_init_nofail(DeviceState *dev);
bool qdev_realize(DeviceState *dev, BusState *bus, Error **errp);
bool qdev_realize_and_unref(DeviceState *dev, BusState *bus, Error **errp);
void qdev_unrealize(DeviceState *dev);
diff --git a/hw/core/qdev.c b/hw/core/qdev.c
index 50336168f2..2131c7f951 100644
--- a/hw/core/qdev.c
+++ b/hw/core/qdev.c
@@ -376,35 +376,6 @@ void qdev_simple_device_unplug_cb(HotplugHandler
*hotplug_dev,
qdev_unrealize(dev);
}
-/*
- * 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;
-
- assert(!dev->realized);
-
- object_ref(OBJECT(dev));
- object_property_set_bool(OBJECT(dev), true, "realized", &err);
- if (err) {
- error_reportf_err(err, "Initialization of device %s failed: ",
- object_get_typename(OBJECT(dev)));
- exit(1);
- }
- object_unref(OBJECT(dev));
-}
-
/*
* Realize @dev.
* @dev must not be plugged into a bus.
--
2.21.3
- Re: [PATCH v2 58/58] MAINTAINERS: Make section QOM cover hw/core/*bus.c as well, (continued)
- [PATCH v2 20/58] isa: Convert uses of isa_create(), isa_try_create() manually, Markus Armbruster, 2020/05/29
- [PATCH v2 13/58] pci: New pci_new(), pci_realize_and_unref() etc., Markus Armbruster, 2020/05/29
- [PATCH v2 36/58] qom: Less verbose object_initialize_child(), Markus Armbruster, 2020/05/29
- [PATCH v2 44/58] sysbus: New sysbus_realize(), sysbus_realize_and_unref(), Markus Armbruster, 2020/05/29
- [PATCH v2 09/58] qdev: Convert uses of qdev_create() with Coccinelle, Markus Armbruster, 2020/05/29
- [PATCH v2 26/58] usb: New usb_new(), usb_realize_and_unref(), Markus Armbruster, 2020/05/29
- [PATCH v2 50/58] sysbus: Convert qdev_set_parent_bus() use with Coccinelle, part 4, Markus Armbruster, 2020/05/29
- [PATCH v2 54/58] qdev: Make qdev_realize() support bus-less devices, Markus Armbruster, 2020/05/29
- [PATCH v2 57/58] qdev: qdev_init_nofail() is now unused, drop,
Markus Armbruster <=
- [PATCH v2 49/58] sysbus: Convert qdev_set_parent_bus() use with Coccinelle, part 3, Markus Armbruster, 2020/05/29
- [PATCH v2 47/58] sysbus: Convert qdev_set_parent_bus() use with Coccinelle, part 1, Markus Armbruster, 2020/05/29
- [PATCH v2 56/58] qdev: Convert bus-less devices to qdev_realize() with Coccinelle, Markus Armbruster, 2020/05/29
- [PATCH v2 45/58] sysbus: Convert to sysbus_realize() etc. with Coccinelle, Markus Armbruster, 2020/05/29
- [PATCH v2 43/58] sysbus: Tidy up sysbus_init_child_obj()'s @childsize arg, part 2, Markus Armbruster, 2020/05/29
- [PATCH v2 04/58] qdev: New qdev_new(), qdev_realize(), etc., Markus Armbruster, 2020/05/29
- [PATCH v2 11/58] qdev: Convert uses of qdev_set_parent_bus() with Coccinelle, Markus Armbruster, 2020/05/29
- [PATCH v2 55/58] qdev: Use qdev_realize() in qdev_device_add(), Markus Armbruster, 2020/05/29
- [PATCH v2 29/58] usb: Eliminate usb_try_create_simple(), Markus Armbruster, 2020/05/29