From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from lists1p.gnu.org (lists1p.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id ED42FC79F99 for ; Sun, 6 Sep 2026 08:43:58 +0000 (UTC) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists1p.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1x38T1-0004DL-3o; Sun, 06 Sep 2026 04:43:11 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists1p.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1x38Sz-0004Bb-9V for qemu-arm@nongnu.org; Sun, 06 Sep 2026 04:43:09 -0400 Received: from us-smtp-delivery-124.mimecast.com ([170.10.129.124]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1x38Sw-00086e-B3 for qemu-arm@nongnu.org; Sun, 06 Sep 2026 04:43:08 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1788684185; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=WqEb8sFA4s67FLLQbRpHSkBnZ3bKXqwlmnJlhobFr1M=; b=AUfwd/XXAFRhs+rEyCAXlys1nBDuqIlFFRX6NgJGTCsWeXadk5rmiV/T6v9xVfMoEnMw3z nWlpoAMTa8ZNmpediZYO2eYySY34BQgWFgjCcvDxR9gOJC83eM8WUOZelG7bMZ36CNmrmm 38M7ng+cboqc64KUTFpdKZHZpxiNuaI= Received: from mx-prod-mc-03.mail-002.prod.us-west-2.aws.redhat.com (ec2-54-186-198-63.us-west-2.compute.amazonaws.com [54.186.198.63]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-711-nYTD-qONNrmghtQZMvTPHg-1; Sun, 06 Sep 2026 04:43:02 -0400 X-MC-Unique: nYTD-qONNrmghtQZMvTPHg-1 X-Mimecast-MFC-AGG-ID: nYTD-qONNrmghtQZMvTPHg_1788684180 Received: from mx-prod-int-08.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-08.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.111]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by mx-prod-mc-03.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id 9E3F51955E77; Sun, 6 Sep 2026 08:42:59 +0000 (UTC) Received: from localhost (headnet04.pony-001.prod.iad2.dc.redhat.com [10.2.32.116]) by mx-prod-int-08.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id 90FB9180034F; Sun, 6 Sep 2026 08:42:58 +0000 (UTC) From: =?utf-8?q?Marc-Andr=C3=A9_Lureau?= Date: Sun, 06 Sep 2026 12:42:36 +0400 Subject: [PATCH 5/9] tests/ide-test: convert to QMP MIME-Version: 1.0 Message-Id: <20260906-nohmp-v1-5-daee96491c43@redhat.com> References: <20260906-nohmp-v1-0-daee96491c43@redhat.com> In-Reply-To: <20260906-nohmp-v1-0-daee96491c43@redhat.com> To: qemu-devel@nongnu.org Cc: John Snow , "Denis V. Lunev" , Fabiano Rosas , Laurent Vivier , Paolo Bonzini , qemu-block@nongnu.org, Peter Maydell , Thomas Huth , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , Aurelien Jarno , qemu-arm@nongnu.org, Halil Pasic , Christian Borntraeger , Eric Farman , Matthew Rosato , Cornelia Huck , qemu-s390x@nongnu.org, =?utf-8?q?Daniel_P=2E_Berrang=C3=A9?= , Glenn Miles , qemu-ppc@nongnu.org, =?utf-8?q?Marc-Andr=C3=A9_Lureau?= X-Developer-Signature: v=1; a=openpgp-sha256; l=2901; i=marcandre.lureau@redhat.com; h=from:subject:message-id; bh=lczRn0yub3gfwsy8LjcshX7XjtY9uvd4i7DdqHF0ttg=; b=owEBbQKS/ZANAwAKAdro4Ql1lpzlAcsmYgBqnSd5fe3nwtDNZJpxTNStR2g3N92mGRLrfLySY br/WQ3ar2yJAjMEAAEKAB0WIQSHqb2TP4fGBtJ29i3a6OEJdZac5QUCap0neQAKCRDa6OEJdZac 5cOxD/9p3Jm1PfOvxspcGscxidXnTjFnoFM1f/XZpk6hjEQtr3VxnDuT7Knrsp9wYHF/5B/Iyd7 3efu3jOpoJyZKQ1m+HQUEvVx2yyGY1iGbah3i0ObauKZv0k1XLy62ApCtX4JmLOaHJgVPG3l/Gc xIolwIkyOvgVzVZhKr8syyHZmohdUCIgF3eaop0ypYIhZndFK0UryZwdVz7MVAo+7MNO5+Wgadj xBjdbW46UrHTHyDMfU9fgzAZTfOOyGc8v5O7qcwicGbW2ngRG8fvjRT6IfKAFx95zgQ69BmrMd2 7yKwqEcqu2fzprX/m/TwOhwigmgi3LNH29h8VyXhVDyxq5IS4DbDudNlmDleQXup6sbURIHIu+V xxTEGqBSJQ4DtZ19EYx1D0A1sbllvqqTsrrJ/PfhLa4Z8wLFU9BcMk0WocbNH1cFNbT32gOxQXO nX+c5BG1L2Gxy8yeY9geXllPqJ/L+xSy09+c2wG6ohU8Sc9+ICN/9QICBG9dU442gsf3OupYrAJ 1aCMzDgZSiGrPO2d8/e9ukc1f2y1/fxW7lq2S4VOA+VyxEZoGjzIclqhfQBXZKZXspC4vSXa7tI P9IhtCZzo73EKMhlvSHAPEQIn94DdJlw6vNrSm25ZRVkRmIsnSeU3jMX4hLSWFxwf8lErvJ5IBw 3cw492mxjifeaKA== X-Developer-Key: i=marcandre.lureau@redhat.com; a=openpgp; fpr=87A9BD933F87C606D276F62DDAE8E10975969CE5 X-Scanned-By: MIMEDefang 3.4.1 on 10.30.177.111 X-Mimecast-MFC-PROC-ID: vPIwKmL2D2vw6moLNUSpEoS6BgL4qqmZS2FlFamlLaE_1788684180 X-Mimecast-Originator: redhat.com Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 8bit Received-SPF: pass client-ip=170.10.129.124; envelope-from=marcandre.lureau@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: 12 X-Spam_score: 1.2 X-Spam_bar: + X-Spam_report: (1.2 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.001, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H2=0.001, RCVD_IN_SBL_CSS=3.335, SPF_HELO_PASS=-0.001, SPF_PASS=-0.001 autolearn=no autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-arm@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-arm-bounces+qemu-arm=archiver.kernel.org@nongnu.org Sender: qemu-arm-bounces+qemu-arm=archiver.kernel.org@nongnu.org The QMP command is explicit, specify both the vmstate and devices. We use the helper introduced previously to wait for job completion. Signed-off-by: Marc-André Lureau --- tests/qtest/ide-test.c | 37 ++++++++++++++++++++++++++++--------- 1 file changed, 28 insertions(+), 9 deletions(-) diff --git a/tests/qtest/ide-test.c b/tests/qtest/ide-test.c index 895fec6d0806..cf109b079982 100644 --- a/tests/qtest/ide-test.c +++ b/tests/qtest/ide-test.c @@ -1345,11 +1345,34 @@ static void ide_prepare_markers(QTestState *qts, QPCIDevice *dev, ide_write_marker(qts, dev, ide_bar, 63, CHS_MARKER_DEFAULT); } -static void ide_hmp_quiet(QTestState *qts, const char *command) +static void ide_snapshot_save(QTestState *qts, const char *tag, + const char *vmstate, const char *device) { - g_autofree char *out = qtest_hmp(qts, "%s", command); + qtest_qmp_assert_success(qts, + "{ 'execute': 'snapshot-save'," + " 'arguments': {" + " 'job-id': 'save0'," + " 'tag': %s," + " 'vmstate': %s," + " 'devices': [%s]" + " }" + "}", tag, vmstate, device); + qtest_qmp_job_wait(qts, "save0"); +} - g_assert_cmpstr(out, ==, ""); +static void ide_snapshot_load(QTestState *qts, const char *tag, + const char *vmstate, const char *device) +{ + qtest_qmp_assert_success(qts, + "{ 'execute': 'snapshot-load'," + " 'arguments': {" + " 'job-id': 'load0'," + " 'tag': %s," + " 'vmstate': %s," + " 'devices': [%s]" + " }" + "}", tag, vmstate, device); + qtest_qmp_job_wait(qts, "load0"); } static char *ide_migration_status(QTestState *qts) @@ -1455,10 +1478,6 @@ static void test_migrate_chs_snapshot(void) char marker[9]; int fd; -#ifndef CONFIG_HMP - g_test_skip("HMP not enabled"); - return; -#endif if (!have_qemu_img()) { g_test_skip("QTEST_QEMU_IMG not set, snapshots need a qcow2 image"); return; @@ -1480,13 +1499,13 @@ static void test_migrate_chs_snapshot(void) /* Snapshot taken while the default translation is in effect */ ide_read_chs_marker(qts, dev, ide_bar, 0, 1, 1, marker); g_assert_cmpstr(marker, ==, CHS_MARKER_DEFAULT); - ide_hmp_quiet(qts, "savevm s0"); + ide_snapshot_save(qts, "s0", "hda", "hda"); ide_set_translation(dev, ide_bar, 8, 32); ide_read_chs_marker(qts, dev, ide_bar, 0, 1, 1, marker); g_assert_cmpstr(marker, ==, CHS_MARKER_CUSTOM); - ide_hmp_quiet(qts, "loadvm s0"); + ide_snapshot_load(qts, "s0", "hda", "hda"); ide_read_chs_marker(qts, dev, ide_bar, 0, 1, 1, marker); g_assert_cmpstr(marker, ==, CHS_MARKER_DEFAULT); -- 2.55.0.543.g5ebe2ebe4ea8