mirrors/qemu
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

qapi: Simplify excess input reporting in input visitors

Browse Source 
When reporting that an unvisited member remains at the end of an
input visit for a struct, we were using g_hash_table_find()
coupled with a callback function that always returns true, to
locate an arbitrary member of the hash table.  But if all we
need is an arbitrary entry, we can get that from a single-use
iterator, without needing a tautological callback function.

Technically, our cast of &(GQueue *) to (void **) is not strict
C (while void * must be able to hold all other pointers, nothing
says a void ** has to be the same width or representation as a
GQueue **).  The kosher way to write it would be the verbose:

    void *tmp;
    GQueue *any;
    if (g_hash_table_iter_next(&iter, NULL, &tmp)) {
        any = tmp;

But our code base (not to mention glib itself) already has other
cases of assuming that ALL pointers have the same width and
representation, where a compiler would have to go out of its way
to mis-compile our borderline behavior.

Suggested-by: Markus Armbruster <armbru@redhat.com>
Signed-off-by: Eric Blake <eblake@redhat.com>
Reviewed-by: Marc-André Lureau <marcandre.lureau@redhat.com>
Message-Id: <1455778109-6278-2-git-send-email-eblake@redhat.com>
Signed-off-by: Markus Armbruster <armbru@redhat.com>
This commit is contained in:
Eric Blake 2016-02-17 23:48:15 -07:00 committed by Markus Armbruster
parent 9d3524b39e
commit f96493b1ab
2 changed files with 8 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
qapi/opts-visitor.c
View File

@ -157,17 +157,11 @@ opts_start_struct(Visitor *v, const char *name, void **obj,
} }
static gboolean
ghr_true(gpointer ign_key, gpointer ign_value, gpointer ign_user_data)
{
return TRUE;
}
static void static void
opts_end_struct(Visitor *v, Error **errp) opts_end_struct(Visitor *v, Error **errp)
{ {
OptsVisitor *ov = to_ov(v); OptsVisitor *ov = to_ov(v);
GHashTableIter iter;
GQueue *any; GQueue *any;
if (--ov->depth > 0) { if (--ov->depth > 0) {
@ -175,8 +169,8 @@ opts_end_struct(Visitor *v, Error **errp)
} }
/* we should have processed all (distinct) QemuOpt instances */ /* we should have processed all (distinct) QemuOpt instances */
any = g_hash_table_find(ov->unprocessed_opts, &ghr_true, NULL); g_hash_table_iter_init(&iter, ov->unprocessed_opts);
if (any) { if (g_hash_table_iter_next(&iter, NULL, (void **)&any)) {
const QemuOpt *first; const QemuOpt *first;
first = g_queue_peek_head(any); first = g_queue_peek_head(any);

14
qapi/qmp-input-visitor.c
View File

@ -90,12 +90,6 @@ static void qmp_input_push(QmpInputVisitor *qiv, QObject *obj, Error **errp)
qiv->nb_stack++; qiv->nb_stack++;
} }
/** Only for qmp_input_pop. */
static gboolean always_true(gpointer key, gpointer val, gpointer user_pkey)
{
*(const char **)user_pkey = (const char *)key;
return TRUE;
}
static void qmp_input_pop(QmpInputVisitor *qiv, Error **errp) static void qmp_input_pop(QmpInputVisitor *qiv, Error **errp)
{ {
@ -104,9 +98,11 @@ static void qmp_input_pop(QmpInputVisitor *qiv, Error **errp)
if (qiv->strict) { if (qiv->strict) {
GHashTable * const top_ht = qiv->stack[qiv->nb_stack - 1].h; GHashTable * const top_ht = qiv->stack[qiv->nb_stack - 1].h;
if (top_ht) { if (top_ht) {
if (g_hash_table_size(top_ht)) { GHashTableIter iter;
const char *key; const char *key;
g_hash_table_find(top_ht, always_true, &key);
g_hash_table_iter_init(&iter, top_ht);
if (g_hash_table_iter_next(&iter, (void **)&key, NULL)) {
error_setg(errp, QERR_QMP_EXTRA_MEMBER, key); error_setg(errp, QERR_QMP_EXTRA_MEMBER, key);
} }
g_hash_table_unref(top_ht); g_hash_table_unref(top_ht);