diff options
| -rw-r--r-- | qmp.c | 6 | ||||
| -rw-r--r-- | tests/device-introspect-test.c | 15 |
2 files changed, 10 insertions, 11 deletions
@@ -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 f240b5c827..8a27b4a702 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); |