From nobody Sat Apr 27 07:28:28 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 1493048060432256.5960406515072; Mon, 24 Apr 2017 08:34:20 -0700 (PDT) Received: from localhost ([::1]:44676 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1d2g0I-00082j-1z for importer@patchew.org; Mon, 24 Apr 2017 11:34:18 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:39360) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1d2fys-0007EI-Mr for qemu-devel@nongnu.org; Mon, 24 Apr 2017 11:32:51 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1d2fyq-00082O-LA for qemu-devel@nongnu.org; Mon, 24 Apr 2017 11:32:50 -0400 Received: from mx1.redhat.com ([209.132.183.28]:41274) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1d2fyq-00081V-C6 for qemu-devel@nongnu.org; Mon, 24 Apr 2017 11:32:48 -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 5893E7F6C5 for ; Mon, 24 Apr 2017 15:32:47 +0000 (UTC) Received: from dgilbert-t530.redhat.com (ovpn-117-235.ams2.redhat.com [10.36.117.235]) by smtp.corp.redhat.com (Postfix) with ESMTP id 81A35179DA; Mon, 24 Apr 2017 15:32:46 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mx1.redhat.com 5893E7F6C5 Authentication-Results: ext-mx01.extmail.prod.ext.phx2.redhat.com; dmarc=none (p=none dis=none) header.from=redhat.com Authentication-Results: ext-mx01.extmail.prod.ext.phx2.redhat.com; spf=pass smtp.mailfrom=dgilbert@redhat.com DKIM-Filter: OpenDKIM Filter v2.11.0 mx1.redhat.com 5893E7F6C5 From: "Dr. David Alan Gilbert (git)" To: qemu-devel@nongnu.org Date: Mon, 24 Apr 2017 16:32:41 +0100 Message-Id: <20170424153244.2600-2-dgilbert@redhat.com> In-Reply-To: <20170424153244.2600-1-dgilbert@redhat.com> References: <20170424153244.2600-1-dgilbert@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.25]); Mon, 24 Apr 2017 15:32:47 +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] [PULL 1/4] hmp: gpa2hva and gpa2hpa hostaddr command 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: pbonzini@redhat.com, thuth@redhat.com 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" From: Paolo Bonzini These commands are useful when testing machine-check passthrough. gpa2hva is useful to inject a MADV_HWPOISON madvise from gdb, while gpa2hpa is useful to inject an error with the mce-inject kernel module. Signed-off-by: Paolo Bonzini Message-Id: <1490021158-4469-1-git-send-email-pbonzini@redhat.com> Signed-off-by: Paolo Bonzini Message-Id: <20170420133058.12911-1-pbonzini@redhat.com> Reviewed-by: Dr. David Alan Gilbert Signed-off-by: Dr. David Alan Gilbert --- hmp-commands.hx | 32 ++++++++++++++++++ monitor.c | 101 ++++++++++++++++++++++++++++++++++++++++++++++++++++= ++++ 2 files changed, 133 insertions(+) diff --git a/hmp-commands.hx b/hmp-commands.hx index 88192817b2..0aca984261 100644 --- a/hmp-commands.hx +++ b/hmp-commands.hx @@ -526,6 +526,38 @@ Dump 80 16 bit values at the start of the video memory. ETEXI =20 { + .name =3D "gpa2hva", + .args_type =3D "addr:l", + .params =3D "addr", + .help =3D "print the host virtual address corresponding to a= guest physical address", + .cmd =3D hmp_gpa2hva, + }, + +STEXI +@item gpa2hva @var{addr} +@findex gpa2hva +Print the host virtual address at which the guest's physical address @var{= addr} +is mapped. +ETEXI + +#ifdef CONFIG_LINUX + { + .name =3D "gpa2hpa", + .args_type =3D "addr:l", + .params =3D "addr", + .help =3D "print the host physical address corresponding to = a guest physical address", + .cmd =3D hmp_gpa2hpa, + }, +#endif + +STEXI +@item gpa2hpa @var{addr} +@findex gpa2hpa +Print the host physical address at which the guest's physical address @var= {addr} +is mapped. +ETEXI + + { .name =3D "p|print", .args_type =3D "fmt:/,val:l", .params =3D "/fmt expr", diff --git a/monitor.c b/monitor.c index be282ecb80..a27dc8003f 100644 --- a/monitor.c +++ b/monitor.c @@ -1421,6 +1421,107 @@ static void hmp_physical_memory_dump(Monitor *mon, = const QDict *qdict) memory_dump(mon, count, format, size, addr, 1); } =20 +static void *gpa2hva(MemoryRegion **p_mr, hwaddr addr, Error **errp) +{ + MemoryRegionSection mrs =3D memory_region_find(get_system_memory(), + addr, 1); + + if (!mrs.mr) { + error_setg(errp, "No memory is mapped at address 0x%" HWADDR_PRIx,= addr); + return NULL; + } + + if (!memory_region_is_ram(mrs.mr) && !memory_region_is_romd(mrs.mr)) { + error_setg(errp, "Memory at address 0x%" HWADDR_PRIx "is not RAM",= addr); + memory_region_unref(mrs.mr); + return NULL; + } + + *p_mr =3D mrs.mr; + return qemu_map_ram_ptr(mrs.mr->ram_block, mrs.offset_within_region); +} + +static void hmp_gpa2hva(Monitor *mon, const QDict *qdict) +{ + hwaddr addr =3D qdict_get_int(qdict, "addr"); + Error *local_err =3D NULL; + MemoryRegion *mr =3D NULL; + void *ptr; + + ptr =3D gpa2hva(&mr, addr, &local_err); + if (local_err) { + error_report_err(local_err); + return; + } + + monitor_printf(mon, "Host virtual address for 0x%" HWADDR_PRIx + " (%s) is %p\n", + addr, mr->name, ptr); + + memory_region_unref(mr); +} + +#ifdef CONFIG_LINUX +static uint64_t vtop(void *ptr, Error **errp) +{ + uint64_t pinfo; + uint64_t ret =3D -1; + uintptr_t addr =3D (uintptr_t) ptr; + uintptr_t pagesize =3D getpagesize(); + off_t offset =3D addr / pagesize * sizeof(pinfo); + int fd; + + fd =3D open("/proc/self/pagemap", O_RDONLY); + if (fd =3D=3D -1) { + error_setg_errno(errp, errno, "Cannot open /proc/self/pagemap"); + return -1; + } + + /* Force copy-on-write if necessary. */ + atomic_add((uint8_t *)ptr, 0); + + if (pread(fd, &pinfo, sizeof(pinfo), offset) !=3D sizeof(pinfo)) { + error_setg_errno(errp, errno, "Cannot read pagemap"); + goto out; + } + if ((pinfo & (1ull << 63)) =3D=3D 0) { + error_setg(errp, "Page not present"); + goto out; + } + ret =3D ((pinfo & 0x007fffffffffffffull) * pagesize) | (addr & (pagesi= ze - 1)); + +out: + close(fd); + return ret; +} + +static void hmp_gpa2hpa(Monitor *mon, const QDict *qdict) +{ + hwaddr addr =3D qdict_get_int(qdict, "addr"); + Error *local_err =3D NULL; + MemoryRegion *mr =3D NULL; + void *ptr; + uint64_t physaddr; + + ptr =3D gpa2hva(&mr, addr, &local_err); + if (local_err) { + error_report_err(local_err); + return; + } + + physaddr =3D vtop(ptr, &local_err); + if (local_err) { + error_report_err(local_err); + } else { + monitor_printf(mon, "Host physical address for 0x%" HWADDR_PRIx + " (%s) is 0x%" PRIx64 "\n", + addr, mr->name, (uint64_t) physaddr); + } + + memory_region_unref(mr); +} +#endif + static void do_print(Monitor *mon, const QDict *qdict) { int format =3D qdict_get_int(qdict, "format"); --=20 2.12.2 From nobody Sat Apr 27 07:28:28 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 1493048065361365.522478887017; Mon, 24 Apr 2017 08:34:25 -0700 (PDT) Received: from localhost ([::1]:44677 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1d2g0N-00085W-Lt for importer@patchew.org; Mon, 24 Apr 2017 11:34:23 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:39363) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1d2fys-0007EJ-PS for qemu-devel@nongnu.org; Mon, 24 Apr 2017 11:32:51 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1d2fyr-00082m-So for qemu-devel@nongnu.org; Mon, 24 Apr 2017 11:32:50 -0400 Received: from mx1.redhat.com ([209.132.183.28]:50130) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1d2fyr-00082V-Mq for qemu-devel@nongnu.org; Mon, 24 Apr 2017 11:32:49 -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 A8239C05975B for ; Mon, 24 Apr 2017 15:32:48 +0000 (UTC) Received: from dgilbert-t530.redhat.com (ovpn-117-235.ams2.redhat.com [10.36.117.235]) by smtp.corp.redhat.com (Postfix) with ESMTP id 9D166179DA; Mon, 24 Apr 2017 15:32:47 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mx1.redhat.com A8239C05975B Authentication-Results: ext-mx08.extmail.prod.ext.phx2.redhat.com; dmarc=none (p=none dis=none) header.from=redhat.com Authentication-Results: ext-mx08.extmail.prod.ext.phx2.redhat.com; spf=pass smtp.mailfrom=dgilbert@redhat.com DKIM-Filter: OpenDKIM Filter v2.11.0 mx1.redhat.com A8239C05975B From: "Dr. David Alan Gilbert (git)" To: qemu-devel@nongnu.org Date: Mon, 24 Apr 2017 16:32:42 +0100 Message-Id: <20170424153244.2600-3-dgilbert@redhat.com> In-Reply-To: <20170424153244.2600-1-dgilbert@redhat.com> References: <20170424153244.2600-1-dgilbert@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.32]); Mon, 24 Apr 2017 15:32:48 +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] [PULL 2/4] 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: pbonzini@redhat.com, thuth@redhat.com 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" From: Thomas Huth 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 Message-Id: <1490860207-8302-2-git-send-email-thuth@redhat.com> Reviewed-by: Markus Armbruster Signed-off-by: Dr. David Alan Gilbert Added note to qtest_hmp/qtest_hmpv's header description to say it discards events --- tests/libqtest.c | 6 ++++++ tests/libqtest.h | 4 +++- 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/tests/libqtest.c b/tests/libqtest.c index 99b1195355..0b0bf1d460 100644 --- a/tests/libqtest.c +++ b/tests/libqtest.c @@ -588,6 +588,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); diff --git a/tests/libqtest.h b/tests/libqtest.h index 2c9962d94f..ee237448da 100644 --- a/tests/libqtest.h +++ b/tests/libqtest.h @@ -132,11 +132,12 @@ void qtest_qmp_eventwait(QTestState *s, const char *e= vent); QDict *qtest_qmp_eventwait_ref(QTestState *s, const char *event); =20 /** - * qtest_hmpv: + * qtest_hmp: * @s: #QTestState instance to operate on. * @fmt...: HMP command to send to QEMU * * Send HMP command to QEMU via QMP's human-monitor-command. + * QMP events are discarded. * * Returns: the command's output. The caller should g_free() it. */ @@ -149,6 +150,7 @@ char *qtest_hmp(QTestState *s, const char *fmt, ...); * @ap: HMP command arguments * * Send HMP command to QEMU via QMP's human-monitor-command. + * QMP events are discarded. * * Returns: the command's output. The caller should g_free() it. */ --=20 2.12.2 From nobody Sat Apr 27 07:28:28 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 14930481731170.6430019422397208; Mon, 24 Apr 2017 08:36:13 -0700 (PDT) Received: from localhost ([::1]:44690 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1d2g27-00010G-M6 for importer@patchew.org; Mon, 24 Apr 2017 11:36:11 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:39381) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1d2fyu-0007EV-Kc for qemu-devel@nongnu.org; Mon, 24 Apr 2017 11:32:57 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1d2fyt-00083X-2I for qemu-devel@nongnu.org; Mon, 24 Apr 2017 11:32:52 -0400 Received: from mx1.redhat.com ([209.132.183.28]:46640) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1d2fys-00082z-PS for qemu-devel@nongnu.org; Mon, 24 Apr 2017 11:32:50 -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 C346B61B92 for ; Mon, 24 Apr 2017 15:32:49 +0000 (UTC) Received: from dgilbert-t530.redhat.com (ovpn-117-235.ams2.redhat.com [10.36.117.235]) by smtp.corp.redhat.com (Postfix) with ESMTP id EDFA1179D3; Mon, 24 Apr 2017 15:32:48 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mx1.redhat.com C346B61B92 Authentication-Results: ext-mx10.extmail.prod.ext.phx2.redhat.com; dmarc=none (p=none dis=none) header.from=redhat.com Authentication-Results: ext-mx10.extmail.prod.ext.phx2.redhat.com; spf=pass smtp.mailfrom=dgilbert@redhat.com DKIM-Filter: OpenDKIM Filter v2.11.0 mx1.redhat.com C346B61B92 From: "Dr. David Alan Gilbert (git)" To: qemu-devel@nongnu.org Date: Mon, 24 Apr 2017 16:32:43 +0100 Message-Id: <20170424153244.2600-4-dgilbert@redhat.com> In-Reply-To: <20170424153244.2600-1-dgilbert@redhat.com> References: <20170424153244.2600-1-dgilbert@redhat.com> MIME-Version: 1.0 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.39]); Mon, 24 Apr 2017 15:32:49 +0000 (UTC) Content-Transfer-Encoding: quoted-printable 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] [PULL 3/4] 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: pbonzini@redhat.com, thuth@redhat.com Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail: RSF_0 Z_629925259 SPT_0 Content-Type: text/plain; charset="utf-8" From: Thomas Huth 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 Message-Id: <1490860207-8302-3-git-send-email-thuth@redhat.com> Reviewed-by: Philippe Mathieu-Daud=C3=A9 Signed-off-by: Dr. David Alan Gilbert --- 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 0b0bf1d460..512c150266 100644 --- a/tests/libqtest.c +++ b/tests/libqtest.c @@ -946,3 +946,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 ee237448da..38bc1e9953 100644 --- a/tests/libqtest.h +++ b/tests/libqtest.h @@ -919,4 +919,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 c3a2633d3c..c4211a4e85 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 d48f890e84..ab0595dc75 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 2.12.2 From nobody Sat Apr 27 07:28:28 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 1493048173872234.63186397456263; Mon, 24 Apr 2017 08:36:13 -0700 (PDT) Received: from localhost ([::1]:44691 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1d2g28-00010u-9a for importer@patchew.org; Mon, 24 Apr 2017 11:36:12 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:39389) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1d2fyv-0007Eo-D1 for qemu-devel@nongnu.org; Mon, 24 Apr 2017 11:32:54 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1d2fyu-00083s-63 for qemu-devel@nongnu.org; Mon, 24 Apr 2017 11:32:53 -0400 Received: from mx1.redhat.com ([209.132.183.28]:46208) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1d2fyt-00083b-TG for qemu-devel@nongnu.org; Mon, 24 Apr 2017 11:32:52 -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 DF3B470720 for ; Mon, 24 Apr 2017 15:32:50 +0000 (UTC) Received: from dgilbert-t530.redhat.com (ovpn-117-235.ams2.redhat.com [10.36.117.235]) by smtp.corp.redhat.com (Postfix) with ESMTP id 15A46179D3; Mon, 24 Apr 2017 15:32:49 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mx1.redhat.com DF3B470720 Authentication-Results: ext-mx02.extmail.prod.ext.phx2.redhat.com; dmarc=none (p=none dis=none) header.from=redhat.com Authentication-Results: ext-mx02.extmail.prod.ext.phx2.redhat.com; spf=pass smtp.mailfrom=dgilbert@redhat.com DKIM-Filter: OpenDKIM Filter v2.11.0 mx1.redhat.com DF3B470720 From: "Dr. David Alan Gilbert (git)" To: qemu-devel@nongnu.org Date: Mon, 24 Apr 2017 16:32:44 +0100 Message-Id: <20170424153244.2600-5-dgilbert@redhat.com> In-Reply-To: <20170424153244.2600-1-dgilbert@redhat.com> References: <20170424153244.2600-1-dgilbert@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.26]); Mon, 24 Apr 2017 15:32:51 +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] [PULL 4/4] 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: pbonzini@redhat.com, thuth@redhat.com 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" From: Thomas Huth 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 Message-Id: <1490860207-8302-4-git-send-email-thuth@redhat.com> Reviewed-by: Dr. David Alan Gilbert Signed-off-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 579ec07cce..31931c0d77 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 0000000000..339ed41d54 --- /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 2.12.2