mirror of
https://github.com/yuzu-emu/unicorn.git
synced 2025-01-22 11:01:00 +00:00
qapi: Remove visit_start_alternate() parameter promote_int
Before the previous commit, parameter promote_int = true made visit_start_alternate() with an input visitor avoid QTYPE_QINT variants and create QTYPE_QFLOAT variants instead. This was used where QTYPE_QINT variants were invalid. The previous commit fused QTYPE_QINT with QTYPE_QFLOAT, rendering promote_int useless and unused. Backports commit 60390d2dc85ffade8981ca41e02335cb07353a6d from qemu
This commit is contained in:
parent
a6623ce754
commit
a57d8a5b50
|
@ -72,7 +72,7 @@ struct Visitor
|
|||
* optional for output visitors. */
|
||||
void (*start_alternate)(Visitor *v, const char *name,
|
||||
GenericAlternate **obj, size_t size,
|
||||
bool promote_int, Error **errp);
|
||||
Error **errp);
|
||||
|
||||
/* Optional, needed for dealloc visitor */
|
||||
void (*end_alternate)(Visitor *v, void **obj);
|
||||
|
|
|
@ -415,15 +415,13 @@ void visit_end_list(Visitor *v, void **list);
|
|||
* the qtype of the next thing to be visited, stored in (*@obj)->type.
|
||||
* Other visitors will leave @obj unchanged.
|
||||
*
|
||||
* If @promote_int, treat integers as QTYPE_FLOAT.
|
||||
*
|
||||
* If successful, this must be paired with visit_end_alternate() with
|
||||
* the same @obj to clean up, even if visiting the contents of the
|
||||
* alternate fails.
|
||||
*/
|
||||
void visit_start_alternate(Visitor *v, const char *name,
|
||||
GenericAlternate **obj, size_t size,
|
||||
bool promote_int, Error **errp);
|
||||
Error **errp);
|
||||
|
||||
/*
|
||||
* Finish visiting an alternate type.
|
||||
|
|
|
@ -70,7 +70,7 @@ static GenericList *qapi_clone_next_list(Visitor *v, GenericList *tail,
|
|||
|
||||
static void qapi_clone_start_alternate(Visitor *v, const char *name,
|
||||
GenericAlternate **obj, size_t size,
|
||||
bool promote_int, Error **errp)
|
||||
Error **errp)
|
||||
{
|
||||
qapi_clone_start_struct(v, name, (void **)obj, size, errp);
|
||||
}
|
||||
|
|
|
@ -39,7 +39,7 @@ static void qapi_dealloc_end_struct(Visitor *v, void **obj)
|
|||
|
||||
static void qapi_dealloc_start_alternate(Visitor *v, const char *name,
|
||||
GenericAlternate **obj, size_t size,
|
||||
bool promote_int, Error **errp)
|
||||
Error **errp)
|
||||
{
|
||||
}
|
||||
|
||||
|
|
|
@ -99,12 +99,12 @@ void visit_end_list(Visitor *v, void **obj)
|
|||
|
||||
void visit_start_alternate(Visitor *v, const char *name,
|
||||
GenericAlternate **obj, size_t size,
|
||||
bool promote_int, Error **errp)
|
||||
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);
|
||||
v->start_alternate(v, name, obj, size, errp);
|
||||
}
|
||||
}
|
||||
|
||||
|
|
|
@ -325,7 +325,7 @@ static void qobject_input_end_list(Visitor *v, void **obj)
|
|||
|
||||
static void qobject_input_start_alternate(Visitor *v, const char *name,
|
||||
GenericAlternate **obj, size_t size,
|
||||
bool promote_int, Error **errp)
|
||||
Error **errp)
|
||||
{
|
||||
QObjectInputVisitor *qiv = to_qiv(v);
|
||||
QObject *qobj = qobject_input_get_object(qiv, name, false, errp);
|
||||
|
|
|
@ -161,20 +161,14 @@ void visit_type_%(c_name)s(Visitor *v, const char *name, %(c_name)s *obj, Error
|
|||
|
||||
|
||||
def gen_visit_alternate(name, variants):
|
||||
promote_int = 'true'
|
||||
ret = ''
|
||||
for var in variants.variants:
|
||||
if var.type.alternate_qtype() == 'QTYPE_QNUM':
|
||||
promote_int = 'false'
|
||||
|
||||
ret += mcgen('''
|
||||
ret = mcgen('''
|
||||
|
||||
void visit_type_%(c_name)s(Visitor *v, const char *name, %(c_name)s **obj, Error **errp)
|
||||
{
|
||||
Error *err = NULL;
|
||||
|
||||
visit_start_alternate(v, name, (GenericAlternate **)obj, sizeof(**obj),
|
||||
%(promote_int)s, &err);
|
||||
&err);
|
||||
if (err) {
|
||||
goto out;
|
||||
}
|
||||
|
@ -183,7 +177,7 @@ void visit_type_%(c_name)s(Visitor *v, const char *name, %(c_name)s **obj, Error
|
|||
}
|
||||
switch ((*obj)->type) {
|
||||
''',
|
||||
c_name=c_name(name), promote_int=promote_int)
|
||||
c_name=c_name(name))
|
||||
|
||||
for var in variants.variants:
|
||||
ret += mcgen('''
|
||||
|
|
Loading…
Reference in a new issue