From nobody Mon Apr 29 04:23:58 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) client-ip=208.118.235.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zoho.com; spf=pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; Return-Path: Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) by mx.zohomail.com with SMTPS id 149086029633791.94585698207186; Thu, 30 Mar 2017 00:51:36 -0700 (PDT) Received: from localhost ([::1]:34174 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ctUrl-0002GX-9p for importer@patchew.org; Thu, 30 Mar 2017 03:51:33 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:49404) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ctUqS-0001VF-2f for qemu-devel@nongnu.org; Thu, 30 Mar 2017 03:50:13 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ctUqR-0006Zo-Di for qemu-devel@nongnu.org; Thu, 30 Mar 2017 03:50:12 -0400 Received: from mx1.redhat.com ([209.132.183.28]:40812) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1ctUqR-0006Xs-8z for qemu-devel@nongnu.org; Thu, 30 Mar 2017 03:50:11 -0400 Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.phx2.redhat.com [10.5.11.14]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 54B5B1555A for ; Thu, 30 Mar 2017 07:50:10 +0000 (UTC) Received: from thh440s.str.redhat.com (dhcp-192-189.str.redhat.com [10.33.192.189]) by smtp.corp.redhat.com (Postfix) with ESMTP id 8BCE418B83; Thu, 30 Mar 2017 07:50:09 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mx1.redhat.com 54B5B1555A Authentication-Results: ext-mx05.extmail.prod.ext.phx2.redhat.com; dmarc=none (p=none dis=none) header.from=redhat.com Authentication-Results: ext-mx05.extmail.prod.ext.phx2.redhat.com; spf=pass smtp.mailfrom=thuth@redhat.com DKIM-Filter: OpenDKIM Filter v2.11.0 mx1.redhat.com 54B5B1555A From: Thomas Huth To: "Dr. David Alan Gilbert" , qemu-devel@nongnu.org Date: Thu, 30 Mar 2017 09:50:05 +0200 Message-Id: <1490860207-8302-2-git-send-email-thuth@redhat.com> In-Reply-To: <1490860207-8302-1-git-send-email-thuth@redhat.com> References: <1490860207-8302-1-git-send-email-thuth@redhat.com> X-Scanned-By: MIMEDefang 2.79 on 10.5.11.14 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.29]); Thu, 30 Mar 2017 07:50:10 +0000 (UTC) X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 209.132.183.28 Subject: [Qemu-devel] [PATCH v2 1/3] libqtest: Ignore QMP events when parsing the response for HMP commands X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Markus Armbruster Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail: RSF_0 Z_629925259 SPT_0 Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" When running certain HMP commands (like "device_del") via QMP, we can sometimes get a QMP event in the response first, so that the "g_assert(ret)" statement in qtest_hmp() triggers and the test fails. Fix this by ignoring such QMP events while looking for the real return value from QMP. Signed-off-by: Thomas Huth --- tests/libqtest.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/tests/libqtest.c b/tests/libqtest.c index a5c3d2b..c9b2d76 100644 --- a/tests/libqtest.c +++ b/tests/libqtest.c @@ -580,6 +580,12 @@ char *qtest_hmpv(QTestState *s, const char *fmt, va_li= st ap) " 'arguments': {'command-line': %s}}", cmd); ret =3D g_strdup(qdict_get_try_str(resp, "return")); + while (ret =3D=3D NULL && qdict_get_try_str(resp, "event")) { + /* Ignore asynchronous QMP events */ + QDECREF(resp); + resp =3D qtest_qmp_receive(s); + ret =3D g_strdup(qdict_get_try_str(resp, "return")); + } g_assert(ret); QDECREF(resp); g_free(cmd); --=20 1.8.3.1 From nobody Mon Apr 29 04:23:58 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) client-ip=208.118.235.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zoho.com; spf=pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; Return-Path: Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) by mx.zohomail.com with SMTPS id 1490860388297845.2187069884804; Thu, 30 Mar 2017 00:53:08 -0700 (PDT) Received: from localhost ([::1]:34180 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ctUtH-0003Uk-1h for importer@patchew.org; Thu, 30 Mar 2017 03:53:07 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:49443) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ctUqV-0001Vz-1X for qemu-devel@nongnu.org; Thu, 30 Mar 2017 03:50:17 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ctUqT-0006g6-NH for qemu-devel@nongnu.org; Thu, 30 Mar 2017 03:50:15 -0400 Received: from mx1.redhat.com ([209.132.183.28]:44352) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1ctUqT-0006e0-FQ for qemu-devel@nongnu.org; Thu, 30 Mar 2017 03:50:13 -0400 Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.phx2.redhat.com [10.5.11.14]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 7C41B7FD68 for ; Thu, 30 Mar 2017 07:50:12 +0000 (UTC) Received: from thh440s.str.redhat.com (dhcp-192-189.str.redhat.com [10.33.192.189]) by smtp.corp.redhat.com (Postfix) with ESMTP id B127D18B8A; Thu, 30 Mar 2017 07:50:10 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mx1.redhat.com 7C41B7FD68 Authentication-Results: ext-mx03.extmail.prod.ext.phx2.redhat.com; dmarc=none (p=none dis=none) header.from=redhat.com Authentication-Results: ext-mx03.extmail.prod.ext.phx2.redhat.com; spf=pass smtp.mailfrom=thuth@redhat.com DKIM-Filter: OpenDKIM Filter v2.11.0 mx1.redhat.com 7C41B7FD68 From: Thomas Huth To: "Dr. David Alan Gilbert" , qemu-devel@nongnu.org Date: Thu, 30 Mar 2017 09:50:06 +0200 Message-Id: <1490860207-8302-3-git-send-email-thuth@redhat.com> In-Reply-To: <1490860207-8302-1-git-send-email-thuth@redhat.com> References: <1490860207-8302-1-git-send-email-thuth@redhat.com> X-Scanned-By: MIMEDefang 2.79 on 10.5.11.14 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.27]); Thu, 30 Mar 2017 07:50:12 +0000 (UTC) X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 209.132.183.28 Subject: [Qemu-devel] [PATCH v2 2/3] libqtest: Add a generic function to run a callback function for every machine X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Markus Armbruster Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail: RSF_0 Z_629925259 SPT_0 Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Some tests need to run single tests for every available machine of the current QEMU binary. To avoid code duplication, let's extract this code that deals with 'query-machines' into a separate function. Signed-off-by: Thomas Huth Reviewed-by: Philippe Mathieu-Daud=C3=A9 --- tests/libqtest.c | 30 +++++++++++++++++ tests/libqtest.h | 8 +++++ tests/pc-cpu-test.c | 95 ++++++++++++++++++++-----------------------------= ---- tests/qom-test.c | 36 ++++---------------- 4 files changed, 80 insertions(+), 89 deletions(-) diff --git a/tests/libqtest.c b/tests/libqtest.c index c9b2d76..d8b8066 100644 --- a/tests/libqtest.c +++ b/tests/libqtest.c @@ -938,3 +938,33 @@ bool qtest_big_endian(QTestState *s) { return s->big_endian; } + +void qtest_cb_for_every_machine(void (*cb)(const char *machine)) +{ + QDict *response, *minfo; + QList *list; + const QListEntry *p; + QObject *qobj; + QString *qstr; + const char *mname; + + qtest_start("-machine none"); + response =3D qmp("{ 'execute': 'query-machines' }"); + g_assert(response); + list =3D qdict_get_qlist(response, "return"); + g_assert(list); + + for (p =3D qlist_first(list); p; p =3D qlist_next(p)) { + minfo =3D qobject_to_qdict(qlist_entry_obj(p)); + g_assert(minfo); + qobj =3D qdict_get(minfo, "name"); + g_assert(qobj); + qstr =3D qobject_to_qstring(qobj); + g_assert(qstr); + mname =3D qstring_get_str(qstr); + cb(mname); + } + + qtest_end(); + QDECREF(response); +} diff --git a/tests/libqtest.h b/tests/libqtest.h index 2c9962d..43ffadd 100644 --- a/tests/libqtest.h +++ b/tests/libqtest.h @@ -917,4 +917,12 @@ void qmp_fd_send(int fd, const char *fmt, ...); QDict *qmp_fdv(int fd, const char *fmt, va_list ap); QDict *qmp_fd(int fd, const char *fmt, ...); =20 +/** + * qtest_cb_for_every_machine: + * @cb: Pointer to the callback function + * + * Call a callback function for every name of all available machines. + */ +void qtest_cb_for_every_machine(void (*cb)(const char *machine)); + #endif diff --git a/tests/pc-cpu-test.c b/tests/pc-cpu-test.c index c3a2633..c4211a4 100644 --- a/tests/pc-cpu-test.c +++ b/tests/pc-cpu-test.c @@ -79,69 +79,46 @@ static void test_data_free(gpointer data) g_free(pc); } =20 -static void add_pc_test_cases(void) +static void add_pc_test_case(const char *mname) { - QDict *response, *minfo; - QList *list; - const QListEntry *p; - QObject *qobj; - QString *qstr; - const char *mname; char *path; PCTestData *data; =20 - qtest_start("-machine none"); - response =3D qmp("{ 'execute': 'query-machines' }"); - g_assert(response); - list =3D qdict_get_qlist(response, "return"); - g_assert(list); - - for (p =3D qlist_first(list); p; p =3D qlist_next(p)) { - minfo =3D qobject_to_qdict(qlist_entry_obj(p)); - g_assert(minfo); - qobj =3D qdict_get(minfo, "name"); - g_assert(qobj); - qstr =3D qobject_to_qstring(qobj); - g_assert(qstr); - mname =3D qstring_get_str(qstr); - if (!g_str_has_prefix(mname, "pc-")) { - continue; - } - data =3D g_malloc(sizeof(PCTestData)); - data->machine =3D g_strdup(mname); - data->cpu_model =3D "Haswell"; /* 1.3+ theoretically */ - data->sockets =3D 1; - data->cores =3D 3; - data->threads =3D 2; - data->maxcpus =3D data->sockets * data->cores * data->threads * 2; - if (g_str_has_suffix(mname, "-1.4") || - (strcmp(mname, "pc-1.3") =3D=3D 0) || - (strcmp(mname, "pc-1.2") =3D=3D 0) || - (strcmp(mname, "pc-1.1") =3D=3D 0) || - (strcmp(mname, "pc-1.0") =3D=3D 0) || - (strcmp(mname, "pc-0.15") =3D=3D 0) || - (strcmp(mname, "pc-0.14") =3D=3D 0) || - (strcmp(mname, "pc-0.13") =3D=3D 0) || - (strcmp(mname, "pc-0.12") =3D=3D 0) || - (strcmp(mname, "pc-0.11") =3D=3D 0) || - (strcmp(mname, "pc-0.10") =3D=3D 0)) { - path =3D g_strdup_printf("cpu/%s/init/%ux%ux%u&maxcpus=3D%u", - mname, data->sockets, data->cores, - data->threads, data->maxcpus); - qtest_add_data_func_full(path, data, test_pc_without_cpu_add, - test_data_free); - g_free(path); - } else { - path =3D g_strdup_printf("cpu/%s/add/%ux%ux%u&maxcpus=3D%u", - mname, data->sockets, data->cores, - data->threads, data->maxcpus); - qtest_add_data_func_full(path, data, test_pc_with_cpu_add, - test_data_free); - g_free(path); - } + if (!g_str_has_prefix(mname, "pc-")) { + return; + } + data =3D g_malloc(sizeof(PCTestData)); + data->machine =3D g_strdup(mname); + data->cpu_model =3D "Haswell"; /* 1.3+ theoretically */ + data->sockets =3D 1; + data->cores =3D 3; + data->threads =3D 2; + data->maxcpus =3D data->sockets * data->cores * data->threads * 2; + if (g_str_has_suffix(mname, "-1.4") || + (strcmp(mname, "pc-1.3") =3D=3D 0) || + (strcmp(mname, "pc-1.2") =3D=3D 0) || + (strcmp(mname, "pc-1.1") =3D=3D 0) || + (strcmp(mname, "pc-1.0") =3D=3D 0) || + (strcmp(mname, "pc-0.15") =3D=3D 0) || + (strcmp(mname, "pc-0.14") =3D=3D 0) || + (strcmp(mname, "pc-0.13") =3D=3D 0) || + (strcmp(mname, "pc-0.12") =3D=3D 0) || + (strcmp(mname, "pc-0.11") =3D=3D 0) || + (strcmp(mname, "pc-0.10") =3D=3D 0)) { + path =3D g_strdup_printf("cpu/%s/init/%ux%ux%u&maxcpus=3D%u", + mname, data->sockets, data->cores, + data->threads, data->maxcpus); + qtest_add_data_func_full(path, data, test_pc_without_cpu_add, + test_data_free); + g_free(path); + } else { + path =3D g_strdup_printf("cpu/%s/add/%ux%ux%u&maxcpus=3D%u", + mname, data->sockets, data->cores, + data->threads, data->maxcpus); + qtest_add_data_func_full(path, data, test_pc_with_cpu_add, + test_data_free); + g_free(path); } - QDECREF(response); - qtest_end(); } =20 int main(int argc, char **argv) @@ -151,7 +128,7 @@ int main(int argc, char **argv) g_test_init(&argc, &argv, NULL); =20 if (strcmp(arch, "i386") =3D=3D 0 || strcmp(arch, "x86_64") =3D=3D 0) { - add_pc_test_cases(); + qtest_cb_for_every_machine(add_pc_test_case); } =20 return g_test_run(); diff --git a/tests/qom-test.c b/tests/qom-test.c index d48f890..ab0595d 100644 --- a/tests/qom-test.c +++ b/tests/qom-test.c @@ -107,46 +107,22 @@ static void test_machine(gconstpointer data) g_free((void *)machine); } =20 -static void add_machine_test_cases(void) +static void add_machine_test_case(const char *mname) { const char *arch =3D qtest_get_arch(); - QDict *response, *minfo; - QList *list; - const QListEntry *p; - QObject *qobj; - QString *qstr; - const char *mname; =20 - qtest_start("-machine none"); - response =3D qmp("{ 'execute': 'query-machines' }"); - g_assert(response); - list =3D qdict_get_qlist(response, "return"); - g_assert(list); - - for (p =3D qlist_first(list); p; p =3D qlist_next(p)) { - minfo =3D qobject_to_qdict(qlist_entry_obj(p)); - g_assert(minfo); - qobj =3D qdict_get(minfo, "name"); - g_assert(qobj); - qstr =3D qobject_to_qstring(qobj); - g_assert(qstr); - mname =3D qstring_get_str(qstr); - if (!is_blacklisted(arch, mname)) { - char *path =3D g_strdup_printf("qom/%s", mname); - qtest_add_data_func(path, g_strdup(mname), test_machine); - g_free(path); - } + if (!is_blacklisted(arch, mname)) { + char *path =3D g_strdup_printf("qom/%s", mname); + qtest_add_data_func(path, g_strdup(mname), test_machine); + g_free(path); } - - qtest_end(); - QDECREF(response); } =20 int main(int argc, char **argv) { g_test_init(&argc, &argv, NULL); =20 - add_machine_test_cases(); + qtest_cb_for_every_machine(add_machine_test_case); =20 return g_test_run(); } --=20 1.8.3.1 From nobody Mon Apr 29 04:23:58 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) client-ip=208.118.235.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zoho.com; spf=pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; Return-Path: Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) by mx.zohomail.com with SMTPS id 1490860311649930.796727956789; Thu, 30 Mar 2017 00:51:51 -0700 (PDT) Received: from localhost ([::1]:34176 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ctUs2-0002TV-92 for importer@patchew.org; Thu, 30 Mar 2017 03:51:50 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:49473) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ctUqY-0001Y7-0O for qemu-devel@nongnu.org; Thu, 30 Mar 2017 03:50:19 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ctUqU-0006l4-Tl for qemu-devel@nongnu.org; Thu, 30 Mar 2017 03:50:18 -0400 Received: from mx1.redhat.com ([209.132.183.28]:42964) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1ctUqU-0006h4-KI for qemu-devel@nongnu.org; Thu, 30 Mar 2017 03:50:14 -0400 Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.phx2.redhat.com [10.5.11.14]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 856BF3DBC1 for ; Thu, 30 Mar 2017 07:50:13 +0000 (UTC) Received: from thh440s.str.redhat.com (dhcp-192-189.str.redhat.com [10.33.192.189]) by smtp.corp.redhat.com (Postfix) with ESMTP id DF3DC18B83; Thu, 30 Mar 2017 07:50:12 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mx1.redhat.com 856BF3DBC1 Authentication-Results: ext-mx06.extmail.prod.ext.phx2.redhat.com; dmarc=none (p=none dis=none) header.from=redhat.com Authentication-Results: ext-mx06.extmail.prod.ext.phx2.redhat.com; spf=pass smtp.mailfrom=thuth@redhat.com DKIM-Filter: OpenDKIM Filter v2.11.0 mx1.redhat.com 856BF3DBC1 From: Thomas Huth To: "Dr. David Alan Gilbert" , qemu-devel@nongnu.org Date: Thu, 30 Mar 2017 09:50:07 +0200 Message-Id: <1490860207-8302-4-git-send-email-thuth@redhat.com> In-Reply-To: <1490860207-8302-1-git-send-email-thuth@redhat.com> References: <1490860207-8302-1-git-send-email-thuth@redhat.com> X-Scanned-By: MIMEDefang 2.79 on 10.5.11.14 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.30]); Thu, 30 Mar 2017 07:50:13 +0000 (UTC) X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 209.132.183.28 Subject: [Qemu-devel] [PATCH v2 3/3] tests: Add a tester for HMP commands X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Markus Armbruster Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail: RSF_0 Z_629925259 SPT_0 Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" HMP commands do not get any automatic testing yet, so on certain QEMU machines, some HMP commands were causing crashes in the past. Thus we should test HMP commands in our test suite, too, to avoid that such problems creep in again in the future. Signed-off-by: Thomas Huth Reviewed-by: Dr. David Alan Gilbert --- tests/Makefile.include | 2 + tests/test-hmp.c | 161 +++++++++++++++++++++++++++++++++++++++++++++= ++++ 2 files changed, 163 insertions(+) create mode 100644 tests/test-hmp.c diff --git a/tests/Makefile.include b/tests/Makefile.include index f3de81f..0e754ac 100644 --- a/tests/Makefile.include +++ b/tests/Makefile.include @@ -331,6 +331,7 @@ check-qtest-xtensaeb-y =3D $(check-qtest-xtensa-y) check-qtest-s390x-y =3D tests/boot-serial-test$(EXESUF) =20 check-qtest-generic-y +=3D tests/qom-test$(EXESUF) +check-qtest-generic-y +=3D tests/test-hmp$(EXESUF) =20 qapi-schema +=3D alternate-any.json qapi-schema +=3D alternate-array.json @@ -720,6 +721,7 @@ tests/tpci200-test$(EXESUF): tests/tpci200-test.o tests/display-vga-test$(EXESUF): tests/display-vga-test.o tests/ipoctal232-test$(EXESUF): tests/ipoctal232-test.o tests/qom-test$(EXESUF): tests/qom-test.o +tests/test-hmp$(EXESUF): tests/test-hmp.o tests/drive_del-test$(EXESUF): tests/drive_del-test.o $(libqos-pc-obj-y) tests/qdev-monitor-test$(EXESUF): tests/qdev-monitor-test.o $(libqos-pc-ob= j-y) tests/nvme-test$(EXESUF): tests/nvme-test.o diff --git a/tests/test-hmp.c b/tests/test-hmp.c new file mode 100644 index 0000000..339ed41 --- /dev/null +++ b/tests/test-hmp.c @@ -0,0 +1,161 @@ +/* + * Test HMP commands. + * + * Copyright (c) 2017 Red Hat Inc. + * + * Author: + * Thomas Huth + * + * This work is licensed under the terms of the GNU GPL, version 2 + * or later. See the COPYING file in the top-level directory. + * + * This test calls some HMP commands for all machines that the current + * QEMU binary provides, to check whether they terminate successfully + * (i.e. do not crash QEMU). + */ + +#include "qemu/osdep.h" +#include "libqtest.h" + +static int verbose; + +static const char *hmp_cmds[] =3D { + "boot_set ndc", + "chardev-add null,id=3Dtestchardev1", + "chardev-remove testchardev1", + "commit all", + "cpu-add 1", + "cpu 0", + "device_add ?", + "device_add usb-mouse,id=3Dmouse1", + "mouse_button 7", + "mouse_move 10 10", + "mouse_button 0", + "device_del mouse1", + "dump-guest-memory /dev/null 0 4096", + "gdbserver", + "host_net_add user id=3Dnet0", + "hostfwd_add tcp::43210-:43210", + "hostfwd_remove tcp::43210-:43210", + "host_net_remove 0 net0", + "i /w 0", + "log all", + "log none", + "memsave 0 4096 \"/dev/null\"", + "migrate_set_cache_size 1", + "migrate_set_downtime 1", + "migrate_set_speed 1", + "netdev_add user,id=3Dnet1", + "set_link net1 off", + "set_link net1 on", + "netdev_del net1", + "nmi", + "o /w 0 0x1234", + "object_add memory-backend-ram,id=3Dmem1,size=3D256M", + "object_del mem1", + "pmemsave 0 4096 \"/dev/null\"", + "p $pc + 8", + "qom-list /", + "qom-set /machine initrd test", + "screendump /dev/null", + "sendkey x", + "singlestep on", + "wavcapture /dev/null", + "stopcapture 0", + "sum 0 512", + "x /8i 0x100", + "xp /16x 0", + NULL +}; + +/* Run through the list of pre-defined commands */ +static void test_commands(void) +{ + char *response; + int i; + + for (i =3D 0; hmp_cmds[i] !=3D NULL; i++) { + if (verbose) { + fprintf(stderr, "\t%s\n", hmp_cmds[i]); + } + response =3D hmp(hmp_cmds[i]); + g_free(response); + } + +} + +/* Run through all info commands and call them blindly (without arguments)= */ +static void test_info_commands(void) +{ + char *resp, *info, *info_buf, *endp; + + info_buf =3D info =3D hmp("help info"); + + while (*info) { + /* Extract the info command, ignore parameters and description */ + g_assert(strncmp(info, "info ", 5) =3D=3D 0); + endp =3D strchr(&info[5], ' '); + g_assert(endp !=3D NULL); + *endp =3D '\0'; + /* Now run the info command */ + if (verbose) { + fprintf(stderr, "\t%s\n", info); + } + resp =3D hmp(info); + g_free(resp); + /* And move forward to the next line */ + info =3D strchr(endp + 1, '\n'); + if (!info) { + break; + } + info +=3D 1; + } + + g_free(info_buf); +} + +static void test_machine(gconstpointer data) +{ + const char *machine =3D data; + char *args; + + args =3D g_strdup_printf("-S -M %s", machine); + qtest_start(args); + + test_info_commands(); + test_commands(); + + qtest_end(); + g_free(args); + g_free((void *)data); +} + +static void add_machine_test_case(const char *mname) +{ + char *path =3D g_strdup_printf("hmp/%s", mname); + + /* Ignore blacklisted machines that have known problems */ + if (!strcmp("isapc", mname) =3D=3D 0 || !strcmp("puv3", mname) + || !strcmp("tricore_testboard", mname) + || !strcmp("xenfv", mname) =3D=3D 0 || !strcmp("xenpv", mname)) { + return; + } + + qtest_add_data_func(path, g_strdup(mname), test_machine); + g_free(path); +} + +int main(int argc, char **argv) +{ + char *v_env =3D getenv("V"); + + if (v_env && *v_env >=3D '2') { + verbose =3D true; + } + + g_test_init(&argc, &argv, NULL); + + qtest_cb_for_every_machine(add_machine_test_case); + + return g_test_run(); +} --=20 1.8.3.1