[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH 5/8] qdev: improve find_device_state() to distinguish simple not
From: |
Vladimir Sementsov-Ogievskiy |
Subject: |
[PATCH 5/8] qdev: improve find_device_state() to distinguish simple not found case |
Date: |
Mon, 2 Aug 2021 21:54:13 +0300 |
We'll need this for realizing qdev_find_child() in the next commit.
Signed-off-by: Vladimir Sementsov-Ogievskiy <vsementsov@virtuozzo.com>
---
softmmu/qdev-monitor.c | 48 +++++++++++++++++++++++++++++-------------
1 file changed, 33 insertions(+), 15 deletions(-)
diff --git a/softmmu/qdev-monitor.c b/softmmu/qdev-monitor.c
index 721dec2d82..0117989009 100644
--- a/softmmu/qdev-monitor.c
+++ b/softmmu/qdev-monitor.c
@@ -819,7 +819,12 @@ void qmp_device_add(QDict *qdict, QObject **ret_data,
Error **errp)
object_unref(OBJECT(dev));
}
-static DeviceState *find_device_state(const char *id, Error **errp)
+/*
+ * Returns: 1 when found, @dev set
+ * 0 not found, @dev and @errp untouched
+ * <0 error, or id is ambiguous, @errp set
+ */
+static int find_device_state(const char *id, DeviceState **dev, Error **errp)
{
Object *obj;
@@ -835,17 +840,16 @@ static DeviceState *find_device_state(const char *id,
Error **errp)
}
if (!obj) {
- error_set(errp, ERROR_CLASS_DEVICE_NOT_FOUND,
- "Device '%s' not found", id);
- return NULL;
+ return 0;
}
if (!object_dynamic_cast(obj, TYPE_DEVICE)) {
error_setg(errp, "%s is not a hotpluggable device", id);
- return NULL;
+ return -EINVAL;
}
- return DEVICE(obj);
+ *dev = DEVICE(obj);
+ return 1;
}
void qdev_unplug(DeviceState *dev, Error **errp)
@@ -894,16 +898,25 @@ void qdev_unplug(DeviceState *dev, Error **errp)
void qmp_device_del(const char *id, Error **errp)
{
- DeviceState *dev = find_device_state(id, errp);
- if (dev != NULL) {
- if (dev->pending_deleted_event) {
- error_setg(errp, "Device %s is already in the "
- "process of unplug", id);
- return;
+ int ret;
+ DeviceState *dev;
+
+ ret = find_device_state(id, &dev, errp);
+ if (ret <= 0) {
+ if (ret == 0) {
+ error_set(errp, ERROR_CLASS_DEVICE_NOT_FOUND,
+ "Device '%s' not found", id);
}
+ return;
+ }
- qdev_unplug(dev, errp);
+ if (dev->pending_deleted_event) {
+ error_setg(errp, "Device %s is already in the "
+ "process of unplug", id);
+ return;
}
+
+ qdev_unplug(dev, errp);
}
void hmp_device_add(Monitor *mon, const QDict *qdict)
@@ -925,11 +938,16 @@ void hmp_device_del(Monitor *mon, const QDict *qdict)
BlockBackend *blk_by_qdev_id(const char *id, Error **errp)
{
+ int ret;
DeviceState *dev;
BlockBackend *blk;
- dev = find_device_state(id, errp);
- if (dev == NULL) {
+ ret = find_device_state(id, &dev, errp);
+ if (ret <= 0) {
+ if (ret == 0) {
+ error_set(errp, ERROR_CLASS_DEVICE_NOT_FOUND,
+ "Device '%s' not found", id);
+ }
return NULL;
}
--
2.29.2
- [PATCH RFC 0/8] blockdev-replace, Vladimir Sementsov-Ogievskiy, 2021/08/02
- [PATCH 2/8] block: add BlockParentClass class, Vladimir Sementsov-Ogievskiy, 2021/08/02
- [PATCH 1/8] block-backend: blk_root(): drop const specifier on return type, Vladimir Sementsov-Ogievskiy, 2021/08/02
- [PATCH 3/8] block: realize BlockParentClass for BlockDriverState, Vladimir Sementsov-Ogievskiy, 2021/08/02
- [PATCH 5/8] qdev: improve find_device_state() to distinguish simple not found case,
Vladimir Sementsov-Ogievskiy <=
- [PATCH 4/8] block/export: realize BlockParentClass functionality, Vladimir Sementsov-Ogievskiy, 2021/08/02
- [PATCH 6/8] qdev: realize BlockParentClass, Vladimir Sementsov-Ogievskiy, 2021/08/02
- [PATCH 7/8] block: improve bdrv_replace_node_noperm(), Vladimir Sementsov-Ogievskiy, 2021/08/02
- [PATCH 8/8] qapi: add blockdev-replace command, Vladimir Sementsov-Ogievskiy, 2021/08/02