From nobody Tue Aug 25 04:33:59 2026 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=quarantine dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1779313920; cv=none; d=zohomail.com; s=zohoarc; b=Qcle82vc9GbJoItMNmDKgAgcEouXfKZ95AXqJ7LUG7DoQaonPmvS1VmINKXKmrWbNGYTxUv8HLnoPgYSf1db66xAZj0+oraEBF6WBASgOShJjpdlhfsNvDDqVtPxMiHXQVyKWcaM6YI/i3kbNybcrTAEPChPZISJVp2C0iUdeXc= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1779313920; h=Content-Type:Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=y1Mue0S2X6VyYUNIZGExwsUa2eSlbjX3q6PRbrp4a54=; b=HK0H3B5YJGo6waxPxauyHyGDDSCtqrAM8bGCiI91Rylg+vDNhORm1U6MivXU9CSfZsU3J8JBi88DW5RfhwTbKsh/StFMxGQjQuzLgD/v2ehAS/0OkJeXM57K7NtrX1Qe8GgTxHGlG4s7Tfs7WVnRB2wcm9ERhH3jxY6O1Omi4pk= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=quarantine dis=none) Return-Path: Received: from lists1p.gnu.org (lists1p.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 177931392044699.16234901683663; Wed, 20 May 2026 14:52:00 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists1p.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1wPopW-00033z-S9; Wed, 20 May 2026 17:51:54 -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 1wPopV-0002t0-6i for qemu-devel@nongnu.org; Wed, 20 May 2026 17:51:53 -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 1wPopP-0004cU-QV for qemu-devel@nongnu.org; Wed, 20 May 2026 17:51:52 -0400 Received: from mx-prod-mc-06.mail-002.prod.us-west-2.aws.redhat.com (ec2-35-165-154-97.us-west-2.compute.amazonaws.com [35.165.154.97]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-643-HBIb78TdPJCykXBztEbVqg-1; Wed, 20 May 2026 17:51:45 -0400 Received: from mx-prod-int-10.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-10.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.95]) (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-06.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id A299F180061B for ; Wed, 20 May 2026 21:51:44 +0000 (UTC) Received: from localhost (unknown [10.44.24.26]) by mx-prod-int-10.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id 5AFDD1681; Wed, 20 May 2026 21:51:42 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1779313907; 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=y1Mue0S2X6VyYUNIZGExwsUa2eSlbjX3q6PRbrp4a54=; b=cF7869iWBfWXa/CUT2S604hUJSE4ySgJJisnEMz8kT+duyE1l3yAxXU0Lkdlg8wcX0UjYL RklP7p9pvDHhjmiS1SQ1nWgvm9gB03ptYWBLnQL9UkxJ30H+7ek58CFpTCdgivXx2XQcDn YJC3kweefxGpkAJJpKkfsyw/GuVhpyk= X-MC-Unique: HBIb78TdPJCykXBztEbVqg-1 X-Mimecast-MFC-AGG-ID: HBIb78TdPJCykXBztEbVqg_1779313904 From: =?utf-8?q?Marc-Andr=C3=A9_Lureau?= Date: Thu, 21 May 2026 01:49:17 +0400 Subject: [PATCH 16/40] tests/qemu-iotests/N: use x-qemu-io QMP command MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Message-Id: <20260521-qemu-no-hmp-v1-16-d104f809e145@redhat.com> References: <20260521-qemu-no-hmp-v1-0-d104f809e145@redhat.com> In-Reply-To: <20260521-qemu-no-hmp-v1-0-d104f809e145@redhat.com> To: qemu-devel@nongnu.org Cc: =?utf-8?q?Marc-Andr=C3=A9_Lureau?= X-Developer-Signature: v=1; a=openpgp-sha256; l=26085; i=marcandre.lureau@redhat.com; h=from:subject:message-id; bh=W7tBIGjX9jcsMOsJY7Cyoyr/m4noj2riyG8PcEHAjc4=; b=owEBbQKS/ZANAwAKAdro4Ql1lpzlAcsmYgBqDiyDpliVo5W90G9OAOfDYKxiB1tvjNAGobr/o FbE3XcDGx6JAjMEAAEKAB0WIQSHqb2TP4fGBtJ29i3a6OEJdZac5QUCag4sgwAKCRDa6OEJdZac 5Q7GD/9Ya1T/eeUEh2uLYtphdI9Obv5+Njcmofo131Kw4+vMXIkB71pwE3kPgFtupdhYpIxTLZN qNfY08k71waSoAjwft2ml8AXuloDbgxWw/rDViKuzOSLfGlK6nhVvXEbKy5HeSXGrqa4g/ZuODn EpFZMu/Xizi2Sj6VM4JzvuQ2M7FblX+csc3N16PUsRaUBvGrMECxn+6UqzI10lljQREV/YyBIO/ JGPfJJAPmf2HsbSDgr0cXctoAnsw0T3P4UPM//wg1Yw4RpJs/VtF/Nfc40zt1TjCcKlGLEsJgfG 9lvrhakgkaPAUeIh54/DsBUkUwRytbT9P31Hm+S8b4SAx9yAHppOuU//IPUQySHzVYm4TRGM5kU PCkcogaPwnBd9IQcecKcwzZ7SNGoYdzwEQ7UitVmE0h4s4E6lUH+QXsNyrkPkexp7Ro/kx/LvTM tho3BxKTbKACVzLUQyV031Bm+NmhCekEtPD9fXNqWxk55yjrXjAa3Dm+tL7MmO7qVeONNwDCeNu Oqx+4KFmHSEl3c+7jyURaY+M5LmlcCh1fyKX19+l7QoMB/Qr5NipZujO54cE67Dw5U7EXfF5twg fr/Ze5QJGtE8SNdfuWoQJVuCRsFUrUJ0D4hjFtiaxiKbMgf8dkmYdXIJIzRSpSoMydFSob1HJIp tnhsZuERWOaldEg== X-Developer-Key: i=marcandre.lureau@redhat.com; a=openpgp; fpr=87A9BD933F87C606D276F62DDAE8E10975969CE5 X-Scanned-By: MIMEDefang 3.6 on 10.30.177.95 Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists1p.gnu.org; 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: -24 X-Spam_score: -2.5 X-Spam_bar: -- X-Spam_report: (-2.5 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.445, 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_H4=0.001, RCVD_IN_MSPIKE_WL=0.001, SPF_HELO_PASS=-0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: qemu development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1779313922631154100 Replace human-monitor-command wrapping of the HMP qemu-io command with direct x-qemu-io QMP calls in the two test cases that exercised corrupted image behavior through the monitor. The only output change is the QMP response: {"return": {}} (void) instead of {"return": ""} (empty HMP string). Signed-off-by: Marc-Andr=C3=A9 Lureau --- tests/qemu-iotests/060 | 8 ++++---- tests/qemu-iotests/060.out | 2 +- tests/qemu-iotests/071 | 30 +++++++++++++++++------------ tests/qemu-iotests/071.out | 8 ++++---- tests/qemu-iotests/117 | 5 +++-- tests/qemu-iotests/117.out | 7 ++++--- tests/qemu-iotests/120 | 4 ++-- tests/qemu-iotests/120.out | 2 +- tests/qemu-iotests/156 | 36 +++++++++++++++++----------------- tests/qemu-iotests/156.out | 48 +++++++++++++++++++++++-------------------= ---- tests/qemu-iotests/161 | 18 ++++++++--------- tests/qemu-iotests/161.out | 24 +++++++++++------------ tests/qemu-iotests/249 | 12 ++++++------ tests/qemu-iotests/249.out | 18 ++++++++--------- tests/qemu-iotests/283 | 4 ++-- tests/qemu-iotests/283.out | 4 ++-- 16 files changed, 119 insertions(+), 111 deletions(-) diff --git a/tests/qemu-iotests/060 b/tests/qemu-iotests/060 index 5cd21a6f686..c2c1cd815f0 100755 --- a/tests/qemu-iotests/060 +++ b/tests/qemu-iotests/060 @@ -449,8 +449,8 @@ echo _make_test_img 64M poke_file "$TEST_IMG" "$rt_offset" "\x00\x00\x00\x00\x00\x00\x00\x0= 0" echo "{'execute': 'qmp_capabilities'} - {'execute': 'human-monitor-command', - 'arguments': {'command-line': 'qemu-io drive \"write 0 512\"'}} + {'execute': 'x-qemu-io', + 'arguments': {'device': 'drive', 'command': 'write 0 512'}} {'execute': 'quit'}" \ | $QEMU -qmp stdio -nographic -nodefaults \ -drive if=3Dnone,node-name=3Ddrive,file=3D"$TEST_IMG",driver= =3Dqcow2 \ @@ -468,8 +468,8 @@ poke_file "$TEST_IMG" "$l1_offset" "\x00\x00\x00\x00\x2= a\x2a\x2a\x2a" # Inactive images are effectively read-only images, so this should be a # non-fatal corruption (which does not modify the image) echo "{'execute': 'qmp_capabilities'} - {'execute': 'human-monitor-command', - 'arguments': {'command-line': 'qemu-io drive \"read 0 512\"'}} + {'execute': 'x-qemu-io', + 'arguments': {'device': 'drive', 'command': 'read 0 512'}} {'execute': 'quit'}" \ | $QEMU -qmp stdio -nographic -nodefaults \ -blockdev "{'node-name': 'drive', diff --git a/tests/qemu-iotests/060.out b/tests/qemu-iotests/060.out index 27275fd6b70..7d3bfc97450 100644 --- a/tests/qemu-iotests/060.out +++ b/tests/qemu-iotests/060.out @@ -419,7 +419,7 @@ qcow2: Marking image as corrupt: Preventing invalid wri= te on metadata (overlaps QMP_VERSION {"return": {}} {"timestamp": {"seconds": TIMESTAMP, "microseconds": TIMESTAMP}, "event"= : "BLOCK_IMAGE_CORRUPTED", "data": {"device": "none0", "msg": "Preventing i= nvalid write on metadata (overlaps with refcount table)", "offset": 65536, = "node-name": "drive", "fatal": true, "size": 65536}} -{"return": "Error: write failed: Input/output error\r\n"} +{"error": {"class": "GenericError", "desc": "write failed: Input/output er= ror"}} {"timestamp": {"seconds": TIMESTAMP, "microseconds": TIMESTAMP}, "event"= : "SHUTDOWN", "data": {"guest": false, "reason": "host-qmp-quit"}} {"return": {}} =20 diff --git a/tests/qemu-iotests/071 b/tests/qemu-iotests/071 index 331f8cfddcf..463f5c02349 100755 --- a/tests/qemu-iotests/071 +++ b/tests/qemu-iotests/071 @@ -139,9 +139,10 @@ run_qemu <