mirror of
https://gitlab.com/qemu-project/qemu.git
synced 2024-12-05 12:16:31 +03:00
qapi qdev qom: Elide redundant has_FOO in generated C
The has_FOO for pointer-valued FOO are redundant, except for arrays. They are also a nuisance to work with. Recent commit "qapi: Start to elide redundant has_FOO in generated C" provided the means to elide them step by step. This is the step for qapi/qdev.json and qapi/qom.json. Said commit explains the transformation in more detail. The invariant violations mentioned there do not occur here. Cc: Paolo Bonzini <pbonzini@redhat.com> Cc: Daniel P. Berrangé <berrange@redhat.com> Cc: Eduardo Habkost <eduardo@habkost.net> Signed-off-by: Markus Armbruster <armbru@redhat.com> Message-Id: <20221104160712.3005652-21-armbru@redhat.com> Reviewed-by: Philippe Mathieu-Daudé <philmd@linaro.org>
This commit is contained in:
parent
0846aaf77c
commit
047f2ca1ce
@ -185,7 +185,7 @@ static void acpi_memory_hotplug_write(void *opaque, hwaddr addr, uint64_t data,
|
||||
*/
|
||||
qapi_event_send_mem_unplug_error(dev->id ? : "",
|
||||
error_get_pretty(local_err));
|
||||
qapi_event_send_device_unplug_guest_error(!!dev->id, dev->id,
|
||||
qapi_event_send_device_unplug_guest_error(dev->id,
|
||||
dev->canonical_path);
|
||||
error_free(local_err);
|
||||
break;
|
||||
|
@ -757,7 +757,7 @@ static void device_finalize(Object *obj)
|
||||
if (dev->pending_deleted_event) {
|
||||
g_assert(dev->canonical_path);
|
||||
|
||||
qapi_event_send_device_deleted(!!dev->id, dev->id, dev->canonical_path);
|
||||
qapi_event_send_device_deleted(dev->id, dev->canonical_path);
|
||||
g_free(dev->canonical_path);
|
||||
dev->canonical_path = NULL;
|
||||
}
|
||||
|
@ -3728,7 +3728,7 @@ void spapr_memory_unplug_rollback(SpaprMachineState *spapr, DeviceState *dev)
|
||||
|
||||
qapi_event_send_mem_unplug_error(dev->id ? : "", qapi_error);
|
||||
|
||||
qapi_event_send_device_unplug_guest_error(!!dev->id, dev->id,
|
||||
qapi_event_send_device_unplug_guest_error(dev->id,
|
||||
dev->canonical_path);
|
||||
}
|
||||
|
||||
|
@ -175,8 +175,7 @@ static uint32_t drc_unisolate_logical(SpaprDrc *drc)
|
||||
"for device %s", drc->dev->id);
|
||||
}
|
||||
|
||||
qapi_event_send_device_unplug_guest_error(!!drc->dev->id,
|
||||
drc->dev->id,
|
||||
qapi_event_send_device_unplug_guest_error(drc->dev->id,
|
||||
drc->dev->canonical_path);
|
||||
}
|
||||
|
||||
|
@ -99,15 +99,13 @@ static void qom_list_types_tramp(ObjectClass *klass, void *data)
|
||||
info->name = g_strdup(object_class_get_name(klass));
|
||||
info->has_abstract = info->abstract = object_class_is_abstract(klass);
|
||||
if (parent) {
|
||||
info->has_parent = true;
|
||||
info->parent = g_strdup(object_class_get_name(parent));
|
||||
}
|
||||
|
||||
QAPI_LIST_PREPEND(*pret, info);
|
||||
}
|
||||
|
||||
ObjectTypeInfoList *qmp_qom_list_types(bool has_implements,
|
||||
const char *implements,
|
||||
ObjectTypeInfoList *qmp_qom_list_types(const char *implements,
|
||||
bool has_abstract,
|
||||
bool abstract,
|
||||
Error **errp)
|
||||
@ -168,10 +166,8 @@ ObjectPropertyInfoList *qmp_device_list_properties(const char *typename,
|
||||
info = g_new0(ObjectPropertyInfo, 1);
|
||||
info->name = g_strdup(prop->name);
|
||||
info->type = g_strdup(prop->type);
|
||||
info->has_description = !!prop->description;
|
||||
info->description = g_strdup(prop->description);
|
||||
info->default_value = qobject_ref(prop->defval);
|
||||
info->has_default_value = !!info->default_value;
|
||||
|
||||
QAPI_LIST_PREPEND(prop_list, info);
|
||||
}
|
||||
@ -215,7 +211,6 @@ ObjectPropertyInfoList *qmp_qom_list_properties(const char *typename,
|
||||
info = g_malloc0(sizeof(*info));
|
||||
info->name = g_strdup(prop->name);
|
||||
info->type = g_strdup(prop->type);
|
||||
info->has_description = !!prop->description;
|
||||
info->description = g_strdup(prop->description);
|
||||
|
||||
QAPI_LIST_PREPEND(prop_list, info);
|
||||
|
@ -759,8 +759,6 @@ class QAPISchemaObjectTypeMember(QAPISchemaMember):
|
||||
assert self.type
|
||||
# Temporary hack to support dropping the has_FOO in reviewable chunks
|
||||
opt_out = [
|
||||
'qapi/qdev.json',
|
||||
'qapi/qom.json',
|
||||
'qapi/replay.json',
|
||||
'qapi/rocker.json',
|
||||
'qapi/run-state.json',
|
||||
|
@ -15,15 +15,13 @@
|
||||
#include "qemu/osdep.h"
|
||||
#include "qapi/qapi-events-qdev.h"
|
||||
|
||||
void qapi_event_send_device_deleted(bool has_device,
|
||||
const char *device,
|
||||
void qapi_event_send_device_deleted(const char *device,
|
||||
const char *path)
|
||||
{
|
||||
/* Nothing to do. */
|
||||
}
|
||||
|
||||
void qapi_event_send_device_unplug_guest_error(bool has_device,
|
||||
const char *device,
|
||||
void qapi_event_send_device_unplug_guest_error(const char *device,
|
||||
const char *path)
|
||||
{
|
||||
/* Nothing to do. */
|
||||
|
@ -50,8 +50,7 @@ static void qos_set_machines_devices_available(void)
|
||||
machines_apply_to_node(mach_info);
|
||||
qapi_free_MachineInfoList(mach_info);
|
||||
|
||||
type_info = qmp_qom_list_types(true, "device", true, true,
|
||||
&error_abort);
|
||||
type_info = qmp_qom_list_types("device", true, true, &error_abort);
|
||||
types_apply_to_node(type_info);
|
||||
qapi_free_ObjectTypeInfoList(type_info);
|
||||
}
|
||||
|
Loading…
Reference in New Issue
Block a user