mirror of
https://github.com/yuzu-emu/unicorn.git
synced 2024-12-23 05:45:36 +00:00
85af4b2030
Making each output visitor provide its own output collection function was the only remaining reason for exposing visitor sub-types to the rest of the code base. Add a polymorphic visit_complete() function which is a no-op for input visitors, and which populates an opaque pointer for output visitors. For maximum type-safety, also add a parameter to the output visitor constructors with a type-correct version of the output pointer, and assert that the two uses match. This approach was considered superior to either passing the output parameter only during construction (action at a distance during visit_free() feels awkward) or only during visit_complete() (defeating type safety makes it easier to use incorrectly). Most callers were function-local, and therefore a mechanical conversion; the testsuite was a bit trickier, but the previous cleanup patch minimized the churn here. The visit_complete() function may be called at most once; doing so lets us use transfer semantics rather than duplication or ref-count semantics to get the just-built output back to the caller, even though it means our behavior is not idempotent. Generated code is simplified as follows for events: |@@ -26,7 +26,7 @@ void qapi_event_send_acpi_device_ost(ACP | QDict *qmp; | Error *err = NULL; | QMPEventFuncEmit emit; |- QmpOutputVisitor *qov; |+ QObject *obj; | Visitor *v; | q_obj_ACPI_DEVICE_OST_arg param = { | info |@@ -39,8 +39,7 @@ void qapi_event_send_acpi_device_ost(ACP | | qmp = qmp_event_build_dict("ACPI_DEVICE_OST"); | |- qov = qmp_output_visitor_new(); |- v = qmp_output_get_visitor(qov); |+ v = qmp_output_visitor_new(&obj); | | visit_start_struct(v, "ACPI_DEVICE_OST", NULL, 0, &err); | if (err) { |@@ -55,7 +54,8 @@ void qapi_event_send_acpi_device_ost(ACP | goto out; | } | |- qdict_put_obj(qmp, "data", qmp_output_get_qobject(qov)); |+ visit_complete(v, &obj); |+ qdict_put_obj(qmp, "data", obj); | emit(QAPI_EVENT_ACPI_DEVICE_OST, qmp, &err); and for commands: | { | Error *err = NULL; |- QmpOutputVisitor *qov = qmp_output_visitor_new(); | Visitor *v; | |- v = qmp_output_get_visitor(qov); |+ v = qmp_output_visitor_new(ret_out); | visit_type_AddfdInfo(v, "unused", &ret_in, &err); |- if (err) { |- goto out; |+ if (!err) { |+ visit_complete(v, ret_out); | } |- *ret_out = qmp_output_get_qobject(qov); |- |-out: | error_propagate(errp, err); Backports commit 3b098d56979d2f7fd707c5be85555d114353a28d from qemu
336 lines
8.1 KiB
C
336 lines
8.1 KiB
C
/*
|
|
* Core Definitions for QAPI Visitor Classes
|
|
*
|
|
* Copyright (C) 2012-2016 Red Hat, Inc.
|
|
* Copyright IBM, Corp. 2011
|
|
*
|
|
*
|
|
* Authors:
|
|
* Anthony Liguori <aliguori@us.ibm.com>
|
|
*
|
|
* This work is licensed under the terms of the GNU LGPL, version 2.1 or later.
|
|
* See the COPYING.LIB file in the top-level directory.
|
|
*
|
|
*/
|
|
|
|
#include "qemu/osdep.h"
|
|
#include "qapi/error.h"
|
|
#include "qemu-common.h"
|
|
#include "qapi/qmp/qobject.h"
|
|
#include "qapi/qmp/qerror.h"
|
|
#include "qapi/visitor.h"
|
|
#include "qapi/visitor-impl.h"
|
|
|
|
void visit_complete(Visitor *v, void *opaque)
|
|
{
|
|
assert(v->type != VISITOR_OUTPUT || v->complete);
|
|
if (v->complete) {
|
|
v->complete(v, opaque);
|
|
}
|
|
}
|
|
|
|
void visit_free(Visitor *v)
|
|
{
|
|
if (v) {
|
|
v->free(v);
|
|
}
|
|
}
|
|
|
|
void visit_start_struct(Visitor *v, const char *name, void **obj,
|
|
size_t size, Error **errp)
|
|
{
|
|
Error *err = NULL;
|
|
|
|
if (obj) {
|
|
assert(size);
|
|
assert(v->type != VISITOR_OUTPUT || *obj);
|
|
}
|
|
v->start_struct(v, name, obj, size, &err);
|
|
if (obj && v->type == VISITOR_INPUT) {
|
|
assert(!err != !*obj);
|
|
}
|
|
error_propagate(errp, err);
|
|
}
|
|
|
|
void visit_check_struct(Visitor *v, Error **errp)
|
|
{
|
|
if (v->check_struct) {
|
|
v->check_struct(v, errp);
|
|
}
|
|
}
|
|
|
|
void visit_end_struct(Visitor *v, void **obj)
|
|
{
|
|
v->end_struct(v, obj);
|
|
}
|
|
|
|
void visit_start_list(Visitor *v, const char *name, GenericList **list,
|
|
size_t size, Error **errp)
|
|
{
|
|
Error *err = NULL;
|
|
|
|
assert(!list || size >= sizeof(GenericList));
|
|
v->start_list(v, name, list, size, &err);
|
|
if (list && v->type == VISITOR_INPUT) {
|
|
assert(!(err && *list));
|
|
}
|
|
error_propagate(errp, err);
|
|
}
|
|
|
|
GenericList *visit_next_list(Visitor *v, GenericList *tail, size_t size)
|
|
{
|
|
assert(tail && size >= sizeof(GenericList));
|
|
return v->next_list(v, tail, size);
|
|
}
|
|
|
|
void visit_end_list(Visitor *v, void **obj)
|
|
{
|
|
v->end_list(v, obj);
|
|
}
|
|
|
|
void visit_start_alternate(Visitor *v, const char *name,
|
|
GenericAlternate **obj, size_t size,
|
|
bool promote_int, Error **errp)
|
|
{
|
|
assert(obj && size >= sizeof(GenericAlternate));
|
|
assert(v->type != VISITOR_OUTPUT || *obj);
|
|
if (v->start_alternate) {
|
|
v->start_alternate(v, name, obj, size, promote_int, errp);
|
|
}
|
|
}
|
|
|
|
void visit_end_alternate(Visitor *v, void **obj)
|
|
{
|
|
if (v->end_alternate) {
|
|
v->end_alternate(v, obj);
|
|
}
|
|
}
|
|
|
|
bool visit_optional(Visitor *v, const char *name, bool *present)
|
|
{
|
|
if (v->optional) {
|
|
v->optional(v, name, present);
|
|
}
|
|
return *present;
|
|
}
|
|
|
|
bool visit_is_input(Visitor *v)
|
|
{
|
|
return v->type == VISITOR_INPUT;
|
|
}
|
|
|
|
void visit_type_int(Visitor *v, const char *name, int64_t *obj, Error **errp)
|
|
{
|
|
assert(obj);
|
|
v->type_int64(v, name, obj, errp);
|
|
}
|
|
|
|
static void visit_type_uintN(Visitor *v, const char *name, uint64_t *obj,
|
|
uint64_t max, const char *type, Error **errp)
|
|
{
|
|
Error *err = NULL;
|
|
uint64_t value = *obj;
|
|
|
|
v->type_uint64(v, name, &value, &err);
|
|
if (err) {
|
|
error_propagate(errp, err);
|
|
} else if (value > max) {
|
|
error_setg(errp, QERR_INVALID_PARAMETER_VALUE,
|
|
name ? name : "null", type);
|
|
} else {
|
|
*obj = value;
|
|
}
|
|
}
|
|
|
|
void visit_type_uint8(Visitor *v, const char *name, uint8_t *obj, Error **errp)
|
|
{
|
|
uint64_t value = *obj;
|
|
visit_type_uintN(v, name, &value, UINT8_MAX, "uint8_t", errp);
|
|
*obj = value;
|
|
}
|
|
|
|
void visit_type_uint16(Visitor *v, const char *name, uint16_t *obj, Error **errp)
|
|
{
|
|
uint64_t value = *obj;
|
|
visit_type_uintN(v, name, &value, UINT16_MAX, "uint16_t", errp);
|
|
*obj = value;
|
|
}
|
|
|
|
void visit_type_uint32(Visitor *v, const char *name, uint32_t *obj, Error **errp)
|
|
{
|
|
uint64_t value = *obj;
|
|
visit_type_uintN(v, name, &value, UINT32_MAX, "uint32_t", errp);
|
|
*obj = value;
|
|
}
|
|
|
|
void visit_type_uint64(Visitor *v, const char *name, uint64_t *obj,
|
|
Error **errp)
|
|
{
|
|
assert(obj);
|
|
v->type_uint64(v, name, obj, errp);
|
|
}
|
|
|
|
static void visit_type_intN(Visitor *v, const char *name, int64_t *obj,
|
|
int64_t min, int64_t max, const char *type,
|
|
Error **errp)
|
|
{
|
|
Error *err = NULL;
|
|
int64_t value = *obj;
|
|
|
|
v->type_int64(v, name, &value, &err);
|
|
if (err) {
|
|
error_propagate(errp, err);
|
|
} else if (value < min || value > max) {
|
|
error_setg(errp, QERR_INVALID_PARAMETER_VALUE,
|
|
name ? name : "null", type);
|
|
} else {
|
|
*obj = value;
|
|
}
|
|
}
|
|
|
|
void visit_type_int8(Visitor *v, const char *name, int8_t *obj, Error **errp)
|
|
{
|
|
int64_t value = *obj;
|
|
visit_type_intN(v, name, &value, INT8_MIN, INT8_MAX, "int8_t", errp);
|
|
*obj = value;
|
|
}
|
|
|
|
void visit_type_int16(Visitor *v, const char *name, int16_t *obj,
|
|
Error **errp)
|
|
{
|
|
int64_t value = *obj;
|
|
visit_type_intN(v, name, &value, INT16_MIN, INT16_MAX, "int16_t", errp);
|
|
*obj = value;
|
|
}
|
|
|
|
void visit_type_int32(Visitor *v, const char *name, int32_t *obj,
|
|
Error **errp)
|
|
{
|
|
int64_t value = *obj;
|
|
visit_type_intN(v, name, &value, INT32_MIN, INT32_MAX, "int32_t", errp);
|
|
*obj = value;
|
|
}
|
|
|
|
void visit_type_int64(Visitor *v, const char *name, int64_t *obj,
|
|
Error **errp)
|
|
{
|
|
assert(obj);
|
|
v->type_int64(v, name, obj, errp);
|
|
}
|
|
|
|
void visit_type_size(Visitor *v, const char *name, uint64_t *obj,
|
|
Error **errp)
|
|
{
|
|
assert(obj);
|
|
if (v->type_size) {
|
|
v->type_size(v, name, obj, errp);
|
|
} else {
|
|
v->type_uint64(v, name, obj, errp);
|
|
}
|
|
}
|
|
|
|
void visit_type_bool(Visitor *v, const char *name, bool *obj, Error **errp)
|
|
{
|
|
assert(obj);
|
|
v->type_bool(v, name, obj, errp);
|
|
}
|
|
|
|
void visit_type_str(Visitor *v, const char *name, char **obj, Error **errp)
|
|
{
|
|
Error *err = NULL;
|
|
|
|
assert(obj);
|
|
/* TODO: Fix callers to not pass NULL when they mean "", so that we
|
|
* can enable:
|
|
assert(v->type != VISITOR_OUTPUT || *obj);
|
|
*/
|
|
v->type_str(v, name, obj, &err);
|
|
if (v->type == VISITOR_INPUT) {
|
|
assert(!err != !*obj);
|
|
}
|
|
error_propagate(errp, err);
|
|
}
|
|
|
|
void visit_type_number(Visitor *v, const char *name, double *obj,
|
|
Error **errp)
|
|
{
|
|
assert(obj);
|
|
v->type_number(v, name, obj, errp);
|
|
}
|
|
|
|
void visit_type_any(Visitor *v, const char *name, QObject **obj, Error **errp)
|
|
{
|
|
Error *err = NULL;
|
|
|
|
assert(obj);
|
|
assert(v->type != VISITOR_OUTPUT || *obj);
|
|
v->type_any(v, name, obj, &err);
|
|
if (v->type == VISITOR_INPUT) {
|
|
assert(!err != !*obj);
|
|
}
|
|
error_propagate(errp, err);
|
|
}
|
|
|
|
void visit_type_null(Visitor *v, const char *name, Error **errp)
|
|
{
|
|
v->type_null(v, name, errp);
|
|
}
|
|
|
|
static void output_type_enum(Visitor *v, const char *name, int *obj,
|
|
const char *const strings[], Error **errp)
|
|
{
|
|
int i = 0;
|
|
int value = *obj;
|
|
char *enum_str;
|
|
|
|
while (strings[i++] != NULL);
|
|
if (value < 0 || value >= i - 1) {
|
|
error_setg(errp, QERR_INVALID_PARAMETER, name ? name : "null");
|
|
return;
|
|
}
|
|
|
|
enum_str = (char *)strings[value];
|
|
visit_type_str(v, name, &enum_str, errp);
|
|
}
|
|
|
|
static void input_type_enum(Visitor *v, const char *name, int *obj,
|
|
const char *const strings[], Error **errp)
|
|
{
|
|
Error *local_err = NULL;
|
|
int64_t value = 0;
|
|
char *enum_str;
|
|
|
|
visit_type_str(v, name, &enum_str, &local_err);
|
|
if (local_err) {
|
|
error_propagate(errp, local_err);
|
|
return;
|
|
}
|
|
|
|
while (strings[value] != NULL) {
|
|
if (strcmp(strings[value], enum_str) == 0) {
|
|
break;
|
|
}
|
|
value++;
|
|
}
|
|
|
|
if (strings[value] == NULL) {
|
|
error_setg(errp, QERR_INVALID_PARAMETER, enum_str);
|
|
g_free(enum_str);
|
|
return;
|
|
}
|
|
|
|
g_free(enum_str);
|
|
*obj = (int)value;
|
|
}
|
|
|
|
void visit_type_enum(Visitor *v, const char *name, int *obj,
|
|
const char *const strings[], Error **errp)
|
|
{
|
|
assert(strings);
|
|
if (v->type == VISITOR_INPUT) {
|
|
input_type_enum(v, name, obj, strings, errp);
|
|
} else if (v->type == VISITOR_OUTPUT) {
|
|
output_type_enum(v, name, obj, strings, errp);
|
|
}
|
|
}
|