[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH 04/26] qdev: move helper function to monitor/misc
From: |
Marc-André Lureau |
Subject: |
[PATCH 04/26] qdev: move helper function to monitor/misc |
Date: |
Sun, 1 Dec 2019 15:15:09 +0400 |
Move the one-user function to the place it is being used.
Signed-off-by: Marc-André Lureau <address@hidden>
---
hw/core/qdev.c | 26 --------------------------
include/hw/qdev-core.h | 2 --
monitor/misc.c | 26 ++++++++++++++++++++++++++
3 files changed, 26 insertions(+), 28 deletions(-)
diff --git a/hw/core/qdev.c b/hw/core/qdev.c
index c1a338bbe4..90eb01bc8e 100644
--- a/hw/core/qdev.c
+++ b/hw/core/qdev.c
@@ -760,32 +760,6 @@ void qdev_alias_all_properties(DeviceState *target, Object
*source)
} while (class != object_class_by_name(TYPE_DEVICE));
}
-static int qdev_add_hotpluggable_device(Object *obj, void *opaque)
-{
- GSList **list = opaque;
- DeviceState *dev = (DeviceState *)object_dynamic_cast(OBJECT(obj),
- TYPE_DEVICE);
-
- if (dev == NULL) {
- return 0;
- }
-
- if (dev->realized && object_property_get_bool(obj, "hotpluggable", NULL)) {
- *list = g_slist_append(*list, dev);
- }
-
- return 0;
-}
-
-GSList *qdev_build_hotpluggable_device_list(Object *peripheral)
-{
- GSList *list = NULL;
-
- object_child_foreach(peripheral, qdev_add_hotpluggable_device, &list);
-
- return list;
-}
-
static bool device_get_realized(Object *obj, Error **errp)
{
DeviceState *dev = DEVICE(obj);
diff --git a/include/hw/qdev-core.h b/include/hw/qdev-core.h
index 1518495b1e..6b0e7b265d 100644
--- a/include/hw/qdev-core.h
+++ b/include/hw/qdev-core.h
@@ -457,8 +457,6 @@ extern bool qdev_hot_removed;
char *qdev_get_dev_path(DeviceState *dev);
-GSList *qdev_build_hotpluggable_device_list(Object *peripheral);
-
void qbus_set_hotplug_handler(BusState *bus, Object *handler, Error **errp);
void qbus_set_bus_hotplug_handler(BusState *bus, Error **errp);
diff --git a/monitor/misc.c b/monitor/misc.c
index 3baa15f3bf..36c85cecf3 100644
--- a/monitor/misc.c
+++ b/monitor/misc.c
@@ -1956,6 +1956,32 @@ void object_add_completion(ReadLineState *rs, int
nb_args, const char *str)
g_slist_free(list);
}
+static int qdev_add_hotpluggable_device(Object *obj, void *opaque)
+{
+ GSList **list = opaque;
+ DeviceState *dev = (DeviceState *)object_dynamic_cast(OBJECT(obj),
+ TYPE_DEVICE);
+
+ if (dev == NULL) {
+ return 0;
+ }
+
+ if (dev->realized && object_property_get_bool(obj, "hotpluggable", NULL)) {
+ *list = g_slist_append(*list, dev);
+ }
+
+ return 0;
+}
+
+static GSList *qdev_build_hotpluggable_device_list(Object *peripheral)
+{
+ GSList *list = NULL;
+
+ object_child_foreach(peripheral, qdev_add_hotpluggable_device, &list);
+
+ return list;
+}
+
static void peripheral_device_del_completion(ReadLineState *rs,
const char *str, size_t len)
{
--
2.24.0
- [PATCH 00/26] Make QDev use class properties, Marc-André Lureau, 2019/12/01
- [PATCH 01/26] object: add extra sanity checks, Marc-André Lureau, 2019/12/01
- [PATCH 02/26] qdev: remove duplicated qdev_property_add_static() doc, Marc-André Lureau, 2019/12/01
- [PATCH 03/26] qdev: remove extraneous error, Marc-André Lureau, 2019/12/01
- [PATCH 04/26] qdev: move helper function to monitor/misc,
Marc-André Lureau <=
- [PATCH 05/26] object: avoid extra class property key duplication, Marc-André Lureau, 2019/12/01
- [PATCH 06/26] object: add class property initializer, Marc-André Lureau, 2019/12/01
- [PATCH 07/26] object: add object_property_get_defaut(), Marc-André Lureau, 2019/12/01
- [PATCH 08/26] object: make object_class_property_add* return property, Marc-André Lureau, 2019/12/01
- [PATCH 09/26] qstring: add qstring_free(), Marc-André Lureau, 2019/12/01
- [PATCH 10/26] object: add object_property_set_defaut_{bool, str, int, uint}(), Marc-André Lureau, 2019/12/01
- [PATCH 11/26] object: do not free class properties, Marc-André Lureau, 2019/12/01
- [PATCH 12/26] object: check strong flag with &, Marc-André Lureau, 2019/12/01
- [PATCH 13/26] object: rename link "child" to "target", Marc-André Lureau, 2019/12/01