qmp: Merge ObjectPropertyInfo and DevicePropertyInfo

ObjectPropertyInfo is more generic and only missing @description.
This adds a description to ObjectPropertyInfo and removes
DevicePropertyInfo so the resulting ObjectPropertyInfo can be used
elsewhere.

Signed-off-by: Alexey Kardashevskiy <aik@ozlabs.ru>
Message-Id: <20180301130939.15875-2-aik@ozlabs.ru>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
This commit is contained in:
Alexey Kardashevskiy
2018-03-02 00:09:38 +11:00
committed by Paolo Bonzini
parent f29d445042
commit 35f63767dc
3 changed files with 18 additions and 31 deletions

View File

@@ -258,8 +258,8 @@ int qdev_device_help(QemuOpts *opts)
{
Error *local_err = NULL;
const char *driver;
DevicePropertyInfoList *prop_list;
DevicePropertyInfoList *prop;
ObjectPropertyInfoList *prop_list;
ObjectPropertyInfoList *prop;
driver = qemu_opt_get(opts, "driver");
if (driver && is_help_option(driver)) {
@@ -295,7 +295,7 @@ int qdev_device_help(QemuOpts *opts)
}
}
qapi_free_DevicePropertyInfoList(prop_list);
qapi_free_ObjectPropertyInfoList(prop_list);
return 1;
error: