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

qom-test: Test qom-list on link<> properties 

But don't test their properties, otherwise we will recurse forever.
Their properties are already tested when we encounter them as child<>
properties elsewhere in the hierarchy, like /machine/unattached/...

This would have caught the crash fixed by 92b3eead.

Signed-off-by: Cole Robinson <crobinso@redhat.com>
Signed-off-by: Andreas Färber <afaerber@suse.de>
This commit is contained in:
Cole Robinson 2014-04-11 18:07:12 -04:00 committed by Andreas Färber
parent 3ee933c9d4
commit 0380aef323
1 changed files with 11 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
tests/qom-test.c
View File

@ -44,7 +44,7 @@ static bool is_blacklisted(const char *arch, const char *mach)
return false; return false;
} }
static void test_properties(const char *path) static void test_properties(const char *path, bool recurse)
{ {
char *child_path; char *child_path;
QDict *response, *tuple; QDict *response, *tuple;
@ -56,14 +56,21 @@ static void test_properties(const char *path)
" 'arguments': { 'path': '%s' } }", path); " 'arguments': { 'path': '%s' } }", path);
g_assert(response); g_assert(response);
if (!recurse) {
return;
}
g_assert(qdict_haskey(response, "return")); g_assert(qdict_haskey(response, "return"));
list = qobject_to_qlist(qdict_get(response, "return")); list = qobject_to_qlist(qdict_get(response, "return"));
QLIST_FOREACH_ENTRY(list, entry) { QLIST_FOREACH_ENTRY(list, entry) {
tuple = qobject_to_qdict(qlist_entry_obj(entry)); tuple = qobject_to_qdict(qlist_entry_obj(entry));
if (strstart(qdict_get_str(tuple, "type"), "child<", NULL)) { bool is_child = strstart(qdict_get_str(tuple, "type"), "child<", NULL);
bool is_link = strstart(qdict_get_str(tuple, "type"), "link<", NULL);
if (is_child || is_link) {
child_path = g_strdup_printf("%s/%s", child_path = g_strdup_printf("%s/%s",
path, qdict_get_str(tuple, "name")); path, qdict_get_str(tuple, "name"));
test_properties(child_path); test_properties(child_path, is_child);
g_free(child_path); g_free(child_path);
} else { } else {
const char *prop = qdict_get_str(tuple, "name"); const char *prop = qdict_get_str(tuple, "name");
@ -87,7 +94,7 @@ static void test_machine(gconstpointer data)
args = g_strdup_printf("-machine %s", machine); args = g_strdup_printf("-machine %s", machine);
qtest_start(args); qtest_start(args);
test_properties("/machine"); test_properties("/machine", true);
response = qmp("{ 'execute': 'quit' }"); response = qmp("{ 'execute': 'quit' }");
g_assert(qdict_haskey(response, "return")); g_assert(qdict_haskey(response, "return"));