Commit 910f738b authored by Markus Armbruster's avatar Markus Armbruster
Browse files

qapi: Improve a QObject input visitor error message 



The QObject input visitor has three error message formats:

* Parameter '%s' is missing
* "Invalid parameter type for '%s', expected: %s"
* "QMP input object member '%s' is unexpected"

The '%s' are member names (or "null", but I'll fix that later).

The last error message calls the thing "QMP input object member"
instead of "parameter".  Misleading when the visitor is used on
QObjects that don't come from QMP.  Change it to "Parameter '%s' is
unexpected".

Signed-off-by: default avatarMarkus Armbruster <armbru@redhat.com>
Reviewed-by: default avatarEric Blake <eblake@redhat.com>
Message-Id: <1488544368-30622-12-git-send-email-armbru@redhat.com>
parent 99fb0c53

qapi/qobject-input-visitor.c

+1 −2
Original line number Diff line number Diff line
@@ -140,8 +140,7 @@ static void qobject_input_check_struct(Visitor *v, Error **errp) 


            g_hash_table_iter_init(&iter, top_ht);

            if (g_hash_table_iter_next(&iter, (void **)&key, NULL)) {

                error_setg(errp, "QMP input object member '%s' is unexpected",

                           key);

                error_setg(errp, "Parameter '%s' is unexpected", key);

            }

        }

    }

tests/test-qga.c

+1 −1
Original line number Diff line number Diff line
@@ -213,7 +213,7 @@ static void test_qga_invalid_args(gconstpointer fix) 
    desc = qdict_get_try_str(error, "desc");



    g_assert_cmpstr(class, ==, "GenericError");

    g_assert_cmpstr(desc, ==, "QMP input object member 'foo' is unexpected");

    g_assert_cmpstr(desc, ==, "Parameter 'foo' is unexpected");



    QDECREF(ret);

}