From nobody Mon Apr 29 02:59:44 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.zohomail.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; dmarc=fail(p=none dis=none) header.from=redhat.com Return-Path: Received: from lists.gnu.org (208.118.235.17 [208.118.235.17]) by mx.zohomail.com with SMTPS id 1542711318173591.5655179459501; Tue, 20 Nov 2018 02:55:18 -0800 (PST) Received: from localhost ([::1]:33003 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gP3gT-0007Ft-IN for importer@patchew.org; Tue, 20 Nov 2018 05:55:09 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:46657) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gP3eY-00066y-Cb for qemu-devel@nongnu.org; Tue, 20 Nov 2018 05:53:11 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1gP3eU-00088Y-1G for qemu-devel@nongnu.org; Tue, 20 Nov 2018 05:53:10 -0500 Received: from mx1.redhat.com ([209.132.183.28]:42086) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1gP3eT-00086G-Qj for qemu-devel@nongnu.org; Tue, 20 Nov 2018 05:53:05 -0500 Received: from smtp.corp.redhat.com (int-mx08.intmail.prod.int.phx2.redhat.com [10.5.11.23]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id C64C4307D85B; Tue, 20 Nov 2018 10:53:04 +0000 (UTC) Received: from thuth.com (ovpn-116-127.ams2.redhat.com [10.36.116.127]) by smtp.corp.redhat.com (Postfix) with ESMTP id F2A54261C8; Tue, 20 Nov 2018 10:53:02 +0000 (UTC) From: Thomas Huth To: qemu-devel@nongnu.org, Peter Maydell Date: Tue, 20 Nov 2018 11:52:21 +0100 Message-Id: <1542711143-1946-2-git-send-email-thuth@redhat.com> In-Reply-To: <1542711143-1946-1-git-send-email-thuth@redhat.com> References: <1542711143-1946-1-git-send-email-thuth@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.84 on 10.5.11.23 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.48]); Tue, 20 Nov 2018 10:53:04 +0000 (UTC) Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 209.132.183.28 Subject: [Qemu-devel] [PULL 1/3] tests: add qmp/missing-any-arg test 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: Laurent Vivier , =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= , Thomas Huth , Markus Armbruster Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" Content-Type: text/plain; charset="utf-8" From: Marc-Andr=C3=A9 Lureau test_qmp_missing_any_arg() is about a bug in infrastructure used by the QMP core, fixed in commit c489780203. We covered the bug in infrastructure unit tests (commit bce3035a44). Let's test it at the QMP level as well. Signed-off-by: Marc-Andr=C3=A9 Lureau Reviewed-by: Thomas Huth Reviewed-by: Markus Armbruster [thuth: Tweaked the commit message according to Markus' suggestion] Signed-off-by: Thomas Huth --- tests/qmp-test.c | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/tests/qmp-test.c b/tests/qmp-test.c index 6c419f6..7517be4 100644 --- a/tests/qmp-test.c +++ b/tests/qmp-test.c @@ -318,6 +318,19 @@ static void test_qmp_preconfig(void) qtest_quit(qs); } =20 +static void test_qmp_missing_any_arg(void) +{ + QTestState *qts; + QDict *resp; + + qts =3D qtest_init(common_args); + resp =3D qtest_qmp(qts, "{'execute': 'qom-set', 'arguments':" + " { 'path': '/machine', 'property': 'rtc-time' } }"); + g_assert_nonnull(resp); + qmp_assert_error_class(resp, "GenericError"); + qtest_quit(qts); +} + int main(int argc, char *argv[]) { g_test_init(&argc, &argv, NULL); @@ -325,6 +338,7 @@ int main(int argc, char *argv[]) qtest_add_func("qmp/protocol", test_qmp_protocol); qtest_add_func("qmp/oob", test_qmp_oob); qtest_add_func("qmp/preconfig", test_qmp_preconfig); + qtest_add_func("qmp/missing-any-arg", test_qmp_missing_any_arg); =20 return g_test_run(); } --=20 1.8.3.1 From nobody Mon Apr 29 02:59:44 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.zohomail.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; dmarc=fail(p=none dis=none) header.from=redhat.com Return-Path: Received: from lists.gnu.org (208.118.235.17 [208.118.235.17]) by mx.zohomail.com with SMTPS id 1542711318180934.5671502176394; Tue, 20 Nov 2018 02:55:18 -0800 (PST) Received: from localhost ([::1]:33004 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gP3gS-0007GC-VJ for importer@patchew.org; Tue, 20 Nov 2018 05:55:09 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:46666) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gP3eY-000670-Lp for qemu-devel@nongnu.org; Tue, 20 Nov 2018 05:53:11 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1gP3eX-0008Hg-QI for qemu-devel@nongnu.org; Tue, 20 Nov 2018 05:53:10 -0500 Received: from mx1.redhat.com ([209.132.183.28]:63469) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1gP3eX-0008Eu-GT for qemu-devel@nongnu.org; Tue, 20 Nov 2018 05:53:09 -0500 Received: from smtp.corp.redhat.com (int-mx08.intmail.prod.int.phx2.redhat.com [10.5.11.23]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 0DA7988E44; Tue, 20 Nov 2018 10:53:08 +0000 (UTC) Received: from thuth.com (ovpn-116-127.ams2.redhat.com [10.36.116.127]) by smtp.corp.redhat.com (Postfix) with ESMTP id 63DB7450B; Tue, 20 Nov 2018 10:53:04 +0000 (UTC) From: Thomas Huth To: qemu-devel@nongnu.org, Peter Maydell Date: Tue, 20 Nov 2018 11:52:22 +0100 Message-Id: <1542711143-1946-3-git-send-email-thuth@redhat.com> In-Reply-To: <1542711143-1946-1-git-send-email-thuth@redhat.com> References: <1542711143-1946-1-git-send-email-thuth@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.84 on 10.5.11.23 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.25]); Tue, 20 Nov 2018 10:53:08 +0000 (UTC) Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 209.132.183.28 Subject: [Qemu-devel] [PULL 2/3] tests/ide: Free pcibus when finishing a test 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: Laurent Vivier , =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= , Thomas Huth , Markus Armbruster Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" Content-Type: text/plain; charset="utf-8" Once a test has finished, the pcibus structure should be freed, to avoid leaking memory and to make sure that the structure is properly re-initialized when the next test starts. Reviewed-by: Eric Blake Reviewed-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: John Snow Signed-off-by: Thomas Huth --- tests/ide-test.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/tests/ide-test.c b/tests/ide-test.c index 33cef61..f0280e6 100644 --- a/tests/ide-test.c +++ b/tests/ide-test.c @@ -142,6 +142,10 @@ static void ide_test_start(const char *cmdline_fmt, ..= .) =20 static void ide_test_quit(void) { + if (pcibus) { + qpci_free_pc(pcibus); + pcibus =3D NULL; + } pc_alloc_uninit(guest_malloc); guest_malloc =3D NULL; qtest_end(); --=20 1.8.3.1 From nobody Mon Apr 29 02:59:44 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.zohomail.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; dmarc=fail(p=none dis=none) header.from=redhat.com Return-Path: Received: from lists.gnu.org (208.118.235.17 [208.118.235.17]) by mx.zohomail.com with SMTPS id 1542711437620121.75364927119108; Tue, 20 Nov 2018 02:57:17 -0800 (PST) Received: from localhost ([::1]:33020 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gP3iN-0000Sj-3w for importer@patchew.org; Tue, 20 Nov 2018 05:57:07 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:46714) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gP3ea-00067L-8R for qemu-devel@nongnu.org; Tue, 20 Nov 2018 05:53:13 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1gP3eZ-0008MF-Ib for qemu-devel@nongnu.org; Tue, 20 Nov 2018 05:53:12 -0500 Received: from mx1.redhat.com ([209.132.183.28]:56692) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1gP3eZ-0008Jv-B9 for qemu-devel@nongnu.org; Tue, 20 Nov 2018 05:53:11 -0500 Received: from smtp.corp.redhat.com (int-mx08.intmail.prod.int.phx2.redhat.com [10.5.11.23]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 1D68B31806FA; Tue, 20 Nov 2018 10:53:10 +0000 (UTC) Received: from thuth.com (ovpn-116-127.ams2.redhat.com [10.36.116.127]) by smtp.corp.redhat.com (Postfix) with ESMTP id 4E06927BC8; Tue, 20 Nov 2018 10:53:08 +0000 (UTC) From: Thomas Huth To: qemu-devel@nongnu.org, Peter Maydell Date: Tue, 20 Nov 2018 11:52:23 +0100 Message-Id: <1542711143-1946-4-git-send-email-thuth@redhat.com> In-Reply-To: <1542711143-1946-1-git-send-email-thuth@redhat.com> References: <1542711143-1946-1-git-send-email-thuth@redhat.com> X-Scanned-By: MIMEDefang 2.84 on 10.5.11.23 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.41]); Tue, 20 Nov 2018 10:53:10 +0000 (UTC) X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 209.132.183.28 Subject: [Qemu-devel] [PULL 3/3] qtest: log QEMU command line 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: Laurent Vivier , =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= , Thomas Huth , Markus Armbruster Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" From: Paolo Bonzini Record the command line that was used to start QEMU. This can be useful for debugging. Signed-off-by: Paolo Bonzini Reviewed-by: Laurent Vivier [thuth: removed trailing \n from the message string] Signed-off-by: Thomas Huth --- tests/libqtest.c | 26 +++++++++++++++----------- 1 file changed, 15 insertions(+), 11 deletions(-) diff --git a/tests/libqtest.c b/tests/libqtest.c index 44ce118..75e07e1 100644 --- a/tests/libqtest.c +++ b/tests/libqtest.c @@ -215,24 +215,28 @@ QTestState *qtest_init_without_qmp_handshake(bool use= _oob, =20 qtest_add_abrt_handler(kill_qemu_hook_func, s); =20 + command =3D g_strdup_printf("exec %s " + "-qtest unix:%s,nowait " + "-qtest-log %s " + "-chardev socket,path=3D%s,nowait,id=3Dchar0= " + "-mon chardev=3Dchar0,mode=3Dcontrol%s " + "-machine accel=3Dqtest " + "-display none " + "%s", qemu_binary, socket_path, + getenv("QTEST_LOG") ? "/dev/fd/2" : "/dev/nu= ll", + qmp_socket_path, use_oob ? ",x-oob=3Don" : "= ", + extra_args ?: ""); + + g_test_message("starting QEMU: %s", command); + s->qemu_pid =3D fork(); if (s->qemu_pid =3D=3D 0) { setenv("QEMU_AUDIO_DRV", "none", true); - command =3D g_strdup_printf("exec %s " - "-qtest unix:%s,nowait " - "-qtest-log %s " - "-chardev socket,path=3D%s,nowait,id=3Dc= har0 " - "-mon chardev=3Dchar0,mode=3Dcontrol%s " - "-machine accel=3Dqtest " - "-display none " - "%s", qemu_binary, socket_path, - getenv("QTEST_LOG") ? "/dev/fd/2" : "/de= v/null", - qmp_socket_path, use_oob ? ",x-oob=3Don"= : "", - extra_args ?: ""); execlp("/bin/sh", "sh", "-c", command, NULL); exit(1); } =20 + g_free(command); s->fd =3D socket_accept(sock); if (s->fd >=3D 0) { s->qmp_fd =3D socket_accept(qmpsock); --=20 1.8.3.1