ShuriZma
/
xemu
mirror of https://github.com/xemu-project/xemu.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

qmp: Don't reuse qmp visitor after grabbing output 

The testsuite was the only client that attempted to reuse a
QmpOutputVisitor for a second visit after encountering an
error and/or calling qmp_output_get_qobject() on a first
visit.  The next patch is about to tighten the semantics to
be one-shot usage of the visitor, like all other visitors
(which will enable further simplifications down the road).

Signed-off-by: Eric Blake <eblake@redhat.com>
Message-Id: <1462854006-24658-1-git-send-email-eblake@redhat.com>
Signed-off-by: Markus Armbruster <armbru@redhat.com>
This commit is contained in:
Eric Blake 2016-05-09 22:20:06 -06:00 committed by Markus Armbruster
parent a543a554cf
commit f2ff429bfa
1 changed files with 12 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
tests/test-qmp-output-visitor.c
View File

@ -43,6 +43,12 @@ static void visitor_output_teardown(TestOutputVisitorData *data,
data->ov = NULL; data->ov = NULL;
} }
static void visitor_reset(TestOutputVisitorData *data)
{
visitor_output_teardown(data, NULL);
visitor_output_setup(data, NULL);
}
static void test_visitor_out_int(TestOutputVisitorData *data, static void test_visitor_out_int(TestOutputVisitorData *data,
const void *unused) const void *unused)
{ {
@ -139,6 +145,7 @@ static void test_visitor_out_enum(TestOutputVisitorData *data,
g_assert_cmpstr(qstring_get_str(qobject_to_qstring(obj)), ==, g_assert_cmpstr(qstring_get_str(qobject_to_qstring(obj)), ==,
EnumOne_lookup[i]); EnumOne_lookup[i]);
qobject_decref(obj); qobject_decref(obj);
visitor_reset(data);
} }
} }
@ -153,6 +160,7 @@ static void test_visitor_out_enum_errors(TestOutputVisitorData *data,
visit_type_EnumOne(data->ov, "unused", &bad_values[i], &err); visit_type_EnumOne(data->ov, "unused", &bad_values[i], &err);
g_assert(err); g_assert(err);
error_free(err); error_free(err);
visitor_reset(data);
} }
} }
@ -262,6 +270,7 @@ static void test_visitor_out_struct_errors(TestOutputVisitorData *data,
visit_type_UserDefOne(data->ov, "unused", &pu, &err); visit_type_UserDefOne(data->ov, "unused", &pu, &err);
g_assert(err); g_assert(err);
error_free(err); error_free(err);
visitor_reset(data);
} }
} }
@ -366,6 +375,7 @@ static void test_visitor_out_any(TestOutputVisitorData *data,
qobject_decref(obj); qobject_decref(obj);
qobject_decref(qobj); qobject_decref(qobj);
visitor_reset(data);
qdict = qdict_new(); qdict = qdict_new();
qdict_put(qdict, "integer", qint_from_int(-42)); qdict_put(qdict, "integer", qint_from_int(-42));
qdict_put(qdict, "boolean", qbool_from_bool(true)); qdict_put(qdict, "boolean", qbool_from_bool(true));
@ -442,6 +452,7 @@ static void test_visitor_out_alternate(TestOutputVisitorData *data,
qapi_free_UserDefAlternate(tmp); qapi_free_UserDefAlternate(tmp);
qobject_decref(arg); qobject_decref(arg);
visitor_reset(data);
tmp = g_new0(UserDefAlternate, 1); tmp = g_new0(UserDefAlternate, 1);
tmp->type = QTYPE_QSTRING; tmp->type = QTYPE_QSTRING;
tmp->u.s = g_strdup("hello"); tmp->u.s = g_strdup("hello");
@ -455,6 +466,7 @@ static void test_visitor_out_alternate(TestOutputVisitorData *data,
qapi_free_UserDefAlternate(tmp); qapi_free_UserDefAlternate(tmp);
qobject_decref(arg); qobject_decref(arg);
visitor_reset(data);
tmp = g_new0(UserDefAlternate, 1); tmp = g_new0(UserDefAlternate, 1);
tmp->type = QTYPE_QDICT; tmp->type = QTYPE_QDICT;
tmp->u.udfu.integer = 1; tmp->u.udfu.integer = 1;