yuzu/unicorn
1
0
Fork 0
mirror of https://github.com/yuzu-emu/unicorn.git synced 2025-02-25 10:06:55 +00:00
Code Issues Packages Projects Releases Wiki Activity

qapi: Drop unused error argument for list and implicit struct

Browse source 
No backend was setting an error when ending the visit of a list or
implicit struct, or when moving to the next list node. Make the
callers a bit easier to follow by making this a part of the contract,
and removing the errp argument - callers can then unconditionally end
an object as part of cleanup without having to think about whether a
second error is dominated by a first, because there is no second
error.

A later patch will then tackle the larger task of splitting
visit_end_struct(), which can indeed set an error.

Backports commit 08f9541dec51700abef0c37994213164ca4e4fc9 from qemu
This commit is contained in:
Eric Blake 2018-02-19 12:58:24 -05:00 committed by Lioncash
parent 70a7b25c6c
commit 3aba81d5aa
No known key found for this signature in database
GPG key ID: 4E3C3CC1031BA9C7
9 changed files with 58 additions and 61 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

60
msvc/unicorn/qapi-visit.c
View file

@ -27,7 +27,7 @@ void visit_type_strList(Visitor *m, strList **obj, const char *name, Error **err
}
for (prev = (GenericList **)obj;
!err && (i = visit_next_list(m, prev, &err)) != NULL;
!err && (i = visit_next_list(m, prev)) != NULL;
prev = &i) {
strList *native_i = (strList *)i;
visit_type_str(m, &native_i->value, NULL, &err);
@ -35,7 +35,7 @@ void visit_type_strList(Visitor *m, strList **obj, const char *name, Error **err
error_propagate(errp, err);
err = NULL;
visit_end_list(m, &err);
visit_end_list(m);
out:
error_propagate(errp, err);
}
@ -51,7 +51,7 @@ void visit_type_intList(Visitor *m, intList **obj, const char *name, Error **err
}
for (prev = (GenericList **)obj;
!err && (i = visit_next_list(m, prev, &err)) != NULL;
!err && (i = visit_next_list(m, prev)) != NULL;
prev = &i) {
intList *native_i = (intList *)i;
visit_type_int(m, &native_i->value, NULL, &err);
@ -59,7 +59,7 @@ void visit_type_intList(Visitor *m, intList **obj, const char *name, Error **err
error_propagate(errp, err);
err = NULL;
visit_end_list(m, &err);
visit_end_list(m);
out:
error_propagate(errp, err);
}
@ -75,7 +75,7 @@ void visit_type_numberList(Visitor *m, numberList **obj, const char *name, Error
}
for (prev = (GenericList **)obj;
!err && (i = visit_next_list(m, prev, &err)) != NULL;
!err && (i = visit_next_list(m, prev)) != NULL;
prev = &i) {
numberList *native_i = (numberList *)i;
visit_type_number(m, &native_i->value, NULL, &err);
@ -83,7 +83,7 @@ void visit_type_numberList(Visitor *m, numberList **obj, const char *name, Error
error_propagate(errp, err);
err = NULL;
visit_end_list(m, &err);
visit_end_list(m);
out:
error_propagate(errp, err);
}
@ -99,7 +99,7 @@ void visit_type_boolList(Visitor *m, boolList **obj, const char *name, Error **e
}
for (prev = (GenericList **)obj;
!err && (i = visit_next_list(m, prev, &err)) != NULL;
!err && (i = visit_next_list(m, prev)) != NULL;
prev = &i) {
boolList *native_i = (boolList *)i;
visit_type_bool(m, &native_i->value, NULL, &err);
@ -107,7 +107,7 @@ void visit_type_boolList(Visitor *m, boolList **obj, const char *name, Error **e
error_propagate(errp, err);
err = NULL;
visit_end_list(m, &err);
visit_end_list(m);
out:
error_propagate(errp, err);
}
@ -123,7 +123,7 @@ void visit_type_int8List(Visitor *m, int8List **obj, const char *name, Error **e
}
for (prev = (GenericList **)obj;
!err && (i = visit_next_list(m, prev, &err)) != NULL;
!err && (i = visit_next_list(m, prev)) != NULL;
prev = &i) {
int8List *native_i = (int8List *)i;
visit_type_int8(m, &native_i->value, NULL, &err);
@ -131,7 +131,7 @@ void visit_type_int8List(Visitor *m, int8List **obj, const char *name, Error **e
error_propagate(errp, err);
err = NULL;
visit_end_list(m, &err);
visit_end_list(m);
out:
error_propagate(errp, err);
}
@ -147,7 +147,7 @@ void visit_type_int16List(Visitor *m, int16List **obj, const char *name, Error *
}
for (prev = (GenericList **)obj;
!err && (i = visit_next_list(m, prev, &err)) != NULL;
!err && (i = visit_next_list(m, prev)) != NULL;
prev = &i) {
int16List *native_i = (int16List *)i;
visit_type_int16(m, &native_i->value, NULL, &err);
@ -155,7 +155,7 @@ void visit_type_int16List(Visitor *m, int16List **obj, const char *name, Error *
error_propagate(errp, err);
err = NULL;
visit_end_list(m, &err);
visit_end_list(m);
out:
error_propagate(errp, err);
}
@ -171,7 +171,7 @@ void visit_type_int32List(Visitor *m, int32List **obj, const char *name, Error *
}
for (prev = (GenericList **)obj;
!err && (i = visit_next_list(m, prev, &err)) != NULL;
!err && (i = visit_next_list(m, prev)) != NULL;
prev = &i) {
int32List *native_i = (int32List *)i;
visit_type_int32(m, &native_i->value, NULL, &err);
@ -179,7 +179,7 @@ void visit_type_int32List(Visitor *m, int32List **obj, const char *name, Error *
error_propagate(errp, err);
err = NULL;
visit_end_list(m, &err);
visit_end_list(m);
out:
error_propagate(errp, err);
}
@ -195,7 +195,7 @@ void visit_type_int64List(Visitor *m, int64List **obj, const char *name, Error *
}
for (prev = (GenericList **)obj;
!err && (i = visit_next_list(m, prev, &err)) != NULL;
!err && (i = visit_next_list(m, prev)) != NULL;
prev = &i) {
int64List *native_i = (int64List *)i;
visit_type_int64(m, &native_i->value, NULL, &err);
@ -203,7 +203,7 @@ void visit_type_int64List(Visitor *m, int64List **obj, const char *name, Error *
error_propagate(errp, err);
err = NULL;
visit_end_list(m, &err);
visit_end_list(m);
out:
error_propagate(errp, err);
}
@ -219,7 +219,7 @@ void visit_type_uint8List(Visitor *m, uint8List **obj, const char *name, Error *
}
for (prev = (GenericList **)obj;
!err && (i = visit_next_list(m, prev, &err)) != NULL;
!err && (i = visit_next_list(m, prev)) != NULL;
prev = &i) {
uint8List *native_i = (uint8List *)i;
visit_type_uint8(m, &native_i->value, NULL, &err);
@ -227,7 +227,7 @@ void visit_type_uint8List(Visitor *m, uint8List **obj, const char *name, Error *
error_propagate(errp, err);
err = NULL;
visit_end_list(m, &err);
visit_end_list(m);
out:
error_propagate(errp, err);
}
@ -243,7 +243,7 @@ void visit_type_uint16List(Visitor *m, uint16List **obj, const char *name, Error
}
for (prev = (GenericList **)obj;
!err && (i = visit_next_list(m, prev, &err)) != NULL;
!err && (i = visit_next_list(m, prev)) != NULL;
prev = &i) {
uint16List *native_i = (uint16List *)i;
visit_type_uint16(m, &native_i->value, NULL, &err);
@ -251,7 +251,7 @@ void visit_type_uint16List(Visitor *m, uint16List **obj, const char *name, Error
error_propagate(errp, err);
err = NULL;
visit_end_list(m, &err);
visit_end_list(m);
out:
error_propagate(errp, err);
}
@ -267,7 +267,7 @@ void visit_type_uint32List(Visitor *m, uint32List **obj, const char *name, Error
}
for (prev = (GenericList **)obj;
!err && (i = visit_next_list(m, prev, &err)) != NULL;
!err && (i = visit_next_list(m, prev)) != NULL;
prev = &i) {
uint32List *native_i = (uint32List *)i;
visit_type_uint32(m, &native_i->value, NULL, &err);
@ -275,7 +275,7 @@ void visit_type_uint32List(Visitor *m, uint32List **obj, const char *name, Error
error_propagate(errp, err);
err = NULL;
visit_end_list(m, &err);
visit_end_list(m);
out:
error_propagate(errp, err);
}
@ -291,7 +291,7 @@ void visit_type_uint64List(Visitor *m, uint64List **obj, const char *name, Error
}
for (prev = (GenericList **)obj;
!err && (i = visit_next_list(m, prev, &err)) != NULL;
!err && (i = visit_next_list(m, prev)) != NULL;
prev = &i) {
uint64List *native_i = (uint64List *)i;
visit_type_uint64(m, &native_i->value, NULL, &err);
@ -299,7 +299,7 @@ void visit_type_uint64List(Visitor *m, uint64List **obj, const char *name, Error
error_propagate(errp, err);
err = NULL;
visit_end_list(m, &err);
visit_end_list(m);
out:
error_propagate(errp, err);
}
@ -315,7 +315,7 @@ void visit_type_ErrorClassList(Visitor *m, ErrorClassList **obj, const char *nam
}
for (prev = (GenericList **)obj;
!err && (i = visit_next_list(m, prev, &err)) != NULL;
!err && (i = visit_next_list(m, prev)) != NULL;
prev = &i) {
ErrorClassList *native_i = (ErrorClassList *)i;
visit_type_ErrorClass(m, &native_i->value, NULL, &err);
@ -323,7 +323,7 @@ void visit_type_ErrorClassList(Visitor *m, ErrorClassList **obj, const char *nam
error_propagate(errp, err);
err = NULL;
visit_end_list(m, &err);
visit_end_list(m);
out:
error_propagate(errp, err);
}
@ -344,7 +344,7 @@ void visit_type_X86CPURegister32List(Visitor *m, X86CPURegister32List **obj, con
}
for (prev = (GenericList **)obj;
!err && (i = visit_next_list(m, prev, &err)) != NULL;
!err && (i = visit_next_list(m, prev)) != NULL;
prev = &i) {
X86CPURegister32List *native_i = (X86CPURegister32List *)i;
visit_type_X86CPURegister32(m, &native_i->value, NULL, &err);
@ -352,7 +352,7 @@ void visit_type_X86CPURegister32List(Visitor *m, X86CPURegister32List **obj, con
error_propagate(errp, err);
err = NULL;
visit_end_list(m, &err);
visit_end_list(m);
out:
error_propagate(errp, err);
}
@ -414,7 +414,7 @@ void visit_type_X86CPUFeatureWordInfoList(Visitor *m, X86CPUFeatureWordInfoList
}
for (prev = (GenericList **)obj;
!err && (i = visit_next_list(m, prev, &err)) != NULL;
!err && (i = visit_next_list(m, prev)) != NULL;
prev = &i) {
X86CPUFeatureWordInfoList *native_i = (X86CPUFeatureWordInfoList *)i;
visit_type_X86CPUFeatureWordInfo(m, &native_i->value, NULL, &err);
@ -422,7 +422,7 @@ void visit_type_X86CPUFeatureWordInfoList(Visitor *m, X86CPUFeatureWordInfoList
error_propagate(errp, err);
err = NULL;
visit_end_list(m, &err);
visit_end_list(m);
out:
error_propagate(errp, err);
}

8
qemu/include/qapi/visitor-impl.h
View file

@ -1,7 +1,7 @@
/*
* Core Definitions for QAPI Visitor implementations
*
* Copyright (C) 2012 Red Hat, Inc.
* Copyright (C) 2012-2016 Red Hat, Inc.
*
* Author: Paolo Bonizni <pbonzini@redhat.com>
*
@ -24,11 +24,11 @@ struct Visitor
void (*start_implicit_struct)(Visitor *v, void **obj, size_t size,
Error **errp);
void (*end_implicit_struct)(Visitor *v, Error **errp);
void (*end_implicit_struct)(Visitor *v);
void (*start_list)(Visitor *v, const char *name, Error **errp);
GenericList *(*next_list)(Visitor *v, GenericList **list, Error **errp);
void (*end_list)(Visitor *v, Error **errp);
GenericList *(*next_list)(Visitor *v, GenericList **list);
void (*end_list)(Visitor *v);
void (*type_enum)(Visitor *v, int *obj, const char *strings[],
const char *kind, const char *name, Error **errp);

6
qemu/include/qapi/visitor.h
View file

@ -35,10 +35,10 @@ void visit_start_struct(Visitor *v, void **obj, const char *kind,
void visit_end_struct(Visitor *v, Error **errp);
void visit_start_implicit_struct(Visitor *v, void **obj, size_t size,
Error **errp);
void visit_end_implicit_struct(Visitor *v, Error **errp);
void visit_end_implicit_struct(Visitor *v);
void visit_start_list(Visitor *v, const char *name, Error **errp);
GenericList *visit_next_list(Visitor *v, GenericList **list, Error **errp);
void visit_end_list(Visitor *v, Error **errp);
GenericList *visit_next_list(Visitor *v, GenericList **list);
void visit_end_list(Visitor *v);
void visit_optional(Visitor *v, bool *present, const char *name,
Error **errp);
void visit_get_next_type(Visitor *v, int *obj, const int *qtypes,

7
qemu/qapi/qapi-dealloc-visitor.c
View file

@ -86,7 +86,7 @@ static void qapi_dealloc_start_implicit_struct(Visitor *v,
qapi_dealloc_push(qov, obj);
}
static void qapi_dealloc_end_implicit_struct(Visitor *v, Error **errp)
static void qapi_dealloc_end_implicit_struct(Visitor *v)
{
QapiDeallocVisitor *qov = to_qov(v);
void **obj = qapi_dealloc_pop(qov);
@ -101,8 +101,7 @@ static void qapi_dealloc_start_list(Visitor *v, const char *name, Error **errp)
qapi_dealloc_push(qov, NULL);
}
static GenericList *qapi_dealloc_next_list(Visitor *v, GenericList **listp,
Error **errp)
static GenericList *qapi_dealloc_next_list(Visitor *v, GenericList **listp)
{
GenericList *list = *listp;
QapiDeallocVisitor *qov = to_qov(v);
@ -122,7 +121,7 @@ static GenericList *qapi_dealloc_next_list(Visitor *v, GenericList **listp,
return NULL;
}
static void qapi_dealloc_end_list(Visitor *v, Error **errp)
static void qapi_dealloc_end_list(Visitor *v)
{
QapiDeallocVisitor *qov = to_qov(v);
void *obj = qapi_dealloc_pop(qov);

12
qemu/qapi/qapi-visit-core.c
View file

@ -37,10 +37,10 @@ void visit_start_implicit_struct(Visitor *v, void **obj, size_t size,
}
}
void visit_end_implicit_struct(Visitor *v, Error **errp)
void visit_end_implicit_struct(Visitor *v)
{
if (v->end_implicit_struct) {
v->end_implicit_struct(v, errp);
v->end_implicit_struct(v);
}
}
@ -49,14 +49,14 @@ void visit_start_list(Visitor *v, const char *name, Error **errp)
v->start_list(v, name, errp);
}
GenericList *visit_next_list(Visitor *v, GenericList **list, Error **errp)
GenericList *visit_next_list(Visitor *v, GenericList **list)
{
return v->next_list(v, list, errp);
return v->next_list(v, list);
}
void visit_end_list(Visitor *v, Error **errp)
void visit_end_list(Visitor *v)
{
v->end_list(v, errp);
v->end_list(v);
}
bool visit_start_union(Visitor *v, bool data_present, Error **errp)

7
qemu/qapi/qmp-input-visitor.c
View file

@ -154,7 +154,7 @@ static void qmp_input_start_implicit_struct(Visitor *v, void **obj,
}
}
static void qmp_input_end_implicit_struct(Visitor *v, Error **errp)
static void qmp_input_end_implicit_struct(Visitor *v)
{
}
@ -172,8 +172,7 @@ static void qmp_input_start_list(Visitor *v, const char *name, Error **errp)
qmp_input_push(qiv, qobj, errp);
}
static GenericList *qmp_input_next_list(Visitor *v, GenericList **list,
Error **errp)
static GenericList *qmp_input_next_list(Visitor *v, GenericList **list)
{
QmpInputVisitor *qiv = to_qiv(v);
GenericList *entry;
@ -202,7 +201,7 @@ static GenericList *qmp_input_next_list(Visitor *v, GenericList **list,
return entry;
}
static void qmp_input_end_list(Visitor *v, Error **errp)
static void qmp_input_end_list(Visitor *v)
{
QmpInputVisitor *qiv = to_qiv(v);

5
qemu/qapi/qmp-output-visitor.c
View file

@ -134,8 +134,7 @@ static void qmp_output_start_list(Visitor *v, const char *name, Error **errp)
qmp_output_push(qov, list);
}
static GenericList *qmp_output_next_list(Visitor *v, GenericList **listp,
Error **errp)
static GenericList *qmp_output_next_list(Visitor *v, GenericList **listp)
{
GenericList *list = *listp;
QmpOutputVisitor *qov = to_qov(v);
@ -150,7 +149,7 @@ static GenericList *qmp_output_next_list(Visitor *v, GenericList **listp,
return list ? list->next : NULL;
}
static void qmp_output_end_list(Visitor *v, Error **errp)
static void qmp_output_end_list(Visitor *v)
{
QmpOutputVisitor *qov = to_qov(v);
qmp_output_pop(qov);

6
qemu/qapi/string-input-visitor.c
View file

@ -1,7 +1,7 @@
/*
* String parsing visitor
*
* Copyright Red Hat, Inc. 2012
* Copyright Red Hat, Inc. 2012-2016
*
* Author: Paolo Bonzini <pbonzini@redhat.com>
*
@ -140,7 +140,7 @@ start_list(Visitor *v, const char *name, Error **errp)
}
static GenericList *
next_list(Visitor *v, GenericList **list, Error **errp)
next_list(Visitor *v, GenericList **list)
{
StringInputVisitor *siv = to_siv(v);
GenericList **link;
@ -179,7 +179,7 @@ next_list(Visitor *v, GenericList **list, Error **errp)
}
static void
end_list(Visitor *v, Error **errp)
end_list(Visitor *v)
{
StringInputVisitor *siv = to_siv(v);
siv->head = true;

8
qemu/scripts/qapi-visit.py
View file

@ -36,7 +36,7 @@ static void visit_type_implicit_%(c_type)s(Visitor *m, %(c_type)s **obj, Error *
visit_start_implicit_struct(m, (void **)obj, sizeof(%(c_type)s), &err);
if (!err) {
visit_type_%(c_type)s_fields(m, obj, errp);
visit_end_implicit_struct(m, &err);
visit_end_implicit_struct(m);
}
error_propagate(errp, err);
}
@ -212,7 +212,7 @@ void visit_type_%(name)sList(Visitor *m, %(name)sList **obj, const char *name, E
}
for (prev = (GenericList **)obj;
!err && (i = visit_next_list(m, prev, &err)) != NULL;
!err && (i = visit_next_list(m, prev)) != NULL;
prev = &i) {
%(name)sList *native_i = (%(name)sList *)i;
visit_type_%(name)s(m, &native_i->value, NULL, &err);
@ -220,7 +220,7 @@ void visit_type_%(name)sList(Visitor *m, %(name)sList **obj, const char *name, E
error_propagate(errp, err);
err = NULL;
visit_end_list(m, &err);
visit_end_list(m);
out:
error_propagate(errp, err);
}
@ -283,7 +283,7 @@ void visit_type_%(name)s(Visitor *m, %(name)s **obj, const char *name, Error **e
out_end:
error_propagate(errp, err);
err = NULL;
visit_end_implicit_struct(m, &err);
visit_end_implicit_struct(m);
out:
error_propagate(errp, err);
}