david.venhoff/QEMU-Nyx-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

qapi-visit: Kill unused visit_end_union()

Browse Source 
The generated code can call visit_end_union() without having called
visit_start_union().  Example:

        if (!*obj) {
            goto out_obj;
        }
        visit_type_CpuInfoBase_fields(v, (CpuInfoBase **)obj, &err);
        if (err) {
            goto out_obj; // if we go from here...
        }
        if (!visit_start_union(v, !!(*obj)->u.data, &err) || err) {
            goto out_obj;
        }
        switch ((*obj)->arch) {
    [...]
        }
    out_obj:
        // ... then *obj is true, and ...
        error_propagate(errp, err);
        err = NULL;
        if (*obj) {
            // we end up here
            visit_end_union(v, !!(*obj)->u.data, &err);
        }
        error_propagate(errp, err);

Harmless only because no visitor implements end_union().  Clean it up
anyway, by deleting the function as useless.

Messed up since we have visit_end_union (commit cee2ded).

Signed-off-by: Markus Armbruster <armbru@redhat.com>
Message-Id: <1453902888-20457-3-git-send-email-armbru@redhat.com>
[expand scope of patch to delete rather than repair]
Signed-off-by: Eric Blake <eblake@redhat.com>
Message-Id: <1454075341-13658-13-git-send-email-eblake@redhat.com>
This commit is contained in:
Eric Blake 2016-01-29 06:48:48 -07:00 committed by Markus Armbruster
parent 92b09babc1
commit 7c91aabd89
4 changed files with 1 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
include/qapi/visitor-impl.h
View File

@ -58,7 +58,6 @@ struct Visitor
/* visit_type_size() falls back to (*type_uint64)() if type_size is unset */ /* visit_type_size() falls back to (*type_uint64)() if type_size is unset */
void (*type_size)(Visitor *v, uint64_t *obj, const char *name, Error **errp); void (*type_size)(Visitor *v, uint64_t *obj, const char *name, Error **errp);
bool (*start_union)(Visitor *v, bool data_present, Error **errp); bool (*start_union)(Visitor *v, bool data_present, Error **errp);
void (*end_union)(Visitor *v, bool data_present, Error **errp);
}; };
void input_type_enum(Visitor *v, int *obj, const char * const strings[], void input_type_enum(Visitor *v, int *obj, const char * const strings[],

1
include/qapi/visitor.h
View File

@ -70,6 +70,5 @@ void visit_type_str(Visitor *v, char **obj, const char *name, Error **errp);
void visit_type_number(Visitor *v, double *obj, const char *name, Error **errp); void visit_type_number(Visitor *v, double *obj, const char *name, Error **errp);
void visit_type_any(Visitor *v, QObject **obj, const char *name, Error **errp); void visit_type_any(Visitor *v, QObject **obj, const char *name, Error **errp);
bool visit_start_union(Visitor *v, bool data_present, Error **errp); bool visit_start_union(Visitor *v, bool data_present, Error **errp);
void visit_end_union(Visitor *v, bool data_present, Error **errp);
#endif #endif

8
qapi/qapi-visit-core.c
View File

@ -1,6 +1,7 @@
/* /*
* Core Definitions for QAPI Visitor Classes * Core Definitions for QAPI Visitor Classes
* *
* Copyright (C) 2012-2016 Red Hat, Inc.
* Copyright IBM, Corp. 2011 * Copyright IBM, Corp. 2011
* *
* Authors: * Authors:
@ -67,13 +68,6 @@ bool visit_start_union(Visitor *v, bool data_present, Error **errp)
return true; return true;
} }
void visit_end_union(Visitor *v, bool data_present, Error **errp)
{
if (v->end_union) {
v->end_union(v, data_present, errp);
}
}
bool visit_optional(Visitor *v, bool *present, const char *name) bool visit_optional(Visitor *v, bool *present, const char *name)
{ {
if (v->optional) { if (v->optional) {

5
scripts/qapi-visit.py
View File

@ -318,11 +318,6 @@ void visit_type_%(c_name)s(Visitor *v, %(c_name)s **obj, const char *name, Error
abort(); abort();
} }
out_obj: out_obj:
error_propagate(errp, err);
err = NULL;
if (*obj) {
visit_end_union(v, !!(*obj)->u.data, &err);
}
error_propagate(errp, err); error_propagate(errp, err);
err = NULL; err = NULL;
visit_end_struct(v, &err); visit_end_struct(v, &err);