[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL 08/10] qmp: Fix device-list-properties not to crash f
From: |
Markus Armbruster |
Subject: |
[Qemu-devel] [PULL 08/10] qmp: Fix device-list-properties not to crash for abstract device |
Date: |
Fri, 2 Oct 2015 19:20:39 +0200 |
Broken in commit f4eb32b "qmp: show QOM properties in
device-list-properties", v2.1.
Cc: address@hidden
Signed-off-by: Markus Armbruster <address@hidden>
Reviewed-by: Eric Blake <address@hidden>
Reviewed-by: Andreas Färber <address@hidden>
Message-Id: <address@hidden>
---
qmp.c | 6 ++++++
tests/device-introspect-test.c | 15 ++++-----------
2 files changed, 10 insertions(+), 11 deletions(-)
diff --git a/qmp.c b/qmp.c
index 057a7cb..1413de4 100644
--- a/qmp.c
+++ b/qmp.c
@@ -515,6 +515,12 @@ DevicePropertyInfoList *qmp_device_list_properties(const
char *typename,
return NULL;
}
+ if (object_class_is_abstract(klass)) {
+ error_setg(errp, QERR_INVALID_PARAMETER_VALUE, "name",
+ "non-abstract device type");
+ return NULL;
+ }
+
obj = object_new(typename);
QTAILQ_FOREACH(prop, &obj->properties, node) {
diff --git a/tests/device-introspect-test.c b/tests/device-introspect-test.c
index b08120d..9cd27f1 100644
--- a/tests/device-introspect-test.c
+++ b/tests/device-introspect-test.c
@@ -45,17 +45,10 @@ static void test_one_device(const char *type)
QDict *resp;
char *help, *qom_tree;
- /*
- * Skip this part for the abstract device test case, because
- * device-list-properties crashes for such devices.
- * FIXME fix it not to crash
- */
- if (strcmp(type, "device")) {
- resp = qmp("{'execute': 'device-list-properties',"
- " 'arguments': {'typename': %s}}",
- type);
- QDECREF(resp);
- }
+ resp = qmp("{'execute': 'device-list-properties',"
+ " 'arguments': {'typename': %s}}",
+ type);
+ QDECREF(resp);
help = hmp("device_add \"%s,help\"", type);
g_free(help);
--
2.4.3
- [Qemu-devel] [PULL 00/10] Fix device introspection regressions, Markus Armbruster, 2015/10/08
- [Qemu-devel] [PULL 05/10] libqtest: Clean up unused QTestState member sigact_old, Markus Armbruster, 2015/10/08
- [Qemu-devel] [PULL 08/10] qmp: Fix device-list-properties not to crash for abstract device,
Markus Armbruster <=
- [Qemu-devel] [PULL 07/10] device-introspect-test: New, covering device introspection, Markus Armbruster, 2015/10/08
- [Qemu-devel] [PULL 10/10] Revert "qdev: Use qdev_get_device_class() for -device <type>, help", Markus Armbruster, 2015/10/08
- [Qemu-devel] [PULL 02/10] hw: do not pass NULL to memory_region_init from instance_init, Markus Armbruster, 2015/10/08
- [Qemu-devel] [PULL 04/10] tests: Fix how qom-test is run, Markus Armbruster, 2015/10/08
- [Qemu-devel] [PULL 09/10] qdev: Protect device-list-properties against broken devices, Markus Armbruster, 2015/10/08
- [Qemu-devel] [PULL 01/10] memory: allow destroying a non-empty MemoryRegion, Markus Armbruster, 2015/10/08
- [Qemu-devel] [PULL 06/10] libqtest: New hmp() & friends, Markus Armbruster, 2015/10/08
- [Qemu-devel] [PULL 03/10] macio: move DBDMA_init from instance_init to realize, Markus Armbruster, 2015/10/08
- Re: [Qemu-devel] [PULL 00/10] Fix device introspection regressions, Peter Maydell, 2015/10/08