From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:40527) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WNi6g-0007sR-KA for qemu-devel@nongnu.org; Wed, 12 Mar 2014 08:18:04 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1WNi6a-0005ox-K2 for qemu-devel@nongnu.org; Wed, 12 Mar 2014 08:17:58 -0400 Received: from cantor2.suse.de ([195.135.220.15]:35287 helo=mx2.suse.de) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WNi6a-0005ot-9y for qemu-devel@nongnu.org; Wed, 12 Mar 2014 08:17:52 -0400 Message-ID: <5320506D.8080700@suse.de> Date: Wed, 12 Mar 2014 13:17:49 +0100 From: =?UTF-8?B?QW5kcmVhcyBGw6RyYmVy?= MIME-Version: 1.0 References: <1394572683-11973-1-git-send-email-afaerber@suse.de> <87bnxb7phe.fsf@blackfin.pond.sub.org> In-Reply-To: <87bnxb7phe.fsf@blackfin.pond.sub.org> Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: quoted-printable Subject: Re: [Qemu-devel] [PATCH qom-next v2] qom-test: Test QOM properties List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Markus Armbruster Cc: qemu-devel@nongnu.org Am 12.03.2014 10:09, schrieb Markus Armbruster: > Andreas F=C3=A4rber writes: >=20 >> Recursively walk all properties under /machine and try to retrieve the= ir >> value. This is a regression test for link<> properties and the >> DeviceState::hotpluggable property. >> >> Cf. be2f78b6b062eec5170e2612299fb8953046993f and >> 1a37eca107cece3ed454bae29eef0bd1fac4a244 >=20 > I'm afraid the last sentence is too terse for me to understand. Commit hashes of a) link<> property bug fix and b) hotpluggable property introduction. Both were about segfaults. >=20 >> Signed-off-by: Andreas F=C3=A4rber >> --- >> v2: Added g_test_message()s. >> >> Applying to qom-next. >> >> tests/qom-test.c | 43 +++++++++++++++++++++++++++++++++++++++++++ >> 1 file changed, 43 insertions(+) >> >> diff --git a/tests/qom-test.c b/tests/qom-test.c >> index b6671fb..4909258 100644 >> --- a/tests/qom-test.c >> +++ b/tests/qom-test.c >> @@ -10,6 +10,7 @@ >> #include >> #include >> =20 >> +#include "qemu-common.h" >> #include "libqtest.h" >> #include "qemu/osdep.h" >> #include "qapi/qmp/types.h" >> @@ -43,6 +44,44 @@ static bool is_blacklisted(const char *arch, const = char *mach) >> return false; >> } >> =20 >> +static void test_properties(const char *path) >> +{ >> + char *cmd, *child_path; >> + QDict *response, *tuple; >> + QList *list; >> + QListEntry *entry; >> + >> + g_test_message("Obtaining properties of %s", path); >> + cmd =3D g_strdup_printf("{ 'execute': 'qom-list'," >> + " 'arguments': { 'path': '%s' } }", path); >> + response =3D qmp(cmd); >> + g_free(cmd); >> + g_assert(response); >> + >> + g_assert(qdict_haskey(response, "return")); >> + list =3D qobject_to_qlist(qdict_get(response, "return")); >> + QLIST_FOREACH_ENTRY(list, entry) { >> + tuple =3D qobject_to_qdict(qlist_entry_obj(entry)); >> + if (strstart(qdict_get_str(tuple, "type"), "child<", NULL)) { >> + child_path =3D g_strdup_printf("%s/%s", >> + path, qdict_get_str(tuple, "= name")); >> + test_properties(child_path); >> + g_free(child_path); >> + } else { >> + const char *prop =3D qdict_get_str(tuple, "name"); >> + g_test_message("Testing property %s.%s", path, prop); >> + cmd =3D g_strdup_printf("{ 'execute': 'qom-get'," >> + " 'arguments': { 'path': '%s'," >> + " 'property': '%s' = } }", >> + path, prop); >> + response =3D qmp(cmd); >> + g_free(cmd); >> + /* This may fail but should not, e.g., segfault. */ >> + g_assert(response); >=20 > I'm not sure I get your comment. Executing qom-get may return a QMP error when accessing a property, but it may not crash. Therefore not much we can assert in the response. If a segfault occurs, the process is gone at this point. >=20 >> + } >> + } >> +} >> + >> static void test_machine(gconstpointer data) >> { >> const char *machine =3D data; >> @@ -51,8 +90,12 @@ static void test_machine(gconstpointer data) >> =20 >> args =3D g_strdup_printf("-machine %s", machine); >> qtest_start(args); >> + >> + test_properties("/machine"); >> + >> response =3D qmp("{ 'execute': 'quit' }"); >> g_assert(qdict_haskey(response, "return")); >> + >> qtest_end(); >> g_free(args); >> } >=20 > Looks like an excellent addition to the test suite. Thanks! Unfortunately adds to the main-loop warnings. Cheers, Andreas --=20 SUSE LINUX Products GmbH, Maxfeldstr. 5, 90409 N=C3=BCrnberg, Germany GF: Jeff Hawn, Jennifer Guild, Felix Imend=C3=B6rffer; HRB 16746 AG N=C3=BC= rnberg