From nobody Sat Sep 26 20:01:40 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=1790108368; cv=none; d=zohomail.com; s=zohoarc; b=kAGBEzMgFtAj/ljuD8aXsVP6wzzlkxX+yyMuYRT3mGJvHp8t8tKGQcj1xld64HjCa05R2tALbipfQ84Xe0nWWnkuogl2GVELWI4OltkUQZ6KVdlvuScfgXQI0eRBDw/dtxUZCd4kFTkw85BhZ+AcC+7l3AxjJFcgTr4jD1BRvEY= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1790108368; 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:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=69y9HyL13lSknhbAxE4hbmWgv5ZVHGP2g+fYLGQQEkA=; b=T3VHpJEdpAl10rV8b7ymRA2Mec1gCSDODxCZkhRIYcemDWzbyDZCw79MqFSmFMJVLPwmokP3lJGJ2DUftU4PdYZWZJtsw+iPttDmTZRrgPrBdNGk1Ct6KnXoP1eDiucCpb0U+ElowN9BQYuRmORbGF/sbBlWfU+mv3duI/Bn7SQ= 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 1790108368601753.9399980016993; Tue, 22 Sep 2026 13:19:28 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists1p.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1x96xX-0003ad-Uh; Tue, 22 Sep 2026 16:19:24 -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 1x96xQ-0003Tn-GJ for qemu-devel@nongnu.org; Tue, 22 Sep 2026 16:19:21 -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 1x96xM-00080E-2W for qemu-devel@nongnu.org; Tue, 22 Sep 2026 16:19:16 -0400 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-247-9AaZk9M_NFC1lD1pg3sgRg-1; Tue, 22 Sep 2026 16:19:09 -0400 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 26464193E884; Tue, 22 Sep 2026 20:19:08 +0000 (UTC) Received: from localhost (headnet03.pony-001.prod.iad2.dc.redhat.com [10.2.32.114]) by mx-prod-int-08.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id E2AC41800446; Tue, 22 Sep 2026 20:19:06 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1790108351; 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=69y9HyL13lSknhbAxE4hbmWgv5ZVHGP2g+fYLGQQEkA=; b=I48w7o0ghziiA19phmolAJg4EqFhUb+eHJ0WlUYGPcYb2jeRKQ2yCnS0bzoNC47i4XWKYw TuFBLR5xhmHmw/mOz7GBo/URhvB2je566qfBqkyRcKHZuuBbb1pCA98bCBoALV197kjwOE M8beJQ0D8bCBLInt/pyndGabJujeK5o= X-MC-Unique: 9AaZk9M_NFC1lD1pg3sgRg-1 X-Mimecast-MFC-AGG-ID: 9AaZk9M_NFC1lD1pg3sgRg_1790108348 From: =?utf-8?q?Marc-Andr=C3=A9_Lureau?= Date: Wed, 23 Sep 2026 00:17:08 +0400 Subject: [PATCH 01/88] scripts/checkpatch: skip trailer checks inside patch diff MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Message-Id: <20260923-nohmp-v1-1-ebc029d4bd80@redhat.com> References: <20260923-nohmp-v1-0-ebc029d4bd80@redhat.com> In-Reply-To: <20260923-nohmp-v1-0-ebc029d4bd80@redhat.com> To: qemu-devel@nongnu.org Cc: Kevin Wolf , =?utf-8?q?Marc-Andr=C3=A9_Lureau?= , Chao Liu X-Developer-Signature: v=1; a=openpgp-sha256; l=923; i=marcandre.lureau@redhat.com; h=from:subject:message-id; bh=qrLUe2DgABzIRe9O7ucC6nnmE7YYrgIhHXKXGq9YC6M=; b=owEBbQKS/ZANAwAKAdro4Ql1lpzlAcsmYgBqsuKtJVfTtcJ9IGw0dOU8em/IuhlgCO/+siZKf 94vwddYRkiJAjMEAAEKAB0WIQSHqb2TP4fGBtJ29i3a6OEJdZac5QUCarLirQAKCRDa6OEJdZac 5X8qEACBzIdoEDQdOKlM2DgsDFG/K3BJrtaVzC9xfFgcQsxA19vON2zX1Opp+Sn3+kFNlZsY4cW pDxQ5Kb4Q0wp6Lm/iDVFxMYP3todAQF9S3JXcDookybn/Td7Zwp45cXgftl7/KMmogodKX2ZoZz GHCHzQJ/WaTRNldrgNFiYhRSboY3+VQmIz6vczRCW+yF5DTC2Nm+3btlTJS4fIJqPRYozK/NYUg HdJR88V/7Z5s8obXIe92HasTa9kjjQBvj/HDKhx7RYARh2FIj8ba94A/U/4wkYMdDrR/JpqkxMt zCQrkzM+Z1jXW89PBcfU38uS1oDapa+xK23mXC/spJMhAXH2pG2kDXTRUHkqVu8WyKINJ45OP+X xWjzS28IAVPP3EzpHbTIsdON5NDEa4dMEFZurxtQgcTrdbWQPKIuk8zTz1NxOUd2d2GuqAOne2a bJiIaPI0WUGjZWYcq9nX2wwBaKmnn1BibmML4kQ3G0BDQZsI1T5W9lgdMKvHNzjJ5KwNxH36lfq 4omDEeGNUn92E4PY4S6MO9zxJrY+Wg3VU2C9rgyxRqWnPbThoaGiY92mWUykN2fL+g301EFDYkc owrpPc/Wvx0Sc9sjtnCEXrLas0aQTG5VqjWoo2PYbATDOdSCwCllWKlNq+QM1IIzPrDnIhb6N+C bQjA4NwoJlEhbXQ== X-Developer-Key: i=marcandre.lureau@redhat.com; a=openpgp; fpr=87A9BD933F87C606D276F62DDAE8E10975969CE5 X-Scanned-By: MIMEDefang 3.4.1 on 10.30.177.111 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: 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, T_SPF_TEMPERROR=0.01 autolearn=no 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: 1790108369389158500 The duplicate-trailer and self-review checks matched trailer-like lines inside the diff body, not just in the commit message. Gate the check on !$is_patch so it only runs before the diff starts. Fixes: c3db8e70451 ("scripts/checkpatch: warn on duplicate trailers and sel= f-review") Signed-off-by: Marc-Andr=C3=A9 Lureau --- scripts/checkpatch.pl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/checkpatch.pl b/scripts/checkpatch.pl index 9838a6417851..c023767f9670 100755 --- a/scripts/checkpatch.pl +++ b/scripts/checkpatch.pl @@ -1834,7 +1834,7 @@ sub process { } =20 # Check for duplicate trailers and self-review - if (!$in_header_lines && + if (!$in_header_lines && !$is_patch && $line =3D~ /^\s*([A-Z][a-zA-Z]*(?:-[a-zA-Z]+)*):\s*(.+)/) { my $trailer_type =3D $1; my $trailer_value =3D $2; --=20 2.56.0.rc0.29.g47ce80527c56 From nobody Sat Sep 26 20:01:40 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=1790108385; cv=none; d=zohomail.com; s=zohoarc; b=FjkMjsLXBb4CuchOqW7gM3sQ5puH8TiGKFhSHlC3fDMqwkPxIJGNtSWKZHqLvyEhhSUtQKZoxNSZS/+jsEU/YN4A/36LytQtaIZpLOnuZN1mnD+08PMcpmmIzilZ8B1Gtwgafe9mKN6pMLkDFG4QZ3FINUTm2T+QrdivSIgrFuI= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1790108385; 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:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=1LK+1iYM3EVcRmDWxxwQd6hqG6qpIuWRBAQPvCkDbqY=; b=Bvgsi7Vp3/ms3kESFJim6LCIBkDf3tJZz9miXPwL1aFWuBfqV1qgCma6JG2ewmRp8YDLY0lRbKZO96vAs6H7/QDyWqj4p2HPnWv8DHl7/65CSeZfjMHiuczNz2LExQG/5ikIXeBDaSvhl1LpdWaYk6k6Fj2HxNUl5U7SCjxfsJc= 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 1790108385721486.95731557408874; Tue, 22 Sep 2026 13:19:45 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists1p.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1x96xc-0003lH-Nl; Tue, 22 Sep 2026 16:19:28 -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 1x96xY-0003e6-Le for qemu-devel@nongnu.org; Tue, 22 Sep 2026 16:19:25 -0400 Received: from us-smtp-delivery-124.mimecast.com ([170.10.133.124]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1x96xV-00080o-9J for qemu-devel@nongnu.org; Tue, 22 Sep 2026 16:19:24 -0400 Received: from mx-prod-mc-05.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-528-1blJMFq7Ok-ckmHNUuWsJg-1; Tue, 22 Sep 2026 16:19:17 -0400 Received: from mx-prod-int-05.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-05.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.17]) (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-05.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id B800A1955F2F; Tue, 22 Sep 2026 20:19:13 +0000 (UTC) Received: from localhost (headnet03.pony-001.prod.iad2.dc.redhat.com [10.2.32.114]) by mx-prod-int-05.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id F1F501956095; Tue, 22 Sep 2026 20:19:10 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1790108360; 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=1LK+1iYM3EVcRmDWxxwQd6hqG6qpIuWRBAQPvCkDbqY=; b=An+DvR4GE3x7AmH3BjrcVHMyjPNYq6qL71mEf5F/wyM8jEAyciCIHHWu1whuElY1mBKK7u U+2NmAj5oBe3Lfs4I5bQggps7w+LMpJxGHJNvgR8KI2oBqR0W2NjNMXKl+aeQV8Rqrd5cX vqmRcOfE2Rl9l0Q4vNcg1R6qwhkDiwI= X-MC-Unique: 1blJMFq7Ok-ckmHNUuWsJg-1 X-Mimecast-MFC-AGG-ID: 1blJMFq7Ok-ckmHNUuWsJg_1790108355 From: =?utf-8?q?Marc-Andr=C3=A9_Lureau?= Date: Wed, 23 Sep 2026 00:17:09 +0400 Subject: [PATCH 02/88] build-sys: bump minimum glib version to v2.68 MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Message-Id: <20260923-nohmp-v1-2-ebc029d4bd80@redhat.com> References: <20260923-nohmp-v1-0-ebc029d4bd80@redhat.com> In-Reply-To: <20260923-nohmp-v1-0-ebc029d4bd80@redhat.com> To: qemu-devel@nongnu.org Cc: Kevin Wolf , =?utf-8?q?Marc-Andr=C3=A9_Lureau?= , Richard Henderson , Paolo Bonzini , =?utf-8?q?Alex_Benn=C3=A9e?= , Pierrick Bouvier , Alexandre Iooss , Christian Schoenebeck , Greg Kurz , "Michael S. Tsirkin" , Igor Mammedov , Ani Sinha , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , Zhao Liu , Stefan Weil , Jason Wang , Gerd Hoffmann , Fam Zheng , Alex Williamson , =?utf-8?q?C=C3=A9dric_Le_Goater?= , Laurent Vivier , Helge Deller , =?utf-8?q?Daniel_P=2E_Berrang=C3=A9?= , Zhang Chen , Li Zhijian , Markus Armbruster , Michael Roth , Chao Liu , Peter Xu X-Developer-Signature: v=1; a=openpgp-sha256; l=19711; i=marcandre.lureau@redhat.com; h=from:subject:message-id; bh=EXLyyH7deMN1AQFmJ94dFqhJDdC3zkdv7UwNTAYmLgM=; b=owEBbQKS/ZANAwAKAdro4Ql1lpzlAcsmYgBqsuKuI9Zm/EGrub9mMBn9LZ1h2jfhrTecJdb2h H9iQusyfQKJAjMEAAEKAB0WIQSHqb2TP4fGBtJ29i3a6OEJdZac5QUCarLirgAKCRDa6OEJdZac 5ZPqEACE1h4Le2sMNvIasZ4jpueaAs66zaEge5BFEQxIkNYGhyF9pLL7rmgHmqwoyWYOuuCf4VT 2WSAD12tK5yZQeGtJ0ockMrLltLu4ApRb0qxujPsfvzUirZpMM6GEQ3/ipR72Rsy1twYYV9D0U1 8nN3gRccb27ftfu5uJouIZxxYzXhSJUeToiyKQBhIbE3lJcNEPu58Xb8WCVmDrnKpeAfotZUMY8 3Svx93EjXXtKyFIXYkUCc0QYwjFIbsttzuhmZoPIHL7wpA80Lw1btIwL4BPBw7L5Grx/TugOs0g 0vkDM7HyNnsTwWHLasaS4JuLNs2D7X0N3XVaJdV8eS82t+6arbv9oTus0D5ZZ/nlHtDT8OYgF+m 1nPa3Li6R4rDrSVbpjfvT7of2dQK6wHbdG9EEGXZm9BWMabBsu80hPUFuHtZQ+ZbgBGOGxhMDgf CaCquUhDe3spy2Q864+XK6uZ9qxp1fLDqBLX3+Tsn7DJ7aViusdjsMAkzLcJGKpziOfRiEl1adb BeGT1WQb2eNyYARqn5wkDupRtjcrJeUX8LEO9lI0QF0ptSeX05QhSv6B/fL0BEsFfQ+SQNvTpaB 3T8hrV6Nq46YJFPdPVeUMj71ej0UKfzDEjNN8sNX9YUyhwNotLi3C11sPiGWnvI6IWtOhchFD4j knM17s6vX5YK/Vg== X-Developer-Key: i=marcandre.lureau@redhat.com; a=openpgp; fpr=87A9BD933F87C606D276F62DDAE8E10975969CE5 X-Scanned-By: MIMEDefang 3.0 on 10.30.177.17 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.133.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_H3=0.001, RCVD_IN_MSPIKE_WL=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-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: 1790108387798158500 CentOS Stream 9 bumped glib to 2.68, according to repology, this is the floor version: centos_stream_9 9 2.68.4 debian_12 12 2.74.6 fedora_43 43 2.86.5 freebsd 15.1 2.88.3 openbsd 7.8 2.88.3 opensuse_leap_15_6 15.6 2.78.6 ubuntu_24_04 24.04 2.80.0 homebrew rolling 2.90.0 msys2_mingw rolling 2.90.0 2.68 brings g_memdup2() for which we had a compat, but also has GStrvBuilder, g_string_replace(), g_test_get_path() among other nice API additions. Replace deprecate g_memdup() usage, and checkpatch check is now redundant with compile-time deprecation error. Signed-off-by: Marc-Andr=C3=A9 Lureau --- accel/tcg/cputlb.c | 4 ++-- contrib/plugins/lockstep.c | 25 ------------------------- hw/9pfs/9p-synth.c | 2 +- hw/9pfs/9p-util.h | 2 +- hw/9pfs/9p.c | 2 +- hw/acpi/core.c | 2 +- hw/core/machine.c | 2 +- hw/i386/multiboot.c | 2 +- hw/net/eepro100.c | 2 +- hw/nvram/fw_cfg.c | 8 ++++---- hw/scsi/mptsas.c | 5 +++-- hw/vfio/pci.c | 2 +- include/glib-compat.h | 41 ++--------------------------------------- linux-user/syscall.c | 2 +- linux-user/uaccess.c | 2 +- meson.build | 2 +- net/colo.c | 4 ++-- qapi/qapi-clone-visitor.c | 16 ++++++++-------- qapi/qapi-visit-core.c | 6 ++++-- scripts/checkpatch.pl | 5 ----- system/memory.c | 2 +- system/vl.c | 2 +- 22 files changed, 38 insertions(+), 102 deletions(-) diff --git a/accel/tcg/cputlb.c b/accel/tcg/cputlb.c index 7f7c208ba121..a91bd167cf8a 100644 --- a/accel/tcg/cputlb.c +++ b/accel/tcg/cputlb.c @@ -833,13 +833,13 @@ void tlb_flush_range_by_mmuidx_all_cpus_synced(CPUSta= te *src_cpu, /* Allocate a separate data block for each destination cpu. */ CPU_FOREACH(dst_cpu) { if (dst_cpu !=3D src_cpu) { - p =3D g_memdup(&d, sizeof(d)); + p =3D g_memdup2(&d, sizeof(d)); async_run_on_cpu(dst_cpu, tlb_flush_range_by_mmuidx_async_1, RUN_ON_CPU_HOST_PTR(p)); } } =20 - p =3D g_memdup(&d, sizeof(d)); + p =3D g_memdup2(&d, sizeof(d)); async_safe_run_on_cpu(src_cpu, tlb_flush_range_by_mmuidx_async_1, RUN_ON_CPU_HOST_PTR(p)); } diff --git a/contrib/plugins/lockstep.c b/contrib/plugins/lockstep.c index ed9d18460fe3..a92658f0115b 100644 --- a/contrib/plugins/lockstep.c +++ b/contrib/plugins/lockstep.c @@ -101,31 +101,6 @@ static void plugin_exit(void *p) plugin_cleanup(NULL); } =20 -/* - * g_memdup has been deprecated in Glib since 2.68 and - * will complain about it if you try to use it. However until - * glib_req_ver for QEMU is bumped we make a copy of the glib-compat - * handler. - */ -static inline gpointer g_memdup2_qemu(gconstpointer mem, gsize byte_size) -{ -#if GLIB_CHECK_VERSION(2, 68, 0) - return g_memdup2(mem, byte_size); -#else - gpointer new_mem; - - if (mem && byte_size !=3D 0) { - new_mem =3D g_malloc(byte_size); - memcpy(new_mem, mem, byte_size); - } else { - new_mem =3D NULL; - } - - return new_mem; -#endif -} -#define g_memdup2(m, s) g_memdup2_qemu(m, s) - static void report_divergance(ExecState *us, ExecState *them) { DivergeState divrec =3D { log, 0 }; diff --git a/hw/9pfs/9p-synth.c b/hw/9pfs/9p-synth.c index 3b3654b2820b..225bb43d8a9b 100644 --- a/hw/9pfs/9p-synth.c +++ b/hw/9pfs/9p-synth.c @@ -525,7 +525,7 @@ static int synth_name_to_path(FsContext *ctx, V9fsPath = *dir_path, out: /* Copy the node pointer to fid */ g_free(target->data); - target->data =3D g_memdup(&node, sizeof(void *)); + target->data =3D g_memdup2(&node, sizeof(void *)); target->size =3D sizeof(void *); return 0; } diff --git a/hw/9pfs/9p-util.h b/hw/9pfs/9p-util.h index 8dfa803dc2c0..68bc33eeeb72 100644 --- a/hw/9pfs/9p-util.h +++ b/hw/9pfs/9p-util.h @@ -265,7 +265,7 @@ static inline struct dirent *qemu_dirent_dup(struct dir= ent *dent) sz =3D offsetof(struct dirent, d_name) + strlen(dent->d_name) + 1; } - return g_memdup(dent, sz); + return g_memdup2(dent, sz); } =20 /* diff --git a/hw/9pfs/9p.c b/hw/9pfs/9p.c index 4764d9db13b1..ffb43993c7a3 100644 --- a/hw/9pfs/9p.c +++ b/hw/9pfs/9p.c @@ -229,7 +229,7 @@ void v9fs_path_copy(V9fsPath *dst, const V9fsPath *src) { v9fs_path_free(dst); dst->size =3D src->size; - dst->data =3D g_memdup(src->data, src->size); + dst->data =3D g_memdup2(src->data, src->size); } =20 int v9fs_name_to_path(V9fsState *s, V9fsPath *dirpath, diff --git a/hw/acpi/core.c b/hw/acpi/core.c index a6a62a742d11..3de7bbd6c6d9 100644 --- a/hw/acpi/core.c +++ b/hw/acpi/core.c @@ -647,7 +647,7 @@ void acpi_pm1_cnt_init(ACPIREGS *ar, MemoryRegion *pare= nt, suspend[3] =3D 1 | ((!disable_s3) << 7); suspend[4] =3D s4_val | ((!disable_s4) << 7); =20 - fw_cfg_add_file(fw_cfg, "etc/system-states", g_memdup(suspend, 6),= 6); + fw_cfg_add_file(fw_cfg, "etc/system-states", g_memdup2(suspend, 6)= , 6); } } =20 diff --git a/hw/core/machine.c b/hw/core/machine.c index 92f7be52a13f..c99b7ade2161 100644 --- a/hw/core/machine.c +++ b/hw/core/machine.c @@ -739,7 +739,7 @@ HotpluggableCPUList *machine_query_hotpluggable_cpus(Ma= chineState *machine) =20 cpu_item->type =3D g_strdup(machine->possible_cpus->cpus[i].type); cpu_item->vcpus_count =3D machine->possible_cpus->cpus[i].vcpus_co= unt; - cpu_item->props =3D g_memdup(&machine->possible_cpus->cpus[i].prop= s, + cpu_item->props =3D g_memdup2(&machine->possible_cpus->cpus[i].pro= ps, sizeof(*cpu_item->props)); =20 cpu =3D machine->possible_cpus->cpus[i].cpu; diff --git a/hw/i386/multiboot.c b/hw/i386/multiboot.c index d544b62afbd5..a59a59338975 100644 --- a/hw/i386/multiboot.c +++ b/hw/i386/multiboot.c @@ -387,7 +387,7 @@ int load_multiboot(X86MachineState *x86ms, mb_debug(" mb_mods_count =3D %d", mbs.mb_mods_count); =20 /* save bootinfo off the stack */ - mb_bootinfo_data =3D g_memdup(bootinfo, sizeof(bootinfo)); + mb_bootinfo_data =3D g_memdup2(bootinfo, sizeof(bootinfo)); =20 /* Pass variables to option rom */ fw_cfg_add_i32(fw_cfg, FW_CFG_KERNEL_ENTRY, mh_entry_addr); diff --git a/hw/net/eepro100.c b/hw/net/eepro100.c index aaa3eb60f8ab..cbf9e400f3ec 100644 --- a/hw/net/eepro100.c +++ b/hw/net/eepro100.c @@ -1883,7 +1883,7 @@ static void e100_nic_realize(PCIDevice *pci_dev, Erro= r **errp) =20 qemu_register_reset(nic_reset, s); =20 - s->vmstate =3D g_memdup(&vmstate_eepro100, sizeof(vmstate_eepro100)); + s->vmstate =3D g_memdup2(&vmstate_eepro100, sizeof(vmstate_eepro100)); s->vmstate->name =3D qemu_get_queue(s->nic)->model; vmstate_register_any(VMSTATE_IF(&pci_dev->qdev), s->vmstate, s); } diff --git a/hw/nvram/fw_cfg.c b/hw/nvram/fw_cfg.c index b057d870c004..62102f6cf3fc 100644 --- a/hw/nvram/fw_cfg.c +++ b/hw/nvram/fw_cfg.c @@ -197,7 +197,7 @@ static void fw_cfg_bootsplash(FWCfgState *s) /* use little endian format */ bst_le16 =3D cpu_to_le16(bst_val); fw_cfg_add_file(s, "etc/boot-menu-wait", - g_memdup(&bst_le16, sizeof bst_le16), sizeof bst_l= e16); + g_memdup2(&bst_le16, sizeof bst_le16), sizeof bst_= le16); } =20 /* insert splash file if user configurated */ @@ -247,7 +247,7 @@ static void fw_cfg_reboot(FWCfgState *s) } =20 rt_le32 =3D cpu_to_le32(rt_val); - fw_cfg_add_file(s, "etc/boot-fail-wait", g_memdup(&rt_le32, 4), 4); + fw_cfg_add_file(s, "etc/boot-fail-wait", g_memdup2(&rt_le32, 4), 4); } =20 static void fw_cfg_write(FWCfgState *s, uint8_t value) @@ -745,7 +745,7 @@ void fw_cfg_add_string(FWCfgState *s, uint16_t key, con= st char *value) size_t sz =3D strlen(value) + 1; =20 trace_fw_cfg_add_string(key, trace_key_name(key), value); - fw_cfg_add_bytes(s, key, g_memdup(value, sz), sz); + fw_cfg_add_bytes(s, key, g_memdup2(value, sz), sz); } =20 void fw_cfg_modify_string(FWCfgState *s, uint16_t key, const char *value) @@ -753,7 +753,7 @@ void fw_cfg_modify_string(FWCfgState *s, uint16_t key, = const char *value) size_t sz =3D strlen(value) + 1; char *old; =20 - old =3D fw_cfg_modify_bytes_read(s, key, g_memdup(value, sz), sz); + old =3D fw_cfg_modify_bytes_read(s, key, g_memdup2(value, sz), sz); g_free(old); } =20 diff --git a/hw/scsi/mptsas.c b/hw/scsi/mptsas.c index 5df124c0ce50..fef94ae28bb9 100644 --- a/hw/scsi/mptsas.c +++ b/hw/scsi/mptsas.c @@ -458,7 +458,8 @@ static void mptsas_process_scsi_task_mgmt(MPTSASState *= s, MPIMsgSCSITaskMgmt *re } else { MPTSASCancelNotifier *notifier; =20 - reply_async =3D g_memdup(&reply, sizeof(MPIMsgSCSITaskMgmt= Reply)); + reply_async =3D g_memdup2(&reply, + sizeof(MPIMsgSCSITaskMgmtReply)); reply_async->IOCLogInfo =3D INT_MAX; =20 count =3D 1; @@ -485,7 +486,7 @@ static void mptsas_process_scsi_task_mgmt(MPTSASState *= s, MPIMsgSCSITaskMgmt *re goto out; } =20 - reply_async =3D g_memdup(&reply, sizeof(MPIMsgSCSITaskMgmtReply)); + reply_async =3D g_memdup2(&reply, sizeof(MPIMsgSCSITaskMgmtReply)); reply_async->IOCLogInfo =3D INT_MAX; =20 count =3D 0; diff --git a/hw/vfio/pci.c b/hw/vfio/pci.c index 428ab2f06983..1a0dddbd8d94 100644 --- a/hw/vfio/pci.c +++ b/hw/vfio/pci.c @@ -2646,7 +2646,7 @@ static void vfio_add_ext_cap(VFIOPCIDevice *vdev, boo= l ats_needed) * physical device, we cache the config space to avoid overwriting * the original config space when we parse the extended capabilities. */ - config =3D g_memdup(pdev->config, vdev->config_size); + config =3D g_memdup2(pdev->config, vdev->config_size); =20 /* * Extended capabilities are chained with each pointing to the next, s= o we diff --git a/include/glib-compat.h b/include/glib-compat.h index 32ee2afdcdf5..1be08ab2764b 100644 --- a/include/glib-compat.h +++ b/include/glib-compat.h @@ -19,12 +19,12 @@ /* Ask for warnings for anything that was marked deprecated in * the defined version, or before. It is a candidate for rewrite. */ -#define GLIB_VERSION_MIN_REQUIRED GLIB_VERSION_2_66 +#define GLIB_VERSION_MIN_REQUIRED GLIB_VERSION_2_68 =20 /* Ask for warnings if code tries to use function that did not * exist in the defined version. These risk breaking builds */ -#define GLIB_VERSION_MAX_ALLOWED GLIB_VERSION_2_66 +#define GLIB_VERSION_MAX_ALLOWED GLIB_VERSION_2_68 =20 #pragma GCC diagnostic push #pragma GCC diagnostic ignored "-Wdeprecated-declarations" @@ -76,43 +76,6 @@ * without generating warnings. */ =20 -/* - * g_memdup2_qemu: - * @mem: (nullable): the memory to copy. - * @byte_size: the number of bytes to copy. - * - * Allocates @byte_size bytes of memory, and copies @byte_size bytes into = it - * from @mem. If @mem is %NULL it returns %NULL. - * - * This replaces g_memdup(), which was prone to integer overflows when - * converting the argument from a #gsize to a #guint. - * - * This static inline version is a backport of the new public API from - * GLib 2.68, kept internal to GLib for backport to older stable releases. - * See https://gitlab.gnome.org/GNOME/glib/-/issues/2319. - * - * Returns: (nullable): a pointer to the newly-allocated copy of the memor= y, - * or %NULL if @mem is %NULL. - */ -static inline gpointer g_memdup2_qemu(gconstpointer mem, gsize byte_size) -{ -#if GLIB_CHECK_VERSION(2, 68, 0) - return g_memdup2(mem, byte_size); -#else - gpointer new_mem; - - if (mem && byte_size !=3D 0) { - new_mem =3D g_malloc(byte_size); - memcpy(new_mem, mem, byte_size); - } else { - new_mem =3D NULL; - } - - return new_mem; -#endif -} -#define g_memdup2(m, s) g_memdup2_qemu(m, s) - static inline bool qemu_g_test_slow(void) { diff --git a/linux-user/syscall.c b/linux-user/syscall.c index 9f454502cb6f..8c62c52d7f2e 100644 --- a/linux-user/syscall.c +++ b/linux-user/syscall.c @@ -8373,7 +8373,7 @@ static abi_long do_open_by_handle_at(abi_long mount_f= d, abi_long handle, return -TARGET_EFAULT; } =20 - fh =3D g_memdup(target_fh, total_size); + fh =3D g_memdup2(target_fh, total_size); fh->handle_bytes =3D size; fh->handle_type =3D tswap32(target_fh->handle_type); =20 diff --git a/linux-user/uaccess.c b/linux-user/uaccess.c index f9bd713edd76..cddd60e0007b 100644 --- a/linux-user/uaccess.c +++ b/linux-user/uaccess.c @@ -16,7 +16,7 @@ void *lock_user(int type, abi_ulong guest_addr, ssize_t l= en, bool copy) host_addr =3D g2h_untagged(guest_addr); #ifdef CONFIG_DEBUG_REMAP if (copy) { - host_addr =3D g_memdup(host_addr, len); + host_addr =3D g_memdup2(host_addr, len); } else { host_addr =3D g_malloc0(len); } diff --git a/meson.build b/meson.build index cfac634cf13e..e9bf1c310ab4 100644 --- a/meson.build +++ b/meson.build @@ -1058,7 +1058,7 @@ have_xen_pci_passthrough =3D get_option('xen_pci_pass= through') \ # the _WIN32_WINNT setting in osdep.h according to the value from glib. # You should also check if any of the glib.version() checks # below can also be removed. -glib_req_ver =3D '>=3D2.66.0' +glib_req_ver =3D '>=3D2.68.0' glib_pc =3D dependency('glib-2.0', version: glib_req_ver, required: true, method: 'pkg-config') glib_cflags =3D [] diff --git a/net/colo.c b/net/colo.c index fb2c36a026f8..21d6b250015f 100644 --- a/net/colo.c +++ b/net/colo.c @@ -166,7 +166,7 @@ Packet *packet_new(const void *data, int size, int vnet= _hdr_len) { Packet *pkt =3D g_slice_new0(Packet); =20 - pkt->data =3D g_memdup(data, size); + pkt->data =3D g_memdup2(data, size); pkt->size =3D size; pkt->creation_ms =3D qemu_clock_get_ms(QEMU_CLOCK_HOST); pkt->vnet_hdr_len =3D vnet_hdr_len; @@ -221,7 +221,7 @@ Connection *connection_get(GHashTable *connection_track= _table, Connection *conn =3D g_hash_table_lookup(connection_track_table, key); =20 if (conn =3D=3D NULL) { - ConnectionKey *new_key =3D g_memdup(key, sizeof(*key)); + ConnectionKey *new_key =3D g_memdup2(key, sizeof(*key)); =20 conn =3D connection_new(key); =20 diff --git a/qapi/qapi-clone-visitor.c b/qapi/qapi-clone-visitor.c index 30997638de50..7ee26cb64464 100644 --- a/qapi/qapi-clone-visitor.c +++ b/qapi/qapi-clone-visitor.c @@ -37,7 +37,7 @@ static bool qapi_clone_start_struct(Visitor *v, const cha= r *name, void **obj, return true; } =20 - *obj =3D g_memdup(*obj, size); + *obj =3D g_memdup2(*obj, size); qcv->depth++; return true; } @@ -65,8 +65,8 @@ static GenericList *qapi_clone_next_list(Visitor *v, Gene= ricList *tail, QapiCloneVisitor *qcv =3D to_qcv(v); =20 assert(qcv->depth); - /* Unshare the tail of the list cloned by g_memdup() */ - tail->next =3D g_memdup(tail->next, size); + /* Unshare the tail of the list cloned by g_memdup2() */ + tail->next =3D g_memdup2(tail->next, size); return tail->next; } =20 @@ -83,7 +83,7 @@ static bool qapi_clone_type_int64(Visitor *v, const char = *name, int64_t *obj, QapiCloneVisitor *qcv =3D to_qcv(v); =20 assert(qcv->depth); - /* Value was already cloned by g_memdup() */ + /* Value was already cloned by g_memdup2() */ return true; } =20 @@ -93,7 +93,7 @@ static bool qapi_clone_type_uint64(Visitor *v, const char= *name, QapiCloneVisitor *qcv =3D to_qcv(v); =20 assert(qcv->depth); - /* Value was already cloned by g_memdup() */ + /* Value was already cloned by g_memdup2() */ return true; } =20 @@ -103,7 +103,7 @@ static bool qapi_clone_type_bool(Visitor *v, const char= *name, bool *obj, QapiCloneVisitor *qcv =3D to_qcv(v); =20 assert(qcv->depth); - /* Value was already cloned by g_memdup() */ + /* Value was already cloned by g_memdup2() */ return true; } =20 @@ -114,7 +114,7 @@ static bool qapi_clone_type_str(Visitor *v, const char = *name, char **obj, =20 assert(qcv->depth); /* - * Pointer was already cloned by g_memdup; create fresh copy. + * Pointer was already cloned by g_memdup2; create fresh copy. * Note that as long as qobject-output-visitor accepts NULL instead of * "", then we must do likewise. However, we want to obey the * input visitor semantics of never producing NULL when the empty @@ -130,7 +130,7 @@ static bool qapi_clone_type_number(Visitor *v, const ch= ar *name, double *obj, QapiCloneVisitor *qcv =3D to_qcv(v); =20 assert(qcv->depth); - /* Value was already cloned by g_memdup() */ + /* Value was already cloned by g_memdup2() */ return true; } =20 diff --git a/qapi/qapi-visit-core.c b/qapi/qapi-visit-core.c index 706c61e02608..469b5694f401 100644 --- a/qapi/qapi-visit-core.c +++ b/qapi/qapi-visit-core.c @@ -432,8 +432,10 @@ bool visit_type_enum(Visitor *v, const char *name, int= *obj, case VISITOR_OUTPUT: return output_type_enum(v, name, obj, lookup, errp); case VISITOR_CLONE: - /* nothing further to do, scalar value was already copied by - * g_memdup() during visit_start_*() */ + /* + * nothing further to do, scalar value was already copied by + * g_memdup2() during visit_start_*() + */ return true; case VISITOR_DEALLOC: /* nothing to deallocate for a scalar */ diff --git a/scripts/checkpatch.pl b/scripts/checkpatch.pl index c023767f9670..5c46567ad03c 100755 --- a/scripts/checkpatch.pl +++ b/scripts/checkpatch.pl @@ -3253,11 +3253,6 @@ sub process { WARN("consider using g_path_get_$1() in preference to g_strdup($1())\n"= . $herecurr); } =20 -# enforce g_memdup2() over g_memdup() - if ($line =3D~ /\bg_memdup\s*\(/) { - ERROR("use g_memdup2() instead of unsafe g_memdup()\n" . $herecurr); - } - # recommend qemu_strto* over strto* for numeric conversions if ($line =3D~ /\b(strto[^kd].*?)\s*\(/) { ERROR("consider using qemu_$1 in preference to $1\n" . $herecurr); diff --git a/system/memory.c b/system/memory.c index 264dc90c0a55..7ada0f6d8caa 100644 --- a/system/memory.c +++ b/system/memory.c @@ -1198,7 +1198,7 @@ static char *memory_region_escape_name(const char *na= me) bytes +=3D memory_region_need_escape(*p) ? 4 : 1; } if (bytes =3D=3D p - name) { - return g_memdup(name, bytes + 1); + return g_memdup2(name, bytes + 1); } =20 escaped =3D g_malloc(bytes + 1); diff --git a/system/vl.c b/system/vl.c index 468a9fc247ac..d9617a6e25e1 100644 --- a/system/vl.c +++ b/system/vl.c @@ -1186,7 +1186,7 @@ static int parse_fw_cfg(void *opaque, QemuOpts *opts,= Error **errp) } if (nonempty_str(str)) { size =3D strlen(str); /* NUL terminator NOT included in fw_cfg blo= b */ - buf =3D g_memdup(str, size); + buf =3D g_memdup2(str, size); } else if (nonempty_str(gen_id)) { if (!fw_cfg_add_file_from_generator(fw_cfg, object_get_objects_roo= t(), gen_id, name, errp)) { --=20 2.56.0.rc0.29.g47ce80527c56 From nobody Sat Sep 26 20:01:40 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=1790108413; cv=none; d=zohomail.com; s=zohoarc; b=AxGk2/0FJ/eF3b1ethOkIUTGOVNh2zS/DxtF94skIFzdKZcP5ZeuSsB27kdApdjgqVyIiGbqBMYP5rAicR438p6pS+dgLwbQl/MYTKJjFOGsGRVIOn8C8mfNBguxMHBWRIGZK7Zr6eWS4ZEAjGg49HD35XKFcg1qxdHMlejKW7k= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1790108413; 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:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=U7QZsC7/FrFYicux7l6y28QFROmIc8OD1R4x8lHt55U=; b=Q0dmfcIbGh6yT51AWslsH6UfC6EuKNx68sGYn+wkjhUiix1ft3dUvcO0D+MPCBQ88eWK5XoyVWVlIA19mdTlb/wSD2jWHH1TPdr3oGcNVx6AXElx3jvt7XttoKGqrwjEfDTl5nEyXAalw784rW9+zqTfYvpuDL+x+ox/xUFFxSw= 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 1790108413780704.2975597413713; Tue, 22 Sep 2026 13:20:13 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists1p.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1x96xf-0003rS-8u; Tue, 22 Sep 2026 16:19:31 -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 1x96xY-0003dE-AN for qemu-devel@nongnu.org; Tue, 22 Sep 2026 16:19:24 -0400 Received: from us-smtp-delivery-124.mimecast.com ([170.10.133.124]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1x96xV-00080l-Hk for qemu-devel@nongnu.org; Tue, 22 Sep 2026 16:19:24 -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-574-foUvt0-OO22oB1akfLawSg-1; Tue, 22 Sep 2026 16:19:18 -0400 Received: from mx-prod-int-01.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-01.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.4]) (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 0E41818009DB; Tue, 22 Sep 2026 20:19:18 +0000 (UTC) Received: from localhost (headnet03.pony-001.prod.iad2.dc.redhat.com [10.2.32.114]) by mx-prod-int-01.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id DF4F93000223; Tue, 22 Sep 2026 20:19:16 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1790108360; 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=U7QZsC7/FrFYicux7l6y28QFROmIc8OD1R4x8lHt55U=; b=DDqtd6etdYMTqn5W5amCsuCqVvS88sPESJqV8EKyzbRTCoeg7U0cvywvG5KT1OJu9nDtHp zXfgpcGICT8ASLoOBLcGDQ3rfP4464hZzZLiVQyGKDH1OJ4eepyXItrN3weFTblULP6tti dW03RSIkHDnv5DiHSQNcQOXEui8bd+U= X-MC-Unique: foUvt0-OO22oB1akfLawSg-1 X-Mimecast-MFC-AGG-ID: foUvt0-OO22oB1akfLawSg_1790108358 From: =?utf-8?q?Marc-Andr=C3=A9_Lureau?= Date: Wed, 23 Sep 2026 00:17:10 +0400 Subject: [PATCH 03/88] docs/devel: minor fix in qom documentation MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Message-Id: <20260923-nohmp-v1-3-ebc029d4bd80@redhat.com> References: <20260923-nohmp-v1-0-ebc029d4bd80@redhat.com> In-Reply-To: <20260923-nohmp-v1-0-ebc029d4bd80@redhat.com> To: qemu-devel@nongnu.org Cc: Kevin Wolf , =?utf-8?q?Marc-Andr=C3=A9_Lureau?= , Paolo Bonzini , =?utf-8?q?Daniel_P=2E_Berrang=C3=A9?= , Pierrick Bouvier X-Developer-Signature: v=1; a=openpgp-sha256; l=762; i=marcandre.lureau@redhat.com; h=from:subject:message-id; bh=4VznpQu3OqPi02T77SauoDwaSYF4Nnw6+ZHTkCNBZd4=; b=owEBbQKS/ZANAwAKAdro4Ql1lpzlAcsmYgBqsuKuGhUVyIxNFQUA7gyUHkkq0+4a7K8ke/G+x Z4VEpqAHeWJAjMEAAEKAB0WIQSHqb2TP4fGBtJ29i3a6OEJdZac5QUCarLirgAKCRDa6OEJdZac 5Z5hD/9yw5DrV7XUuZz8EHEJuTDSoe5xtqzKaOuE4Ix1KccpIylf4+64wXQX08aINUUtPjM6/3x DacS6f9I8U9kfwGicWWf4Vc1aQUEaWl5mcIySS22DjSyocnV7o2HEFO2acfljokG5/cghdnCR4o jk0fDlFpz9FdHVxJQlrv2G/a5IwfJdL4qmknhAIyNfWeJA78jVw/o4BAlnhUHCWIP/VojaasaSD 0nl5x0DSYezEZodE+0z9uuj2UdO+xJi6dSNDMcaInblTzU7KjC/xtfHPw8A5PP9Z+k7LAcp/S3F czDSmoiZBLiZ+NRZPAQ/Ly8ILpLdxu76NqC0WGafGjJV6+0/ucEWgSXOY9WywjUFvWhy11Q/JXB 2TBzuTfl5EUyLJN7uUCEjhgQI4BxnX1PRI1vfBT94shG851OFswltBaWTcpTpBN+kX5L0jlyOl/ LQd9vzSrvdeglfZZRU0KLT2mANX/3qwkMlR1zNGwqn0pqpL7RMTDxJKhv4R8CznPI9Dd3WM22Vs cLyp5R2SEz1BdbymsFFuwkuqAHqFd4puwMIkJ9PhtoliA7BdJwHL8B2cMEq2SzQW+ypdCR86daC z4XW5BpVBcsM17SAimxure8+60DiYXHkbzs1uJqi3STZfVrYHKmlZX0+LxMq6ZLv7Cwb626aJgH WMH57PA6/M+6gvQ== X-Developer-Key: i=marcandre.lureau@redhat.com; a=openpgp; fpr=87A9BD933F87C606D276F62DDAE8E10975969CE5 X-Scanned-By: MIMEDefang 3.4.1 on 10.30.177.4 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.133.124; envelope-from=marcandre.lureau@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 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_H3=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: 1790108415661158500 It declares an autoptr for the instance. Signed-off-by: Marc-Andr=C3=A9 Lureau --- docs/devel/qom.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/devel/qom.rst b/docs/devel/qom.rst index 935bb1004a78..9e467b6df857 100644 --- a/docs/devel/qom.rst +++ b/docs/devel/qom.rst @@ -328,7 +328,7 @@ This is equivalent to the following: typedef struct MyDevice MyDevice; typedef struct MyDeviceClass MyDeviceClass; =20 - G_DEFINE_AUTOPTR_CLEANUP_FUNC(MyDeviceClass, object_unref) + G_DEFINE_AUTOPTR_CLEANUP_FUNC(MyDevice, object_unref) =20 #define MY_DEVICE_GET_CLASS(void *obj) \ OBJECT_GET_CLASS(MyDeviceClass, obj, TYPE_MY_DEVICE) --=20 2.56.0.rc0.29.g47ce80527c56 From nobody Sat Sep 26 20:01:40 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=1790108395; cv=none; d=zohomail.com; s=zohoarc; b=A5C0Hek4VqX7G1VDLA2W8lQcg0+178k3b9jlHxB0bwVM8Xkr4d6b1JqZ6Ypbf9xFNhhrbXQFXqcXxf4ciZuLZI6JQpKp13Aldw660vl8mSsgkhlQ599liKnOfDiQaDSg9/18bhFANa4wq8x24pFz3HAynDPFRA9/6RG4ICWsouo= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1790108395; 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:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=g0RZECvoBHybvITfeZazRxpJBGY5Us5QWdTiTh4eJGQ=; b=W7nAZiOM3fCcWFafls+gYmLdLCrKP5al8XsBHPT335yvt9khp3Mezoxkayn0zT+ts08OiAovJTKxV/2lffqfo0iTUssU1BFx9m3VPF21EOQv3a1hrITqECDNx2UMLLdd50EzlQ7iLuc+RZTs0xOBECvKN7gQxIKtoRyQupPBGo8= 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 179010839504067.4534622071485; Tue, 22 Sep 2026 13:19:55 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists1p.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1x96xi-0003wr-Cr; Tue, 22 Sep 2026 16:19:34 -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 1x96xf-0003tY-Fd for qemu-devel@nongnu.org; Tue, 22 Sep 2026 16:19:31 -0400 Received: from us-smtp-delivery-124.mimecast.com ([170.10.133.124]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1x96xd-00082a-G6 for qemu-devel@nongnu.org; Tue, 22 Sep 2026 16:19:31 -0400 Received: from mx-prod-mc-01.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-664-VNLNkaD4P-2mnLNtkrBY9Q-1; Tue, 22 Sep 2026 16:19:24 -0400 Received: from mx-prod-int-03.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-03.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.12]) (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-01.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id 3769C195398E; Tue, 22 Sep 2026 20:19:22 +0000 (UTC) Received: from localhost (headnet03.pony-001.prod.iad2.dc.redhat.com [10.2.32.114]) by mx-prod-int-03.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id 97E451956086; Tue, 22 Sep 2026 20:19:20 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1790108368; 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=g0RZECvoBHybvITfeZazRxpJBGY5Us5QWdTiTh4eJGQ=; b=EzTGHXlsSZC5xS9Sazs69HyPGnthH0yW1EYA3iZ2J4DiovVzdcLumsu7b6/beu3bK8I3+6 eAIW+KlZMJP00axYs1g3LxIurmv/Laftf1AWvE1pAnjqQYGQuxpuN4a3/kCx3r2qApgNZo 8aV5uM8Rvh2nstpS7Up+Y8jv9c6Z9dU= X-MC-Unique: VNLNkaD4P-2mnLNtkrBY9Q-1 X-Mimecast-MFC-AGG-ID: VNLNkaD4P-2mnLNtkrBY9Q_1790108362 From: =?utf-8?q?Marc-Andr=C3=A9_Lureau?= Date: Wed, 23 Sep 2026 00:17:11 +0400 Subject: [PATCH 04/88] qom: auto-terminate interfaces array in OBJECT_DEFINE_TYPE macros MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Message-Id: <20260923-nohmp-v1-4-ebc029d4bd80@redhat.com> References: <20260923-nohmp-v1-0-ebc029d4bd80@redhat.com> In-Reply-To: <20260923-nohmp-v1-0-ebc029d4bd80@redhat.com> To: qemu-devel@nongnu.org Cc: Kevin Wolf , =?utf-8?q?Marc-Andr=C3=A9_Lureau?= , Gerd Hoffmann , Stefano Garzarella , Ani Sinha , "Michael S. Tsirkin" , Igor Mammedov , Peter Maydell , "Maciej S. Szmigiero" , Nicholas Piggin , Harsh Prateek Bora , Amit Machhiwal , David Hildenbrand , Paolo Bonzini , =?utf-8?q?Daniel_P=2E_Berrang=C3=A9?= , Peter Xu , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , Marcelo Tosatti , Halil Pasic , Christian Borntraeger , Eric Farman , Matthew Rosato , Cornelia Huck , Richard Henderson , Ilya Leoshkevich , qemu-ppc@nongnu.org, kvm@vger.kernel.org, qemu-s390x@nongnu.org X-Developer-Signature: v=1; a=openpgp-sha256; l=8994; i=marcandre.lureau@redhat.com; h=from:subject:message-id; bh=eKTevt0GpGNi9UNQRmH/tu4k22GUVBnqSGQEIe+cSTs=; b=owEBbQKS/ZANAwAKAdro4Ql1lpzlAcsmYgBqsuKugHMZS/3VcAn6w7feXTeNienazwdXDcINX ZeIF440SOCJAjMEAAEKAB0WIQSHqb2TP4fGBtJ29i3a6OEJdZac5QUCarLirgAKCRDa6OEJdZac 5XIWD/9OyIJMyyuZo+LCvFFlqu/g4cVR0RdIuB/+gmKWf/93TqgZNy16RbXjWcNUNzf9n8huaz8 0yUnEuSFTz1BazDP6u1WqZybmkftuAI7eVEdGQ4KWdmvUl+NxbL1FdUxSj+xcJFSvkkCpIBFY0F o91bWMBpYtB7fQBziO0ZhiVwElgzOfbefzVA0o4JFsj0alZFuQtTKrBAB9DB9Miu7l1ij0GK2tY X+S3zY3qjqq3A0AG/u2+mmE2aYb+YZA31SWrYpRTj2b2eIKIPoa5UYzpb9Uph2EVRciaQw7Aisy K7hmd0+8/9wa/jXaO7FUgUFfxbH5JfD81HWzOCQqbEhfxcXANVSuuj4lAsY9Ii1FFOaOba6PWso 8JLqL2WjuLfw9uXnL+xaVkJy9yg3t7FBQQdADt+XQpYg/21b0ucXvzweYpA9KIu1WylWbIzSkjU 9nqXTw/o2rY9IhDijOzmtNfYs9oF7HsuYQpnRWPFVNIQiIatHqcKvNJb/zFzbbMWjmcwEIFJCWJ Yxe/XrdLqxTqhgf5ZQK9MjOshQw9UGJDV4c9dxC5QybYP5loB3WfFE5v4hLTPaG56XV2f0DFuQa +FqLwFEh3tVTWX676fkAucCe7jwRR/EahWqVEUfMZ35R86F8F0GVtHJD7W8WN+9sayDuHOVBRi5 nDWOJixVBqFa4MQ== X-Developer-Key: i=marcandre.lureau@redhat.com; a=openpgp; fpr=87A9BD933F87C606D276F62DDAE8E10975969CE5 X-Scanned-By: MIMEDefang 3.0 on 10.30.177.12 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.133.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_H3=0.001, RCVD_IN_MSPIKE_WL=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-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: 1790108395507158500 The DO_OBJECT_DEFINE_TYPE_EXTENDED macro requires callers to manually append a NULL sentinel to the interfaces list. Forgetting it causes out-of-bounds reads during type registration, leading to run-time crashes. Append an empty initializer in the base macro so the sentinel is always present, and drop the now-redundant manual terminators from all callers. Signed-off-by: Marc-Andr=C3=A9 Lureau --- backends/igvm-cfg.c | 3 +-- hw/acpi/pci.c | 6 ++---- hw/core/reset.c | 4 +++- hw/core/resetcontainer.c | 5 ++++- hw/hyperv/hv-balloon.c | 2 +- hw/ppc/pef.c | 3 +-- hw/virtio/virtio-mem.c | 6 +++++- include/qom/object.h | 6 +++--- system/ram-block-attributes.c | 3 +-- target/i386/kvm/tdx.c | 3 +-- target/s390x/kvm/pv.c | 3 +-- 11 files changed, 23 insertions(+), 21 deletions(-) diff --git a/backends/igvm-cfg.c b/backends/igvm-cfg.c index 935ba54f54f3..8ec7d4ab6174 100644 --- a/backends/igvm-cfg.c +++ b/backends/igvm-cfg.c @@ -72,8 +72,7 @@ static void igvm_complete(UserCreatable *uc, Error **errp) =20 OBJECT_DEFINE_TYPE_WITH_INTERFACES(IgvmCfg, igvm_cfg, IGVM_CFG, OBJECT, { TYPE_USER_CREATABLE }, - { TYPE_RESETTABLE_INTERFACE }, - { NULL }) + { TYPE_RESETTABLE_INTERFACE }) =20 static void igvm_cfg_class_init(ObjectClass *oc, const void *data) { diff --git a/hw/acpi/pci.c b/hw/acpi/pci.c index c82924be8620..5a96c0e77817 100644 --- a/hw/acpi/pci.c +++ b/hw/acpi/pci.c @@ -83,8 +83,7 @@ typedef struct AcpiGenericInitiatorClass { =20 OBJECT_DEFINE_TYPE_WITH_INTERFACES(AcpiGenericInitiator, acpi_generic_init= iator, ACPI_GENERIC_INITIATOR, OBJECT, - { TYPE_USER_CREATABLE }, - { NULL }) + { TYPE_USER_CREATABLE }) =20 OBJECT_DECLARE_SIMPLE_TYPE(AcpiGenericInitiator, ACPI_GENERIC_INITIATOR) =20 @@ -199,8 +198,7 @@ typedef struct AcpiGenericPortClass { =20 OBJECT_DEFINE_TYPE_WITH_INTERFACES(AcpiGenericPort, acpi_generic_port, ACPI_GENERIC_PORT, OBJECT, - { TYPE_USER_CREATABLE }, - { NULL }) + { TYPE_USER_CREATABLE }) =20 OBJECT_DECLARE_SIMPLE_TYPE(AcpiGenericPort, ACPI_GENERIC_PORT) =20 diff --git a/hw/core/reset.c b/hw/core/reset.c index e7230b49b704..c35ac9b9c9a7 100644 --- a/hw/core/reset.c +++ b/hw/core/reset.c @@ -58,7 +58,9 @@ struct LegacyReset { bool skip_on_snapshot_load; }; =20 -OBJECT_DEFINE_SIMPLE_TYPE_WITH_INTERFACES(LegacyReset, legacy_reset, LEGAC= Y_RESET, OBJECT, { TYPE_RESETTABLE_INTERFACE }, { }) +OBJECT_DEFINE_SIMPLE_TYPE_WITH_INTERFACES(LegacyReset, legacy_reset, + LEGACY_RESET, OBJECT, + { TYPE_RESETTABLE_INTERFACE }) =20 static ResettableState *legacy_reset_get_state(Object *obj) { diff --git a/hw/core/resetcontainer.c b/hw/core/resetcontainer.c index a4a6476a0363..cc46a1c62b82 100644 --- a/hw/core/resetcontainer.c +++ b/hw/core/resetcontainer.c @@ -24,7 +24,10 @@ struct ResettableContainer { GPtrArray *children; }; =20 -OBJECT_DEFINE_SIMPLE_TYPE_WITH_INTERFACES(ResettableContainer, resettable_= container, RESETTABLE_CONTAINER, OBJECT, { TYPE_RESETTABLE_INTERFACE }, { }) +OBJECT_DEFINE_SIMPLE_TYPE_WITH_INTERFACES(ResettableContainer, + resettable_container, + RESETTABLE_CONTAINER, OBJECT, + { TYPE_RESETTABLE_INTERFACE }) =20 void resettable_container_add(ResettableContainer *rc, Object *obj) { diff --git a/hw/hyperv/hv-balloon.c b/hw/hyperv/hv-balloon.c index b8664a246b47..36e54c6a4c26 100644 --- a/hw/hyperv/hv-balloon.c +++ b/hw/hyperv/hv-balloon.c @@ -160,7 +160,7 @@ typedef struct HvBalloon { =20 OBJECT_DEFINE_SIMPLE_TYPE_WITH_INTERFACES(HvBalloon, hv_balloon, \ HV_BALLOON, VMBUS_DEVICE, \ - { TYPE_MEMORY_DEVICE }, { }) + { TYPE_MEMORY_DEVICE }) =20 #define HV_BALLOON_SET_STATE(hvb, news) \ do { \ diff --git a/hw/ppc/pef.c b/hw/ppc/pef.c index 39b4ce94f10b..a055774caebc 100644 --- a/hw/ppc/pef.c +++ b/hw/ppc/pef.c @@ -124,8 +124,7 @@ OBJECT_DEFINE_TYPE_WITH_INTERFACES(PefGuest, pef_guest, PEF_GUEST, CONFIDENTIAL_GUEST_SUPPORT, - { TYPE_USER_CREATABLE }, - { NULL }) + { TYPE_USER_CREATABLE }) =20 static void pef_guest_class_init(ObjectClass *oc, const void *data) { diff --git a/hw/virtio/virtio-mem.c b/hw/virtio/virtio-mem.c index 7130ed852d9c..488ee25dec53 100644 --- a/hw/virtio/virtio-mem.c +++ b/hw/virtio/virtio-mem.c @@ -1681,7 +1681,11 @@ static void virtio_register_types(void) =20 type_init(virtio_register_types) =20 -OBJECT_DEFINE_SIMPLE_TYPE_WITH_INTERFACES(VirtioMemSystemReset, virtio_mem= _system_reset, VIRTIO_MEM_SYSTEM_RESET, OBJECT, { TYPE_RESETTABLE_INTERFACE= }, { }) +OBJECT_DEFINE_SIMPLE_TYPE_WITH_INTERFACES(VirtioMemSystemReset, + virtio_mem_system_reset, + VIRTIO_MEM_SYSTEM_RESET, + OBJECT, + { TYPE_RESETTABLE_INTERFACE }) =20 static void virtio_mem_system_reset_init(Object *obj) { diff --git a/include/qom/object.h b/include/qom/object.h index 328521866463..24727906ec02 100644 --- a/include/qom/object.h +++ b/include/qom/object.h @@ -294,7 +294,7 @@ struct Object .class_size =3D CLASS_SIZE, \ .class_init =3D module_obj_name##_class_init, \ .abstract =3D ABSTRACT, \ - .interfaces =3D (const InterfaceInfo[]) { __VA_ARGS__ } , \ + .interfaces =3D (const InterfaceInfo[]) { __VA_ARGS__, { } } , \ }; \ \ static void \ @@ -365,8 +365,8 @@ struct Object * for the common case of a non-abstract type, with one or more implemented * interfaces. * - * Note when passing the list of interfaces, be sure to include the final - * NULL entry, e.g. { TYPE_USER_CREATABLE }, { NULL } + * The NULL terminator is added automatically by the macro, so only + * the actual interfaces need to be listed, e.g. { TYPE_USER_CREATABLE } */ #define OBJECT_DEFINE_TYPE_WITH_INTERFACES(ModuleObjName, module_obj_name,= \ MODULE_OBJ_NAME, \ diff --git a/system/ram-block-attributes.c b/system/ram-block-attributes.c index 59ec7a28eb05..4ef70b5a4082 100644 --- a/system/ram-block-attributes.c +++ b/system/ram-block-attributes.c @@ -18,8 +18,7 @@ OBJECT_DEFINE_SIMPLE_TYPE_WITH_INTERFACES(RamBlockAttribu= tes, ram_block_attributes, RAM_BLOCK_ATTRIBUTES, OBJECT, - { TYPE_RAM_DISCARD_SOURCE }, - { }) + { TYPE_RAM_DISCARD_SOURCE }) =20 static size_t ram_block_attributes_get_block_size(void) diff --git a/target/i386/kvm/tdx.c b/target/i386/kvm/tdx.c index 8294dbde3aa8..f1fa9e7ffe2b 100644 --- a/target/i386/kvm/tdx.c +++ b/target/i386/kvm/tdx.c @@ -1559,8 +1559,7 @@ OBJECT_DEFINE_TYPE_WITH_INTERFACES(TdxGuest, TDX_GUEST, X86_CONFIDENTIAL_GUEST, { TYPE_USER_CREATABLE }, - { TYPE_RESETTABLE_INTERFACE }, - { NULL }) + { TYPE_RESETTABLE_INTERFACE }) =20 static void tdx_guest_init(Object *obj) { diff --git a/target/s390x/kvm/pv.c b/target/s390x/kvm/pv.c index 3d508165f348..8d4a7b5275e1 100644 --- a/target/s390x/kvm/pv.c +++ b/target/s390x/kvm/pv.c @@ -402,8 +402,7 @@ OBJECT_DEFINE_TYPE_WITH_INTERFACES(S390PVGuest, s390_pv_guest, S390_PV_GUEST, CONFIDENTIAL_GUEST_SUPPORT, - { TYPE_USER_CREATABLE }, - { NULL }) + { TYPE_USER_CREATABLE }) =20 static void s390_pv_guest_class_init(ObjectClass *oc, const void *data) { --=20 2.56.0.rc0.29.g47ce80527c56 From nobody Sat Sep 26 20:01:40 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=1790108531; cv=none; d=zohomail.com; s=zohoarc; b=XhDDFibMKpjWVlSRuXtCLXzXXXff1myVnxRs/I+81J1nW5LZULgmk/iOGTpYkUZqpEsxMTM7UsBbILVbS/AZ8fClGsymDoKN4tPSFqTIO1pJRBH5u7IPaH5iH2IdFL205Jhx5UA3UTRA5LBtnaFEpgpSf09KAGc3n11vyYXh9+k= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1790108531; 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:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=Ug/u3sndBRP4pAlXPylAVbR1naChheCB4kkX/CVJlxY=; b=muoril5dsfoE/1T0Kdf84Qs82pWPONVTd5irIWlejQ8f5nDQ3LE5Eb6cQ+OyF8/V1n3JtJO56L5oXRBA1WjWT8mUJQDYX/HQw+UkNMU0/0wSKp2hIP4XAHtRTa3wn/86M4IkJHO9rx01ZLBEQXMzC50xk1RLTuPF5gzOd27HJOk= 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 1790108531089303.2044794941248; Tue, 22 Sep 2026 13:22:11 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists1p.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1x96xv-0004I1-6P; Tue, 22 Sep 2026 16:19:50 -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 1x96xl-0004A9-4F for qemu-devel@nongnu.org; Tue, 22 Sep 2026 16:19:37 -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 1x96xe-00082w-VK for qemu-devel@nongnu.org; Tue, 22 Sep 2026 16:19:36 -0400 Received: from mx-prod-mc-05.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-7-VNOzX7VYMgy8GX6ZHneFuA-1; Tue, 22 Sep 2026 16:19:28 -0400 Received: from mx-prod-int-05.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-05.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.17]) (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-05.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id F3E2719774FA; Tue, 22 Sep 2026 20:19:26 +0000 (UTC) Received: from localhost (headnet03.pony-001.prod.iad2.dc.redhat.com [10.2.32.114]) by mx-prod-int-05.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id 0522C1956095; Tue, 22 Sep 2026 20:19:24 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1790108370; 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=Ug/u3sndBRP4pAlXPylAVbR1naChheCB4kkX/CVJlxY=; b=PimYBF9B0W74wBBXhd66d/NENlr7ZZnohC4+Y/kTNFlaGnQg0h40zZUJeodG5fXkqK9Vh8 qxA0P7lbKkEY+SxMBsxuAiVLbngp9mfAfqNJITt6Y5ji7vIjsgNipXP8vULPTySEL75MuP voQJzzI1Eh5s7fKvov1qUmdvV361x7I= X-MC-Unique: VNOzX7VYMgy8GX6ZHneFuA-1 X-Mimecast-MFC-AGG-ID: VNOzX7VYMgy8GX6ZHneFuA_1790108367 From: =?utf-8?q?Marc-Andr=C3=A9_Lureau?= Date: Wed, 23 Sep 2026 00:17:12 +0400 Subject: [PATCH 05/88] qemu-io: drop "qemu-io:" prefix in error-report MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Message-Id: <20260923-nohmp-v1-5-ebc029d4bd80@redhat.com> References: <20260923-nohmp-v1-0-ebc029d4bd80@redhat.com> In-Reply-To: <20260923-nohmp-v1-0-ebc029d4bd80@redhat.com> To: qemu-devel@nongnu.org Cc: Kevin Wolf , =?utf-8?q?Marc-Andr=C3=A9_Lureau?= , Hanna Reitz , Eric Blake , Vladimir Sementsov-Ogievskiy , Markus Armbruster , qemu-block@nongnu.org X-Developer-Signature: v=1; a=openpgp-sha256; l=161047; i=marcandre.lureau@redhat.com; h=from:subject:message-id; bh=5JBydEEPB+JaG1Yaa4ZzvV9TPnIxR80RFqVmyk0VEhM=; b=owEBbQKS/ZANAwAKAdro4Ql1lpzlAcsmYgBqsuKuadY9WaQg2A3dgbAr33PxJsbq29PBK5ERW 5E6pXSYNPqJAjMEAAEKAB0WIQSHqb2TP4fGBtJ29i3a6OEJdZac5QUCarLirgAKCRDa6OEJdZac 5VXOD/0bHZeEftO3Ku7CPTZ7SLB9PR5iTx8NUmCSakWKesmkrYpa2OEMjx/lsveW5TYRhjaeBb6 UqbIpOb8pc22rVyRsTXovIrP+iEFzGTgpwStgAR+95VOSstvBvEJFCPdG2njmXflVk49NeOBClW MCQwVtHz+vwaQ8OV5pVTM270ntZzlWsyKyhWO5LpAFNcvmHLVUxIucdhNREma4v5DH73mqflsFz OV8orp3J7XFsNx+P798zJXSF96DdQmRGN4NGu/SqkIfS3kkxcgWA1Nb8QUSwrJGLzv2Pse7EIE3 WcHBVP9WAr/JSH30RsbGIqyXvQ2zedJFWx4MZGOkJqYBtuhlKfqvnwISSroqStGrlFpXqP+/0EO kPOYVbGd6mSNkMiCWzGUrqRinxu622iWnK11cE7svgOZRHuyrw3G70Hl+lBA5tWx5Lrfm73CblD Gk0/eNlAxDks/OOXmxC59emJPyceDRAdcNmCGvfw4TmevVCqmoydccP95WxXGd+g9z1KYUQWOT9 77TobDCHTvFzJpvD52nL2PlbLOQh8pFOTTToUlk4GhZmclkYeOz2GBcdrmCBqXZ4dT3e2WDWO98 CMGcJHp7kbsM2DWnE8RjR5gsVOxKR8Va5EbE9a/gRTcqOgrUoabvs6xFjm2U3tjIz0TWF5T14be 9LeNa3WvXgD9gDA== X-Developer-Key: i=marcandre.lureau@redhat.com; a=openpgp; fpr=87A9BD933F87C606D276F62DDAE8E10975969CE5 X-Scanned-By: MIMEDefang 3.0 on 10.30.177.17 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: 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-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: 1790108532659158500 qemu-io is still primarily an interactive program, and constantly printing the name of the program you're interacting with has little value. Suggested-by: Kevin Wolf Signed-off-by: Marc-Andr=C3=A9 Lureau Reviewed-by: Vladimir Sementsov-Ogievskiy --- qemu-io.c | 4 + tests/qemu-iotests/004.out | 20 +- tests/qemu-iotests/021.out | 60 ++-- tests/qemu-iotests/026.out | 396 ++++++++++-------= ---- tests/qemu-iotests/026.out.nocache | 168 ++++----- tests/qemu-iotests/059.out | 6 +- tests/qemu-iotests/060.out | 46 +-- tests/qemu-iotests/061.out | 4 +- tests/qemu-iotests/069.out | 2 +- tests/qemu-iotests/070.out | 2 +- tests/qemu-iotests/071.out | 4 +- tests/qemu-iotests/072.out | 2 +- tests/qemu-iotests/075.out | 14 +- tests/qemu-iotests/076.out | 6 +- tests/qemu-iotests/078.out | 12 +- tests/qemu-iotests/080.out | 44 +-- tests/qemu-iotests/081.out | 4 +- tests/qemu-iotests/083.out | 104 +++--- tests/qemu-iotests/088.out | 12 +- tests/qemu-iotests/089.out | 4 +- tests/qemu-iotests/092.out | 24 +- tests/qemu-iotests/103.out | 14 +- tests/qemu-iotests/114.out | 4 +- tests/qemu-iotests/116.out | 14 +- tests/qemu-iotests/133.out | 30 +- tests/qemu-iotests/134.out | 2 +- tests/qemu-iotests/137.out | 30 +- tests/qemu-iotests/140.out | 2 +- tests/qemu-iotests/143.out | 4 +- tests/qemu-iotests/153.out | 42 +-- tests/qemu-iotests/171.out | 68 ++-- tests/qemu-iotests/187.out | 6 +- tests/qemu-iotests/188.out | 2 +- tests/qemu-iotests/197.out | 2 +- tests/qemu-iotests/205 | 4 +- tests/qemu-iotests/214.out | 2 +- tests/qemu-iotests/215.out | 2 +- tests/qemu-iotests/220.out | 2 +- tests/qemu-iotests/226.out | 16 +- tests/qemu-iotests/244.out | 22 +- tests/qemu-iotests/271.out | 14 +- tests/qemu-iotests/289.out | 2 +- tests/qemu-iotests/293.out | 30 +- tests/qemu-iotests/294.out | 4 +- tests/qemu-iotests/305.out | 2 +- tests/qemu-iotests/307.out | 2 +- tests/qemu-iotests/tests/file-io-error.out | 2 +- tests/qemu-iotests/tests/image-fleecing.out | 12 +- tests/qemu-iotests/tests/inactive-node-nbd.out | 10 +- tests/qemu-iotests/tests/nbd-reconnect-on-open.out | 4 +- tests/qemu-iotests/tests/parallels-bitmap.out | 4 +- tests/qemu-iotests/tests/parallels-checks.out | 4 +- util/error-report.c | 2 +- 53 files changed, 651 insertions(+), 647 deletions(-) diff --git a/qemu-io.c b/qemu-io.c index 598d5b1c9ca9..7d6a65a50814 100644 --- a/qemu-io.c +++ b/qemu-io.c @@ -628,6 +628,10 @@ int main(int argc, char **argv) exit(1); } =20 + /* Compute the prompt before clearing prgname */ + get_prompt(); + g_set_prgname(""); + qemu_init_main_loop(&error_fatal); =20 if (!trace_init_backends()) { diff --git a/tests/qemu-iotests/004.out b/tests/qemu-iotests/004.out index 37da6024809f..fb8593289f51 100644 --- a/tests/qemu-iotests/004.out +++ b/tests/qemu-iotests/004.out @@ -6,36 +6,36 @@ wrote 1048576/1048576 bytes at offset 133169152 1 MiB, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec) =20 write into image boundary -qemu-io: write failed: Input/output error +write failed: Input/output error =20 write at image boundary -qemu-io: write failed: Input/output error +write failed: Input/output error =20 write past image boundary -qemu-io: write failed: Input/output error +write failed: Input/output error =20 pwrite past image boundary -qemu-io: write failed: Input/output error +write failed: Input/output error =20 writev past image boundary -qemu-io: writev failed: Input/output error +writev failed: Input/output error =20 read before image boundary read 1048576/1048576 bytes at offset 133169152 1 MiB, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec) =20 read into image boundary -qemu-io: read failed: Input/output error +read failed: Input/output error =20 read at image boundary -qemu-io: read failed: Input/output error +read failed: Input/output error =20 read past image boundary -qemu-io: read failed: Input/output error +read failed: Input/output error =20 pread past image boundary -qemu-io: read failed: Input/output error +read failed: Input/output error =20 readv past image boundary -qemu-io: readv failed: Input/output error +readv failed: Input/output error *** done diff --git a/tests/qemu-iotests/021.out b/tests/qemu-iotests/021.out index dfdfeb503780..8533f8e58ae6 100644 --- a/tests/qemu-iotests/021.out +++ b/tests/qemu-iotests/021.out @@ -2,92 +2,92 @@ QA output created by 021 Formatting 'TEST_DIR/t.IMGFMT', fmt=3DIMGFMT size=3D134217728 =20 =3D=3D testing writev -P -1 =3D=3D -qemu-io: -1 is not a valid pattern byte +-1 is not a valid pattern byte =20 =3D=3D testing read -P -1 =3D=3D -qemu-io: -1 is not a valid pattern byte +-1 is not a valid pattern byte =20 =3D=3D testing write -P -1 =3D=3D -qemu-io: -1 is not a valid pattern byte +-1 is not a valid pattern byte =20 =3D=3D testing readv -P -1 =3D=3D -qemu-io: -1 is not a valid pattern byte +-1 is not a valid pattern byte =20 =3D=3D testing aio_read -P -1 =3D=3D -qemu-io: -1 is not a valid pattern byte +-1 is not a valid pattern byte =20 =3D=3D testing aio_write -P -1 =3D=3D -qemu-io: -1 is not a valid pattern byte +-1 is not a valid pattern byte =20 =3D=3D testing writev -P 300 =3D=3D -qemu-io: 300 is not a valid pattern byte +300 is not a valid pattern byte =20 =3D=3D testing read -P 300 =3D=3D -qemu-io: 300 is not a valid pattern byte +300 is not a valid pattern byte =20 =3D=3D testing write -P 300 =3D=3D -qemu-io: 300 is not a valid pattern byte +300 is not a valid pattern byte =20 =3D=3D testing readv -P 300 =3D=3D -qemu-io: 300 is not a valid pattern byte +300 is not a valid pattern byte =20 =3D=3D testing aio_read -P 300 =3D=3D -qemu-io: 300 is not a valid pattern byte +300 is not a valid pattern byte =20 =3D=3D testing aio_write -P 300 =3D=3D -qemu-io: 300 is not a valid pattern byte +300 is not a valid pattern byte =20 =3D=3D testing writev -P 12m =3D=3D -qemu-io: 12m is not a valid pattern byte +12m is not a valid pattern byte =20 =3D=3D testing read -P 12m =3D=3D -qemu-io: 12m is not a valid pattern byte +12m is not a valid pattern byte =20 =3D=3D testing write -P 12m =3D=3D -qemu-io: 12m is not a valid pattern byte +12m is not a valid pattern byte =20 =3D=3D testing readv -P 12m =3D=3D -qemu-io: 12m is not a valid pattern byte +12m is not a valid pattern byte =20 =3D=3D testing aio_read -P 12m =3D=3D -qemu-io: 12m is not a valid pattern byte +12m is not a valid pattern byte =20 =3D=3D testing aio_write -P 12m =3D=3D -qemu-io: 12m is not a valid pattern byte +12m is not a valid pattern byte =20 =3D=3D testing writev -P 4k =3D=3D -qemu-io: 4k is not a valid pattern byte +4k is not a valid pattern byte =20 =3D=3D testing read -P 4k =3D=3D -qemu-io: 4k is not a valid pattern byte +4k is not a valid pattern byte =20 =3D=3D testing write -P 4k =3D=3D -qemu-io: 4k is not a valid pattern byte +4k is not a valid pattern byte =20 =3D=3D testing readv -P 4k =3D=3D -qemu-io: 4k is not a valid pattern byte +4k is not a valid pattern byte =20 =3D=3D testing aio_read -P 4k =3D=3D -qemu-io: 4k is not a valid pattern byte +4k is not a valid pattern byte =20 =3D=3D testing aio_write -P 4k =3D=3D -qemu-io: 4k is not a valid pattern byte +4k is not a valid pattern byte =20 =3D=3D testing writev -P route66 =3D=3D -qemu-io: route66 is not a valid pattern byte +route66 is not a valid pattern byte =20 =3D=3D testing read -P route66 =3D=3D -qemu-io: route66 is not a valid pattern byte +route66 is not a valid pattern byte =20 =3D=3D testing write -P route66 =3D=3D -qemu-io: route66 is not a valid pattern byte +route66 is not a valid pattern byte =20 =3D=3D testing readv -P route66 =3D=3D -qemu-io: route66 is not a valid pattern byte +route66 is not a valid pattern byte =20 =3D=3D testing aio_read -P route66 =3D=3D -qemu-io: route66 is not a valid pattern byte +route66 is not a valid pattern byte =20 =3D=3D testing aio_write -P route66 =3D=3D -qemu-io: route66 is not a valid pattern byte +route66 is not a valid pattern byte *** done diff --git a/tests/qemu-iotests/026.out b/tests/qemu-iotests/026.out index b998a9ac83da..050bbfa18863 100644 --- a/tests/qemu-iotests/026.out +++ b/tests/qemu-iotests/026.out @@ -4,442 +4,442 @@ Errors while writing 128 kB Formatting 'TEST_DIR/t.IMGFMT', fmt=3DIMGFMT size=3D1073741824 =20 Event: l1_update; errno: 5; imm: off; once: on; write -qemu-io: write failed: Input/output error +write failed: Input/output error No errors were found on the image. Formatting 'TEST_DIR/t.IMGFMT', fmt=3DIMGFMT size=3D1073741824 =20 Event: l1_update; errno: 5; imm: off; once: on; write -b -qemu-io: write failed: Input/output error +write failed: Input/output error No errors were found on the image. Formatting 'TEST_DIR/t.IMGFMT', fmt=3DIMGFMT size=3D1073741824 =20 Event: l1_update; errno: 5; imm: off; once: off; write -qemu-io: write failed: Input/output error -qemu-io: Failed to flush the L2 table cache: Input/output error -qemu-io: Failed to flush the refcount block cache: Input/output error +write failed: Input/output error +Failed to flush the L2 table cache: Input/output error +Failed to flush the refcount block cache: Input/output error No errors were found on the image. Formatting 'TEST_DIR/t.IMGFMT', fmt=3DIMGFMT size=3D1073741824 =20 Event: l1_update; errno: 5; imm: off; once: off; write -b -qemu-io: write failed: Input/output error -qemu-io: Failed to flush the L2 table cache: Input/output error -qemu-io: Failed to flush the refcount block cache: Input/output error +write failed: Input/output error +Failed to flush the L2 table cache: Input/output error +Failed to flush the refcount block cache: Input/output error No errors were found on the image. Formatting 'TEST_DIR/t.IMGFMT', fmt=3DIMGFMT size=3D1073741824 =20 Event: l1_update; errno: 28; imm: off; once: on; write -qemu-io: write failed: No space left on device +write failed: No space left on device No errors were found on the image. Formatting 'TEST_DIR/t.IMGFMT', fmt=3DIMGFMT size=3D1073741824 =20 Event: l1_update; errno: 28; imm: off; once: on; write -b -qemu-io: write failed: No space left on device +write failed: No space left on device No errors were found on the image. Formatting 'TEST_DIR/t.IMGFMT', fmt=3DIMGFMT size=3D1073741824 =20 Event: l1_update; errno: 28; imm: off; once: off; write -qemu-io: write failed: No space left on device -qemu-io: Failed to flush the L2 table cache: No space left on device -qemu-io: Failed to flush the refcount block cache: No space left on device +write failed: No space left on device +Failed to flush the L2 table cache: No space left on device +Failed to flush the refcount block cache: No space left on device No errors were found on the image. Formatting 'TEST_DIR/t.IMGFMT', fmt=3DIMGFMT size=3D1073741824 =20 Event: l1_update; errno: 28; imm: off; once: off; write -b -qemu-io: write failed: No space left on device -qemu-io: Failed to flush the L2 table cache: No space left on device -qemu-io: Failed to flush the refcount block cache: No space left on device +write failed: No space left on device +Failed to flush the L2 table cache: No space left on device +Failed to flush the refcount block cache: No space left on device No errors were found on the image. Formatting 'TEST_DIR/t.IMGFMT', fmt=3DIMGFMT size=3D1073741824 =20 Event: l2_load; errno: 5; imm: off; once: on; write wrote 131072/131072 bytes at offset 0 128 KiB, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec) -qemu-io: write failed: Input/output error -qemu-io: read failed: Input/output error +write failed: Input/output error +read failed: Input/output error No errors were found on the image. Formatting 'TEST_DIR/t.IMGFMT', fmt=3DIMGFMT size=3D1073741824 =20 Event: l2_load; errno: 5; imm: off; once: on; write -b wrote 131072/131072 bytes at offset 0 128 KiB, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec) -qemu-io: write failed: Input/output error -qemu-io: read failed: Input/output error +write failed: Input/output error +read failed: Input/output error No errors were found on the image. Formatting 'TEST_DIR/t.IMGFMT', fmt=3DIMGFMT size=3D1073741824 =20 Event: l2_load; errno: 5; imm: off; once: off; write wrote 131072/131072 bytes at offset 0 128 KiB, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec) -qemu-io: write failed: Input/output error -qemu-io: read failed: Input/output error +write failed: Input/output error +read failed: Input/output error No errors were found on the image. Formatting 'TEST_DIR/t.IMGFMT', fmt=3DIMGFMT size=3D1073741824 =20 Event: l2_load; errno: 5; imm: off; once: off; write -b wrote 131072/131072 bytes at offset 0 128 KiB, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec) -qemu-io: write failed: Input/output error -qemu-io: read failed: Input/output error +write failed: Input/output error +read failed: Input/output error No errors were found on the image. Formatting 'TEST_DIR/t.IMGFMT', fmt=3DIMGFMT size=3D1073741824 =20 Event: l2_load; errno: 28; imm: off; once: on; write wrote 131072/131072 bytes at offset 0 128 KiB, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec) -qemu-io: write failed: No space left on device -qemu-io: read failed: No space left on device +write failed: No space left on device +read failed: No space left on device No errors were found on the image. Formatting 'TEST_DIR/t.IMGFMT', fmt=3DIMGFMT size=3D1073741824 =20 Event: l2_load; errno: 28; imm: off; once: on; write -b wrote 131072/131072 bytes at offset 0 128 KiB, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec) -qemu-io: write failed: No space left on device -qemu-io: read failed: No space left on device +write failed: No space left on device +read failed: No space left on device No errors were found on the image. Formatting 'TEST_DIR/t.IMGFMT', fmt=3DIMGFMT size=3D1073741824 =20 Event: l2_load; errno: 28; imm: off; once: off; write wrote 131072/131072 bytes at offset 0 128 KiB, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec) -qemu-io: write failed: No space left on device -qemu-io: read failed: No space left on device +write failed: No space left on device +read failed: No space left on device No errors were found on the image. Formatting 'TEST_DIR/t.IMGFMT', fmt=3DIMGFMT size=3D1073741824 =20 Event: l2_load; errno: 28; imm: off; once: off; write -b wrote 131072/131072 bytes at offset 0 128 KiB, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec) -qemu-io: write failed: No space left on device -qemu-io: read failed: No space left on device +write failed: No space left on device +read failed: No space left on device No errors were found on the image. Formatting 'TEST_DIR/t.IMGFMT', fmt=3DIMGFMT size=3D1073741824 =20 Event: l2_update; errno: 5; imm: off; once: on; write -qemu-io: write failed: Input/output error +write failed: Input/output error No errors were found on the image. Formatting 'TEST_DIR/t.IMGFMT', fmt=3DIMGFMT size=3D1073741824 =20 Event: l2_update; errno: 5; imm: off; once: on; write -b -qemu-io: write failed: Input/output error +write failed: Input/output error No errors were found on the image. Formatting 'TEST_DIR/t.IMGFMT', fmt=3DIMGFMT size=3D1073741824 =20 Event: l2_update; errno: 5; imm: off; once: off; write -qemu-io: write failed: Input/output error -qemu-io: Failed to flush the L2 table cache: Input/output error -qemu-io: Failed to flush the refcount block cache: Input/output error +write failed: Input/output error +Failed to flush the L2 table cache: Input/output error +Failed to flush the refcount block cache: Input/output error No errors were found on the image. Formatting 'TEST_DIR/t.IMGFMT', fmt=3DIMGFMT size=3D1073741824 =20 Event: l2_update; errno: 5; imm: off; once: off; write -b -qemu-io: write failed: Input/output error -qemu-io: Failed to flush the L2 table cache: Input/output error -qemu-io: Failed to flush the refcount block cache: Input/output error +write failed: Input/output error +Failed to flush the L2 table cache: Input/output error +Failed to flush the refcount block cache: Input/output error No errors were found on the image. Formatting 'TEST_DIR/t.IMGFMT', fmt=3DIMGFMT size=3D1073741824 =20 Event: l2_update; errno: 28; imm: off; once: on; write -qemu-io: write failed: No space left on device +write failed: No space left on device No errors were found on the image. Formatting 'TEST_DIR/t.IMGFMT', fmt=3DIMGFMT size=3D1073741824 =20 Event: l2_update; errno: 28; imm: off; once: on; write -b -qemu-io: write failed: No space left on device +write failed: No space left on device No errors were found on the image. Formatting 'TEST_DIR/t.IMGFMT', fmt=3DIMGFMT size=3D1073741824 =20 Event: l2_update; errno: 28; imm: off; once: off; write -qemu-io: write failed: No space left on device -qemu-io: Failed to flush the L2 table cache: No space left on device -qemu-io: Failed to flush the refcount block cache: No space left on device +write failed: No space left on device +Failed to flush the L2 table cache: No space left on device +Failed to flush the refcount block cache: No space left on device No errors were found on the image. Formatting 'TEST_DIR/t.IMGFMT', fmt=3DIMGFMT size=3D1073741824 =20 Event: l2_update; errno: 28; imm: off; once: off; write -b -qemu-io: write failed: No space left on device -qemu-io: Failed to flush the L2 table cache: No space left on device -qemu-io: Failed to flush the refcount block cache: No space left on device +write failed: No space left on device +Failed to flush the L2 table cache: No space left on device +Failed to flush the refcount block cache: No space left on device No errors were found on the image. Formatting 'TEST_DIR/t.IMGFMT', fmt=3DIMGFMT size=3D1073741824 =20 Event: l2_alloc_write; errno: 5; imm: off; once: on; write -qemu-io: write failed: Input/output error +write failed: Input/output error No errors were found on the image. Formatting 'TEST_DIR/t.IMGFMT', fmt=3DIMGFMT size=3D1073741824 =20 Event: l2_alloc_write; errno: 5; imm: off; once: on; write -b -qemu-io: write failed: Input/output error +write failed: Input/output error No errors were found on the image. Formatting 'TEST_DIR/t.IMGFMT', fmt=3DIMGFMT size=3D1073741824 =20 Event: l2_alloc_write; errno: 5; imm: off; once: off; write -qemu-io: write failed: Input/output error -qemu-io: Failed to flush the L2 table cache: Input/output error -qemu-io: Failed to flush the refcount block cache: Input/output error +write failed: Input/output error +Failed to flush the L2 table cache: Input/output error +Failed to flush the refcount block cache: Input/output error No errors were found on the image. Formatting 'TEST_DIR/t.IMGFMT', fmt=3DIMGFMT size=3D1073741824 =20 Event: l2_alloc_write; errno: 5; imm: off; once: off; write -b -qemu-io: write failed: Input/output error -qemu-io: Failed to flush the L2 table cache: Input/output error -qemu-io: Failed to flush the refcount block cache: Input/output error +write failed: Input/output error +Failed to flush the L2 table cache: Input/output error +Failed to flush the refcount block cache: Input/output error No errors were found on the image. Formatting 'TEST_DIR/t.IMGFMT', fmt=3DIMGFMT size=3D1073741824 =20 Event: l2_alloc_write; errno: 28; imm: off; once: on; write -qemu-io: write failed: No space left on device +write failed: No space left on device No errors were found on the image. Formatting 'TEST_DIR/t.IMGFMT', fmt=3DIMGFMT size=3D1073741824 =20 Event: l2_alloc_write; errno: 28; imm: off; once: on; write -b -qemu-io: write failed: No space left on device +write failed: No space left on device No errors were found on the image. Formatting 'TEST_DIR/t.IMGFMT', fmt=3DIMGFMT size=3D1073741824 =20 Event: l2_alloc_write; errno: 28; imm: off; once: off; write -qemu-io: write failed: No space left on device -qemu-io: Failed to flush the L2 table cache: No space left on device -qemu-io: Failed to flush the refcount block cache: No space left on device +write failed: No space left on device +Failed to flush the L2 table cache: No space left on device +Failed to flush the refcount block cache: No space left on device No errors were found on the image. Formatting 'TEST_DIR/t.IMGFMT', fmt=3DIMGFMT size=3D1073741824 =20 Event: l2_alloc_write; errno: 28; imm: off; once: off; write -b -qemu-io: write failed: No space left on device -qemu-io: Failed to flush the L2 table cache: No space left on device -qemu-io: Failed to flush the refcount block cache: No space left on device +write failed: No space left on device +Failed to flush the L2 table cache: No space left on device +Failed to flush the refcount block cache: No space left on device No errors were found on the image. Formatting 'TEST_DIR/t.IMGFMT', fmt=3DIMGFMT size=3D1073741824 =20 Event: write_aio; errno: 5; imm: off; once: on; write -qemu-io: write failed: Input/output error +write failed: Input/output error No errors were found on the image. Formatting 'TEST_DIR/t.IMGFMT', fmt=3DIMGFMT size=3D1073741824 =20 Event: write_aio; errno: 5; imm: off; once: on; write -b -qemu-io: write failed: Input/output error +write failed: Input/output error No errors were found on the image. Formatting 'TEST_DIR/t.IMGFMT', fmt=3DIMGFMT size=3D1073741824 =20 Event: write_aio; errno: 5; imm: off; once: off; write -qemu-io: write failed: Input/output error -qemu-io: Failed to flush the L2 table cache: Input/output error -qemu-io: Failed to flush the refcount block cache: Input/output error +write failed: Input/output error +Failed to flush the L2 table cache: Input/output error +Failed to flush the refcount block cache: Input/output error No errors were found on the image. Formatting 'TEST_DIR/t.IMGFMT', fmt=3DIMGFMT size=3D1073741824 =20 Event: write_aio; errno: 5; imm: off; once: off; write -b -qemu-io: write failed: Input/output error -qemu-io: Failed to flush the L2 table cache: Input/output error -qemu-io: Failed to flush the refcount block cache: Input/output error +write failed: Input/output error +Failed to flush the L2 table cache: Input/output error +Failed to flush the refcount block cache: Input/output error No errors were found on the image. Formatting 'TEST_DIR/t.IMGFMT', fmt=3DIMGFMT size=3D1073741824 =20 Event: write_aio; errno: 28; imm: off; once: on; write -qemu-io: write failed: No space left on device +write failed: No space left on device No errors were found on the image. Formatting 'TEST_DIR/t.IMGFMT', fmt=3DIMGFMT size=3D1073741824 =20 Event: write_aio; errno: 28; imm: off; once: on; write -b -qemu-io: write failed: No space left on device +write failed: No space left on device No errors were found on the image. Formatting 'TEST_DIR/t.IMGFMT', fmt=3DIMGFMT size=3D1073741824 =20 Event: write_aio; errno: 28; imm: off; once: off; write -qemu-io: write failed: No space left on device -qemu-io: Failed to flush the L2 table cache: No space left on device -qemu-io: Failed to flush the refcount block cache: No space left on device +write failed: No space left on device +Failed to flush the L2 table cache: No space left on device +Failed to flush the refcount block cache: No space left on device No errors were found on the image. Formatting 'TEST_DIR/t.IMGFMT', fmt=3DIMGFMT size=3D1073741824 =20 Event: write_aio; errno: 28; imm: off; once: off; write -b -qemu-io: write failed: No space left on device -qemu-io: Failed to flush the L2 table cache: No space left on device -qemu-io: Failed to flush the refcount block cache: No space left on device +write failed: No space left on device +Failed to flush the L2 table cache: No space left on device +Failed to flush the refcount block cache: No space left on device No errors were found on the image. Formatting 'TEST_DIR/t.IMGFMT', fmt=3DIMGFMT size=3D1073741824 =20 Event: refblock_load; errno: 5; imm: off; once: on; write -qemu-io: write failed: Input/output error +write failed: Input/output error No errors were found on the image. Formatting 'TEST_DIR/t.IMGFMT', fmt=3DIMGFMT size=3D1073741824 =20 Event: refblock_load; errno: 5; imm: off; once: on; write -b -qemu-io: write failed: Input/output error +write failed: Input/output error No errors were found on the image. Formatting 'TEST_DIR/t.IMGFMT', fmt=3DIMGFMT size=3D1073741824 =20 Event: refblock_load; errno: 5; imm: off; once: off; write -qemu-io: write failed: Input/output error -qemu-io: Failed to flush the L2 table cache: Input/output error -qemu-io: Failed to flush the refcount block cache: Input/output error +write failed: Input/output error +Failed to flush the L2 table cache: Input/output error +Failed to flush the refcount block cache: Input/output error No errors were found on the image. Formatting 'TEST_DIR/t.IMGFMT', fmt=3DIMGFMT size=3D1073741824 =20 Event: refblock_load; errno: 5; imm: off; once: off; write -b -qemu-io: write failed: Input/output error -qemu-io: Failed to flush the L2 table cache: Input/output error -qemu-io: Failed to flush the refcount block cache: Input/output error +write failed: Input/output error +Failed to flush the L2 table cache: Input/output error +Failed to flush the refcount block cache: Input/output error No errors were found on the image. Formatting 'TEST_DIR/t.IMGFMT', fmt=3DIMGFMT size=3D1073741824 =20 Event: refblock_load; errno: 28; imm: off; once: on; write -qemu-io: write failed: No space left on device +write failed: No space left on device No errors were found on the image. Formatting 'TEST_DIR/t.IMGFMT', fmt=3DIMGFMT size=3D1073741824 =20 Event: refblock_load; errno: 28; imm: off; once: on; write -b -qemu-io: write failed: No space left on device +write failed: No space left on device No errors were found on the image. Formatting 'TEST_DIR/t.IMGFMT', fmt=3DIMGFMT size=3D1073741824 =20 Event: refblock_load; errno: 28; imm: off; once: off; write -qemu-io: write failed: No space left on device -qemu-io: Failed to flush the L2 table cache: No space left on device -qemu-io: Failed to flush the refcount block cache: No space left on device +write failed: No space left on device +Failed to flush the L2 table cache: No space left on device +Failed to flush the refcount block cache: No space left on device No errors were found on the image. Formatting 'TEST_DIR/t.IMGFMT', fmt=3DIMGFMT size=3D1073741824 =20 Event: refblock_load; errno: 28; imm: off; once: off; write -b -qemu-io: write failed: No space left on device -qemu-io: Failed to flush the L2 table cache: No space left on device -qemu-io: Failed to flush the refcount block cache: No space left on device +write failed: No space left on device +Failed to flush the L2 table cache: No space left on device +Failed to flush the refcount block cache: No space left on device No errors were found on the image. Formatting 'TEST_DIR/t.IMGFMT', fmt=3DIMGFMT size=3D1073741824 =20 Event: refblock_update_part; errno: 5; imm: off; once: on; write -qemu-io: write failed: Input/output error +write failed: Input/output error No errors were found on the image. Formatting 'TEST_DIR/t.IMGFMT', fmt=3DIMGFMT size=3D1073741824 =20 Event: refblock_update_part; errno: 5; imm: off; once: on; write -b -qemu-io: write failed: Input/output error +write failed: Input/output error No errors were found on the image. Formatting 'TEST_DIR/t.IMGFMT', fmt=3DIMGFMT size=3D1073741824 =20 Event: refblock_update_part; errno: 5; imm: off; once: off; write -qemu-io: write failed: Input/output error -qemu-io: Failed to flush the L2 table cache: Input/output error -qemu-io: Failed to flush the refcount block cache: Input/output error +write failed: Input/output error +Failed to flush the L2 table cache: Input/output error +Failed to flush the refcount block cache: Input/output error No errors were found on the image. Formatting 'TEST_DIR/t.IMGFMT', fmt=3DIMGFMT size=3D1073741824 =20 Event: refblock_update_part; errno: 5; imm: off; once: off; write -b -qemu-io: write failed: Input/output error -qemu-io: Failed to flush the L2 table cache: Input/output error -qemu-io: Failed to flush the refcount block cache: Input/output error +write failed: Input/output error +Failed to flush the L2 table cache: Input/output error +Failed to flush the refcount block cache: Input/output error No errors were found on the image. Formatting 'TEST_DIR/t.IMGFMT', fmt=3DIMGFMT size=3D1073741824 =20 Event: refblock_update_part; errno: 28; imm: off; once: on; write -qemu-io: write failed: No space left on device +write failed: No space left on device No errors were found on the image. Formatting 'TEST_DIR/t.IMGFMT', fmt=3DIMGFMT size=3D1073741824 =20 Event: refblock_update_part; errno: 28; imm: off; once: on; write -b -qemu-io: write failed: No space left on device +write failed: No space left on device No errors were found on the image. Formatting 'TEST_DIR/t.IMGFMT', fmt=3DIMGFMT size=3D1073741824 =20 Event: refblock_update_part; errno: 28; imm: off; once: off; write -qemu-io: write failed: No space left on device -qemu-io: Failed to flush the L2 table cache: No space left on device -qemu-io: Failed to flush the refcount block cache: No space left on device +write failed: No space left on device +Failed to flush the L2 table cache: No space left on device +Failed to flush the refcount block cache: No space left on device No errors were found on the image. Formatting 'TEST_DIR/t.IMGFMT', fmt=3DIMGFMT size=3D1073741824 =20 Event: refblock_update_part; errno: 28; imm: off; once: off; write -b -qemu-io: write failed: No space left on device -qemu-io: Failed to flush the L2 table cache: No space left on device -qemu-io: Failed to flush the refcount block cache: No space left on device +write failed: No space left on device +Failed to flush the L2 table cache: No space left on device +Failed to flush the refcount block cache: No space left on device No errors were found on the image. Formatting 'TEST_DIR/t.IMGFMT', fmt=3DIMGFMT size=3D1073741824 =20 Event: refblock_alloc; errno: 5; imm: off; once: on; write -qemu-io: write failed: Input/output error +write failed: Input/output error No errors were found on the image. Formatting 'TEST_DIR/t.IMGFMT', fmt=3DIMGFMT size=3D1073741824 =20 Event: refblock_alloc; errno: 5; imm: off; once: on; write -b -qemu-io: write failed: Input/output error +write failed: Input/output error No errors were found on the image. Formatting 'TEST_DIR/t.IMGFMT', fmt=3DIMGFMT size=3D1073741824 =20 Event: refblock_alloc; errno: 5; imm: off; once: off; write -qemu-io: write failed: Input/output error -qemu-io: Failed to flush the L2 table cache: Input/output error -qemu-io: Failed to flush the refcount block cache: Input/output error +write failed: Input/output error +Failed to flush the L2 table cache: Input/output error +Failed to flush the refcount block cache: Input/output error No errors were found on the image. Formatting 'TEST_DIR/t.IMGFMT', fmt=3DIMGFMT size=3D1073741824 =20 Event: refblock_alloc; errno: 5; imm: off; once: off; write -b -qemu-io: write failed: Input/output error -qemu-io: Failed to flush the L2 table cache: Input/output error -qemu-io: Failed to flush the refcount block cache: Input/output error +write failed: Input/output error +Failed to flush the L2 table cache: Input/output error +Failed to flush the refcount block cache: Input/output error No errors were found on the image. Formatting 'TEST_DIR/t.IMGFMT', fmt=3DIMGFMT size=3D1073741824 =20 Event: refblock_alloc; errno: 28; imm: off; once: on; write -qemu-io: write failed: No space left on device +write failed: No space left on device No errors were found on the image. Formatting 'TEST_DIR/t.IMGFMT', fmt=3DIMGFMT size=3D1073741824 =20 Event: refblock_alloc; errno: 28; imm: off; once: on; write -b -qemu-io: write failed: No space left on device +write failed: No space left on device No errors were found on the image. Formatting 'TEST_DIR/t.IMGFMT', fmt=3DIMGFMT size=3D1073741824 =20 Event: refblock_alloc; errno: 28; imm: off; once: off; write -qemu-io: write failed: No space left on device -qemu-io: Failed to flush the L2 table cache: No space left on device -qemu-io: Failed to flush the refcount block cache: No space left on device +write failed: No space left on device +Failed to flush the L2 table cache: No space left on device +Failed to flush the refcount block cache: No space left on device No errors were found on the image. Formatting 'TEST_DIR/t.IMGFMT', fmt=3DIMGFMT size=3D1073741824 =20 Event: refblock_alloc; errno: 28; imm: off; once: off; write -b -qemu-io: write failed: No space left on device -qemu-io: Failed to flush the L2 table cache: No space left on device -qemu-io: Failed to flush the refcount block cache: No space left on device +write failed: No space left on device +Failed to flush the L2 table cache: No space left on device +Failed to flush the refcount block cache: No space left on device No errors were found on the image. Formatting 'TEST_DIR/t.IMGFMT', fmt=3DIMGFMT size=3D1073741824 =20 Event: cluster_alloc; errno: 5; imm: off; once: on; write -qemu-io: write failed: Input/output error +write failed: Input/output error No errors were found on the image. Formatting 'TEST_DIR/t.IMGFMT', fmt=3DIMGFMT size=3D1073741824 =20 Event: cluster_alloc; errno: 5; imm: off; once: on; write -b -qemu-io: write failed: Input/output error +write failed: Input/output error No errors were found on the image. Formatting 'TEST_DIR/t.IMGFMT', fmt=3DIMGFMT size=3D1073741824 =20 Event: cluster_alloc; errno: 5; imm: off; once: off; write -qemu-io: write failed: Input/output error +write failed: Input/output error No errors were found on the image. Formatting 'TEST_DIR/t.IMGFMT', fmt=3DIMGFMT size=3D1073741824 =20 Event: cluster_alloc; errno: 5; imm: off; once: off; write -b -qemu-io: write failed: Input/output error +write failed: Input/output error No errors were found on the image. Formatting 'TEST_DIR/t.IMGFMT', fmt=3DIMGFMT size=3D1073741824 =20 Event: cluster_alloc; errno: 28; imm: off; once: on; write -qemu-io: write failed: No space left on device +write failed: No space left on device No errors were found on the image. Formatting 'TEST_DIR/t.IMGFMT', fmt=3DIMGFMT size=3D1073741824 =20 Event: cluster_alloc; errno: 28; imm: off; once: on; write -b -qemu-io: write failed: No space left on device +write failed: No space left on device No errors were found on the image. Formatting 'TEST_DIR/t.IMGFMT', fmt=3DIMGFMT size=3D1073741824 =20 Event: cluster_alloc; errno: 28; imm: off; once: off; write -qemu-io: write failed: No space left on device +write failed: No space left on device No errors were found on the image. Formatting 'TEST_DIR/t.IMGFMT', fmt=3DIMGFMT size=3D1073741824 =20 Event: cluster_alloc; errno: 28; imm: off; once: off; write -b -qemu-io: write failed: No space left on device +write failed: No space left on device No errors were found on the image. =20 =3D=3D=3D Refcount table growth tests =3D=3D=3D @@ -447,122 +447,122 @@ No errors were found on the image. Formatting 'TEST_DIR/t.IMGFMT', fmt=3DIMGFMT size=3D1073741824 =20 Event: refblock_alloc_hookup; errno: 28; imm: off; once: on; write -qemu-io: write failed: No space left on device +write failed: No space left on device No errors were found on the image. Formatting 'TEST_DIR/t.IMGFMT', fmt=3DIMGFMT size=3D1073741824 =20 Event: refblock_alloc_hookup; errno: 28; imm: off; once: on; write -b -qemu-io: write failed: No space left on device +write failed: No space left on device No errors were found on the image. Formatting 'TEST_DIR/t.IMGFMT', fmt=3DIMGFMT size=3D1073741824 =20 Event: refblock_alloc_hookup; errno: 28; imm: off; once: off; write -qemu-io: write failed: No space left on device -qemu-io: Failed to flush the L2 table cache: No space left on device -qemu-io: Failed to flush the refcount block cache: No space left on device +write failed: No space left on device +Failed to flush the L2 table cache: No space left on device +Failed to flush the refcount block cache: No space left on device No errors were found on the image. Formatting 'TEST_DIR/t.IMGFMT', fmt=3DIMGFMT size=3D1073741824 =20 Event: refblock_alloc_hookup; errno: 28; imm: off; once: off; write -b -qemu-io: write failed: No space left on device -qemu-io: Failed to flush the L2 table cache: No space left on device -qemu-io: Failed to flush the refcount block cache: No space left on device +write failed: No space left on device +Failed to flush the L2 table cache: No space left on device +Failed to flush the refcount block cache: No space left on device No errors were found on the image. Formatting 'TEST_DIR/t.IMGFMT', fmt=3DIMGFMT size=3D1073741824 =20 Event: refblock_alloc_write; errno: 28; imm: off; once: on; write -qemu-io: write failed: No space left on device +write failed: No space left on device No errors were found on the image. Formatting 'TEST_DIR/t.IMGFMT', fmt=3DIMGFMT size=3D1073741824 =20 Event: refblock_alloc_write; errno: 28; imm: off; once: on; write -b -qemu-io: write failed: No space left on device +write failed: No space left on device No errors were found on the image. Formatting 'TEST_DIR/t.IMGFMT', fmt=3DIMGFMT size=3D1073741824 =20 Event: refblock_alloc_write; errno: 28; imm: off; once: off; write -qemu-io: write failed: No space left on device -qemu-io: Failed to flush the L2 table cache: No space left on device -qemu-io: Failed to flush the refcount block cache: No space left on device +write failed: No space left on device +Failed to flush the L2 table cache: No space left on device +Failed to flush the refcount block cache: No space left on device No errors were found on the image. Formatting 'TEST_DIR/t.IMGFMT', fmt=3DIMGFMT size=3D1073741824 =20 Event: refblock_alloc_write; errno: 28; imm: off; once: off; write -b -qemu-io: write failed: No space left on device -qemu-io: Failed to flush the L2 table cache: No space left on device -qemu-io: Failed to flush the refcount block cache: No space left on device +write failed: No space left on device +Failed to flush the L2 table cache: No space left on device +Failed to flush the refcount block cache: No space left on device No errors were found on the image. Formatting 'TEST_DIR/t.IMGFMT', fmt=3DIMGFMT size=3D1073741824 =20 Event: refblock_alloc_write_blocks; errno: 28; imm: off; once: on; write -qemu-io: write failed: No space left on device +write failed: No space left on device No errors were found on the image. Formatting 'TEST_DIR/t.IMGFMT', fmt=3DIMGFMT size=3D1073741824 =20 Event: refblock_alloc_write_blocks; errno: 28; imm: off; once: on; write -b -qemu-io: write failed: No space left on device +write failed: No space left on device No errors were found on the image. Formatting 'TEST_DIR/t.IMGFMT', fmt=3DIMGFMT size=3D1073741824 =20 Event: refblock_alloc_write_blocks; errno: 28; imm: off; once: off; write -qemu-io: write failed: No space left on device -qemu-io: Failed to flush the L2 table cache: No space left on device -qemu-io: Failed to flush the refcount block cache: No space left on device +write failed: No space left on device +Failed to flush the L2 table cache: No space left on device +Failed to flush the refcount block cache: No space left on device No errors were found on the image. Formatting 'TEST_DIR/t.IMGFMT', fmt=3DIMGFMT size=3D1073741824 =20 Event: refblock_alloc_write_blocks; errno: 28; imm: off; once: off; write = -b -qemu-io: write failed: No space left on device -qemu-io: Failed to flush the L2 table cache: No space left on device -qemu-io: Failed to flush the refcount block cache: No space left on device +write failed: No space left on device +Failed to flush the L2 table cache: No space left on device +Failed to flush the refcount block cache: No space left on device No errors were found on the image. Formatting 'TEST_DIR/t.IMGFMT', fmt=3DIMGFMT size=3D1073741824 =20 Event: refblock_alloc_write_table; errno: 28; imm: off; once: on; write -qemu-io: write failed: No space left on device +write failed: No space left on device No errors were found on the image. Formatting 'TEST_DIR/t.IMGFMT', fmt=3DIMGFMT size=3D1073741824 =20 Event: refblock_alloc_write_table; errno: 28; imm: off; once: on; write -b -qemu-io: write failed: No space left on device +write failed: No space left on device No errors were found on the image. Formatting 'TEST_DIR/t.IMGFMT', fmt=3DIMGFMT size=3D1073741824 =20 Event: refblock_alloc_write_table; errno: 28; imm: off; once: off; write -qemu-io: write failed: No space left on device -qemu-io: Failed to flush the L2 table cache: No space left on device -qemu-io: Failed to flush the refcount block cache: No space left on device +write failed: No space left on device +Failed to flush the L2 table cache: No space left on device +Failed to flush the refcount block cache: No space left on device No errors were found on the image. Formatting 'TEST_DIR/t.IMGFMT', fmt=3DIMGFMT size=3D1073741824 =20 Event: refblock_alloc_write_table; errno: 28; imm: off; once: off; write -b -qemu-io: write failed: No space left on device -qemu-io: Failed to flush the L2 table cache: No space left on device -qemu-io: Failed to flush the refcount block cache: No space left on device +write failed: No space left on device +Failed to flush the L2 table cache: No space left on device +Failed to flush the refcount block cache: No space left on device No errors were found on the image. Formatting 'TEST_DIR/t.IMGFMT', fmt=3DIMGFMT size=3D1073741824 =20 Event: refblock_alloc_switch_table; errno: 28; imm: off; once: on; write -qemu-io: write failed: No space left on device +write failed: No space left on device No errors were found on the image. Formatting 'TEST_DIR/t.IMGFMT', fmt=3DIMGFMT size=3D1073741824 =20 Event: refblock_alloc_switch_table; errno: 28; imm: off; once: on; write -b -qemu-io: write failed: No space left on device +write failed: No space left on device No errors were found on the image. Formatting 'TEST_DIR/t.IMGFMT', fmt=3DIMGFMT size=3D1073741824 =20 Event: refblock_alloc_switch_table; errno: 28; imm: off; once: off; write -qemu-io: write failed: No space left on device -qemu-io: Failed to flush the L2 table cache: No space left on device -qemu-io: Failed to flush the refcount block cache: No space left on device +write failed: No space left on device +Failed to flush the L2 table cache: No space left on device +Failed to flush the refcount block cache: No space left on device No errors were found on the image. Formatting 'TEST_DIR/t.IMGFMT', fmt=3DIMGFMT size=3D1073741824 =20 Event: refblock_alloc_switch_table; errno: 28; imm: off; once: off; write = -b -qemu-io: write failed: No space left on device -qemu-io: Failed to flush the L2 table cache: No space left on device -qemu-io: Failed to flush the refcount block cache: No space left on device +write failed: No space left on device +Failed to flush the L2 table cache: No space left on device +Failed to flush the refcount block cache: No space left on device No errors were found on the image. =20 =3D=3D=3D L1 growth tests =3D=3D=3D @@ -570,76 +570,76 @@ No errors were found on the image. Formatting 'TEST_DIR/t.IMGFMT', fmt=3DIMGFMT size=3D1073741824 =20 Event: l1_grow_alloc_table; errno: 5; imm: off; once: on -qemu-io: write failed: Input/output error +write failed: Input/output error No errors were found on the image. Formatting 'TEST_DIR/t.IMGFMT', fmt=3DIMGFMT size=3D1073741824 =20 Event: l1_grow_alloc_table; errno: 5; imm: off; once: off -qemu-io: write failed: Input/output error +write failed: Input/output error No errors were found on the image. Formatting 'TEST_DIR/t.IMGFMT', fmt=3DIMGFMT size=3D1073741824 =20 Event: l1_grow_alloc_table; errno: 28; imm: off; once: on -qemu-io: write failed: No space left on device +write failed: No space left on device No errors were found on the image. Formatting 'TEST_DIR/t.IMGFMT', fmt=3DIMGFMT size=3D1073741824 =20 Event: l1_grow_alloc_table; errno: 28; imm: off; once: off -qemu-io: write failed: No space left on device +write failed: No space left on device No errors were found on the image. Formatting 'TEST_DIR/t.IMGFMT', fmt=3DIMGFMT size=3D1073741824 =20 Event: l1_grow_write_table; errno: 5; imm: off; once: on -qemu-io: write failed: Input/output error +write failed: Input/output error No errors were found on the image. Formatting 'TEST_DIR/t.IMGFMT', fmt=3DIMGFMT size=3D1073741824 =20 Event: l1_grow_write_table; errno: 5; imm: off; once: off -qemu-io: write failed: Input/output error -qemu-io: Failed to flush the L2 table cache: Input/output error -qemu-io: Failed to flush the refcount block cache: Input/output error +write failed: Input/output error +Failed to flush the L2 table cache: Input/output error +Failed to flush the refcount block cache: Input/output error No errors were found on the image. Formatting 'TEST_DIR/t.IMGFMT', fmt=3DIMGFMT size=3D1073741824 =20 Event: l1_grow_write_table; errno: 28; imm: off; once: on -qemu-io: write failed: No space left on device +write failed: No space left on device No errors were found on the image. Formatting 'TEST_DIR/t.IMGFMT', fmt=3DIMGFMT size=3D1073741824 =20 Event: l1_grow_write_table; errno: 28; imm: off; once: off -qemu-io: write failed: No space left on device -qemu-io: Failed to flush the L2 table cache: No space left on device -qemu-io: Failed to flush the refcount block cache: No space left on device +write failed: No space left on device +Failed to flush the L2 table cache: No space left on device +Failed to flush the refcount block cache: No space left on device No errors were found on the image. Formatting 'TEST_DIR/t.IMGFMT', fmt=3DIMGFMT size=3D1073741824 =20 Event: l1_grow_activate_table; errno: 5; imm: off; once: on -qemu-io: write failed: Input/output error +write failed: Input/output error No errors were found on the image. Formatting 'TEST_DIR/t.IMGFMT', fmt=3DIMGFMT size=3D1073741824 =20 Event: l1_grow_activate_table; errno: 5; imm: off; once: off -qemu-io: write failed: Input/output error -qemu-io: Failed to flush the L2 table cache: Input/output error -qemu-io: Failed to flush the refcount block cache: Input/output error +write failed: Input/output error +Failed to flush the L2 table cache: Input/output error +Failed to flush the refcount block cache: Input/output error No errors were found on the image. Formatting 'TEST_DIR/t.IMGFMT', fmt=3DIMGFMT size=3D1073741824 =20 Event: l1_grow_activate_table; errno: 28; imm: off; once: on -qemu-io: write failed: No space left on device +write failed: No space left on device No errors were found on the image. Formatting 'TEST_DIR/t.IMGFMT', fmt=3DIMGFMT size=3D1073741824 =20 Event: l1_grow_activate_table; errno: 28; imm: off; once: off -qemu-io: write failed: No space left on device -qemu-io: Failed to flush the L2 table cache: No space left on device -qemu-io: Failed to flush the refcount block cache: No space left on device +write failed: No space left on device +Failed to flush the L2 table cache: No space left on device +Failed to flush the refcount block cache: No space left on device No errors were found on the image. =20 =3D=3D=3D Avoid cluster leaks after temporary failure =3D=3D=3D =20 Formatting 'TEST_DIR/t.IMGFMT', fmt=3DIMGFMT size=3D67108864 -qemu-io: write failed: Input/output error +write failed: Input/output error wrote 1048576/1048576 bytes at offset 0 1 MiB, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec) No errors were found on the image. @@ -651,6 +651,6 @@ wrote 1024/1024 bytes at offset 0 1 KiB, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec) wrote 1024/1024 bytes at offset 0 1 KiB, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec) -qemu-io: write failed: Input/output error +write failed: Input/output error No errors were found on the image. *** done diff --git a/tests/qemu-iotests/026.out.nocache b/tests/qemu-iotests/026.ou= t.nocache index 9359d26d7e20..b46d00b35c85 100644 --- a/tests/qemu-iotests/026.out.nocache +++ b/tests/qemu-iotests/026.out.nocache @@ -14,15 +14,15 @@ No errors were found on the image. Formatting 'TEST_DIR/t.IMGFMT', fmt=3DIMGFMT size=3D1073741824=20 =20 Event: l1_update; errno: 5; imm: off; once: off; write=20 -qemu-io: Failed to flush the L2 table cache: Input/output error -qemu-io: Failed to flush the refcount block cache: Input/output error +Failed to flush the L2 table cache: Input/output error +Failed to flush the refcount block cache: Input/output error write failed: Input/output error No errors were found on the image. Formatting 'TEST_DIR/t.IMGFMT', fmt=3DIMGFMT size=3D1073741824=20 =20 Event: l1_update; errno: 5; imm: off; once: off; write -b -qemu-io: Failed to flush the L2 table cache: Input/output error -qemu-io: Failed to flush the refcount block cache: Input/output error +Failed to flush the L2 table cache: Input/output error +Failed to flush the refcount block cache: Input/output error write failed: Input/output error No errors were found on the image. Formatting 'TEST_DIR/t.IMGFMT', fmt=3DIMGFMT size=3D1073741824=20 @@ -38,15 +38,15 @@ No errors were found on the image. Formatting 'TEST_DIR/t.IMGFMT', fmt=3DIMGFMT size=3D1073741824=20 =20 Event: l1_update; errno: 28; imm: off; once: off; write=20 -qemu-io: Failed to flush the L2 table cache: No space left on device -qemu-io: Failed to flush the refcount block cache: No space left on device +Failed to flush the L2 table cache: No space left on device +Failed to flush the refcount block cache: No space left on device write failed: No space left on device No errors were found on the image. Formatting 'TEST_DIR/t.IMGFMT', fmt=3DIMGFMT size=3D1073741824=20 =20 Event: l1_update; errno: 28; imm: off; once: off; write -b -qemu-io: Failed to flush the L2 table cache: No space left on device -qemu-io: Failed to flush the refcount block cache: No space left on device +Failed to flush the L2 table cache: No space left on device +Failed to flush the refcount block cache: No space left on device write failed: No space left on device No errors were found on the image. Formatting 'TEST_DIR/t.IMGFMT', fmt=3DIMGFMT size=3D1073741824=20 @@ -128,16 +128,16 @@ No errors were found on the image. Formatting 'TEST_DIR/t.IMGFMT', fmt=3DIMGFMT size=3D1073741824 =20 Event: l2_update; errno: 5; imm: off; once: off; write=20 -qemu-io: Failed to flush the L2 table cache: Input/output error -qemu-io: Failed to flush the refcount block cache: Input/output error +Failed to flush the L2 table cache: Input/output error +Failed to flush the refcount block cache: Input/output error wrote 131072/131072 bytes at offset 0 128 KiB, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec) No errors were found on the image. Formatting 'TEST_DIR/t.IMGFMT', fmt=3DIMGFMT size=3D1073741824=20 =20 Event: l2_update; errno: 5; imm: off; once: off; write -b -qemu-io: Failed to flush the L2 table cache: Input/output error -qemu-io: Failed to flush the refcount block cache: Input/output error +Failed to flush the L2 table cache: Input/output error +Failed to flush the refcount block cache: Input/output error wrote 131072/131072 bytes at offset 0 128 KiB, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec) No errors were found on the image. @@ -156,16 +156,16 @@ No errors were found on the image. Formatting 'TEST_DIR/t.IMGFMT', fmt=3DIMGFMT size=3D1073741824 =20 Event: l2_update; errno: 28; imm: off; once: off; write=20 -qemu-io: Failed to flush the L2 table cache: No space left on device -qemu-io: Failed to flush the refcount block cache: No space left on device +Failed to flush the L2 table cache: No space left on device +Failed to flush the refcount block cache: No space left on device wrote 131072/131072 bytes at offset 0 128 KiB, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec) No errors were found on the image. Formatting 'TEST_DIR/t.IMGFMT', fmt=3DIMGFMT size=3D1073741824=20 =20 Event: l2_update; errno: 28; imm: off; once: off; write -b -qemu-io: Failed to flush the L2 table cache: No space left on device -qemu-io: Failed to flush the refcount block cache: No space left on device +Failed to flush the L2 table cache: No space left on device +Failed to flush the refcount block cache: No space left on device wrote 131072/131072 bytes at offset 0 128 KiB, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec) No errors were found on the image. @@ -182,15 +182,15 @@ No errors were found on the image. Formatting 'TEST_DIR/t.IMGFMT', fmt=3DIMGFMT size=3D1073741824=20 =20 Event: l2_alloc_write; errno: 5; imm: off; once: off; write=20 -qemu-io: Failed to flush the L2 table cache: Input/output error -qemu-io: Failed to flush the refcount block cache: Input/output error +Failed to flush the L2 table cache: Input/output error +Failed to flush the refcount block cache: Input/output error write failed: Input/output error No errors were found on the image. Formatting 'TEST_DIR/t.IMGFMT', fmt=3DIMGFMT size=3D1073741824=20 =20 Event: l2_alloc_write; errno: 5; imm: off; once: off; write -b -qemu-io: Failed to flush the L2 table cache: Input/output error -qemu-io: Failed to flush the refcount block cache: Input/output error +Failed to flush the L2 table cache: Input/output error +Failed to flush the refcount block cache: Input/output error write failed: Input/output error No errors were found on the image. Formatting 'TEST_DIR/t.IMGFMT', fmt=3DIMGFMT size=3D1073741824=20 @@ -206,15 +206,15 @@ No errors were found on the image. Formatting 'TEST_DIR/t.IMGFMT', fmt=3DIMGFMT size=3D1073741824=20 =20 Event: l2_alloc_write; errno: 28; imm: off; once: off; write=20 -qemu-io: Failed to flush the L2 table cache: No space left on device -qemu-io: Failed to flush the refcount block cache: No space left on device +Failed to flush the L2 table cache: No space left on device +Failed to flush the refcount block cache: No space left on device write failed: No space left on device No errors were found on the image. Formatting 'TEST_DIR/t.IMGFMT', fmt=3DIMGFMT size=3D1073741824=20 =20 Event: l2_alloc_write; errno: 28; imm: off; once: off; write -b -qemu-io: Failed to flush the L2 table cache: No space left on device -qemu-io: Failed to flush the refcount block cache: No space left on device +Failed to flush the L2 table cache: No space left on device +Failed to flush the refcount block cache: No space left on device write failed: No space left on device No errors were found on the image. Formatting 'TEST_DIR/t.IMGFMT', fmt=3DIMGFMT size=3D1073741824=20 @@ -230,15 +230,15 @@ No errors were found on the image. Formatting 'TEST_DIR/t.IMGFMT', fmt=3DIMGFMT size=3D1073741824=20 =20 Event: write_aio; errno: 5; imm: off; once: off; write=20 -qemu-io: Failed to flush the L2 table cache: Input/output error -qemu-io: Failed to flush the refcount block cache: Input/output error +Failed to flush the L2 table cache: Input/output error +Failed to flush the refcount block cache: Input/output error write failed: Input/output error No errors were found on the image. Formatting 'TEST_DIR/t.IMGFMT', fmt=3DIMGFMT size=3D1073741824=20 =20 Event: write_aio; errno: 5; imm: off; once: off; write -b -qemu-io: Failed to flush the L2 table cache: Input/output error -qemu-io: Failed to flush the refcount block cache: Input/output error +Failed to flush the L2 table cache: Input/output error +Failed to flush the refcount block cache: Input/output error write failed: Input/output error No errors were found on the image. Formatting 'TEST_DIR/t.IMGFMT', fmt=3DIMGFMT size=3D1073741824=20 @@ -254,15 +254,15 @@ No errors were found on the image. Formatting 'TEST_DIR/t.IMGFMT', fmt=3DIMGFMT size=3D1073741824=20 =20 Event: write_aio; errno: 28; imm: off; once: off; write=20 -qemu-io: Failed to flush the L2 table cache: No space left on device -qemu-io: Failed to flush the refcount block cache: No space left on device +Failed to flush the L2 table cache: No space left on device +Failed to flush the refcount block cache: No space left on device write failed: No space left on device No errors were found on the image. Formatting 'TEST_DIR/t.IMGFMT', fmt=3DIMGFMT size=3D1073741824=20 =20 Event: write_aio; errno: 28; imm: off; once: off; write -b -qemu-io: Failed to flush the L2 table cache: No space left on device -qemu-io: Failed to flush the refcount block cache: No space left on device +Failed to flush the L2 table cache: No space left on device +Failed to flush the refcount block cache: No space left on device write failed: No space left on device No errors were found on the image. Formatting 'TEST_DIR/t.IMGFMT', fmt=3DIMGFMT size=3D1073741824=20 @@ -278,15 +278,15 @@ No errors were found on the image. Formatting 'TEST_DIR/t.IMGFMT', fmt=3DIMGFMT size=3D1073741824=20 =20 Event: refblock_load; errno: 5; imm: off; once: off; write=20 -qemu-io: Failed to flush the L2 table cache: Input/output error -qemu-io: Failed to flush the refcount block cache: Input/output error +Failed to flush the L2 table cache: Input/output error +Failed to flush the refcount block cache: Input/output error write failed: Input/output error No errors were found on the image. Formatting 'TEST_DIR/t.IMGFMT', fmt=3DIMGFMT size=3D1073741824=20 =20 Event: refblock_load; errno: 5; imm: off; once: off; write -b -qemu-io: Failed to flush the L2 table cache: Input/output error -qemu-io: Failed to flush the refcount block cache: Input/output error +Failed to flush the L2 table cache: Input/output error +Failed to flush the refcount block cache: Input/output error write failed: Input/output error No errors were found on the image. Formatting 'TEST_DIR/t.IMGFMT', fmt=3DIMGFMT size=3D1073741824=20 @@ -302,15 +302,15 @@ No errors were found on the image. Formatting 'TEST_DIR/t.IMGFMT', fmt=3DIMGFMT size=3D1073741824=20 =20 Event: refblock_load; errno: 28; imm: off; once: off; write=20 -qemu-io: Failed to flush the L2 table cache: No space left on device -qemu-io: Failed to flush the refcount block cache: No space left on device +Failed to flush the L2 table cache: No space left on device +Failed to flush the refcount block cache: No space left on device write failed: No space left on device No errors were found on the image. Formatting 'TEST_DIR/t.IMGFMT', fmt=3DIMGFMT size=3D1073741824=20 =20 Event: refblock_load; errno: 28; imm: off; once: off; write -b -qemu-io: Failed to flush the L2 table cache: No space left on device -qemu-io: Failed to flush the refcount block cache: No space left on device +Failed to flush the L2 table cache: No space left on device +Failed to flush the refcount block cache: No space left on device write failed: No space left on device No errors were found on the image. Formatting 'TEST_DIR/t.IMGFMT', fmt=3DIMGFMT size=3D1073741824=20 @@ -326,15 +326,15 @@ No errors were found on the image. Formatting 'TEST_DIR/t.IMGFMT', fmt=3DIMGFMT size=3D1073741824=20 =20 Event: refblock_update_part; errno: 5; imm: off; once: off; write=20 -qemu-io: Failed to flush the L2 table cache: Input/output error -qemu-io: Failed to flush the refcount block cache: Input/output error +Failed to flush the L2 table cache: Input/output error +Failed to flush the refcount block cache: Input/output error write failed: Input/output error No errors were found on the image. Formatting 'TEST_DIR/t.IMGFMT', fmt=3DIMGFMT size=3D1073741824=20 =20 Event: refblock_update_part; errno: 5; imm: off; once: off; write -b -qemu-io: Failed to flush the L2 table cache: Input/output error -qemu-io: Failed to flush the refcount block cache: Input/output error +Failed to flush the L2 table cache: Input/output error +Failed to flush the refcount block cache: Input/output error write failed: Input/output error No errors were found on the image. Formatting 'TEST_DIR/t.IMGFMT', fmt=3DIMGFMT size=3D1073741824=20 @@ -350,15 +350,15 @@ No errors were found on the image. Formatting 'TEST_DIR/t.IMGFMT', fmt=3DIMGFMT size=3D1073741824=20 =20 Event: refblock_update_part; errno: 28; imm: off; once: off; write=20 -qemu-io: Failed to flush the L2 table cache: No space left on device -qemu-io: Failed to flush the refcount block cache: No space left on device +Failed to flush the L2 table cache: No space left on device +Failed to flush the refcount block cache: No space left on device write failed: No space left on device No errors were found on the image. Formatting 'TEST_DIR/t.IMGFMT', fmt=3DIMGFMT size=3D1073741824=20 =20 Event: refblock_update_part; errno: 28; imm: off; once: off; write -b -qemu-io: Failed to flush the L2 table cache: No space left on device -qemu-io: Failed to flush the refcount block cache: No space left on device +Failed to flush the L2 table cache: No space left on device +Failed to flush the refcount block cache: No space left on device write failed: No space left on device No errors were found on the image. Formatting 'TEST_DIR/t.IMGFMT', fmt=3DIMGFMT size=3D1073741824=20 @@ -374,15 +374,15 @@ No errors were found on the image. Formatting 'TEST_DIR/t.IMGFMT', fmt=3DIMGFMT size=3D1073741824=20 =20 Event: refblock_alloc; errno: 5; imm: off; once: off; write=20 -qemu-io: Failed to flush the L2 table cache: Input/output error -qemu-io: Failed to flush the refcount block cache: Input/output error +Failed to flush the L2 table cache: Input/output error +Failed to flush the refcount block cache: Input/output error write failed: Input/output error No errors were found on the image. Formatting 'TEST_DIR/t.IMGFMT', fmt=3DIMGFMT size=3D1073741824=20 =20 Event: refblock_alloc; errno: 5; imm: off; once: off; write -b -qemu-io: Failed to flush the L2 table cache: Input/output error -qemu-io: Failed to flush the refcount block cache: Input/output error +Failed to flush the L2 table cache: Input/output error +Failed to flush the refcount block cache: Input/output error write failed: Input/output error No errors were found on the image. Formatting 'TEST_DIR/t.IMGFMT', fmt=3DIMGFMT size=3D1073741824=20 @@ -398,15 +398,15 @@ No errors were found on the image. Formatting 'TEST_DIR/t.IMGFMT', fmt=3DIMGFMT size=3D1073741824=20 =20 Event: refblock_alloc; errno: 28; imm: off; once: off; write=20 -qemu-io: Failed to flush the L2 table cache: No space left on device -qemu-io: Failed to flush the refcount block cache: No space left on device +Failed to flush the L2 table cache: No space left on device +Failed to flush the refcount block cache: No space left on device write failed: No space left on device No errors were found on the image. Formatting 'TEST_DIR/t.IMGFMT', fmt=3DIMGFMT size=3D1073741824=20 =20 Event: refblock_alloc; errno: 28; imm: off; once: off; write -b -qemu-io: Failed to flush the L2 table cache: No space left on device -qemu-io: Failed to flush the refcount block cache: No space left on device +Failed to flush the L2 table cache: No space left on device +Failed to flush the refcount block cache: No space left on device write failed: No space left on device No errors were found on the image. Formatting 'TEST_DIR/t.IMGFMT', fmt=3DIMGFMT size=3D1073741824=20 @@ -465,15 +465,15 @@ No errors were found on the image. Formatting 'TEST_DIR/t.IMGFMT', fmt=3DIMGFMT size=3D1073741824=20 =20 Event: refblock_alloc_hookup; errno: 28; imm: off; once: off; write=20 -qemu-io: Failed to flush the L2 table cache: No space left on device -qemu-io: Failed to flush the refcount block cache: No space left on device +Failed to flush the L2 table cache: No space left on device +Failed to flush the refcount block cache: No space left on device write failed: No space left on device No errors were found on the image. Formatting 'TEST_DIR/t.IMGFMT', fmt=3DIMGFMT size=3D1073741824=20 =20 Event: refblock_alloc_hookup; errno: 28; imm: off; once: off; write -b -qemu-io: Failed to flush the L2 table cache: No space left on device -qemu-io: Failed to flush the refcount block cache: No space left on device +Failed to flush the L2 table cache: No space left on device +Failed to flush the refcount block cache: No space left on device write failed: No space left on device No errors were found on the image. Formatting 'TEST_DIR/t.IMGFMT', fmt=3DIMGFMT size=3D1073741824=20 @@ -489,15 +489,15 @@ No errors were found on the image. Formatting 'TEST_DIR/t.IMGFMT', fmt=3DIMGFMT size=3D1073741824=20 =20 Event: refblock_alloc_write; errno: 28; imm: off; once: off; write=20 -qemu-io: Failed to flush the L2 table cache: No space left on device -qemu-io: Failed to flush the refcount block cache: No space left on device +Failed to flush the L2 table cache: No space left on device +Failed to flush the refcount block cache: No space left on device write failed: No space left on device No errors were found on the image. Formatting 'TEST_DIR/t.IMGFMT', fmt=3DIMGFMT size=3D1073741824=20 =20 Event: refblock_alloc_write; errno: 28; imm: off; once: off; write -b -qemu-io: Failed to flush the L2 table cache: No space left on device -qemu-io: Failed to flush the refcount block cache: No space left on device +Failed to flush the L2 table cache: No space left on device +Failed to flush the refcount block cache: No space left on device write failed: No space left on device No errors were found on the image. Formatting 'TEST_DIR/t.IMGFMT', fmt=3DIMGFMT size=3D1073741824=20 @@ -513,15 +513,15 @@ No errors were found on the image. Formatting 'TEST_DIR/t.IMGFMT', fmt=3DIMGFMT size=3D1073741824=20 =20 Event: refblock_alloc_write_blocks; errno: 28; imm: off; once: off; write=20 -qemu-io: Failed to flush the L2 table cache: No space left on device -qemu-io: Failed to flush the refcount block cache: No space left on device +Failed to flush the L2 table cache: No space left on device +Failed to flush the refcount block cache: No space left on device write failed: No space left on device No errors were found on the image. Formatting 'TEST_DIR/t.IMGFMT', fmt=3DIMGFMT size=3D1073741824=20 =20 Event: refblock_alloc_write_blocks; errno: 28; imm: off; once: off; write = -b -qemu-io: Failed to flush the L2 table cache: No space left on device -qemu-io: Failed to flush the refcount block cache: No space left on device +Failed to flush the L2 table cache: No space left on device +Failed to flush the refcount block cache: No space left on device write failed: No space left on device No errors were found on the image. Formatting 'TEST_DIR/t.IMGFMT', fmt=3DIMGFMT size=3D1073741824=20 @@ -537,15 +537,15 @@ No errors were found on the image. Formatting 'TEST_DIR/t.IMGFMT', fmt=3DIMGFMT size=3D1073741824=20 =20 Event: refblock_alloc_write_table; errno: 28; imm: off; once: off; write=20 -qemu-io: Failed to flush the L2 table cache: No space left on device -qemu-io: Failed to flush the refcount block cache: No space left on device +Failed to flush the L2 table cache: No space left on device +Failed to flush the refcount block cache: No space left on device write failed: No space left on device No errors were found on the image. Formatting 'TEST_DIR/t.IMGFMT', fmt=3DIMGFMT size=3D1073741824=20 =20 Event: refblock_alloc_write_table; errno: 28; imm: off; once: off; write -b -qemu-io: Failed to flush the L2 table cache: No space left on device -qemu-io: Failed to flush the refcount block cache: No space left on device +Failed to flush the L2 table cache: No space left on device +Failed to flush the refcount block cache: No space left on device write failed: No space left on device No errors were found on the image. Formatting 'TEST_DIR/t.IMGFMT', fmt=3DIMGFMT size=3D1073741824=20 @@ -561,15 +561,15 @@ No errors were found on the image. Formatting 'TEST_DIR/t.IMGFMT', fmt=3DIMGFMT size=3D1073741824=20 =20 Event: refblock_alloc_switch_table; errno: 28; imm: off; once: off; write=20 -qemu-io: Failed to flush the L2 table cache: No space left on device -qemu-io: Failed to flush the refcount block cache: No space left on device +Failed to flush the L2 table cache: No space left on device +Failed to flush the refcount block cache: No space left on device write failed: No space left on device No errors were found on the image. Formatting 'TEST_DIR/t.IMGFMT', fmt=3DIMGFMT size=3D1073741824=20 =20 Event: refblock_alloc_switch_table; errno: 28; imm: off; once: off; write = -b -qemu-io: Failed to flush the L2 table cache: No space left on device -qemu-io: Failed to flush the refcount block cache: No space left on device +Failed to flush the L2 table cache: No space left on device +Failed to flush the refcount block cache: No space left on device write failed: No space left on device No errors were found on the image. =20 @@ -603,8 +603,8 @@ No errors were found on the image. Formatting 'TEST_DIR/t.IMGFMT', fmt=3DIMGFMT size=3D1073741824=20 =20 Event: l1_grow_write_table; errno: 5; imm: off; once: off -qemu-io: Failed to flush the L2 table cache: Input/output error -qemu-io: Failed to flush the refcount block cache: Input/output error +Failed to flush the L2 table cache: Input/output error +Failed to flush the refcount block cache: Input/output error write failed: Input/output error No errors were found on the image. Formatting 'TEST_DIR/t.IMGFMT', fmt=3DIMGFMT size=3D1073741824=20 @@ -615,8 +615,8 @@ No errors were found on the image. Formatting 'TEST_DIR/t.IMGFMT', fmt=3DIMGFMT size=3D1073741824=20 =20 Event: l1_grow_write_table; errno: 28; imm: off; once: off -qemu-io: Failed to flush the L2 table cache: No space left on device -qemu-io: Failed to flush the refcount block cache: No space left on device +Failed to flush the L2 table cache: No space left on device +Failed to flush the refcount block cache: No space left on device write failed: No space left on device No errors were found on the image. Formatting 'TEST_DIR/t.IMGFMT', fmt=3DIMGFMT size=3D1073741824=20 @@ -627,8 +627,8 @@ No errors were found on the image. Formatting 'TEST_DIR/t.IMGFMT', fmt=3DIMGFMT size=3D1073741824=20 =20 Event: l1_grow_activate_table; errno: 5; imm: off; once: off -qemu-io: Failed to flush the L2 table cache: Input/output error -qemu-io: Failed to flush the refcount block cache: Input/output error +Failed to flush the L2 table cache: Input/output error +Failed to flush the refcount block cache: Input/output error write failed: Input/output error No errors were found on the image. Formatting 'TEST_DIR/t.IMGFMT', fmt=3DIMGFMT size=3D1073741824=20 @@ -639,8 +639,8 @@ No errors were found on the image. Formatting 'TEST_DIR/t.IMGFMT', fmt=3DIMGFMT size=3D1073741824=20 =20 Event: l1_grow_activate_table; errno: 28; imm: off; once: off -qemu-io: Failed to flush the L2 table cache: No space left on device -qemu-io: Failed to flush the refcount block cache: No space left on device +Failed to flush the L2 table cache: No space left on device +Failed to flush the refcount block cache: No space left on device write failed: No space left on device No errors were found on the image. =20 diff --git a/tests/qemu-iotests/059.out b/tests/qemu-iotests/059.out index 275ee7c7781a..be757ea2f211 100644 --- a/tests/qemu-iotests/059.out +++ b/tests/qemu-iotests/059.out @@ -2,15 +2,15 @@ QA output created by 059 =20 =3D=3D=3D Testing invalid granularity =3D=3D=3D Formatting 'TEST_DIR/t.IMGFMT', fmt=3DIMGFMT size=3D67108864 -qemu-io: can't open device TEST_DIR/t.vmdk: Invalid granularity, image may= be corrupt +can't open device TEST_DIR/t.vmdk: Invalid granularity, image may be corru= pt =20 =3D=3D=3D Testing too big L2 table size =3D=3D=3D Formatting 'TEST_DIR/t.IMGFMT', fmt=3DIMGFMT size=3D67108864 -qemu-io: can't open device TEST_DIR/t.vmdk: L2 table size too big +can't open device TEST_DIR/t.vmdk: L2 table size too big =20 =3D=3D=3D Testing too big L1 table size =3D=3D=3D Formatting 'TEST_DIR/t.IMGFMT', fmt=3DIMGFMT size=3D67108864 -qemu-io: can't open device TEST_DIR/t.vmdk: L1 size too big +can't open device TEST_DIR/t.vmdk: L1 size too big =20 =3D=3D=3D Testing monolithicFlat creation and opening =3D=3D=3D Formatting 'TEST_DIR/t.IMGFMT', fmt=3DIMGFMT size=3D2147483648 diff --git a/tests/qemu-iotests/060.out b/tests/qemu-iotests/060.out index 27275fd6b70e..8870a478231c 100644 --- a/tests/qemu-iotests/060.out +++ b/tests/qemu-iotests/060.out @@ -9,7 +9,7 @@ ERROR cluster 3 refcount=3D1 reference=3D3 Data may be corrupted, or further writes to the image may corrupt it. incompatible_features [] qcow2: Marking image as corrupt: Preventing invalid write on metadata (ove= rlaps with active L1 table); further corruption events will be suppressed -qemu-io: write failed: Input/output error +write failed: Input/output error incompatible_features [1] image: TEST_DIR/t.IMGFMT file format: IMGFMT @@ -22,8 +22,8 @@ Format specific information: refcount bits: 16 corrupt: true extended l2: false -qemu-io: can't open device TEST_DIR/t.IMGFMT: IMGFMT: Image is corrupt; ca= nnot be opened read/write -qemu-io: no file open, try 'help open' +can't open device TEST_DIR/t.IMGFMT: IMGFMT: Image is corrupt; cannot be o= pened read/write +no file open, try 'help open' read 512/512 bytes at offset 0 512 bytes, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec) =20 @@ -37,7 +37,7 @@ ERROR cluster 2 refcount=3D1 reference=3D2 Data may be corrupted, or further writes to the image may corrupt it. incompatible_features [] qcow2: Marking image as corrupt: Preventing invalid write on metadata (ove= rlaps with refcount block); further corruption events will be suppressed -qemu-io: write failed: Input/output error +write failed: Input/output error incompatible_features [1] ERROR refcount block 0 refcount=3D2 ERROR cluster 2 refcount=3D1 reference=3D2 @@ -73,7 +73,7 @@ Data may be corrupted, or further writes to the image may= corrupt it. This means waste of disk space, but no harm to data. incompatible_features [] qcow2: Marking image as corrupt: Preventing invalid write on metadata (ove= rlaps with inactive L2 table); further corruption events will be suppressed -qemu-io: write failed: Input/output error +write failed: Input/output error incompatible_features [1] ERROR cluster 4 refcount=3D1 reference=3D2 Leaked cluster 9 refcount=3D1 reference=3D0 @@ -108,8 +108,8 @@ wrote 65536/65536 bytes at offset 0 wrote 65536/65536 bytes at offset 536870912 64 KiB, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec) qcow2: Marking image as corrupt: Preventing invalid write on metadata (ove= rlaps with active L2 table); further corruption events will be suppressed -qemu-io: write failed: Input/output error -qemu-io: aio_write failed: No medium found +write failed: Input/output error +aio_write failed: No medium found blkdebug: Suspended request '0' blkdebug: Resuming request '0' =20 @@ -119,7 +119,7 @@ Formatting 'TEST_DIR/t.IMGFMT', fmt=3DIMGFMT size=3D671= 08864 wrote 65536/65536 bytes at offset 0 64 KiB, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec) qcow2: Marking image as corrupt: Preventing invalid write on metadata (ove= rlaps with qcow2_header); further corruption events will be suppressed -qemu-io: write failed: Input/output error +write failed: Input/output error =20 =3D=3D=3D Testing unaligned L1 entry =3D=3D=3D =20 @@ -127,7 +127,7 @@ Formatting 'TEST_DIR/t.IMGFMT', fmt=3DIMGFMT size=3D671= 08864 wrote 65536/65536 bytes at offset 0 64 KiB, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec) qcow2: Marking image as corrupt: L2 table offset 0x42a00 unaligned (L1 ind= ex: 0); further corruption events will be suppressed -qemu-io: read failed: Input/output error +read failed: Input/output error Formatting 'TEST_DIR/t.IMGFMT', fmt=3DIMGFMT size=3D67108864 wrote 65536/65536 bytes at offset 0 64 KiB, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec) @@ -140,7 +140,7 @@ Formatting 'TEST_DIR/t.IMGFMT', fmt=3DIMGFMT size=3D671= 08864 wrote 65536/65536 bytes at offset 0 64 KiB, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec) qcow2: Marking image as corrupt: Cluster allocation offset 0x52a00 unalign= ed (L2 offset: 0x40000, L2 index: 0); further corruption events will be sup= pressed -qemu-io: read failed: Input/output error +read failed: Input/output error =20 =3D=3D=3D Testing unaligned pre-allocated zero cluster =3D=3D=3D =20 @@ -154,7 +154,7 @@ qemu-img: Failed to turn zero into data clusters: Input= /output error =20 Formatting 'TEST_DIR/t.IMGFMT', fmt=3DIMGFMT size=3D67108864 qcow2: Marking image as corrupt: Refblock offset 0x22a00 unaligned (reftab= le index: 0); further corruption events will be suppressed -qemu-io: write failed: Input/output error +write failed: Input/output error =20 =3D=3D=3D Testing non-fatal corruption on freeing =3D=3D=3D =20 @@ -171,8 +171,8 @@ Formatting 'TEST_DIR/t.IMGFMT', fmt=3DIMGFMT size=3D671= 08864 wrote 65536/65536 bytes at offset 0 64 KiB, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec) qcow2: Image is corrupt: Cluster allocation offset 0x52a00 unaligned (L2 o= ffset: 0x40000, L2 index: 0); further non-fatal corruption events will be s= uppressed -qemu-io: read failed: Input/output error -qemu-io: read failed: Input/output error +read failed: Input/output error +read failed: Input/output error =20 =3D=3D=3D Testing non-fatal and then fatal corruption report =3D=3D=3D =20 @@ -181,7 +181,7 @@ wrote 131072/131072 bytes at offset 0 128 KiB, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec) qcow2: Image is corrupt: Cannot free unaligned cluster 0x52a00; further no= n-fatal corruption events will be suppressed qcow2: Marking image as corrupt: Cluster allocation offset 0x62a00 unalign= ed (L2 offset: 0x40000, L2 index: 0x1); further corruption events will be s= uppressed -qemu-io: read failed: Input/output error +read failed: Input/output error discard 65536/65536 bytes at offset 0 64 KiB, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec) =20 @@ -189,7 +189,7 @@ discard 65536/65536 bytes at offset 0 =20 Formatting 'TEST_DIR/t.IMGFMT', fmt=3DIMGFMT size=3D67108864 qcow2: Marking image as corrupt: Preventing invalid write on metadata (ove= rlaps with refcount table); further corruption events will be suppressed -qemu-io: write failed: Input/output error +write failed: Input/output error ERROR cluster 0 refcount=3D0 reference=3D1 ERROR cluster 1 refcount=3D0 reference=3D1 ERROR cluster 3 refcount=3D0 reference=3D1 @@ -209,7 +209,7 @@ Formatting 'TEST_DIR/t.IMGFMT', fmt=3DIMGFMT size=3D671= 08864 wrote 65536/65536 bytes at offset 0 64 KiB, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec) qcow2: Marking image as corrupt: Preventing invalid allocation of refcount= block at offset 0; further corruption events will be suppressed -qemu-io: write failed: Input/output error +write failed: Input/output error ERROR cluster 0 refcount=3D0 reference=3D1 ERROR cluster 1 refcount=3D0 reference=3D1 ERROR cluster 3 refcount=3D0 reference=3D1 @@ -229,7 +229,7 @@ No errors were found on the image. =20 Formatting 'TEST_DIR/t.IMGFMT', fmt=3DIMGFMT size=3D67108864 qcow2: Marking image as corrupt: Preventing invalid allocation of L2 table= at offset 0; further corruption events will be suppressed -qemu-io: write failed: Input/output error +write failed: Input/output error ERROR cluster 0 refcount=3D0 reference=3D1 ERROR cluster 1 refcount=3D0 reference=3D1 ERROR cluster 2 refcount=3D0 reference=3D1 @@ -251,7 +251,7 @@ Formatting 'TEST_DIR/t.IMGFMT', fmt=3DIMGFMT size=3D671= 08864 wrote 65536/65536 bytes at offset 65536 64 KiB, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec) qcow2: Marking image as corrupt: Preventing invalid allocation of compress= ed cluster at offset 0; further corruption events will be suppressed -qemu-io: write failed: Input/output error +write failed: Input/output error ERROR cluster 0 refcount=3D0 reference=3D1 ERROR cluster 1 refcount=3D0 reference=3D1 ERROR cluster 2 refcount=3D0 reference=3D1 @@ -270,7 +270,7 @@ No errors were found on the image. =3D=3D=3D Testing zero refcount table size =3D=3D=3D =20 Formatting 'TEST_DIR/t.IMGFMT', fmt=3DIMGFMT size=3D67108864 -qemu-io: can't open device TEST_DIR/t.IMGFMT: Image does not contain a ref= erence count table +can't open device TEST_DIR/t.IMGFMT: Image does not contain a reference co= unt table ERROR cluster 0 refcount=3D0 reference=3D1 ERROR cluster 3 refcount=3D0 reference=3D1 Rebuilding refcount structure @@ -286,7 +286,7 @@ No errors were found on the image. =20 Formatting 'TEST_DIR/t.IMGFMT', fmt=3DIMGFMT size=3D67108864 qcow2: Marking image as corrupt: Preventing invalid allocation of L2 table= at offset 0; further corruption events will be suppressed -qemu-io: write failed: Input/output error +write failed: Input/output error =20 =3D=3D=3D Testing dirty corrupt image =3D=3D=3D =20 @@ -299,7 +299,7 @@ Can't get refcount for cluster 2: Input/output error Can't get refcount for cluster 3: Input/output error Rebuilding refcount structure Repairing cluster 1 refcount=3D1 reference=3D0 -qemu-io: can't open device TEST_DIR/t.IMGFMT: Could not repair dirty image= : Input/output error +can't open device TEST_DIR/t.IMGFMT: Could not repair dirty image: Input/o= utput error --- Repairing --- Leaked cluster 1 refcount=3D1 reference=3D0 Repairing cluster 1 refcount=3D1 reference=3D0 @@ -319,7 +319,7 @@ wrote 65536/65536 bytes at offset 0 discard 65536/65536 bytes at offset 0 64 KiB, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec) qcow2: Marking image as corrupt: Preallocated zero cluster offset 0x2a00 u= naligned (guest offset: 0); further corruption events will be suppressed -qemu-io: write failed: Input/output error +write failed: Input/output error --- Repairing --- Repairing offset=3D2a00: Preallocated cluster is not properly aligned; L2 = entry corrupted. The following inconsistencies were found and repaired: @@ -337,7 +337,7 @@ wrote 131072/131072 bytes at offset 0 128 KiB, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec) qcow2: Marking image as corrupt: Refblock offset 0x2a00 unaligned (reftabl= e index: 0); further corruption events will be suppressed qcow2_free_clusters failed: Input/output error -qemu-io: discard failed: No medium found +discard failed: No medium found --- Repairing --- ERROR refcount block 0 is not cluster aligned; refcount table entry corrup= ted qcow2: Marking image as corrupt: Refblock offset 0x2a00 unaligned (reftabl= e index: 0); further corruption events will be suppressed diff --git a/tests/qemu-iotests/061.out b/tests/qemu-iotests/061.out index 951c6bf3e62c..7e34a6fd9c28 100644 --- a/tests/qemu-iotests/061.out +++ b/tests/qemu-iotests/061.out @@ -545,7 +545,7 @@ Formatting 'TEST_DIR/t.IMGFMT', fmt=3DIMGFMT size=3D671= 08864 qemu-img: data-file can only be set for images that use an external data f= ile =20 Formatting 'TEST_DIR/t.IMGFMT', fmt=3DIMGFMT size=3D67108864 data_file=3DT= EST_DIR/t.IMGFMT.data -qemu-io: can't open device TEST_DIR/t.IMGFMT: Could not open 'foo': No suc= h file or directory +can't open device TEST_DIR/t.IMGFMT: Could not open 'foo': No such file or= directory read 4096/4096 bytes at offset 0 4 KiB, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec) image: TEST_DIR/t.IMGFMT @@ -562,7 +562,7 @@ Format specific information: corrupt: false extended l2: false =20 -qemu-io: can't open device TEST_DIR/t.IMGFMT: 'data-file' is required for = this image +can't open device TEST_DIR/t.IMGFMT: 'data-file' is required for this image read 4096/4096 bytes at offset 0 4 KiB, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec) image: TEST_DIR/t.IMGFMT diff --git a/tests/qemu-iotests/069.out b/tests/qemu-iotests/069.out index 126b4d2d519b..0409b4700e0f 100644 --- a/tests/qemu-iotests/069.out +++ b/tests/qemu-iotests/069.out @@ -4,5 +4,5 @@ QA output created by 069 =20 Formatting 'TEST_DIR/t.IMGFMT.base', fmt=3DIMGFMT size=3D131072 Formatting 'TEST_DIR/t.IMGFMT', fmt=3DIMGFMT size=3D131072 backing_file=3D= TEST_DIR/t.IMGFMT.base backing_fmt=3DIMGFMT -qemu-io: can't open device TEST_DIR/t.IMGFMT: Could not open backing file:= Could not open 'TEST_DIR/t.IMGFMT.base': No such file or directory +can't open device TEST_DIR/t.IMGFMT: Could not open backing file: Could no= t open 'TEST_DIR/t.IMGFMT.base': No such file or directory *** done diff --git a/tests/qemu-iotests/070.out b/tests/qemu-iotests/070.out index 2fbfd7eaf334..287f16de2a6f 100644 --- a/tests/qemu-iotests/070.out +++ b/tests/qemu-iotests/070.out @@ -1,7 +1,7 @@ QA output created by 070 =20 =3D=3D=3D Verify open image read-only fails, due to dirty log =3D=3D=3D -qemu-io: can't open device TEST_DIR/iotest-dirtylog-10G-4M.vhdx: VHDX imag= e file 'TEST_DIR/iotest-dirtylog-10G-4M.vhdx' opened read-only, but contain= s a log that needs to be replayed +can't open device TEST_DIR/iotest-dirtylog-10G-4M.vhdx: VHDX image file 'T= EST_DIR/iotest-dirtylog-10G-4M.vhdx' opened read-only, but contains a log t= hat needs to be replayed To replay the log, run: qemu-img check -r all 'TEST_DIR/iotest-dirtylog-10G-4M.vhdx' =3D=3D=3D Verify open image replays log =3D=3D=3D diff --git a/tests/qemu-iotests/071.out b/tests/qemu-iotests/071.out index f2d015d8ccae..15353aba08b9 100644 --- a/tests/qemu-iotests/071.out +++ b/tests/qemu-iotests/071.out @@ -30,11 +30,11 @@ blkverify: read offset=3D0 bytes=3D512 contents mismatc= h at offset 0 =20 =3D=3D=3D Testing blkdebug through filename =3D=3D=3D =20 -qemu-io: read failed: Input/output error +read failed: Input/output error =20 =3D=3D=3D Testing blkdebug through file blockref =3D=3D=3D =20 -qemu-io: read failed: Input/output error +read failed: Input/output error =20 =3D=3D=3D Testing blkdebug on existing block device =3D=3D=3D =20 diff --git a/tests/qemu-iotests/072.out b/tests/qemu-iotests/072.out index d7ce24da1f7a..fe949d47817a 100644 --- a/tests/qemu-iotests/072.out +++ b/tests/qemu-iotests/072.out @@ -15,7 +15,7 @@ read 512/512 bytes at offset 512 512 bytes, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec) read 512/512 bytes at offset 1024 512 bytes, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec) -qemu-io: Pattern verification failed at offset 0, 512 bytes +Pattern verification failed at offset 0, 512 bytes read 512/512 bytes at offset 0 512 bytes, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec) *** done diff --git a/tests/qemu-iotests/075.out b/tests/qemu-iotests/075.out index 4f3871d33717..b234b758e026 100644 --- a/tests/qemu-iotests/075.out +++ b/tests/qemu-iotests/075.out @@ -9,23 +9,23 @@ read 512/512 bytes at offset 1048064 512 bytes, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec) =20 =3D=3D block_size must be a multiple of 512 =3D=3D -qemu-io: can't open device TEST_DIR/simple-pattern.cloop: block_size 513 m= ust be a multiple of 512 +can't open device TEST_DIR/simple-pattern.cloop: block_size 513 must be a = multiple of 512 =20 =3D=3D block_size cannot be zero =3D=3D -qemu-io: can't open device TEST_DIR/simple-pattern.cloop: block_size canno= t be zero +can't open device TEST_DIR/simple-pattern.cloop: block_size cannot be zero =20 =3D=3D huge block_size =3D=3D=3D -qemu-io: can't open device TEST_DIR/simple-pattern.cloop: block_size 42949= 66784 must be 64 MB or less +can't open device TEST_DIR/simple-pattern.cloop: block_size 4294966784 mus= t be 64 MB or less =20 =3D=3D offsets_size overflow =3D=3D=3D -qemu-io: can't open device TEST_DIR/simple-pattern.cloop: n_blocks 4294967= 295 must be 536870911 or less +can't open device TEST_DIR/simple-pattern.cloop: n_blocks 4294967295 must = be 536870911 or less =20 =3D=3D refuse images that require too many offsets =3D=3D=3D -qemu-io: can't open device TEST_DIR/simple-pattern.cloop: image requires t= oo many offsets, try increasing block size +can't open device TEST_DIR/simple-pattern.cloop: image requires too many o= ffsets, try increasing block size =20 =3D=3D refuse images with non-monotonically increasing offsets =3D=3D -qemu-io: can't open device TEST_DIR/simple-pattern.cloop: offsets not mono= tonically increasing at index 1, image file is corrupt +can't open device TEST_DIR/simple-pattern.cloop: offsets not monotonically= increasing at index 1, image file is corrupt =20 =3D=3D refuse images with invalid compressed block size =3D=3D -qemu-io: can't open device TEST_DIR/simple-pattern.cloop: invalid compress= ed block size at index 1, image file is corrupt +can't open device TEST_DIR/simple-pattern.cloop: invalid compressed block = size at index 1, image file is corrupt *** done diff --git a/tests/qemu-iotests/076.out b/tests/qemu-iotests/076.out index 2de8a710a55d..9c66c5fb46b7 100644 --- a/tests/qemu-iotests/076.out +++ b/tests/qemu-iotests/076.out @@ -5,13 +5,13 @@ read 65536/65536 bytes at offset 0 64 KiB, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec) =20 =3D=3D Negative catalog size =3D=3D -qemu-io: can't open device TEST_DIR/parallels-v1: Catalog too large +can't open device TEST_DIR/parallels-v1: Catalog too large =20 =3D=3D Overflow in catalog allocation =3D=3D -qemu-io: can't open device TEST_DIR/parallels-v1: Catalog too large +can't open device TEST_DIR/parallels-v1: Catalog too large =20 =3D=3D Zero sectors per track =3D=3D -qemu-io: can't open device TEST_DIR/parallels-v1: Invalid image: Zero sect= ors per track +can't open device TEST_DIR/parallels-v1: Invalid image: Zero sectors per t= rack =20 =3D=3D Read from a valid v2 image =3D=3D read 65536/65536 bytes at offset 0 diff --git a/tests/qemu-iotests/078.out b/tests/qemu-iotests/078.out index 4a82e1779fe3..c3d6aa4fe465 100644 --- a/tests/qemu-iotests/078.out +++ b/tests/qemu-iotests/078.out @@ -5,18 +5,18 @@ read 512/512 bytes at offset 0 512 bytes, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec) =20 =3D=3D Negative catalog size =3D=3D -qemu-io: can't open device TEST_DIR/empty.bochs: Catalog size is too large +can't open device TEST_DIR/empty.bochs: Catalog size is too large =20 =3D=3D Overflow for catalog size * sizeof(uint32_t) =3D=3D -qemu-io: can't open device TEST_DIR/empty.bochs: Catalog size is too large +can't open device TEST_DIR/empty.bochs: Catalog size is too large =20 =3D=3D Too small catalog bitmap for image size =3D=3D -qemu-io: can't open device TEST_DIR/empty.bochs: Catalog size is too small= for this disk size -qemu-io: can't open device TEST_DIR/empty.bochs: Catalog size is too small= for this disk size +can't open device TEST_DIR/empty.bochs: Catalog size is too small for this= disk size +can't open device TEST_DIR/empty.bochs: Catalog size is too small for this= disk size =20 =3D=3D Negative extent size =3D=3D -qemu-io: can't open device TEST_DIR/empty.bochs: Extent size 2147483648 is= too large +can't open device TEST_DIR/empty.bochs: Extent size 2147483648 is too large =20 =3D=3D Zero extent size =3D=3D -qemu-io: can't open device TEST_DIR/empty.bochs: Extent size must be at le= ast 512 +can't open device TEST_DIR/empty.bochs: Extent size must be at least 512 *** done diff --git a/tests/qemu-iotests/080.out b/tests/qemu-iotests/080.out index b20c21faf6a9..bf0ede4e206f 100644 --- a/tests/qemu-iotests/080.out +++ b/tests/qemu-iotests/080.out @@ -2,34 +2,34 @@ QA output created by 080 =20 =3D=3D Huge header size =3D=3D Formatting 'TEST_DIR/t.IMGFMT', fmt=3DIMGFMT size=3D67108864 -qemu-io: can't open device TEST_DIR/t.qcow2: qcow2 header exceeds cluster = size -qemu-io: can't open device TEST_DIR/t.qcow2: qcow2 header exceeds cluster = size +can't open device TEST_DIR/t.qcow2: qcow2 header exceeds cluster size +can't open device TEST_DIR/t.qcow2: qcow2 header exceeds cluster size =20 =3D=3D Huge unknown header extension =3D=3D Formatting 'TEST_DIR/t.IMGFMT', fmt=3DIMGFMT size=3D67108864 -qemu-io: can't open device TEST_DIR/t.qcow2: Invalid backing file offset -qemu-io: can't open device TEST_DIR/t.qcow2: Header extension too large -qemu-io: can't open device TEST_DIR/t.qcow2: Header extension too large +can't open device TEST_DIR/t.qcow2: Invalid backing file offset +can't open device TEST_DIR/t.qcow2: Header extension too large +can't open device TEST_DIR/t.qcow2: Header extension too large =20 =3D=3D Huge refcount table size =3D=3D Formatting 'TEST_DIR/t.IMGFMT', fmt=3DIMGFMT size=3D67108864 -qemu-io: can't open device TEST_DIR/t.qcow2: Reference count table too lar= ge -qemu-io: can't open device TEST_DIR/t.qcow2: Reference count table too lar= ge +can't open device TEST_DIR/t.qcow2: Reference count table too large +can't open device TEST_DIR/t.qcow2: Reference count table too large =20 =3D=3D Misaligned refcount table =3D=3D Formatting 'TEST_DIR/t.IMGFMT', fmt=3DIMGFMT size=3D67108864 -qemu-io: can't open device TEST_DIR/t.qcow2: Reference count table offset = invalid +can't open device TEST_DIR/t.qcow2: Reference count table offset invalid =20 =3D=3D Huge refcount offset =3D=3D Formatting 'TEST_DIR/t.IMGFMT', fmt=3DIMGFMT size=3D67108864 -qemu-io: can't open device TEST_DIR/t.qcow2: Reference count table offset = invalid +can't open device TEST_DIR/t.qcow2: Reference count table offset invalid =20 =3D=3D Invalid snapshot table =3D=3D Formatting 'TEST_DIR/t.IMGFMT', fmt=3DIMGFMT size=3D67108864 -qemu-io: can't open device TEST_DIR/t.qcow2: Snapshot table too large -qemu-io: can't open device TEST_DIR/t.qcow2: Snapshot table too large -qemu-io: can't open device TEST_DIR/t.qcow2: Snapshot table offset invalid -qemu-io: can't open device TEST_DIR/t.qcow2: Snapshot table offset invalid +can't open device TEST_DIR/t.qcow2: Snapshot table too large +can't open device TEST_DIR/t.qcow2: Snapshot table too large +can't open device TEST_DIR/t.qcow2: Snapshot table offset invalid +can't open device TEST_DIR/t.qcow2: Snapshot table offset invalid =20 =3D=3D Hitting snapshot table size limit =3D=3D Formatting 'TEST_DIR/t.IMGFMT', fmt=3DIMGFMT size=3D67108864 @@ -39,10 +39,10 @@ read 512/512 bytes at offset 0 =20 =3D=3D Invalid L1 table =3D=3D Formatting 'TEST_DIR/t.IMGFMT', fmt=3DIMGFMT size=3D67108864 -qemu-io: can't open device TEST_DIR/t.qcow2: Active L1 table too large -qemu-io: can't open device TEST_DIR/t.qcow2: Active L1 table too large -qemu-io: can't open device TEST_DIR/t.qcow2: Active L1 table offset invalid -qemu-io: can't open device TEST_DIR/t.qcow2: Active L1 table offset invalid +can't open device TEST_DIR/t.qcow2: Active L1 table too large +can't open device TEST_DIR/t.qcow2: Active L1 table too large +can't open device TEST_DIR/t.qcow2: Active L1 table offset invalid +can't open device TEST_DIR/t.qcow2: Active L1 table offset invalid =20 =3D=3D Invalid L1 table (with internal snapshot in the image) =3D=3D Formatting 'TEST_DIR/t.IMGFMT', fmt=3DIMGFMT size=3D67108864 @@ -50,7 +50,7 @@ qemu-img: Could not open 'TEST_DIR/t.IMGFMT': L1 table is= too small =20 =3D=3D Invalid backing file size =3D=3D Formatting 'TEST_DIR/t.IMGFMT', fmt=3DIMGFMT size=3D67108864 -qemu-io: can't open device TEST_DIR/t.qcow2: Backing file name too long +can't open device TEST_DIR/t.qcow2: Backing file name too long =20 =3D=3D Invalid L2 entry (huge physical offset) =3D=3D Formatting 'TEST_DIR/t.IMGFMT', fmt=3DIMGFMT size=3D67108864 @@ -66,8 +66,8 @@ wrote 512/512 bytes at offset 0 qemu-img: Failed to load snapshot: Snapshot L1 table offset invalid qemu-img: Snapshot L1 table offset invalid qemu-img: Failed to turn zero into data clusters: Invalid argument -qemu-io: write failed: Invalid argument -qemu-io: Failed to flush the refcount block cache: Invalid argument +write failed: Invalid argument +Failed to flush the refcount block cache: Invalid argument qemu-img: Snapshot L1 table offset invalid qemu-img: Could not apply snapshot 'test': Failed to load snapshot: Invali= d argument qemu-img: Could not delete snapshot 'test': Snapshot L1 table offset inval= id @@ -89,8 +89,8 @@ wrote 512/512 bytes at offset 0 qemu-img: Failed to load snapshot: Snapshot L1 table too large qemu-img: Snapshot L1 table too large qemu-img: Failed to turn zero into data clusters: File too large -qemu-io: write failed: File too large -qemu-io: Failed to flush the refcount block cache: File too large +write failed: File too large +Failed to flush the refcount block cache: File too large qemu-img: Snapshot L1 table too large qemu-img: Could not apply snapshot 'test': Failed to load snapshot: File t= oo large qemu-img: Could not delete snapshot 'test': Snapshot L1 table too large diff --git a/tests/qemu-iotests/081.out b/tests/qemu-iotests/081.out index bc902bd81832..084b6fbff66a 100644 --- a/tests/qemu-iotests/081.out +++ b/tests/qemu-iotests/081.out @@ -81,7 +81,7 @@ wrote 10485760/10485760 bytes at offset 0 10 MiB, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec) =20 =3D=3D checking that quorum is broken =3D=3D -qemu-io: read failed: Input/output error +read failed: Input/output error =20 =3D=3D checking the blkverify mode with broken content =3D=3D quorum: offset=3D0 bytes=3D10485760 contents mismatch at offset 0 @@ -97,7 +97,7 @@ read 10485760/10485760 bytes at offset 0 10 MiB, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec) =20 =3D=3D checking the blkverify mode with invalid settings =3D=3D -qemu-io: can't open: blkverify=3Don can only be set if there are exactly t= wo files and vote-threshold is 2 +can't open: blkverify=3Don can only be set if there are exactly two files = and vote-threshold is 2 =20 =3D=3D dynamically adding a child to a quorum =3D=3D Testing: diff --git a/tests/qemu-iotests/083.out b/tests/qemu-iotests/083.out index a1c446d5365e..70696dae1180 100644 --- a/tests/qemu-iotests/083.out +++ b/tests/qemu-iotests/083.out @@ -1,83 +1,83 @@ QA output created by 083 =3D=3D=3D Check disconnect before neg1 =3D=3D=3D =20 -qemu-io: can't open device nbd+tcp://127.0.0.1:PORT/foo +can't open device nbd+tcp://127.0.0.1:PORT/foo =20 =3D=3D=3D Check disconnect after neg1 =3D=3D=3D =20 -qemu-io: can't open device nbd+tcp://127.0.0.1:PORT/foo +can't open device nbd+tcp://127.0.0.1:PORT/foo =20 =3D=3D=3D Check disconnect 8 neg1 =3D=3D=3D =20 -qemu-io: can't open device nbd+tcp://127.0.0.1:PORT/foo +can't open device nbd+tcp://127.0.0.1:PORT/foo =20 =3D=3D=3D Check disconnect 16 neg1 =3D=3D=3D =20 -qemu-io: can't open device nbd+tcp://127.0.0.1:PORT/foo +can't open device nbd+tcp://127.0.0.1:PORT/foo =20 =3D=3D=3D Check disconnect before export =3D=3D=3D =20 -qemu-io: can't open device nbd+tcp://127.0.0.1:PORT/foo +can't open device nbd+tcp://127.0.0.1:PORT/foo =20 =3D=3D=3D Check disconnect after export =3D=3D=3D =20 -qemu-io: can't open device nbd+tcp://127.0.0.1:PORT/foo +can't open device nbd+tcp://127.0.0.1:PORT/foo =20 =3D=3D=3D Check disconnect 4 export =3D=3D=3D =20 -qemu-io: can't open device nbd+tcp://127.0.0.1:PORT/foo +can't open device nbd+tcp://127.0.0.1:PORT/foo =20 =3D=3D=3D Check disconnect 12 export =3D=3D=3D =20 -qemu-io: can't open device nbd+tcp://127.0.0.1:PORT/foo +can't open device nbd+tcp://127.0.0.1:PORT/foo =20 =3D=3D=3D Check disconnect 16 export =3D=3D=3D =20 -qemu-io: can't open device nbd+tcp://127.0.0.1:PORT/foo +can't open device nbd+tcp://127.0.0.1:PORT/foo =20 =3D=3D=3D Check disconnect before neg2 =3D=3D=3D =20 -qemu-io: can't open device nbd+tcp://127.0.0.1:PORT/foo +can't open device nbd+tcp://127.0.0.1:PORT/foo =20 =3D=3D=3D Check disconnect after neg2 =3D=3D=3D =20 -qemu-io: read failed: Input/output error +read failed: Input/output error =20 =3D=3D=3D Check disconnect 8 neg2 =3D=3D=3D =20 -qemu-io: can't open device nbd+tcp://127.0.0.1:PORT/foo +can't open device nbd+tcp://127.0.0.1:PORT/foo =20 =3D=3D=3D Check disconnect 10 neg2 =3D=3D=3D =20 -qemu-io: can't open device nbd+tcp://127.0.0.1:PORT/foo +can't open device nbd+tcp://127.0.0.1:PORT/foo =20 =3D=3D=3D Check disconnect before request =3D=3D=3D =20 -qemu-io: read failed: Input/output error +read failed: Input/output error =20 =3D=3D=3D Check disconnect after request =3D=3D=3D =20 -qemu-io: read failed: Input/output error +read failed: Input/output error =20 =3D=3D=3D Check disconnect before reply =3D=3D=3D =20 -qemu-io: read failed: Input/output error +read failed: Input/output error =20 =3D=3D=3D Check disconnect after reply =3D=3D=3D =20 -qemu-io: read failed: Input/output error +read failed: Input/output error =20 =3D=3D=3D Check disconnect 4 reply =3D=3D=3D =20 -qemu-io: read failed: Input/output error +read failed: Input/output error =20 =3D=3D=3D Check disconnect 8 reply =3D=3D=3D =20 -qemu-io: read failed: Input/output error +read failed: Input/output error =20 =3D=3D=3D Check disconnect before data =3D=3D=3D =20 -qemu-io: read failed: Input/output error +read failed: Input/output error =20 =3D=3D=3D Check disconnect after data =3D=3D=3D =20 @@ -86,107 +86,107 @@ read 512/512 bytes at offset 0 =20 =3D=3D=3D Check disconnect before neg-classic =3D=3D=3D =20 -qemu-io: can't open device nbd+tcp://127.0.0.1:PORT/ +can't open device nbd+tcp://127.0.0.1:PORT/ =20 =3D=3D=3D Check disconnect 8 neg-classic =3D=3D=3D =20 -qemu-io: can't open device nbd+tcp://127.0.0.1:PORT/ +can't open device nbd+tcp://127.0.0.1:PORT/ =20 =3D=3D=3D Check disconnect 16 neg-classic =3D=3D=3D =20 -qemu-io: can't open device nbd+tcp://127.0.0.1:PORT/ +can't open device nbd+tcp://127.0.0.1:PORT/ =20 =3D=3D=3D Check disconnect 24 neg-classic =3D=3D=3D =20 -qemu-io: can't open device nbd+tcp://127.0.0.1:PORT/ +can't open device nbd+tcp://127.0.0.1:PORT/ =20 =3D=3D=3D Check disconnect 28 neg-classic =3D=3D=3D =20 -qemu-io: can't open device nbd+tcp://127.0.0.1:PORT/ +can't open device nbd+tcp://127.0.0.1:PORT/ =20 =3D=3D=3D Check disconnect after neg-classic =3D=3D=3D =20 -qemu-io: read failed: Input/output error +read failed: Input/output error =20 =3D=3D=3D Check disconnect before neg1 =3D=3D=3D =20 -qemu-io: can't open device nbd+unix:///foo?socket=3DSOCK_DIR/nbd.sock +can't open device nbd+unix:///foo?socket=3DSOCK_DIR/nbd.sock =20 =3D=3D=3D Check disconnect after neg1 =3D=3D=3D =20 -qemu-io: can't open device nbd+unix:///foo?socket=3DSOCK_DIR/nbd.sock +can't open device nbd+unix:///foo?socket=3DSOCK_DIR/nbd.sock =20 =3D=3D=3D Check disconnect 8 neg1 =3D=3D=3D =20 -qemu-io: can't open device nbd+unix:///foo?socket=3DSOCK_DIR/nbd.sock +can't open device nbd+unix:///foo?socket=3DSOCK_DIR/nbd.sock =20 =3D=3D=3D Check disconnect 16 neg1 =3D=3D=3D =20 -qemu-io: can't open device nbd+unix:///foo?socket=3DSOCK_DIR/nbd.sock +can't open device nbd+unix:///foo?socket=3DSOCK_DIR/nbd.sock =20 =3D=3D=3D Check disconnect before export =3D=3D=3D =20 -qemu-io: can't open device nbd+unix:///foo?socket=3DSOCK_DIR/nbd.sock +can't open device nbd+unix:///foo?socket=3DSOCK_DIR/nbd.sock =20 =3D=3D=3D Check disconnect after export =3D=3D=3D =20 -qemu-io: can't open device nbd+unix:///foo?socket=3DSOCK_DIR/nbd.sock +can't open device nbd+unix:///foo?socket=3DSOCK_DIR/nbd.sock =20 =3D=3D=3D Check disconnect 4 export =3D=3D=3D =20 -qemu-io: can't open device nbd+unix:///foo?socket=3DSOCK_DIR/nbd.sock +can't open device nbd+unix:///foo?socket=3DSOCK_DIR/nbd.sock =20 =3D=3D=3D Check disconnect 12 export =3D=3D=3D =20 -qemu-io: can't open device nbd+unix:///foo?socket=3DSOCK_DIR/nbd.sock +can't open device nbd+unix:///foo?socket=3DSOCK_DIR/nbd.sock =20 =3D=3D=3D Check disconnect 16 export =3D=3D=3D =20 -qemu-io: can't open device nbd+unix:///foo?socket=3DSOCK_DIR/nbd.sock +can't open device nbd+unix:///foo?socket=3DSOCK_DIR/nbd.sock =20 =3D=3D=3D Check disconnect before neg2 =3D=3D=3D =20 -qemu-io: can't open device nbd+unix:///foo?socket=3DSOCK_DIR/nbd.sock +can't open device nbd+unix:///foo?socket=3DSOCK_DIR/nbd.sock =20 =3D=3D=3D Check disconnect after neg2 =3D=3D=3D =20 -qemu-io: read failed: Input/output error +read failed: Input/output error =20 =3D=3D=3D Check disconnect 8 neg2 =3D=3D=3D =20 -qemu-io: can't open device nbd+unix:///foo?socket=3DSOCK_DIR/nbd.sock +can't open device nbd+unix:///foo?socket=3DSOCK_DIR/nbd.sock =20 =3D=3D=3D Check disconnect 10 neg2 =3D=3D=3D =20 -qemu-io: can't open device nbd+unix:///foo?socket=3DSOCK_DIR/nbd.sock +can't open device nbd+unix:///foo?socket=3DSOCK_DIR/nbd.sock =20 =3D=3D=3D Check disconnect before request =3D=3D=3D =20 -qemu-io: read failed: Input/output error +read failed: Input/output error =20 =3D=3D=3D Check disconnect after request =3D=3D=3D =20 -qemu-io: read failed: Input/output error +read failed: Input/output error =20 =3D=3D=3D Check disconnect before reply =3D=3D=3D =20 -qemu-io: read failed: Input/output error +read failed: Input/output error =20 =3D=3D=3D Check disconnect after reply =3D=3D=3D =20 -qemu-io: read failed: Input/output error +read failed: Input/output error =20 =3D=3D=3D Check disconnect 4 reply =3D=3D=3D =20 -qemu-io: read failed: Input/output error +read failed: Input/output error =20 =3D=3D=3D Check disconnect 8 reply =3D=3D=3D =20 -qemu-io: read failed: Input/output error +read failed: Input/output error =20 =3D=3D=3D Check disconnect before data =3D=3D=3D =20 -qemu-io: read failed: Input/output error +read failed: Input/output error =20 =3D=3D=3D Check disconnect after data =3D=3D=3D =20 @@ -195,26 +195,26 @@ read 512/512 bytes at offset 0 =20 =3D=3D=3D Check disconnect before neg-classic =3D=3D=3D =20 -qemu-io: can't open device nbd+unix:///?socket=3DSOCK_DIR/nbd.sock +can't open device nbd+unix:///?socket=3DSOCK_DIR/nbd.sock =20 =3D=3D=3D Check disconnect 8 neg-classic =3D=3D=3D =20 -qemu-io: can't open device nbd+unix:///?socket=3DSOCK_DIR/nbd.sock +can't open device nbd+unix:///?socket=3DSOCK_DIR/nbd.sock =20 =3D=3D=3D Check disconnect 16 neg-classic =3D=3D=3D =20 -qemu-io: can't open device nbd+unix:///?socket=3DSOCK_DIR/nbd.sock +can't open device nbd+unix:///?socket=3DSOCK_DIR/nbd.sock =20 =3D=3D=3D Check disconnect 24 neg-classic =3D=3D=3D =20 -qemu-io: can't open device nbd+unix:///?socket=3DSOCK_DIR/nbd.sock +can't open device nbd+unix:///?socket=3DSOCK_DIR/nbd.sock =20 =3D=3D=3D Check disconnect 28 neg-classic =3D=3D=3D =20 -qemu-io: can't open device nbd+unix:///?socket=3DSOCK_DIR/nbd.sock +can't open device nbd+unix:///?socket=3DSOCK_DIR/nbd.sock =20 =3D=3D=3D Check disconnect after neg-classic =3D=3D=3D =20 -qemu-io: read failed: Input/output error +read failed: Input/output error =20 *** done diff --git a/tests/qemu-iotests/088.out b/tests/qemu-iotests/088.out index 814be7181dc5..1f6bcf0abc97 100644 --- a/tests/qemu-iotests/088.out +++ b/tests/qemu-iotests/088.out @@ -2,10 +2,10 @@ QA output created by 088 =20 =3D=3D Invalid block size =3D=3D Formatting 'TEST_DIR/t.IMGFMT', fmt=3DIMGFMT size=3D67108864 -qemu-io: can't open device TEST_DIR/t.vpc: Invalid block size 0 -qemu-io: can't open device TEST_DIR/t.vpc: Invalid block size 0 -qemu-io: can't open device TEST_DIR/t.vpc: Invalid block size 128 -qemu-io: can't open device TEST_DIR/t.vpc: Invalid block size 128 -qemu-io: can't open device TEST_DIR/t.vpc: Invalid block size 305419896 -qemu-io: can't open device TEST_DIR/t.vpc: Invalid block size 305419896 +can't open device TEST_DIR/t.vpc: Invalid block size 0 +can't open device TEST_DIR/t.vpc: Invalid block size 0 +can't open device TEST_DIR/t.vpc: Invalid block size 128 +can't open device TEST_DIR/t.vpc: Invalid block size 128 +can't open device TEST_DIR/t.vpc: Invalid block size 305419896 +can't open device TEST_DIR/t.vpc: Invalid block size 305419896 *** done diff --git a/tests/qemu-iotests/089.out b/tests/qemu-iotests/089.out index a29e19b12d7e..c53fc4823a16 100644 --- a/tests/qemu-iotests/089.out +++ b/tests/qemu-iotests/089.out @@ -16,7 +16,7 @@ read 512/512 bytes at offset 512 512 bytes, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec) read 512/512 bytes at offset 1024 512 bytes, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec) -qemu-io: Pattern verification failed at offset 0, 512 bytes +Pattern verification failed at offset 0, 512 bytes read 512/512 bytes at offset 0 512 bytes, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec) =20 @@ -33,7 +33,7 @@ read 512/512 bytes at offset 0 Formatting 'TEST_DIR/t.IMGFMT', fmt=3DIMGFMT size=3D67108864 wrote 512/512 bytes at offset 229376 512 bytes, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec) -qemu-io: read failed: Input/output error +read failed: Input/output error =20 =3D=3D=3D Testing qemu-img info output =3D=3D=3D =20 diff --git a/tests/qemu-iotests/092.out b/tests/qemu-iotests/092.out index 3e799148735f..6eda321fc6bc 100644 --- a/tests/qemu-iotests/092.out +++ b/tests/qemu-iotests/092.out @@ -2,25 +2,25 @@ QA output created by 092 =20 =3D=3D Invalid cluster size =3D=3D Formatting 'TEST_DIR/t.IMGFMT', fmt=3DIMGFMT size=3D67108864 -qemu-io: can't open device TEST_DIR/t.qcow: Cluster size must be between 5= 12 and 64k -qemu-io: can't open device TEST_DIR/t.qcow: Cluster size must be between 5= 12 and 64k -qemu-io: can't open device TEST_DIR/t.qcow: Cluster size must be between 5= 12 and 64k -qemu-io: can't open device TEST_DIR/t.qcow: Cluster size must be between 5= 12 and 64k +can't open device TEST_DIR/t.qcow: Cluster size must be between 512 and 64k +can't open device TEST_DIR/t.qcow: Cluster size must be between 512 and 64k +can't open device TEST_DIR/t.qcow: Cluster size must be between 512 and 64k +can't open device TEST_DIR/t.qcow: Cluster size must be between 512 and 64k =20 =3D=3D Invalid L2 table size =3D=3D Formatting 'TEST_DIR/t.IMGFMT', fmt=3DIMGFMT size=3D67108864 -qemu-io: can't open device TEST_DIR/t.qcow: L2 table size must be between = 512 and 64k -qemu-io: can't open device TEST_DIR/t.qcow: L2 table size must be between = 512 and 64k -qemu-io: can't open device TEST_DIR/t.qcow: L2 table size must be between = 512 and 64k -qemu-io: can't open device TEST_DIR/t.qcow: L2 table size must be between = 512 and 64k +can't open device TEST_DIR/t.qcow: L2 table size must be between 512 and 6= 4k +can't open device TEST_DIR/t.qcow: L2 table size must be between 512 and 6= 4k +can't open device TEST_DIR/t.qcow: L2 table size must be between 512 and 6= 4k +can't open device TEST_DIR/t.qcow: L2 table size must be between 512 and 6= 4k =20 =3D=3D Invalid size =3D=3D Formatting 'TEST_DIR/t.IMGFMT', fmt=3DIMGFMT size=3D67108864 -qemu-io: can't open device TEST_DIR/t.qcow: Image too large -qemu-io: can't open device TEST_DIR/t.qcow: Image too large +can't open device TEST_DIR/t.qcow: Image too large +can't open device TEST_DIR/t.qcow: Image too large =20 =3D=3D Invalid backing file length =3D=3D Formatting 'TEST_DIR/t.IMGFMT', fmt=3DIMGFMT size=3D67108864 -qemu-io: can't open device TEST_DIR/t.qcow: Backing file name too long -qemu-io: can't open device TEST_DIR/t.qcow: Backing file name too long +can't open device TEST_DIR/t.qcow: Backing file name too long +can't open device TEST_DIR/t.qcow: Backing file name too long *** done diff --git a/tests/qemu-iotests/103.out b/tests/qemu-iotests/103.out index 16704cf499a0..bd9eec325028 100644 --- a/tests/qemu-iotests/103.out +++ b/tests/qemu-iotests/103.out @@ -5,13 +5,13 @@ wrote 65536/65536 bytes at offset 0 =20 =3D=3D=3D Testing invalid option combinations =3D=3D=3D =20 -qemu-io: can't open device TEST_DIR/t.IMGFMT: cache-size, l2-cache-size an= d refcount-cache-size may not be set at the same time -qemu-io: can't open device TEST_DIR/t.IMGFMT: l2-cache-size may not exceed= cache-size -qemu-io: can't open device TEST_DIR/t.IMGFMT: refcount-cache-size may not = exceed cache-size -qemu-io: can't open device TEST_DIR/t.IMGFMT: cache-size, l2-cache-size an= d refcount-cache-size may not be set at the same time -qemu-io: can't open device TEST_DIR/t.IMGFMT: L2 cache entry size must be = a power of two between 512 and the cluster size (65536) -qemu-io: can't open device TEST_DIR/t.IMGFMT: L2 cache entry size must be = a power of two between 512 and the cluster size (65536) -qemu-io: can't open device TEST_DIR/t.IMGFMT: L2 cache entry size must be = a power of two between 512 and the cluster size (65536) +can't open device TEST_DIR/t.IMGFMT: cache-size, l2-cache-size and refcoun= t-cache-size may not be set at the same time +can't open device TEST_DIR/t.IMGFMT: l2-cache-size may not exceed cache-si= ze +can't open device TEST_DIR/t.IMGFMT: refcount-cache-size may not exceed ca= che-size +can't open device TEST_DIR/t.IMGFMT: cache-size, l2-cache-size and refcoun= t-cache-size may not be set at the same time +can't open device TEST_DIR/t.IMGFMT: L2 cache entry size must be a power o= f two between 512 and the cluster size (65536) +can't open device TEST_DIR/t.IMGFMT: L2 cache entry size must be a power o= f two between 512 and the cluster size (65536) +can't open device TEST_DIR/t.IMGFMT: L2 cache entry size must be a power o= f two between 512 and the cluster size (65536) =20 =3D=3D=3D Testing valid option combinations =3D=3D=3D =20 diff --git a/tests/qemu-iotests/114.out b/tests/qemu-iotests/114.out index 80220e440eca..c629db04e02f 100644 --- a/tests/qemu-iotests/114.out +++ b/tests/qemu-iotests/114.out @@ -10,8 +10,8 @@ virtual size: 64 MiB (67108864 bytes) cluster_size: 65536 backing file: TEST_DIR/t.IMGFMT.base backing file format: foo -qemu-io: can't open device TEST_DIR/t.qcow2: Could not open backing file: = Unknown driver 'foo' -qemu-io: no file open, try 'help open' +can't open device TEST_DIR/t.qcow2: Could not open backing file: Unknown d= river 'foo' +no file open, try 'help open' read 4096/4096 bytes at offset 0 4 KiB, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec) qemu-img: Could not change the backing file to 'TEST_DIR/t.qcow2.base': ba= cking format must be specified diff --git a/tests/qemu-iotests/116.out b/tests/qemu-iotests/116.out index 5f6c6fffcaf2..6d9f5488063d 100644 --- a/tests/qemu-iotests/116.out +++ b/tests/qemu-iotests/116.out @@ -2,29 +2,29 @@ QA output created by 116 =20 =3D=3D truncated header cluster =3D=3D Formatting 'TEST_DIR/t.IMGFMT', fmt=3DIMGFMT size=3D134217728 -qemu-io: can't open device TEST_DIR/t.qed: QED table offset is invalid +can't open device TEST_DIR/t.qed: QED table offset is invalid =20 =3D=3D invalid header magic =3D=3D Formatting 'TEST_DIR/t.IMGFMT', fmt=3DIMGFMT size=3D134217728 -qemu-io: can't open device TEST_DIR/t.qed: Image not in QED format +can't open device TEST_DIR/t.qed: Image not in QED format =20 =3D=3D invalid cluster size =3D=3D Formatting 'TEST_DIR/t.IMGFMT', fmt=3DIMGFMT size=3D134217728 -qemu-io: can't open device TEST_DIR/t.qed: QED cluster size is invalid +can't open device TEST_DIR/t.qed: QED cluster size is invalid =20 =3D=3D invalid table size =3D=3D Formatting 'TEST_DIR/t.IMGFMT', fmt=3DIMGFMT size=3D134217728 -qemu-io: can't open device TEST_DIR/t.qed: QED table size is invalid +can't open device TEST_DIR/t.qed: QED table size is invalid =20 =3D=3D invalid header size =3D=3D Formatting 'TEST_DIR/t.IMGFMT', fmt=3DIMGFMT size=3D134217728 -qemu-io: can't open device TEST_DIR/t.qed: QED table offset is invalid +can't open device TEST_DIR/t.qed: QED table offset is invalid =20 =3D=3D invalid L1 table offset =3D=3D Formatting 'TEST_DIR/t.IMGFMT', fmt=3DIMGFMT size=3D134217728 -qemu-io: can't open device TEST_DIR/t.qed: QED table offset is invalid +can't open device TEST_DIR/t.qed: QED table offset is invalid =20 =3D=3D invalid image size =3D=3D Formatting 'TEST_DIR/t.IMGFMT', fmt=3DIMGFMT size=3D134217728 -qemu-io: can't open device TEST_DIR/t.qed: QED image size is invalid +can't open device TEST_DIR/t.qed: QED image size is invalid *** done diff --git a/tests/qemu-iotests/133.out b/tests/qemu-iotests/133.out index d70c2e8041ce..8934c32dadd0 100644 --- a/tests/qemu-iotests/133.out +++ b/tests/qemu-iotests/133.out @@ -4,18 +4,18 @@ Formatting 'TEST_DIR/t.IMGFMT', fmt=3DIMGFMT size=3D67108= 864 backing_file=3DTEST_DIR/t =20 =3D=3D=3D Check that node-name can't be changed =3D=3D=3D =20 -qemu-io: Cannot change the option 'node-name' -qemu-io: Cannot change the option 'node-name' -qemu-io: Cannot change the option 'node-name' +Cannot change the option 'node-name' +Cannot change the option 'node-name' +Cannot change the option 'node-name' =20 =3D=3D=3D Check that unchanged node-name is okay =3D=3D=3D =20 =20 =3D=3D=3D Check that driver can't be changed =3D=3D=3D =20 -qemu-io: Cannot change the option 'driver' -qemu-io: Cannot change the option 'driver' -qemu-io: Cannot change the option 'driver' +Cannot change the option 'driver' +Cannot change the option 'driver' +Cannot change the option 'driver' =20 =3D=3D=3D Check that unchanged driver is okay =3D=3D=3D =20 @@ -27,16 +27,16 @@ format name: null-co =20 =3D=3D=3D Check that mixing -c/-r/-w and their corresponding options is fo= rbidden =3D=3D=3D =20 -qemu-io: Cannot set both -r/-w and 'read-only' -qemu-io: Cannot set both -r/-w and 'read-only' -qemu-io: Cannot set both -c and the cache options -qemu-io: Cannot set both -c and the cache options -qemu-io: Cannot set both -c and the cache options +Cannot set both -r/-w and 'read-only' +Cannot set both -r/-w and 'read-only' +Cannot set both -c and the cache options +Cannot set both -c and the cache options +Cannot set both -c and the cache options =20 =3D=3D=3D Check that invalid options are handled correctly =3D=3D=3D =20 -qemu-io: Parameter 'read-only' expects 'on' or 'off' -qemu-io: Parameter 'cache.no-flush' expects 'on' or 'off' -qemu-io: Parameter 'cache.direct' expects 'on' or 'off' -qemu-io: Parameter 'auto-read-only' expects 'on' or 'off' +Parameter 'read-only' expects 'on' or 'off' +Parameter 'cache.no-flush' expects 'on' or 'off' +Parameter 'cache.direct' expects 'on' or 'off' +Parameter 'auto-read-only' expects 'on' or 'off' *** done diff --git a/tests/qemu-iotests/134.out b/tests/qemu-iotests/134.out index ce2a0df166ee..4abc5b5f7da6 100644 --- a/tests/qemu-iotests/134.out +++ b/tests/qemu-iotests/134.out @@ -24,7 +24,7 @@ read 134217728/134217728 bytes at offset 0 128 MiB, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec) =20 =3D=3D verify pattern failure with wrong password =3D=3D -qemu-io: Pattern verification failed at offset 0, 134217728 bytes +Pattern verification failed at offset 0, 134217728 bytes read 134217728/134217728 bytes at offset 0 128 MiB, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec) *** done diff --git a/tests/qemu-iotests/137.out b/tests/qemu-iotests/137.out index 1947c1a1bd7c..b22d4aeb747f 100644 --- a/tests/qemu-iotests/137.out +++ b/tests/qemu-iotests/137.out @@ -15,30 +15,30 @@ read 33554432/33554432 bytes at offset 0 =20 =3D=3D=3D Try setting some invalid values =3D=3D=3D =20 -qemu-io: Parameter 'lazy-refcounts' expects 'on' or 'off' -qemu-io: cache-size, l2-cache-size and refcount-cache-size may not be set = at the same time -qemu-io: l2-cache-size may not exceed cache-size -qemu-io: refcount-cache-size may not exceed cache-size -qemu-io: L2 cache entry size must be a power of two between 512 and the cl= uster size (65536) -qemu-io: L2 cache entry size must be a power of two between 512 and the cl= uster size (65536) -qemu-io: Refcount cache size too big -qemu-io: Conflicting values for qcow2 options 'overlap-check' ('constant')= and 'overlap-check.template' ('all') -qemu-io: Unsupported value 'blubb' for qcow2 option 'overlap-check'. Allow= ed are any of the following: none, constant, cached, all -qemu-io: Unsupported value 'blubb' for qcow2 option 'overlap-check'. Allow= ed are any of the following: none, constant, cached, all -qemu-io: Cache clean interval too big +Parameter 'lazy-refcounts' expects 'on' or 'off' +cache-size, l2-cache-size and refcount-cache-size may not be set at the sa= me time +l2-cache-size may not exceed cache-size +refcount-cache-size may not exceed cache-size +L2 cache entry size must be a power of two between 512 and the cluster siz= e (65536) +L2 cache entry size must be a power of two between 512 and the cluster siz= e (65536) +Refcount cache size too big +Conflicting values for qcow2 options 'overlap-check' ('constant') and 'ove= rlap-check.template' ('all') +Unsupported value 'blubb' for qcow2 option 'overlap-check'. Allowed are an= y of the following: none, constant, cached, all +Unsupported value 'blubb' for qcow2 option 'overlap-check'. Allowed are an= y of the following: none, constant, cached, all +Cache clean interval too big Formatting 'TEST_DIR/t.IMGFMT', fmt=3DIMGFMT size=3D36028797018963968 -qemu-io: L2 cache size too big +L2 cache size too big Formatting 'TEST_DIR/t.IMGFMT', fmt=3DIMGFMT size=3D67108864 =20 =3D=3D=3D Test transaction semantics =3D=3D=3D =20 -qemu-io: Unsupported value 'blubb' for qcow2 option 'overlap-check'. Allow= ed are any of the following: none, constant, cached, all +Unsupported value 'blubb' for qcow2 option 'overlap-check'. Allowed are an= y of the following: none, constant, cached, all wrote 512/512 bytes at offset 0 512 bytes, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec) ./common.rc: Killed ( VALGRIND_QEMU=3D"${VALGRIND_QEMU_IO}" _qemu_proc_exe= c "${VALGRIND_LOGFILE}" "$QEMU_IO_PROG" $QEMU_IO_ARGS "$@" ) OK: Dirty bit not set Formatting 'TEST_DIR/t.IMGFMT', fmt=3DIMGFMT size=3D67108864 -qemu-io: Parameter 'lazy-refcounts' expects 'on' or 'off' +Parameter 'lazy-refcounts' expects 'on' or 'off' qcow2: Marking image as corrupt: Preventing invalid allocation of L2 table= at offset 0; further corruption events will be suppressed -qemu-io: write failed: Input/output error +write failed: Input/output error *** done diff --git a/tests/qemu-iotests/140.out b/tests/qemu-iotests/140.out index 32866440aed3..c2a75fd5f7e8 100644 --- a/tests/qemu-iotests/140.out +++ b/tests/qemu-iotests/140.out @@ -16,7 +16,7 @@ read 65536/65536 bytes at offset 0 { 'execute': 'eject', 'arguments': { 'device': 'drv' }} {"timestamp": {"seconds": TIMESTAMP, "microseconds": TIMESTAMP}, "event"= : "BLOCK_EXPORT_DELETED", "data": {"id": "drv"}} -qemu-io: can't open device nbd+unix:///drv?socket=3DSOCK_DIR/nbd: Requeste= d export not available +can't open device nbd+unix:///drv?socket=3DSOCK_DIR/nbd: Requested export = not available server reported: export 'drv' not present { 'execute': 'quit' } {"timestamp": {"seconds": TIMESTAMP, "microseconds": TIMESTAMP}, "event"= : "SHUTDOWN", "data": {"guest": false, "reason": "host-qmp-quit"}} diff --git a/tests/qemu-iotests/143.out b/tests/qemu-iotests/143.out index d6afa32abc54..5e685a06415b 100644 --- a/tests/qemu-iotests/143.out +++ b/tests/qemu-iotests/143.out @@ -5,9 +5,9 @@ QA output created by 143 'arguments': { 'addr': { 'type': 'unix', 'data': { 'path': 'SOCK_DIR/nbd' }}}} {"return": {}} -qemu-io: can't open device nbd+unix:///no_such_export?socket=3DSOCK_DIR/nb= d: Requested export not available +can't open device nbd+unix:///no_such_export?socket=3DSOCK_DIR/nbd: Reques= ted export not available server reported: export 'no_such_export' not present -qemu-io: can't open device nbd+unix:///aa--aa1?socket=3DSOCK_DIR/nbd: Requ= ested export not available +can't open device nbd+unix:///aa--aa1?socket=3DSOCK_DIR/nbd: Requested exp= ort not available server reported: export 'aa--aa...' not present { 'execute': 'quit' } {"timestamp": {"seconds": TIMESTAMP, "microseconds": TIMESTAMP}, "event"= : "SHUTDOWN", "data": {"guest": false, "reason": "host-qmp-quit"}} diff --git a/tests/qemu-iotests/153.out b/tests/qemu-iotests/153.out index e235d9e59e35..1607a79b36b7 100644 --- a/tests/qemu-iotests/153.out +++ b/tests/qemu-iotests/153.out @@ -23,22 +23,22 @@ Is another process using the image [TEST_DIR/t.qcow2]? =3D=3D Running utility commands =3D=3D =20 _qemu_io_wrapper -c read 0 512 TEST_DIR/t.qcow2 -qemu-io: can't open device TEST_DIR/t.qcow2: Failed to get "write" lock +can't open device TEST_DIR/t.qcow2: Failed to get "write" lock Is another process using the image [TEST_DIR/t.qcow2]? =20 _qemu_io_wrapper -r -c read 0 512 TEST_DIR/t.qcow2 -qemu-io: can't open device TEST_DIR/t.qcow2: Failed to get shared "write" = lock +can't open device TEST_DIR/t.qcow2: Failed to get shared "write" lock Is another process using the image [TEST_DIR/t.qcow2]? =20 _qemu_io_wrapper -c open TEST_DIR/t.qcow2 -c read 0 512 -qemu-io: can't open device TEST_DIR/t.qcow2: Failed to get "write" lock +can't open device TEST_DIR/t.qcow2: Failed to get "write" lock Is another process using the image [TEST_DIR/t.qcow2]? -qemu-io: no file open, try 'help open' +no file open, try 'help open' =20 _qemu_io_wrapper -c open -r TEST_DIR/t.qcow2 -c read 0 512 -qemu-io: can't open device TEST_DIR/t.qcow2: Failed to get shared "write" = lock +can't open device TEST_DIR/t.qcow2: Failed to get shared "write" lock Is another process using the image [TEST_DIR/t.qcow2]? -qemu-io: no file open, try 'help open' +no file open, try 'help open' =20 _qemu_img_wrapper info TEST_DIR/t.qcow2 qemu-img: Could not open 'TEST_DIR/t.qcow2': Failed to get shared "write" = lock @@ -101,13 +101,13 @@ backing file format: IMGFMT =3D=3D Running utility commands -U =3D=3D =20 _qemu_io_wrapper -U -c read 0 512 TEST_DIR/t.qcow2 -qemu-io: can't open device TEST_DIR/t.qcow2: force-share=3Don can only be = used with read-only images +can't open device TEST_DIR/t.qcow2: force-share=3Don can only be used with= read-only images =20 _qemu_io_wrapper -U -r -c read 0 512 TEST_DIR/t.qcow2 =20 _qemu_io_wrapper -c open -U TEST_DIR/t.qcow2 -c read 0 512 -qemu-io: can't open device TEST_DIR/t.qcow2: force-share=3Don can only be = used with read-only images -qemu-io: no file open, try 'help open' +can't open device TEST_DIR/t.qcow2: force-share=3Don can only be used with= read-only images +no file open, try 'help open' =20 _qemu_io_wrapper -c open -r -U TEST_DIR/t.qcow2 -c read 0 512 =20 @@ -168,15 +168,15 @@ Is another process using the image [TEST_DIR/t.qcow2]? =3D=3D Running utility commands =3D=3D =20 _qemu_io_wrapper -c read 0 512 TEST_DIR/t.qcow2 -qemu-io: can't open device TEST_DIR/t.qcow2: Failed to get "write" lock +can't open device TEST_DIR/t.qcow2: Failed to get "write" lock Is another process using the image [TEST_DIR/t.qcow2]? =20 _qemu_io_wrapper -r -c read 0 512 TEST_DIR/t.qcow2 =20 _qemu_io_wrapper -c open TEST_DIR/t.qcow2 -c read 0 512 -qemu-io: can't open device TEST_DIR/t.qcow2: Failed to get "write" lock +can't open device TEST_DIR/t.qcow2: Failed to get "write" lock Is another process using the image [TEST_DIR/t.qcow2]? -qemu-io: no file open, try 'help open' +no file open, try 'help open' =20 _qemu_io_wrapper -c open -r TEST_DIR/t.qcow2 -c read 0 512 =20 @@ -225,13 +225,13 @@ backing file format: IMGFMT =3D=3D Running utility commands -U =3D=3D =20 _qemu_io_wrapper -U -c read 0 512 TEST_DIR/t.qcow2 -qemu-io: can't open device TEST_DIR/t.qcow2: force-share=3Don can only be = used with read-only images +can't open device TEST_DIR/t.qcow2: force-share=3Don can only be used with= read-only images =20 _qemu_io_wrapper -U -r -c read 0 512 TEST_DIR/t.qcow2 =20 _qemu_io_wrapper -c open -U TEST_DIR/t.qcow2 -c read 0 512 -qemu-io: can't open device TEST_DIR/t.qcow2: force-share=3Don can only be = used with read-only images -qemu-io: no file open, try 'help open' +can't open device TEST_DIR/t.qcow2: force-share=3Don can only be used with= read-only images +no file open, try 'help open' =20 _qemu_io_wrapper -c open -r -U TEST_DIR/t.qcow2 -c read 0 512 =20 @@ -330,13 +330,13 @@ backing file format: IMGFMT =3D=3D Running utility commands -U =3D=3D =20 _qemu_io_wrapper -U -c read 0 512 TEST_DIR/t.qcow2 -qemu-io: can't open device TEST_DIR/t.qcow2: force-share=3Don can only be = used with read-only images +can't open device TEST_DIR/t.qcow2: force-share=3Don can only be used with= read-only images =20 _qemu_io_wrapper -U -r -c read 0 512 TEST_DIR/t.qcow2 =20 _qemu_io_wrapper -c open -U TEST_DIR/t.qcow2 -c read 0 512 -qemu-io: can't open device TEST_DIR/t.qcow2: force-share=3Don can only be = used with read-only images -qemu-io: no file open, try 'help open' +can't open device TEST_DIR/t.qcow2: force-share=3Don can only be used with= read-only images +no file open, try 'help open' =20 _qemu_io_wrapper -c open -r -U TEST_DIR/t.qcow2 -c read 0 512 =20 @@ -430,7 +430,7 @@ Adding drive {"return": "OKrn"} =20 _qemu_io_wrapper TEST_DIR/t.qcow2 -c write 0 512 -qemu-io: can't open device TEST_DIR/t.qcow2: Failed to get "write" lock +can't open device TEST_DIR/t.qcow2: Failed to get "write" lock Is another process using the image [TEST_DIR/t.qcow2]? Creating overlay with qemu-img when the guest is running should be allowed =20 @@ -455,7 +455,7 @@ _qemu_img_wrapper info TEST_DIR/t.qcow2 {"return": ""} =20 _qemu_io_wrapper TEST_DIR/t.qcow2 -c write 0 512 -qemu-io: can't open device TEST_DIR/t.qcow2: Failed to get "write" lock +can't open device TEST_DIR/t.qcow2: Failed to get "write" lock Is another process using the image [TEST_DIR/t.qcow2]? Closing the other { 'execute': 'human-monitor-command', @@ -478,5 +478,5 @@ qemu-img: --force-share/-U conflicts with image options No conflict: =20 Conflict: -qemu-io: -U conflicts with image options +-U conflicts with image options *** done diff --git a/tests/qemu-iotests/171.out b/tests/qemu-iotests/171.out index 67ef9b884152..ec3363b4f440 100644 --- a/tests/qemu-iotests/171.out +++ b/tests/qemu-iotests/171.out @@ -21,32 +21,32 @@ wrote 1/1 bytes at offset 3583 1 bytes, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec) =20 write across image boundary -qemu-io: write failed: Input/output error +write failed: Input/output error =20 write at image boundary -qemu-io: write failed: Input/output error +write failed: Input/output error =20 write after image boundary -qemu-io: write failed: Input/output error +write failed: Input/output error =20 writev before/after image boundary -qemu-io: writev failed: Input/output error +writev failed: Input/output error =20 read before image boundary read 1/1 bytes at offset 3583 1 bytes, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec) =20 read across image boundary -qemu-io: read failed: Input/output error +read failed: Input/output error =20 read at image boundary -qemu-io: read failed: Input/output error +read failed: Input/output error =20 read after image boundary -qemu-io: read failed: Input/output error +read failed: Input/output error =20 readv before/after image boundary -qemu-io: readv failed: Input/output error +readv failed: Input/output error =20 fill image with pattern wrote 4096/4096 bytes at offset 0 @@ -60,7 +60,7 @@ read 4/4 bytes at offset 510 4 bytes, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec) =20 write zeroes across image boundary -qemu-io: write failed: Input/output error +write failed: Input/output error =20 write zeroes at image boundary and check wrote 2/2 bytes at offset 3582 @@ -68,7 +68,7 @@ wrote 2/2 bytes at offset 3582 00000ffe: 00 00 .. read 2/2 bytes at offset 4094 2 bytes, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec) -qemu-io: read failed: Input/output error +read failed: Input/output error =20 fill image with pattern wrote 4096/4096 bytes at offset 0 @@ -82,7 +82,7 @@ read 4/4 bytes at offset 510 4 bytes, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec) =20 discard across image boundary -qemu-io: discard failed: Input/output error +discard failed: Input/output error =20 discard at image boundary and check discard 2/2 bytes at offset 3582 @@ -90,7 +90,7 @@ discard 2/2 bytes at offset 3582 00000ffe: 00 00 .. read 2/2 bytes at offset 4094 2 bytes, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec) -qemu-io: read failed: Input/output error +read failed: Input/output error =20 =3D=3D test 'offset' and 'size' options =3D=3D Formatting 'TEST_DIR/t.IMGFMT', fmt=3DIMGFMT size=3D4096 @@ -113,32 +113,32 @@ wrote 1/1 bytes at offset 2047 1 bytes, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec) =20 write across image boundary -qemu-io: write failed: Input/output error +write failed: Input/output error =20 write at image boundary -qemu-io: write failed: Input/output error +write failed: Input/output error =20 write after image boundary -qemu-io: write failed: Input/output error +write failed: Input/output error =20 writev before/after image boundary -qemu-io: writev failed: Input/output error +writev failed: Input/output error =20 read before image boundary read 1/1 bytes at offset 2047 1 bytes, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec) =20 read across image boundary -qemu-io: read failed: Input/output error +read failed: Input/output error =20 read at image boundary -qemu-io: read failed: Input/output error +read failed: Input/output error =20 read after image boundary -qemu-io: read failed: Input/output error +read failed: Input/output error =20 readv before/after image boundary -qemu-io: readv failed: Input/output error +readv failed: Input/output error =20 fill image with pattern wrote 4096/4096 bytes at offset 0 @@ -152,7 +152,7 @@ read 4/4 bytes at offset 510 4 bytes, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec) =20 write zeroes across image boundary -qemu-io: write failed: Input/output error +write failed: Input/output error =20 write zeroes at image boundary and check wrote 2/2 bytes at offset 2046 @@ -176,7 +176,7 @@ read 4/4 bytes at offset 510 4 bytes, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec) =20 discard across image boundary -qemu-io: discard failed: Input/output error +discard failed: Input/output error =20 discard at image boundary and check discard 2/2 bytes at offset 2046 @@ -209,32 +209,32 @@ wrote 1/1 bytes at offset 2047 1 bytes, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec) =20 write across image boundary -qemu-io: write failed: Input/output error +write failed: Input/output error =20 write at image boundary -qemu-io: write failed: Input/output error +write failed: Input/output error =20 write after image boundary -qemu-io: write failed: Input/output error +write failed: Input/output error =20 writev before/after image boundary -qemu-io: writev failed: Input/output error +writev failed: Input/output error =20 read before image boundary read 1/1 bytes at offset 2047 1 bytes, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec) =20 read across image boundary -qemu-io: read failed: Input/output error +read failed: Input/output error =20 read at image boundary -qemu-io: read failed: Input/output error +read failed: Input/output error =20 read after image boundary -qemu-io: read failed: Input/output error +read failed: Input/output error =20 readv before/after image boundary -qemu-io: readv failed: Input/output error +readv failed: Input/output error =20 fill image with pattern wrote 4096/4096 bytes at offset 0 @@ -248,7 +248,7 @@ read 4/4 bytes at offset 8 4 bytes, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec) =20 write zeroes across image boundary -qemu-io: write failed: Input/output error +write failed: Input/output error =20 write zeroes at image boundary and check wrote 2/2 bytes at offset 2046 @@ -272,7 +272,7 @@ read 4/4 bytes at offset 8 4 bytes, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec) =20 discard across image boundary -qemu-io: discard failed: Input/output error +discard failed: Input/output error =20 discard at image boundary and check discard 2/2 bytes at offset 2046 @@ -290,12 +290,12 @@ wrote 512/512 bytes at offset 0 512 bytes, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec) wrote 1/1 bytes at offset 511 1 bytes, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec) -qemu-io: write failed: Input/output error +write failed: Input/output error wrote 1024/1024 bytes at offset 0 1 KiB, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec) wrote 1/1 bytes at offset 1023 1 bytes, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec) -qemu-io: write failed: Input/output error +write failed: Input/output error checking boundaries 000001fe: 00 00 0a 0a .... read 4/4 bytes at offset 510 diff --git a/tests/qemu-iotests/187.out b/tests/qemu-iotests/187.out index 86203d8abcb0..30b987f71f8d 100644 --- a/tests/qemu-iotests/187.out +++ b/tests/qemu-iotests/187.out @@ -3,16 +3,16 @@ Formatting 'TEST_DIR/t.IMGFMT', fmt=3DIMGFMT size=3D67108= 864 =20 Start from read-only =20 -qemu-io: Block node is read-only +Block node is read-only wrote 65536/65536 bytes at offset 0 64 KiB, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec) -qemu-io: Block node is read-only +Block node is read-only =20 Start from read-write =20 wrote 65536/65536 bytes at offset 0 64 KiB, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec) -qemu-io: Block node is read-only +Block node is read-only wrote 65536/65536 bytes at offset 0 64 KiB, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec) *** done diff --git a/tests/qemu-iotests/188.out b/tests/qemu-iotests/188.out index 5426861b180c..0f05a6901419 100644 --- a/tests/qemu-iotests/188.out +++ b/tests/qemu-iotests/188.out @@ -14,7 +14,7 @@ read 16777216/16777216 bytes at offset 0 16 MiB, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec) =20 =3D=3D verify open failure with wrong password =3D=3D -qemu-io: can't open: Invalid password, cannot unlock any keyslot +can't open: Invalid password, cannot unlock any keyslot =20 =3D=3D verify that has_zero_init returns false when preallocating =3D=3D Formatting 'TEST_DIR/t.IMGFMT.orig', fmt=3DIMGFMT size=3D16777216 diff --git a/tests/qemu-iotests/197.out b/tests/qemu-iotests/197.out index 86c57b51d303..ebb20da95f6e 100644 --- a/tests/qemu-iotests/197.out +++ b/tests/qemu-iotests/197.out @@ -16,7 +16,7 @@ read 2147483136/2147483136 bytes at offset 1024 2 GiB, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec) read 1024/1024 bytes at offset 3221226496 1 KiB, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec) -qemu-io: can't open device TEST_DIR/t.wrap.qcow2: Can't use copy-on-read o= n read-only device +can't open device TEST_DIR/t.wrap.qcow2: Can't use copy-on-read on read-on= ly device 2 GiB (0x80010000) bytes allocated at offset 0 bytes (0x0) 1023.938 MiB (0x3fff0000) bytes not allocated at offset 2 GiB (0x80010000) 64 KiB (0x10000) bytes allocated at offset 3 GiB (0xc0000000) diff --git a/tests/qemu-iotests/205 b/tests/qemu-iotests/205 index 3ed3ed233ac9..947de270c8e7 100755 --- a/tests/qemu-iotests/205 +++ b/tests/qemu-iotests/205 @@ -75,11 +75,11 @@ class TestNbdServerRemove(iotests.QMPTestCase): =20 def assertReadFailed(self, qemu_io_output): self.assertEqual(filter_qemu_io(qemu_io_output).strip(), - 'qemu-io: read failed: Input/output error') + 'read failed: Input/output error') =20 def assertConnectFailed(self, qemu_io_output): self.assertEqual(filter_qemu_io(qemu_io_output).strip(), - "qemu-io: can't open device " + nbd_uri + + "can't open device " + nbd_uri + ": Requested export not available\n" "server reported: export 'exp' not present") =20 diff --git a/tests/qemu-iotests/214.out b/tests/qemu-iotests/214.out index 26056938ee9e..9fc67287f8e1 100644 --- a/tests/qemu-iotests/214.out +++ b/tests/qemu-iotests/214.out @@ -7,7 +7,7 @@ wrote 2097152/2097152 bytes at offset 0 2 MiB, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec) wrote 2097152/2097152 bytes at offset 2097152 2 MiB, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec) -qemu-io: read failed: Input/output error +read failed: Input/output error No errors were found on the image. read 4194304/4194304 bytes at offset 0 4 MiB, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec) diff --git a/tests/qemu-iotests/215.out b/tests/qemu-iotests/215.out index 5a2fe40d0314..70b0f5fb1956 100644 --- a/tests/qemu-iotests/215.out +++ b/tests/qemu-iotests/215.out @@ -16,7 +16,7 @@ read 2147483136/2147483136 bytes at offset 1024 2 GiB, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec) read 1024/1024 bytes at offset 3221226496 1 KiB, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec) -qemu-io: can't open device TEST_DIR/t.wrap.qcow2: Block node is read-only +can't open device TEST_DIR/t.wrap.qcow2: Block node is read-only 2 GiB (0x80010000) bytes allocated at offset 0 bytes (0x0) 1023.938 MiB (0x3fff0000) bytes not allocated at offset 2 GiB (0x80010000) 64 KiB (0x10000) bytes allocated at offset 3 GiB (0xc0000000) diff --git a/tests/qemu-iotests/220.out b/tests/qemu-iotests/220.out index 6f200ec89479..33b994b8a14b 100644 --- a/tests/qemu-iotests/220.out +++ b/tests/qemu-iotests/220.out @@ -38,7 +38,7 @@ wrote 2097152/2097152 bytes at offset 37748736 No errors were found on the image. image size 39845888 =3D=3D Trying to write compressed cluster =3D=3D -qemu-io: write failed: File too large +write failed: File too large image size 562949957615616 =3D=3D Writing normal cluster =3D=3D wrote 2097152/2097152 bytes at offset 0 diff --git a/tests/qemu-iotests/226.out b/tests/qemu-iotests/226.out index 55504d29c4b3..14d1be50f748 100644 --- a/tests/qemu-iotests/226.out +++ b/tests/qemu-iotests/226.out @@ -3,24 +3,24 @@ QA output created by 226 =3D=3D=3D Testing with driver:file =3D=3D=3D =20 =3D=3D Testing RO =3D=3D -qemu-io: can't open: 'file' driver requires 'TEST_DIR/t.IMGFMT' to be a re= gular file -qemu-io: can't open: 'file' driver requires '/dev/null' to be a regular fi= le +can't open: 'file' driver requires 'TEST_DIR/t.IMGFMT' to be a regular file +can't open: 'file' driver requires '/dev/null' to be a regular file =3D=3D Testing RW =3D=3D -qemu-io: can't open: Could not open 'TEST_DIR/t.IMGFMT': Is a directory -qemu-io: can't open: 'file' driver requires '/dev/null' to be a regular fi= le +can't open: Could not open 'TEST_DIR/t.IMGFMT': Is a directory +can't open: 'file' driver requires '/dev/null' to be a regular file =20 =3D=3D=3D Testing with driver:host_device =3D=3D=3D =20 =3D=3D Testing RO =3D=3D -qemu-io: can't open: 'host_device' driver requires 'TEST_DIR/t.IMGFMT' to = be either a character or block device +can't open: 'host_device' driver requires 'TEST_DIR/t.IMGFMT' to be either= a character or block device =3D=3D Testing RW =3D=3D -qemu-io: can't open: Could not open 'TEST_DIR/t.IMGFMT': Is a directory +can't open: Could not open 'TEST_DIR/t.IMGFMT': Is a directory =20 =3D=3D=3D Testing with driver:host_cdrom =3D=3D=3D =20 =3D=3D Testing RO =3D=3D -qemu-io: can't open: 'host_cdrom' driver requires 'TEST_DIR/t.IMGFMT' to b= e either a character or block device +can't open: 'host_cdrom' driver requires 'TEST_DIR/t.IMGFMT' to be either = a character or block device =3D=3D Testing RW =3D=3D -qemu-io: can't open: Could not open 'TEST_DIR/t.IMGFMT': Is a directory +can't open: Could not open 'TEST_DIR/t.IMGFMT': Is a directory =20 *** done diff --git a/tests/qemu-iotests/244.out b/tests/qemu-iotests/244.out index c5e62146c930..6b7fbb3a4168 100644 --- a/tests/qemu-iotests/244.out +++ b/tests/qemu-iotests/244.out @@ -9,23 +9,23 @@ read 65536/65536 bytes at offset 0 64 KiB, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec) read 65536/65536 bytes at offset 0 64 KiB, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec) -qemu-io: can't open device TEST_DIR/t.qcow2: Could not open 'inexistent': = No such file or directory -qemu-io: no file open, try 'help open' +can't open device TEST_DIR/t.qcow2: Could not open 'inexistent': No such f= ile or directory +no file open, try 'help open' =20 Data file required, but without data file name in the image: -qemu-io: can't open device TEST_DIR/t.qcow2: 'data-file' is required for t= his image -qemu-io: no file open, try 'help open' +can't open device TEST_DIR/t.qcow2: 'data-file' is required for this image +no file open, try 'help open' read 65536/65536 bytes at offset 0 64 KiB, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec) -qemu-io: can't open device TEST_DIR/t.qcow2: Could not open 'inexistent': = No such file or directory -qemu-io: no file open, try 'help open' +can't open device TEST_DIR/t.qcow2: Could not open 'inexistent': No such f= ile or directory +no file open, try 'help open' =20 Setting data-file for an image with internal data: Formatting 'TEST_DIR/t.IMGFMT', fmt=3DIMGFMT size=3D67108864 -qemu-io: can't open device TEST_DIR/t.qcow2: 'data-file' can only be set f= or images with an external data file -qemu-io: no file open, try 'help open' -qemu-io: can't open device TEST_DIR/t.qcow2: Could not open 'inexistent': = No such file or directory -qemu-io: no file open, try 'help open' +can't open device TEST_DIR/t.qcow2: 'data-file' can only be set for images= with an external data file +no file open, try 'help open' +can't open device TEST_DIR/t.qcow2: Could not open 'inexistent': No such f= ile or directory +no file open, try 'help open' =20 =3D=3D=3D Conflicting features =3D=3D=3D =20 @@ -37,7 +37,7 @@ qemu-img: error while writing at byte 0: Operation not su= pported =20 Convert uncompressed, then write compressed data manually: Images are identical. -qemu-io: write failed: Operation not supported +write failed: Operation not supported No errors were found on the image. =20 Take an internal snapshot: diff --git a/tests/qemu-iotests/271.out b/tests/qemu-iotests/271.out index da92d4b5b1ab..0b24d501595b 100644 --- a/tests/qemu-iotests/271.out +++ b/tests/qemu-iotests/271.out @@ -456,7 +456,7 @@ L2 entry #0: 0x8000000000050001 0000000000000001 Formatting 'TEST_DIR/t.IMGFMT', fmt=3DIMGFMT size=3D1048576 L2 entry #1: 0x8000000000060000 00000001ffffffff qcow2: Marking image as corrupt: Invalid cluster entry found (L2 offset: = 0x40000, L2 index: 0x1); further corruption events will be suppressed -qemu-io: read failed: Input/output error +read failed: Input/output error =20 ### Corrupted L2 entries - read test (unallocated) ### =20 @@ -471,14 +471,14 @@ L2 entry #0: 0x0000000000000001 0000000000000000 Formatting 'TEST_DIR/t.IMGFMT', fmt=3DIMGFMT size=3D1048576 L2 entry #0: 0x0000000000000000 0000000000000001 qcow2: Marking image as corrupt: Invalid cluster entry found (L2 offset: = 0x40000, L2 index: 0); further corruption events will be suppressed -qemu-io: read failed: Input/output error +read failed: Input/output error =20 # Both 'subcluster is zero' and 'subcluster is allocated' bits set =20 Formatting 'TEST_DIR/t.IMGFMT', fmt=3DIMGFMT size=3D1048576 L2 entry #1: 0x0000000000000000 0000000100000001 qcow2: Marking image as corrupt: Invalid cluster entry found (L2 offset: = 0x40000, L2 index: 0x1); further corruption events will be suppressed -qemu-io: read failed: Input/output error +read failed: Input/output error =20 ### Compressed cluster with subcluster bitmap !=3D 0 - read test ### =20 @@ -501,7 +501,7 @@ L2 entry #0: 0x8000000000050001 0000000000000001 Formatting 'TEST_DIR/t.IMGFMT', fmt=3DIMGFMT size=3D1048576 L2 entry #1: 0x8000000000060000 00000001ffffffff qcow2: Marking image as corrupt: Invalid cluster entry found (L2 offset: 0= x40000, L2 index: 0x1); further corruption events will be suppressed -qemu-io: write failed: Input/output error +write failed: Input/output error =20 ### Corrupted L2 entries - write test (unallocated) ### =20 @@ -516,14 +516,14 @@ L2 entry #0: 0x8000000000060000 0000000000000001 Formatting 'TEST_DIR/t.IMGFMT', fmt=3DIMGFMT size=3D1048576 L2 entry #0: 0x0000000000000000 0000000000000001 qcow2: Marking image as corrupt: Invalid cluster entry found (L2 offset: 0= x40000, L2 index: 0); further corruption events will be suppressed -qemu-io: write failed: Input/output error +write failed: Input/output error =20 # Both 'subcluster is zero' and 'subcluster is allocated' bits set =20 Formatting 'TEST_DIR/t.IMGFMT', fmt=3DIMGFMT size=3D1048576 L2 entry #1: 0x0000000000000000 0000000100000001 qcow2: Marking image as corrupt: Invalid cluster entry found (L2 offset: 0= x40000, L2 index: 0x1); further corruption events will be suppressed -qemu-io: write failed: Input/output error +write failed: Input/output error =20 ### Compressed cluster with subcluster bitmap !=3D 0 - write test ### =20 @@ -555,7 +555,7 @@ Double checking the fixed image now... 1 errors were found on the image. Data may be corrupted, or further writes to the image may corrupt it. qcow2: Marking image as corrupt: Cluster allocation offset 0x50200 unalign= ed (L2 offset: 0x40000, L2 index: 0); further corruption events will be sup= pressed -qemu-io: read failed: Input/output error +read failed: Input/output error # Corrupted L2 entry, no allocated subclusters # Formatting 'TEST_DIR/t.IMGFMT', fmt=3DIMGFMT size=3D131072 backing_file=3D= TEST_DIR/t.IMGFMT.base backing_fmt=3Draw Repairing offset=3D50200: Preallocated cluster is not properly aligned; L2= entry corrupted. diff --git a/tests/qemu-iotests/289.out b/tests/qemu-iotests/289.out index 58e4f4942f0c..e54e2629d4dc 100644 --- a/tests/qemu-iotests/289.out +++ b/tests/qemu-iotests/289.out @@ -3,6 +3,6 @@ QA output created by 289 =3D=3D=3D Avoid freeing external data clusters on failure =3D=3D=3D =20 Formatting 'TEST_DIR/t.IMGFMT', fmt=3DIMGFMT size=3D65536 data_file=3DTEST= _DIR/t.IMGFMT.data_file -qemu-io: write failed: Input/output error +write failed: Input/output error No errors were found on the image. *** done diff --git a/tests/qemu-iotests/293.out b/tests/qemu-iotests/293.out index 72607831260c..5e5b0d8d54b8 100644 --- a/tests/qemu-iotests/293.out +++ b/tests/qemu-iotests/293.out @@ -23,10 +23,10 @@ read 4096/4096 bytes at offset 0 4 KiB, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec) =20 =3D=3D erase slot 0 and try it =3D=3D -qemu-io: can't open: Invalid password, cannot unlock any keyslot +can't open: Invalid password, cannot unlock any keyslot =20 =3D=3D erase slot 2 and try it =3D=3D -qemu-io: can't open: Invalid password, cannot unlock any keyslot +can't open: Invalid password, cannot unlock any keyslot =20 =3D=3D filling 4 slots with secret 2 =3D=3D =20 @@ -54,9 +54,9 @@ read 4096/4096 bytes at offset 0 qemu-img: All the active keyslots match the (old) password that was given = and erasing them will erase all the data in the image irreversibly - refusi= ng operation =20 =3D=3D only secret3 should work now =3D=3D -qemu-io: can't open: Invalid password, cannot unlock any keyslot -qemu-io: can't open: Invalid password, cannot unlock any keyslot -qemu-io: can't open: Invalid password, cannot unlock any keyslot +can't open: Invalid password, cannot unlock any keyslot +can't open: Invalid password, cannot unlock any keyslot +can't open: Invalid password, cannot unlock any keyslot read 4096/4096 bytes at offset 0 4 KiB, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec) =20 @@ -66,9 +66,9 @@ read 4096/4096 bytes at offset 0 =3D=3D only secret0 should work now =3D=3D read 4096/4096 bytes at offset 0 4 KiB, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec) -qemu-io: can't open: Invalid password, cannot unlock any keyslot -qemu-io: can't open: Invalid password, cannot unlock any keyslot -qemu-io: can't open: Invalid password, cannot unlock any keyslot +can't open: Invalid password, cannot unlock any keyslot +can't open: Invalid password, cannot unlock any keyslot +can't open: Invalid password, cannot unlock any keyslot =20 =3D=3D replace secret0 with secret1 (should fail) =3D=3D qemu-img: Refusing to overwrite active keyslot 0 - please erase it first @@ -76,11 +76,11 @@ qemu-img: Refusing to overwrite active keyslot 0 - plea= se erase it first =3D=3D replace secret0 with secret1 with force (should work) =3D=3D =20 =3D=3D only secret1 should work now =3D=3D -qemu-io: can't open: Invalid password, cannot unlock any keyslot +can't open: Invalid password, cannot unlock any keyslot read 4096/4096 bytes at offset 0 4 KiB, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec) -qemu-io: can't open: Invalid password, cannot unlock any keyslot -qemu-io: can't open: Invalid password, cannot unlock any keyslot +can't open: Invalid password, cannot unlock any keyslot +can't open: Invalid password, cannot unlock any keyslot =20 =3D=3D erase last secret (should fail) =3D=3D qemu-img: Attempt to erase the only active keyslot 0 which will erase all = the data in the image irreversibly - refusing operation @@ -92,8 +92,8 @@ qemu-img: No keyslots match given (old) password for eras= e operation =3D=3D erase last secret with force by slot (should work) =3D=3D =20 =3D=3D we have no secrets now, data is lost forever =3D=3D -qemu-io: can't open: Invalid password, cannot unlock any keyslot -qemu-io: can't open: Invalid password, cannot unlock any keyslot -qemu-io: can't open: Invalid password, cannot unlock any keyslot -qemu-io: can't open: Invalid password, cannot unlock any keyslot +can't open: Invalid password, cannot unlock any keyslot +can't open: Invalid password, cannot unlock any keyslot +can't open: Invalid password, cannot unlock any keyslot +can't open: Invalid password, cannot unlock any keyslot *** done diff --git a/tests/qemu-iotests/294.out b/tests/qemu-iotests/294.out index 994ae873081c..6aeabb43f604 100644 --- a/tests/qemu-iotests/294.out +++ b/tests/qemu-iotests/294.out @@ -15,14 +15,14 @@ read 4096/4096 bytes at offset 0 =3D=3D erase slot 0 =3D=3D =20 =3D=3D test that key 0 doesn't open the image =3D=3D -qemu-io: can't open: Invalid password, cannot unlock any keyslot +can't open: Invalid password, cannot unlock any keyslot =20 =3D=3D 'restore' the image header =3D=3D 1+0 records in 1+0 records out =20 =3D=3D test that key 0 still doesn't open the image (key material is erase= d) =3D=3D -qemu-io: can't open: Invalid password, cannot unlock any keyslot +can't open: Invalid password, cannot unlock any keyslot =20 =3D=3D test that key 1 still works =3D=3D read 4096/4096 bytes at offset 0 diff --git a/tests/qemu-iotests/305.out b/tests/qemu-iotests/305.out index af09d6a3ff48..538019e72601 100644 --- a/tests/qemu-iotests/305.out +++ b/tests/qemu-iotests/305.out @@ -12,5 +12,5 @@ discard 1024/1024 bytes at offset 125952 ### Corrupt the offset of the second refcount block ### Try to allocate the discarded clusters again qcow2: Marking image as corrupt: Refblock offset 0x20600 unaligned (reftab= le index: 0x1); further corruption events will be suppressed -qemu-io: write failed: Input/output error +write failed: Input/output error *** done diff --git a/tests/qemu-iotests/307.out b/tests/qemu-iotests/307.out index 608b407a6fc5..a9b37d3ac119 100644 --- a/tests/qemu-iotests/307.out +++ b/tests/qemu-iotests/307.out @@ -127,7 +127,7 @@ exports available: 1 {"error": {"class": "GenericError", "desc": "export 'export1' still in use= "}} {"execute": "block-export-del", "arguments": {"id": "export1", "mode": "ha= rd"}} {"return": {}} -qemu-io: read failed: Input/output error +read failed: Input/output error =20 {"execute": "query-block-exports", "arguments": {}} {"return": []} diff --git a/tests/qemu-iotests/tests/file-io-error.out b/tests/qemu-iotest= s/tests/file-io-error.out index bf8c0018ba5a..0f46455a94a7 100644 --- a/tests/qemu-iotests/tests/file-io-error.out +++ b/tests/qemu-iotests/tests/file-io-error.out @@ -21,7 +21,7 @@ QA output created by file-io-error }} {"return": {}} =20 -qemu-io: write failed: Input/output error +write failed: Input/output error =20 {'execute': 'block-export-del', 'arguments': {'id': 'exp0'}} diff --git a/tests/qemu-iotests/tests/image-fleecing.out b/tests/qemu-iotes= ts/tests/image-fleecing.out index dc788f1e20a4..acfc89ff0e99 100644 --- a/tests/qemu-iotests/tests/image-fleecing.out +++ b/tests/qemu-iotests/tests/image-fleecing.out @@ -238,13 +238,13 @@ read -P0xd5 1M 64k read -P0xdc 32M 64k read -P0xcd 0x3ff0000 64k read -P0 0x00f8000 32k -qemu-io: read failed: Invalid argument +read failed: Invalid argument =20 read -P0 0x2010000 32k -qemu-io: read failed: Invalid argument +read failed: Invalid argument =20 read -P0 0x3fe0000 64k -qemu-io: read failed: Invalid argument +read failed: Invalid argument =20 =20 --- Testing COW --- @@ -265,13 +265,13 @@ read -P0xd5 1M 64k read -P0xdc 32M 64k read -P0xcd 0x3ff0000 64k read -P0 0x00f8000 32k -qemu-io: read failed: Invalid argument +read failed: Invalid argument =20 read -P0 0x2010000 32k -qemu-io: read failed: Invalid argument +read failed: Invalid argument =20 read -P0 0x3fe0000 64k -qemu-io: read failed: Invalid argument +read failed: Invalid argument =20 =20 --- Cleanup --- diff --git a/tests/qemu-iotests/tests/inactive-node-nbd.out b/tests/qemu-io= tests/tests/inactive-node-nbd.out index 96af7608ded2..cdb5bfbaac5b 100644 --- a/tests/qemu-iotests/tests/inactive-node-nbd.out +++ b/tests/qemu-iotests/tests/inactive-node-nbd.out @@ -215,16 +215,16 @@ target-fmt active: True read 65536/65536 bytes at offset 0 64 KiB, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec) =20 -qemu-io: write failed: Operation not permitted +write failed: Operation not permitted =20 -qemu-io: write failed: Operation not permitted +write failed: Operation not permitted =20 -qemu-io: write failed: Operation not permitted +write failed: Operation not permitted =20 -qemu-io: discard failed: Operation not permitted +discard failed: Operation not permitted =20 =20 -qemu-io: Failed to get allocation status: Operation not permitted +Failed to get allocation status: Operation not permitted =20 =20 =3D=3D=3D Inactivating a read-only node =3D=3D=3D diff --git a/tests/qemu-iotests/tests/nbd-reconnect-on-open.out b/tests/qem= u-iotests/tests/nbd-reconnect-on-open.out index b3dd90f2a3cd..69544c38a560 100644 --- a/tests/qemu-iotests/tests/nbd-reconnect-on-open.out +++ b/tests/qemu-iotests/tests/nbd-reconnect-on-open.out @@ -2,10 +2,10 @@ read 1048576/1048576 bytes at offset 0 1 MiB, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec) =20 Check fail to connect with 0 seconds of timeout -qemu-io: can't open: Failed to connect to 'SOCK_DIR/PID-nbd-sock': No such= file or directory +can't open: Failed to connect to 'SOCK_DIR/PID-nbd-sock': No such file or = directory =20 qemu_io finished in 0..0.2 seconds, OK Check fail to connect with 1 seconds of timeout -qemu-io: can't open: Failed to connect to 'SOCK_DIR/PID-nbd-sock': No such= file or directory +can't open: Failed to connect to 'SOCK_DIR/PID-nbd-sock': No such file or = directory =20 qemu_io finished in 1..1.2 seconds, OK diff --git a/tests/qemu-iotests/tests/parallels-bitmap.out b/tests/qemu-iot= ests/tests/parallels-bitmap.out index df6f6761062e..580296d179ba 100644 --- a/tests/qemu-iotests/tests/parallels-bitmap.out +++ b/tests/qemu-iotests/tests/parallels-bitmap.out @@ -82,10 +82,10 @@ qemu-img: Operation add on bitmap 9b7b8b2e-1c4a-4d3f-8e= 6a-1f2d3c4b5a69 failed: B in use after deactivation: False in use after activation: True --- a bitmap which can not be written is reported, not lost in silence - qemu-io: Lost persistent bitmaps during inactivation of node 'NODE_NAM= E': Can't save dirty bitmap 9b7b8b2e-1c4a-4d3f-8e6a-1f2d3c4b5a69: IO error:= Input/output error + Lost persistent bitmaps during inactivation of node 'NODE_NAME': Can't= save dirty bitmap 9b7b8b2e-1c4a-4d3f-8e6a-1f2d3c4b5a69: IO error: Input/ou= tput error in use after the failure: True --- but the guest data went through, and the image says it is in use -qemu-io: warning: Dropping the Format Extension of node 'NODE_NAME', which= does not look like one: Wrong parallels Format Extension magic: 0x11111111= 11111111, expected: 0xab234cef23dcea87 +warning: Dropping the Format Extension of node 'NODE_NAME', which does not= look like one: Wrong parallels Format Extension magic: 0x1111111111111111,= expected: 0xab234cef23dcea87 read 65536/65536 bytes at offset 0 64 KiB, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec) =20 diff --git a/tests/qemu-iotests/tests/parallels-checks.out b/tests/qemu-iot= ests/tests/parallels-checks.out index f6806f82fa76..bc77ce1f5347 100644 --- a/tests/qemu-iotests/tests/parallels-checks.out +++ b/tests/qemu-iotests/tests/parallels-checks.out @@ -146,7 +146,7 @@ Formatting 'TEST_DIR/t.IMGFMT', fmt=3DIMGFMT size=3D419= 4304 =3D=3D open must fail cleanly instead of aborting =3D=3D qemu-img: Could not open 'TEST_DIR/t.IMGFMT': Invalid image: Catalog size = too small for advertised disk size =3D=3D write into the uncovered range must fail cleanly too =3D=3D -qemu-io: can't open device TEST_DIR/t.parallels: Invalid image: Catalog si= ze too small for advertised disk size +can't open device TEST_DIR/t.parallels: Invalid image: Catalog size too sm= all for advertised disk size Formatting 'TEST_DIR/t.IMGFMT', fmt=3DIMGFMT size=3D4194304 =3D=3D TEST BAT ENTRY POINTING OUTSIDE IMAGE =3D=3D =3D=3D corrupt image: point first cluster far outside the file =3D=3D @@ -307,7 +307,7 @@ Formatting 'TEST_DIR/t.IMGFMT', fmt=3DIMGFMT size=3D419= 4304 =3D=3D a guest write may reuse the extension cluster, so clobber it =3D=3D =3D=3D pretend the image was not closed correctly =3D=3D =3D=3D the image opens, the extension is dropped =3D=3D -qemu-io: warning: Dropping the Format Extension of node 'NODE_NAME', which= does not look like one: Wrong parallels Format Extension magic: 0xaaaaaaaa= aaaaaaaa, expected: 0xab234cef23dcea87 +warning: Dropping the Format Extension of node 'NODE_NAME', which does not= look like one: Wrong parallels Format Extension magic: 0xaaaaaaaaaaaaaaaa,= expected: 0xab234cef23dcea87 Repairing image was not closed correctly Repairing space leaked at the end of the image 1048576 wrote 65536/65536 bytes at offset 0 diff --git a/util/error-report.c b/util/error-report.c index 8932beebfb9f..451ee2af4599 100644 --- a/util/error-report.c +++ b/util/error-report.c @@ -185,7 +185,7 @@ static void print_loc(MonitorHMP *hmp) int i; const char *const *argp; =20 - if (!hmp && g_get_prgname()) { + if (!hmp && g_get_prgname() && *g_get_prgname()) { fprintf(stderr, "%s:", g_get_prgname()); sep =3D " "; } --=20 2.56.0.rc0.29.g47ce80527c56 From nobody Sat Sep 26 20:01:40 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=1790108866; cv=none; d=zohomail.com; s=zohoarc; b=KTu4JYBckY5v2Matb8iIUU6Y9ZMn1yU3CTUMDXUIn9pim7OLPrdhrZ4VP5gsZPArq1RKcRPybrdr3uvMoIJhpFjEm/6GZ0VTwDgDK/HI9j7JtQIG05mtGJB0ZOHRjZ33qw7oZF1rNl+AopghV6SG8PQaBqKmp1sshjv0tmHT9T8= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1790108866; 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:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=RyfhKlZkwl5XMd0Mk7GKH6ETO4+1HsezyqdsV/FL+Iw=; b=cCahmo3fK2hW6H35YxxCPwwDLkhBi58oaFpw8N1Kjs1inkSkFLl5GEKjSE3osjRJE7GJLJ+DcyGv0KTEEkRqx95Qzca1CvDs1qjULeVJTK66XSQGsHjtQCGJthuqVBNrtd7m1ZK/lQNSS2ktqNb/YDjj+ALQTfyn2cMOMQD2aCk= 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 1790108866049802.2688697164057; Tue, 22 Sep 2026 13:27:46 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists1p.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1x96yL-0004sY-33; Tue, 22 Sep 2026 16:20:13 -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 1x96xl-0004Cu-Tn for qemu-devel@nongnu.org; Tue, 22 Sep 2026 16:19:38 -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 1x96xk-00083Z-14 for qemu-devel@nongnu.org; Tue, 22 Sep 2026 16:19:37 -0400 Received: from mx-prod-mc-01.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-453-WTtLw25oN4KY5FICm6yP8g-1; Tue, 22 Sep 2026 16:19:32 -0400 Received: from mx-prod-int-06.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-06.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.93]) (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-01.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id 148C319541BB; Tue, 22 Sep 2026 20:19:31 +0000 (UTC) Received: from localhost (headnet03.pony-001.prod.iad2.dc.redhat.com [10.2.32.114]) by mx-prod-int-06.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id 48DD81800370; Tue, 22 Sep 2026 20:19:28 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1790108375; 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=RyfhKlZkwl5XMd0Mk7GKH6ETO4+1HsezyqdsV/FL+Iw=; b=WaPQYcIIHIksUw6LQkMac0NfvntMdJhenlifI4G3ERs0VUDyKNUbdoa5X6doUb89sNlU2l gn3+rA9TceVf8S5Vata1tlgm4xm35/CtR1h8Gl380fa3Iy2Bbq0tecThaaQm1qsXrPQMdi 28VDr8WDCV4HDJcIKZQcqpsoXJBov/o= X-MC-Unique: WTtLw25oN4KY5FICm6yP8g-1 X-Mimecast-MFC-AGG-ID: WTtLw25oN4KY5FICm6yP8g_1790108371 From: =?utf-8?q?Marc-Andr=C3=A9_Lureau?= Date: Wed, 23 Sep 2026 00:17:13 +0400 Subject: [PATCH 06/88] monitor: allow a bare Monitor MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Message-Id: <20260923-nohmp-v1-6-ebc029d4bd80@redhat.com> References: <20260923-nohmp-v1-0-ebc029d4bd80@redhat.com> In-Reply-To: <20260923-nohmp-v1-0-ebc029d4bd80@redhat.com> To: qemu-devel@nongnu.org Cc: Kevin Wolf , =?utf-8?q?Marc-Andr=C3=A9_Lureau?= , "Dr. David Alan Gilbert" , Markus Armbruster X-Developer-Signature: v=1; a=openpgp-sha256; l=6564; i=marcandre.lureau@redhat.com; h=from:subject:message-id; bh=dMAhMQFKjXriER2uy0I1fY/g6vj1m7FbD22JhHV+4Lo=; b=owEBbQKS/ZANAwAKAdro4Ql1lpzlAcsmYgBqsuKuUoUMF0v22CIU4BqZIQWRPTufksv8wZDMa GlGaAsIoMyJAjMEAAEKAB0WIQSHqb2TP4fGBtJ29i3a6OEJdZac5QUCarLirgAKCRDa6OEJdZac 5WCfD/43K2Nt4pu9UOA250C9OIcJDtspCmF7FqOajBLvIAkuk606AnrL7L6xgeoCF3YPh8D4QoP q99E79j3yWCCI5Q144MhtQDdwAmoAlKt4Oiz2k7HazF5BaclxsSv5FfdNkPm13yblQLnAcy/dA7 VyzozsLQak3J8l1WIZAUBz9MMzOzG7kbzXph8nLCO34H8rRODo6NEO/oOrQ7XQ47f7f5BxK50wN CmzJ8KfcM5XziQ54rmwCVpj9zCEab29dr4RnXw8W1k1DvRwRoOkqhwyR4tkpZV0TL9UKZnRxdDP nZKHxmZkgW/jsmUKp48oPDQBKX43d2EqQQonwjgYG4B/xFSJ2+h8ZD76iKXpqiZQwq8BJ309EoV 4bE0fiLxxdZitP9OB3NcGJ6Uo0V3AzZl6CX2rXfgbm8Q0BU3jrUhYdRAam/9YgeZmML6TNZZd3W ffE4gnzxYBZ2oKo4a0MoNoRiNl4r3If+6amRRqDQIndHeljwBh8EmVbv7b/NFACPWTly1VHiQrY M90uDLWWWEohzDMcR7k3KChU/97x+hok6zDET0sxplW90cryYJyR77YCyDMGQH0O0QqvNLlQgcM og30prHobAQxqR7iGwQ+BHDq0BQ1l+lHu+zgHByT6QlaYrLS1aZUKMp90Br5ybo9GrODeeXIGc8 AMT+VDz7V2ovQsg== X-Developer-Key: i=marcandre.lureau@redhat.com; a=openpgp; fpr=87A9BD933F87C606D276F62DDAE8E10975969CE5 X-Scanned-By: MIMEDefang 3.4.1 on 10.30.177.93 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: 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-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: 1790108868314158500 For qemu-io commands, we want to capture qemu_printf() output. Let's allow to instantiate a bare monitor and steal its output. We move UserCreatable to the leaf HMP & QMP monitors, to only allow -object on these. Signed-off-by: Marc-Andr=C3=A9 Lureau --- include/monitor/monitor.h | 2 ++ monitor/hmp.c | 12 ++++-------- monitor/monitor.c | 28 ++++++++++++++++------------ monitor/qmp.c | 12 ++++-------- 4 files changed, 26 insertions(+), 28 deletions(-) diff --git a/include/monitor/monitor.h b/include/monitor/monitor.h index 2a550aec023f..e8216b2f4cbf 100644 --- a/include/monitor/monitor.h +++ b/include/monitor/monitor.h @@ -29,6 +29,7 @@ void monitor_new_qmp(const char *id, const char *chardev_= id, bool pretty, Error **errp); int monitor_new(MonitorOptions *opts, bool allow_hmp, Error **errp); int monitor_new_opts(QemuOpts *opts, Error **errp); +bool monitor_complete(Monitor *mon, Error **errp); void monitor_cleanup(void); =20 void monitor_suspend(Monitor *mon); @@ -39,6 +40,7 @@ int monitor_fd_param(Monitor *mon, const char *fdname, Er= ror **errp); =20 int monitor_puts(Monitor *mon, const char *str); void monitor_flush(Monitor *mon); +GString *monitor_steal_output(Monitor *mon); =20 int monitor_puts_locked(Monitor *mon, const char *str); void monitor_flush_locked(Monitor *mon); diff --git a/monitor/hmp.c b/monitor/hmp.c index 488ec23937df..53d84d160992 100644 --- a/monitor/hmp.c +++ b/monitor/hmp.c @@ -46,7 +46,9 @@ #include "system/block-backend.h" #include "trace.h" =20 -OBJECT_DEFINE_TYPE(MonitorHMP, monitor_hmp, MONITOR_HMP, MONITOR); +OBJECT_DEFINE_TYPE_WITH_INTERFACES(MonitorHMP, monitor_hmp, + MONITOR_HMP, MONITOR, + { TYPE_USER_CREATABLE }); =20 MonitorHMP *monitor_cur_hmp(void) { @@ -1629,17 +1631,11 @@ void monitor_new_hmp(const char *id, const char *ch= ardev_id, static void monitor_hmp_complete(UserCreatable *uc, Error **errp) { MonitorHMP *hmp =3D MONITOR_HMP(uc); - UserCreatableClass *ucc_parent =3D - USER_CREATABLE_CLASS( - object_class_get_parent( - OBJECT_CLASS(MONITOR_HMP_GET_CLASS(hmp)))); ERRP_GUARD(); =20 - ucc_parent->complete(uc, errp); - if (*errp) { + if (!monitor_complete(MONITOR(uc), errp)) { return; } - if (hmp->parent_obj.chardev_id) { if (hmp->use_readline) { hmp->rs =3D readline_init(monitor_readline_printf, diff --git a/monitor/monitor.c b/monitor/monitor.c index 2654b81890dd..ee462cade7d1 100644 --- a/monitor/monitor.c +++ b/monitor/monitor.c @@ -79,8 +79,7 @@ static bool monitor_destroyed; =20 int monitor_device_index; =20 -OBJECT_DEFINE_TYPE_EXTENDED(Monitor, monitor, MONITOR, OBJECT, true, - { TYPE_USER_CREATABLE }, {}); +OBJECT_DEFINE_TYPE(Monitor, monitor, MONITOR, OBJECT) =20 static void monitor_finalize(Object *obj) { @@ -110,17 +109,11 @@ static void monitor_set_chardev_id(Object *obj, const= char *str, Error **errp) mon->chardev_id =3D g_strdup(str); } =20 -static void monitor_complete(UserCreatable *uc, Error **errp); - static void monitor_class_init(ObjectClass *cls, const void *data) { - UserCreatableClass *ucc =3D USER_CREATABLE_CLASS(cls); - object_class_property_add_str(cls, "chardev", monitor_get_chardev_id, monitor_set_chardev_id); - - ucc->complete =3D monitor_complete; } =20 static void monitor_init(Object *obj) @@ -273,6 +266,16 @@ int monitor_puts(Monitor *mon, const char *str) return monitor_puts_locked(mon, str); } =20 +GString *monitor_steal_output(Monitor *mon) +{ + GString *output; + + QEMU_LOCK_GUARD(&mon->mon_lock); + output =3D mon->outbuf; + mon->outbuf =3D g_string_new(NULL); + return output; +} + static MonitorQAPIEventConf monitor_qapi_event_conf[QAPI_EVENT__MAX] =3D { /* Limit guest-triggerable events to 1 per second */ [QAPI_EVENT_RTC_CHANGE] =3D { 1000 * SCALE_MS }, @@ -658,20 +661,20 @@ char *monitor_compat_id(void) return g_strdup_printf("compat_monitor%d", monitor_device_index++); } =20 -static void monitor_complete(UserCreatable *uc, Error **errp) +bool monitor_complete(Monitor *mon, Error **errp) { - Monitor *mon =3D MONITOR(uc); AioContext *ctx; =20 + assert(!mon->accept_input_bh); if (mon->chardev_id) { Chardev *chr =3D qemu_chr_find(mon->chardev_id); if (chr =3D=3D NULL) { error_setg(errp, "chardev \"%s\" not found", mon->chardev_id); - return; + return false; } =20 if (!qemu_chr_fe_init(&mon->chr, chr, errp)) { - return; + return false; } } =20 @@ -685,6 +688,7 @@ static void monitor_complete(UserCreatable *uc, Error *= *errp) ctx =3D qemu_get_aio_context(); } mon->accept_input_bh =3D aio_bh_new(ctx, monitor_accept_input, mon); + return true; } =20 int monitor_new(MonitorOptions *opts, bool allow_hmp, Error **errp) diff --git a/monitor/qmp.c b/monitor/qmp.c index aec03157750c..00126ae0983c 100644 --- a/monitor/qmp.c +++ b/monitor/qmp.c @@ -77,7 +77,9 @@ QmpCommandList qmp_commands, qmp_cap_negotiation_commands; /* Monitor being serviced by the dispatcher. Protected by BQL. */ static MonitorQMP *qmp_dispatcher_current_mon; =20 -OBJECT_DEFINE_TYPE(MonitorQMP, monitor_qmp, MONITOR_QMP, MONITOR); +OBJECT_DEFINE_TYPE_WITH_INTERFACES(MonitorQMP, monitor_qmp, + MONITOR_QMP, MONITOR, + { TYPE_USER_CREATABLE }); =20 static void monitor_qmp_cleanup_req_queue_locked(MonitorQMP *mon); =20 @@ -704,17 +706,11 @@ void monitor_new_qmp(const char *id, const char *char= dev_id, static void monitor_qmp_complete(UserCreatable *uc, Error **errp) { MonitorQMP *mon =3D MONITOR_QMP(uc); - UserCreatableClass *ucc_parent =3D - USER_CREATABLE_CLASS( - object_class_get_parent( - OBJECT_CLASS(MONITOR_QMP_GET_CLASS(mon)))); ERRP_GUARD(); =20 - ucc_parent->complete(uc, errp); - if (*errp) { + if (!monitor_complete(MONITOR(uc), errp)) { return; } - qemu_chr_fe_set_echo(&mon->parent_obj.chr, true); =20 if (monitor_requires_iothread(MONITOR(mon))) { --=20 2.56.0.rc0.29.g47ce80527c56 From nobody Sat Sep 26 20:01:40 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=1790108426; cv=none; d=zohomail.com; s=zohoarc; b=iyeWc316OJB7AlQxPCxrfqn3d19eLp1C8qrq3GBSzJsYil/Eg+JNLSJADa0QvGY08iBJqAMELpop5/QB1Bvysk0THK+osiqhr9fnn4LPjRYZ+8HG2clevLHSdbxc52V9FTyERC9nm0jKQsovM5CdpHlnxWE8KYA6jX2wSV8ycbQ= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1790108426; 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:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=zITn74UA8P4zpzsh9dZZf0zY8iFD58J6Rtd4+E08IZQ=; b=bKLzam3DMZ6k74fNMU/eyG78GE7b68PjDff0NAzxtvcL1u3ke8sRkRSXfDpxsFZ8ecn610pyemb1d5qzKr//gDkDouAZiI8BB9WZe5kwYbn8LOEfmDDBfJLn54fmNqbwMYgogQoStaLtuDeuGj0QJXavY+sqPY1MzdtaCIEwXTA= 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 1790108426468471.6908060878608; Tue, 22 Sep 2026 13:20:26 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists1p.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1x96yN-00052X-0j; Tue, 22 Sep 2026 16:20:15 -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 1x96xn-0004GO-Rb for qemu-devel@nongnu.org; Tue, 22 Sep 2026 16:19:41 -0400 Received: from us-smtp-delivery-124.mimecast.com ([170.10.133.124]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1x96xm-00083r-7H for qemu-devel@nongnu.org; Tue, 22 Sep 2026 16:19:39 -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-166-NinC_KgGPBqcDTom4EyGgQ-1; Tue, 22 Sep 2026 16:19:36 -0400 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-06.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id 1A45318005A1; Tue, 22 Sep 2026 20:19:35 +0000 (UTC) Received: from localhost (headnet03.pony-001.prod.iad2.dc.redhat.com [10.2.32.114]) by mx-prod-int-08.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id 164521800446; Tue, 22 Sep 2026 20:19:33 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1790108377; 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=zITn74UA8P4zpzsh9dZZf0zY8iFD58J6Rtd4+E08IZQ=; b=bNDVba6Zsmn+LmRd2bwkLkI9JC7mLhUF5bSZSvlUISqwvVmjaoZsGg6GdnTiHqCNAKS2Xi 1ENQ4+SxU8yxacIMmwv1gbr3jv5xRRxHKx6hHGZaDIBHIvuIcu5hI2fffHQTtWBJ7WQovx CHdu5R5+qjhdyYIoN9JVaYKTO4Si0zo= X-MC-Unique: NinC_KgGPBqcDTom4EyGgQ-1 X-Mimecast-MFC-AGG-ID: NinC_KgGPBqcDTom4EyGgQ_1790108375 From: =?utf-8?q?Marc-Andr=C3=A9_Lureau?= Date: Wed, 23 Sep 2026 00:17:14 +0400 Subject: [PATCH 07/88] qemu-print: use monitor_puts() for any non-QMP monitor MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Message-Id: <20260923-nohmp-v1-7-ebc029d4bd80@redhat.com> References: <20260923-nohmp-v1-0-ebc029d4bd80@redhat.com> In-Reply-To: <20260923-nohmp-v1-0-ebc029d4bd80@redhat.com> To: qemu-devel@nongnu.org Cc: Kevin Wolf , =?utf-8?q?Marc-Andr=C3=A9_Lureau?= , Paolo Bonzini , "Dr. David Alan Gilbert" X-Developer-Signature: v=1; a=openpgp-sha256; l=2591; i=marcandre.lureau@redhat.com; h=from:subject:message-id; bh=UGcbFthFg1o910LN1ITwHs7jzoQGUbuOX/XNgbfh37A=; b=owEBbQKS/ZANAwAKAdro4Ql1lpzlAcsmYgBqsuKuQymoL8P3d/muMi7Pg8a1TBHjE80Q4Mffk u+VeTcSK76JAjMEAAEKAB0WIQSHqb2TP4fGBtJ29i3a6OEJdZac5QUCarLirgAKCRDa6OEJdZac 5aoHD/9Uh4USghAPf5JqmiLtWKUzQ18nLGKdSpkrGZCo0igumLped3yS8MeUwvhzbP8hsN8+8hP ETuOlrAYKP8YTQPnx+EeeTgaPt3G4VgOgqY+VttAh/M/pS3d+VujvuPwO1ClPAkKHx1XogrwJAC gb9nyZz3SqI9efdgs6s1GhxmUD1+0DzTEQA01cngTADrLlz2ivAbgKUoyitE3One6AXt5Fd4OXZ YkqXIqr7ES4dVR3ghqe9pN4Da69GWSE3dFINkpSOJdlMiM8cJWPeIMH2HYf7oCWY4BNsyFK2270 9OhDA5EQqiHkbENuz3/QNBgIpT3D9IV5IC80ZEEEaXkbWiodMWJJEuDSd4mTb06DD3lVv2IKO2I 0dBrxnrkA0vJ1aRjMeiPDQReB8bTXzekLcxnrA4QcYNCLcpk1CSbv1/iTuD3oO5Z+DrqItksGOz 7cQzPvwvIfihkxKOyeiVlseKE6V6pjr1sem1hUsAP3RSwOSDVBAdG+YIub3Bk5JeG01EOEyjBUl KEreJ3AF17IoWRe1f/yjK/OAE4jQRkpRqCVKdTX+aiJfAyqE8wLJ0UTAGrY1I4ZEmrnVwCcB+dx 7LCUyR5sTY3hMXYQvMS9WgrO+2Vo+li79YRxp33ZgXV0cwRUFx3ItLTaAYCvXLW0m2PECiI5Ww/ h+QT8h5WVDyeZOA== X-Developer-Key: i=marcandre.lureau@redhat.com; a=openpgp; fpr=87A9BD933F87C606D276F62DDAE8E10975969CE5 X-Scanned-By: MIMEDefang 3.4.1 on 10.30.177.111 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.133.124; envelope-from=marcandre.lureau@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 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_H3=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: 1790108427687158500 Instead of requiring a MonitorHMP and going through monitor_hmp_vprintf(), use monitor_puts() on the base Monitor class. This allows qemu_printf() to work with any monitor type that isn't QMP, which will be needed to capture output via a bare Monitor used as a buffer. Add monitor_puts() since qemu_printf() is in libqemuutil. Signed-off-by: Marc-Andr=C3=A9 Lureau --- stubs/meson.build | 1 + stubs/monitor-puts.c | 9 +++++++++ util/qemu-print.c | 16 +++++----------- 3 files changed, 15 insertions(+), 11 deletions(-) diff --git a/stubs/meson.build b/stubs/meson.build index 29b6644b2549..52c733e32a91 100644 --- a/stubs/meson.build +++ b/stubs/meson.build @@ -9,6 +9,7 @@ stub_ss.add(files('is-daemonized.c')) stub_ss.add(files('monitor-core.c')) stub_ss.add(files('monitor-cur.c')) stub_ss.add(files('monitor-hmp.c')) +stub_ss.add(files('monitor-puts.c')) stub_ss.add(files('qapi-event-emit.c')) stub_ss.add(files('replay-mode.c')) stub_ss.add(files('trace-control.c')) diff --git a/stubs/monitor-puts.c b/stubs/monitor-puts.c new file mode 100644 index 000000000000..c4cf4f632845 --- /dev/null +++ b/stubs/monitor-puts.c @@ -0,0 +1,9 @@ +/* SPDX-License-Identifier: GPL-2.0-or-later */ + +#include "qemu/osdep.h" +#include "monitor/monitor.h" + +int monitor_puts(Monitor *mon, const char *str) +{ + abort(); +} diff --git a/util/qemu-print.c b/util/qemu-print.c index ab09dd8600ec..323789f265f9 100644 --- a/util/qemu-print.c +++ b/util/qemu-print.c @@ -19,25 +19,19 @@ /* * Print like vprintf(). * Print to current monitor if we have one, else to stdout. - * (if the monitor is QMP, fail without printing anything) + * QMP monitors are rejected (return -1) since they don't accept + * free-form text output. */ int qemu_vprintf(const char *fmt, va_list ap) { Monitor *cur_mon =3D monitor_cur(); =20 - /* for all monitors: QMP & HMP */ if (cur_mon) { -#ifdef CONFIG_HMP - /* don't use monitor_cur_hmp(), to avoid a second lookup */ - MonitorHMP *hmp =3D (MonitorHMP *) - object_dynamic_cast(OBJECT(cur_mon), TYPE_MONITOR_HMP); - if (!hmp) { + if (object_dynamic_cast(OBJECT(cur_mon), TYPE_MONITOR_QMP)) { return -1; } - return monitor_hmp_vprintf(hmp, fmt, ap); -#else - return -1; -#endif + g_autofree char *buf =3D g_strdup_vprintf(fmt, ap); + return monitor_puts(cur_mon, buf); } return vprintf(fmt, ap); } --=20 2.56.0.rc0.29.g47ce80527c56 From nobody Sat Sep 26 20:01:40 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=1790108463; cv=none; d=zohomail.com; s=zohoarc; b=fQKIzEK9oUg5SZAorUC4rsEfAPJoHO4ey1c7UZiNLBXGgFG/9ZImK5VZE7hvue9RW046CPwsdKa2tg2hea8HwbD86UVeC4YRzGUe+rWCmn7s9q/7EfgN2wC9Q6xDqCj7PW67nSOTrY5JgUqmzSudPmBw9fwXZZqO+BOvYu762T8= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1790108463; 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:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=ahtL8d/f5ccJKChY/SNUDX21P/8Lv41CXrtUhi0Z4yE=; b=AloBxNlzO39AOshwNRF+IDiS0Jy+/o2/JM0Umq41ZVasskh9LvB8gy0Mg+J9daNQyPhy8iQwWpPz+XmyEcrHxcBXmxtj1CQFU8tbqXn9rFPyipUrxRvDd1zGOoXCx7XCuKgxvD9WpNATiLpCUnAEe7rtgZDYoUnGQ619Up1IJ+o= 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 1790108463188773.6382703776151; Tue, 22 Sep 2026 13:21:03 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists1p.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1x96ya-00062n-ED; Tue, 22 Sep 2026 16:20:29 -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 1x96xu-0004OS-Kf for qemu-devel@nongnu.org; Tue, 22 Sep 2026 16:19:50 -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 1x96xr-00084a-Ft for qemu-devel@nongnu.org; Tue, 22 Sep 2026 16:19:45 -0400 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-117--d94FC3qOs6ee_vsLRwiHg-1; Tue, 22 Sep 2026 16:19:39 -0400 Received: from mx-prod-int-05.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-05.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.17]) (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 837EA1955DC8; Tue, 22 Sep 2026 20:19:38 +0000 (UTC) Received: from localhost (headnet03.pony-001.prod.iad2.dc.redhat.com [10.2.32.114]) by mx-prod-int-05.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id 87D561956095; Tue, 22 Sep 2026 20:19:37 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1790108382; 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=ahtL8d/f5ccJKChY/SNUDX21P/8Lv41CXrtUhi0Z4yE=; b=jQCnBqyHbRLjjqo3KFHJ8Zo/CfetHJWxPsjeGSRD2GIgWoxbEuyejQI8Mr9S5IWphfnrK/ RxO7pLh3abIPd2vypR7FT0p7J31IEqxCC3HHmzBvxdQc9s7UBecQEtU5aqH5F1xCL5wgng zQL2viLjeSFxu4aPQgnB6BKi/lyn5tQ= X-MC-Unique: -d94FC3qOs6ee_vsLRwiHg-1 X-Mimecast-MFC-AGG-ID: -d94FC3qOs6ee_vsLRwiHg_1790108378 From: =?utf-8?q?Marc-Andr=C3=A9_Lureau?= Date: Wed, 23 Sep 2026 00:17:15 +0400 Subject: [PATCH 08/88] block/monitor: capture x-qemu-io output MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Message-Id: <20260923-nohmp-v1-8-ebc029d4bd80@redhat.com> References: <20260923-nohmp-v1-0-ebc029d4bd80@redhat.com> In-Reply-To: <20260923-nohmp-v1-0-ebc029d4bd80@redhat.com> To: qemu-devel@nongnu.org Cc: Kevin Wolf , =?utf-8?q?Marc-Andr=C3=A9_Lureau?= , Hanna Reitz , Eric Blake , Markus Armbruster , Fabiano Rosas , Laurent Vivier , Paolo Bonzini , qemu-block@nongnu.org X-Developer-Signature: v=1; a=openpgp-sha256; l=15707; i=marcandre.lureau@redhat.com; h=from:subject:message-id; bh=E85hmf8j4i6epgOYHttBoGqQ6Fh4ArEKDkO29LWFxlA=; b=owEBbQKS/ZANAwAKAdro4Ql1lpzlAcsmYgBqsuKuq37pRNq9fF2dq+8Z7vVF+pl2Mt1EuAYtH bBFpvjZXIeJAjMEAAEKAB0WIQSHqb2TP4fGBtJ29i3a6OEJdZac5QUCarLirgAKCRDa6OEJdZac 5ZgqEACdGPVW820WDse2U0lbIsGYPmH4P8+4uwoDr6J1DA1mg64NbAWFUDbWEisW8iH+eM9lyS/ ESnX1U3C6R665cTjRUG/DnUOJoz0HaUOyQg4YYq1ed6xNuXFM03Hx+G4hi+6Wd9YCH0/V5DIBm0 9U9DxZa52YVyTgYyzKXx2CumJ8pr6XRRhL0wVEwCXAUsNddBz7l1ruiXUUqbzqXf8Jqs3+ZVWio BQ7OBuhWPBSv5m7jiLIrQ9PvpOaJRDpymfIQdAtpbmw8DVxWahvvYKYFhBJV02KguGWqlUO0SdA yNn2jk0leOtIDGSolRt8/j9mVxPjRv9OLsRtaToG51Lik60KvAWftQ/q18vN0wn5u247CmWrsPF nMpfQG/lyye+B30p+wHeHK4ajvhWms/eDJMkGowl5LBlOpa3+sV/B7/3/jrrdtWE2PRsq2DBaEs Sn2HTRJAPS3WpnJvJH3ul2EznzLxj3+RG0nWcAcoPPWu1TwjbXI/hrxhikvHO5FzKWuTDs4uMQL Y2jhS2BxureH4u0uqVhz9+1jKO9Vvx9zWrnNPPIqOBqHWeU09rdL2a1wYlkRF76YWyqrwAzG1Fs FVf9XH9u543pZ0d2r4n3/PMPHqZcdWk+TIMsGiQYqOdGitcP2BA+kycum5B1nVU5KlRHGyWVeGc d17A1jeY6f5DAEw== X-Developer-Key: i=marcandre.lureau@redhat.com; a=openpgp; fpr=87A9BD933F87C606D276F62DDAE8E10975969CE5 X-Scanned-By: MIMEDefang 3.0 on 10.30.177.17 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: 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-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: 1790108463902158500 Use a bare monitor to capture qemuio_command() printf output. Return it as HumanReadableText. Signed-off-by: Marc-Andr=C3=A9 Lureau --- block/monitor/block-hmp-cmds.c | 14 +++++--- block/monitor/qmp-cmds.c | 49 +++++++++++++++++++++++----- qapi/block.json | 3 ++ qemu-io-cmds.c | 74 ++++++++++++++++++++++----------------= ---- system/qtest.c | 4 ++- tests/qemu-iotests/iotests.py | 2 +- 6 files changed, 95 insertions(+), 51 deletions(-) diff --git a/block/monitor/block-hmp-cmds.c b/block/monitor/block-hmp-cmds.c index 7bae4d425c6d..ed071c0f4144 100644 --- a/block/monitor/block-hmp-cmds.c +++ b/block/monitor/block-hmp-cmds.c @@ -543,12 +543,18 @@ void hmp_qemu_io(MonitorHMP *hmp, const QDict *qdict) bool qdev =3D qdict_get_try_bool(qdict, "qdev", false); const char *device =3D qdict_get_str(qdict, "device"); const char *command =3D qdict_get_str(qdict, "command"); + g_autoptr(HumanReadableText) out =3D NULL; Error *err =3D NULL; =20 - qmp_x_qemu_io(qdev ? NULL : device, - qdev ? device : NULL, - command, &err); - hmp_handle_error(hmp, err); + out =3D qmp_x_qemu_io(qdev ? NULL : device, + qdev ? device : NULL, + command, &err); + if (hmp_handle_error(hmp, err)) { + return; + } + + /* use stdout and not monitor_puts() for compatiblity reasons */ + printf("%s", out->human_readable_text); } =20 static void print_block_info(MonitorHMP *hmp, BlockInfo *info, diff --git a/block/monitor/qmp-cmds.c b/block/monitor/qmp-cmds.c index e5759d824f13..4ea4d5985833 100644 --- a/block/monitor/qmp-cmds.c +++ b/block/monitor/qmp-cmds.c @@ -5,44 +5,51 @@ #include "block/block_int.h" #include "qapi/qapi-commands-block.h" #include "qapi/error.h" +#include "qapi/type-helpers.h" +#include "monitor/monitor.h" #include "qemu-io.h" =20 -void qmp_x_qemu_io(const char *device, const char *qdev, - const char *command, Error **errp) +HumanReadableText *qmp_x_qemu_io(const char *device, const char *qdev, + const char *command, Error **errp) { + ERRP_GUARD(); BlockBackend *blk =3D NULL; BlockBackend *local_blk =3D NULL; BlockDriverState *bs =3D NULL; - int ret; + g_autoptr(Monitor) capture_mon =3D NULL; + g_autoptr(GString) str =3D NULL; + Monitor *old_mon =3D NULL; + HumanReadableText *ret =3D NULL; + int r; =20 if (!device && !qdev) { error_setg(errp, "Must specify either device or qdev"); - return; + return NULL; } if (qdev && device) { error_setg(errp, "Cannot specify both qdev and device"); - return; + return NULL; } =20 if (qdev) { blk =3D blk_by_qdev_id(qdev, errp); if (!blk) { - return; + return NULL; } } else { blk =3D blk_by_name(device); if (!blk) { bs =3D bdrv_lookup_bs(NULL, device, errp); if (!bs) { - return; + return NULL; } } } =20 if (bs) { blk =3D local_blk =3D blk_new(bdrv_get_aio_context(bs), 0, BLK_PER= M_ALL); - ret =3D blk_insert_bs(blk, bs, errp); - if (ret < 0) { + r =3D blk_insert_bs(blk, bs, errp); + if (r < 0) { goto fail; } } @@ -72,8 +79,32 @@ void qmp_x_qemu_io(const char *device, const char *qdev, * extended, possibly resulting in a read-only guest device keeping wr= ite * permissions. Ugly, but it appears to be the lesser evil. */ + + /* + * qemuio_command() doesn't return structured output, so we need + * to capture the monitor output, use a bare monitor for that. + */ + capture_mon =3D MONITOR(object_new(TYPE_MONITOR)); + old_mon =3D monitor_set_cur(qemu_coroutine_self(), capture_mon); + qemuio_command(blk, command, errp); =20 + monitor_set_cur(qemu_coroutine_self(), old_mon); + + if (*errp) { + goto fail; + } + + str =3D monitor_steal_output(capture_mon); + + /* + * monitor_puts_locked() adds \r before \n for terminal display; + * strip those from captured output + */ + g_string_replace(str, "\r", "", 0); + ret =3D human_readable_text_from_str(str); + fail: blk_unref(local_blk); + return ret; } diff --git a/qapi/block.json b/qapi/block.json index 012a9d73333b..da135f419386 100644 --- a/qapi/block.json +++ b/qapi/block.json @@ -618,6 +618,8 @@ # # @command: the qemu-io command string to execute. # +# Returns: qemu-io output as a string +# # Features: # # @unstable: This command is for testing only. @@ -635,5 +637,6 @@ 'data': { '*device': 'str', '*qdev': 'str', 'command': 'str' }, + 'returns': 'HumanReadableText', 'features': [ 'unstable' ], 'allow-preconfig': true } diff --git a/qemu-io-cmds.c b/qemu-io-cmds.c index aa795fd87a14..28b810c25e58 100644 --- a/qemu-io-cmds.c +++ b/qemu-io-cmds.c @@ -17,6 +17,7 @@ #include "block/block_int.h" /* for info_f() */ #include "block/qapi.h" #include "qemu/error-report.h" +#include "qemu/qemu-print.h" #include "qemu/main-loop.h" #include "qemu/option.h" #include "qemu/timer.h" @@ -52,7 +53,7 @@ void qemuio_add_command(const cmdinfo_t *ci) =20 void qemuio_command_usage(const cmdinfo_t *ci) { - printf("%s %s -- %s\n", ci->name, ci->args, ci->oneline); + qemu_printf("%s %s -- %s\n", ci->name, ci->args, ci->oneline); } =20 static int init_check_command(BlockBackend *blk, const cmdinfo_t *ct, @@ -453,19 +454,19 @@ static void dump_buffer(const void *buffer, int64_t o= ffset, int64_t len) for (i =3D 0, p =3D buffer; i < len; i +=3D 16) { const uint8_t *s =3D p; =20 - printf("%08" PRIx64 ": ", offset + i); + qemu_printf("%08" PRIx64 ": ", offset + i); for (j =3D 0; j < 16 && i + j < len; j++, p++) { - printf("%02x ", *p); + qemu_printf("%02x ", *p); } - printf(" "); + qemu_printf(" "); for (j =3D 0; j < 16 && i + j < len; j++, s++) { if (isalnum(*s)) { - printf("%c", *s); + qemu_printf("%c", *s); } else { - printf("."); + qemu_printf("."); } } - printf("\n"); + qemu_printf("\n"); } } =20 @@ -478,12 +479,12 @@ static void print_report(const char *op, struct times= pec *t, int64_t offset, if (!Cflag) { cvtstr((double)total, s1, sizeof(s1)); cvtstr(tdiv((double)total, *t), s2, sizeof(s2)); - printf("%s %"PRId64"/%"PRId64" bytes at offset %" PRId64 "\n", + qemu_printf("%s %"PRId64"/%"PRId64" bytes at offset %" PRId64 "\n", op, total, count, offset); - printf("%s, %d ops; %s (%s/sec and %.4f ops/sec)\n", + qemu_printf("%s, %d ops; %s (%s/sec and %.4f ops/sec)\n", s1, cnt, ts, s2, tdiv((double)cnt, *t)); } else {/* bytes,ops,time,bytes/sec,ops/sec */ - printf("%"PRId64",%d,%s,%.3f,%.3f\n", + qemu_printf("%"PRId64",%d,%s,%.3f,%.3f\n", total, cnt, ts, tdiv((double)total, *t), tdiv((double)cnt, *t)); @@ -674,7 +675,7 @@ static int do_aio_writev(BlockBackend *blk, QEMUIOVecto= r *qiov, =20 static void read_help(void) { - printf( + qemu_printf( "\n" " reads a range of bytes from the given offset\n" "\n" @@ -877,7 +878,7 @@ out: =20 static void readv_help(void) { - printf( + qemu_printf( "\n" " reads a range of bytes from the given offset into multiple buffers\n" "\n" @@ -1012,7 +1013,7 @@ out: =20 static void write_help(void) { - printf( + qemu_printf( "\n" " writes a range of bytes from the given offset\n" "\n" @@ -1239,7 +1240,7 @@ out: static void writev_help(void) { - printf( + qemu_printf( "\n" " writes a range of bytes from the given offset source from multiple buffe= rs\n" "\n" @@ -1449,7 +1450,7 @@ out: =20 static void aio_read_help(void) { - printf( + qemu_printf( "\n" " asynchronously reads a range of bytes from the given offset\n" "\n" @@ -1504,7 +1505,7 @@ static int aio_read_f(BlockBackend *blk, int argc, ch= ar **argv, Error **errp) } break; case 'i': - printf("injecting invalid read request\n"); + qemu_printf("injecting invalid read request\n"); block_acct_invalid(blk_get_stats(blk), BLOCK_ACCT_READ); g_free(ctx); return 0; @@ -1558,7 +1559,7 @@ static int aio_read_f(BlockBackend *blk, int argc, ch= ar **argv, Error **errp) =20 static void aio_write_help(void) { - printf( + qemu_printf( "\n" " asynchronously writes a range of bytes from the given offset source\n" " from multiple buffers\n" @@ -1629,7 +1630,7 @@ static int aio_write_f(BlockBackend *blk, int argc, c= har **argv, Error **errp) } break; case 'i': - printf("injecting invalid write request\n"); + qemu_printf("injecting invalid write request\n"); block_acct_invalid(blk_get_stats(blk), BLOCK_ACCT_WRITE); g_free(ctx); return 0; @@ -1780,7 +1781,7 @@ static int zone_report_f(BlockBackend *blk, int argc,= char **argv, Error **errp) error_setg(errp, "zone report failed: %s", strerror(-ret)); } else { for (int i =3D 0; i < nr_zones; ++i) { - printf("start: 0x%" PRIx64 ", len 0x%" PRIx64 ", " + qemu_printf("start: 0x%" PRIx64 ", len 0x%" PRIx64 ", " "cap"" 0x%" PRIx64 ", wptr 0x%" PRIx64 ", " "zcond:%u, [type: %u]\n", tosector(zones[i].start), tosector(zones[i].length), @@ -1986,7 +1987,7 @@ static int zone_append_f(BlockBackend *blk, int argc,= char **argv, Error **errp) } =20 if (pflag) { - printf("After zap done, the append sector is 0x%" PRIx64 "\n", + qemu_printf("After zap done, the append sector is 0x%" PRIx64 "\n", tosector(offset)); } =20 @@ -2072,7 +2073,7 @@ static int length_f(BlockBackend *blk, int argc, char= **argv, Error **errp) } =20 cvtstr(size, s1, sizeof(s1)); - printf("%s\n", s1); + qemu_printf("%s\n", s1); return 0; } =20 @@ -2098,10 +2099,10 @@ static int info_f(BlockBackend *blk, int argc, char= **argv, Error **errp) GRAPH_RDLOCK_GUARD_MAINLOOP(); =20 if (bs->drv && bs->drv->format_name) { - printf("format name: %s\n", bs->drv->format_name); + qemu_printf("format name: %s\n", bs->drv->format_name); } if (bs->drv && bs->drv->protocol_name) { - printf("format name: %s\n", bs->drv->protocol_name); + qemu_printf("format name: %s\n", bs->drv->protocol_name); } =20 ret =3D bdrv_get_info(bs, &bdi); @@ -2112,8 +2113,8 @@ static int info_f(BlockBackend *blk, int argc, char *= *argv, Error **errp) cvtstr(bdi.cluster_size, s1, sizeof(s1)); cvtstr(bdi.vm_state_offset, s2, sizeof(s2)); =20 - printf("cluster size: %s\n", s1); - printf("vm state offset: %s\n", s2); + qemu_printf("cluster size: %s\n", s1); + qemu_printf("vm state offset: %s\n", s2); =20 spec_info =3D bdrv_get_specific_info(bs, errp); if (*errp) { @@ -2140,7 +2141,7 @@ static const cmdinfo_t info_cmd =3D { =20 static void discard_help(void) { - printf( + qemu_printf( "\n" " discards a range of bytes from the given offset\n" "\n" @@ -2230,7 +2231,7 @@ static int discard_f(BlockBackend *blk, int argc, cha= r **argv, Error **errp) =20 static void aio_discard_help(void) { - printf( + qemu_printf( "\n" " asynchronously discards a range of bytes from the given offset\n" "\n" @@ -2388,7 +2389,7 @@ static int alloc_f(BlockBackend *blk, int argc, char = **argv, Error **errp) =20 cvtstr(start, s1, sizeof(s1)); =20 - printf("%"PRId64"/%"PRId64" bytes allocated at offset %s\n", + qemu_printf("%"PRId64"/%"PRId64" bytes allocated at offset %s\n", sum_alloc, count, s1); return 0; } @@ -2462,8 +2463,9 @@ static int map_f(BlockBackend *blk, int argc, char **= argv, Error **errp) retstr =3D ret ? " allocated" : "not allocated"; cvtstr(num, s1, sizeof(s1)); cvtstr(offset, s2, sizeof(s2)); - printf("%s (0x%" PRIx64 ") bytes %s at offset %s (0x%" PRIx64 ")\n= ", - s1, num, retstr, s2, offset); + qemu_printf("%s (0x%" PRIx64 ") bytes %s" + " at offset %s (0x%" PRIx64 ")\n", + s1, num, retstr, s2, offset); =20 offset +=3D num; bytes -=3D num; @@ -2483,7 +2485,7 @@ static const cmdinfo_t map_cmd =3D { =20 static void reopen_help(void) { - printf( + qemu_printf( "\n" " Changes the open options of an already opened image\n" "\n" @@ -2729,7 +2731,7 @@ static const cmdinfo_t abort_cmd =3D { =20 static void sigraise_help(void) { - printf( + qemu_printf( "\n" " raises the given signal\n" "\n" @@ -2819,12 +2821,12 @@ static const cmdinfo_t sleep_cmd =3D { =20 static void help_oneline(const char *cmd, const cmdinfo_t *ct) { - printf("%s ", cmd); + qemu_printf("%s ", cmd); =20 if (ct->args) { - printf("%s ", ct->args); + qemu_printf("%s ", ct->args); } - printf("-- %s\n", ct->oneline); + qemu_printf("-- %s\n", ct->oneline); } =20 static void help_onecmd(const char *cmd, const cmdinfo_t *ct) @@ -2842,7 +2844,7 @@ static void help_all(void) for (ct =3D cmdtab; ct < &cmdtab[ncmds]; ct++) { help_oneline(ct->name, ct); } - printf("\nUse 'help commandname' for extended help.\n"); + qemu_printf("\nUse 'help commandname' for extended help.\n"); } =20 static int help_f(BlockBackend *blk, int argc, char **argv, Error **errp) diff --git a/system/qtest.c b/system/qtest.c index 47c954838dd0..e07c7acf34fc 100644 --- a/system/qtest.c +++ b/system/qtest.c @@ -801,13 +801,15 @@ static void qtest_process_command(CharFrontend *chr, = gchar **words) } else if (strcmp(words[0], "qemu-io") =3D=3D 0) { const char *io_dev; g_autofree char *io_cmd =3D NULL; + /* ignore multi-line output for now */ + g_autoptr(HumanReadableText) out =3D NULL; Error *err =3D NULL; =20 g_assert(words[1] && words[2]); io_dev =3D words[1]; io_cmd =3D g_strjoinv(" ", &words[2]); =20 - qmp_x_qemu_io(io_dev, NULL, io_cmd, &err); + out =3D qmp_x_qemu_io(io_dev, NULL, io_cmd, &err); qtest_sendf(chr, err ? "FAIL %s\n" : "OK\n", err ? error_get_pretty(err) : NULL); error_free(err); diff --git a/tests/qemu-iotests/iotests.py b/tests/qemu-iotests/iotests.py index 7d5a77a85e58..445a22a8659a 100644 --- a/tests/qemu-iotests/iotests.py +++ b/tests/qemu-iotests/iotests.py @@ -965,7 +965,7 @@ def qmp_qemu_io(self, drive: str, cmd: str, res =3D self.qmp_log('x-qemu-io', **kwargs) else: res =3D self.qmp('x-qemu-io', **kwargs) - return res.get('error', {}).get('desc', '') + return res.get('return', {}).get('human-readable-text', '') =20 def flatten_qmp_object(self, obj, output=3DNone, basestr=3D''): if output is None: --=20 2.56.0.rc0.29.g47ce80527c56 From nobody Sat Sep 26 20:01:40 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=1790108936; cv=none; d=zohomail.com; s=zohoarc; b=R8QTZGwPQCQ/bvJuXapGwr8jV7UBdaU7ibI25HBnEB4i6gfrW9/oDlsBl8r1iZfXieYp2aFbaAzJfXKnrvMuz4nFCeVFp/chsba6EjSoVkzSB1I/lQdtgO10VLvedz1YhtzyoY0/NaLGaFyL0Hbs4jUIZemfjBbB/toUf1V3xD8= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1790108936; 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:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=2RwZJpFBMV3SCwEfM8kdxiiIrdxzj3xjHFG8k4sz4yQ=; b=L3z7yrJNLDzELUOvgT7qjc8r0kNrXXR3g877rv0a7TtgIxUdBfgrfXIMBdex77l1RgqyUFrmB2ocnaDz2M+5vaBYPp3g3k/giaNsNA9d7q3bFhHooDqr4pjkd/sIts7lH68v550IkuZTsaeoAV39ZeoH+PCEj4HFOf75v+NFzww= 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 1790108936071643.1301128626174; Tue, 22 Sep 2026 13:28:56 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists1p.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1x96yR-0005QL-L4; Tue, 22 Sep 2026 16:20:19 -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 1x96xz-0004TL-EU for qemu-devel@nongnu.org; Tue, 22 Sep 2026 16:19:54 -0400 Received: from us-smtp-delivery-124.mimecast.com ([170.10.133.124]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1x96xt-00084r-A4 for qemu-devel@nongnu.org; Tue, 22 Sep 2026 16:19:47 -0400 Received: from mx-prod-mc-01.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-380-PUU68JGLOOOxCvTAsJg_HQ-1; Tue, 22 Sep 2026 16:19:43 -0400 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-01.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id 14AF0195398E; Tue, 22 Sep 2026 20:19:42 +0000 (UTC) Received: from localhost (headnet03.pony-001.prod.iad2.dc.redhat.com [10.2.32.114]) by mx-prod-int-08.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id 450F11800446; Tue, 22 Sep 2026 20:19:40 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1790108384; 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=2RwZJpFBMV3SCwEfM8kdxiiIrdxzj3xjHFG8k4sz4yQ=; b=B/0Rkl0Mn5mO4TBgeL6KRHJuQHE021f6X7Njgayc1gTQZ0rZULLAkLIjK/K4X3Sa+LebBp 8Ts3yP7HXTypvvBFkv6JjdVKWgWiuER13pYTLY8j9PrgFkJEqVFClCZTkqQwCJ3v89UaXH cYdL+36a/Nj8bvGZSokZXrvcohwPoBg= X-MC-Unique: PUU68JGLOOOxCvTAsJg_HQ-1 X-Mimecast-MFC-AGG-ID: PUU68JGLOOOxCvTAsJg_HQ_1790108382 From: =?utf-8?q?Marc-Andr=C3=A9_Lureau?= Date: Wed, 23 Sep 2026 00:17:16 +0400 Subject: [PATCH 09/88] qemu-iotests/iotests: filter x-qemu-io messages MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Message-Id: <20260923-nohmp-v1-9-ebc029d4bd80@redhat.com> References: <20260923-nohmp-v1-0-ebc029d4bd80@redhat.com> In-Reply-To: <20260923-nohmp-v1-0-ebc029d4bd80@redhat.com> To: qemu-devel@nongnu.org Cc: Kevin Wolf , =?utf-8?q?Marc-Andr=C3=A9_Lureau?= , Hanna Reitz , qemu-block@nongnu.org X-Developer-Signature: v=1; a=openpgp-sha256; l=1284; i=marcandre.lureau@redhat.com; h=from:subject:message-id; bh=5/OzWutjkIhlWuRLjbXJLQxKLZvvxMaDJBsOSR/JzPU=; b=owEBbQKS/ZANAwAKAdro4Ql1lpzlAcsmYgBqsuKulDX6IDIxbDT9mKfQfkSq6P+ZiHupjXjjb YRsj/bG6XSJAjMEAAEKAB0WIQSHqb2TP4fGBtJ29i3a6OEJdZac5QUCarLirgAKCRDa6OEJdZac 5UBkD/97FClJKWsfMDnxm5/NHdP76ook3GfMY+mG6SjKgdrkhAQNN0btVE+6DuhxWPphI2ui4J3 u9obswaRFeo+6ALrAdJxGWWP2tWOgqLOXGS9fe1EJkZfhQJSZqb9/TFJw8Jj9/hBq+EDwRi8bx8 LJSZF2Tr6ITkPNxT4Y3bzv2pI8SrjeDmLThrsGtxGuN/nfAo18htUo5zXqJc7J0R2CB5yInaKNQ RaGpVcC1dy+kVMN3SwdTVijcHHKPHUupJ9LArTz9sdK3fleoBj1qKm2P/BHrgLnXWUsE2bE5QNj +3WZ12YP+X1vYPw7nbtx7O2DGAiZJfhJFes0PSVgOjgE8ZzwPJjdrWUn4Elb4UIhc/Aajj49f7z LSexCn0g15FPxqduXy5IZNy20LundxKLiZokZfFkjW09bb1smsLK0JSnYMIEN5I3iMyTbF+CpsR XJuSLKv1pxhbnmz0DAycLjecvv4QyL7VYvm9YxSpHVPWVqkaW9Cj1Gdd8bvOxDlWDp9PgJDwz6z 9VAlWalz54CElMpkICW6eO9y9Tgh+YnW5Zj00bgxea4agImp1Tjz8AUk6ERusaXZKn1OUqzStEo BbbGACjBD+df1fWOlkOSwcZP1CC9SvfD4oeZPlVF/9nsbGny9s091KvNIG6PhOMT/2oF8O82djP Pf6HXtR7YHmbRtg== X-Developer-Key: i=marcandre.lureau@redhat.com; a=openpgp; fpr=87A9BD933F87C606D276F62DDAE8E10975969CE5 X-Scanned-By: MIMEDefang 3.4.1 on 10.30.177.111 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.133.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_H3=0.001, RCVD_IN_MSPIKE_WL=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-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: 1790108936375158501 Signed-off-by: Marc-Andr=C3=A9 Lureau --- tests/qemu-iotests/iotests.py | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/tests/qemu-iotests/iotests.py b/tests/qemu-iotests/iotests.py index 445a22a8659a..5d9b5ded64ac 100644 --- a/tests/qemu-iotests/iotests.py +++ b/tests/qemu-iotests/iotests.py @@ -708,6 +708,13 @@ def _filter(_key, value): return value return filter_qmp(qmsg, _filter) =20 +def filter_x_qemu_io(qmsg): + def _filter(_key, value): + if is_str(value): + return filter_qemu_io(value) + return value + return filter_qmp(qmsg, _filter) + def filter_nbd_exports(output: str) -> str: return re.sub(r'((min|opt|max) block): [0-9]+', r'\1: XXX', output) =20 @@ -962,7 +969,8 @@ def qmp_qemu_io(self, drive: str, cmd: str, else: kwargs['device'] =3D drive if use_log: - res =3D self.qmp_log('x-qemu-io', **kwargs) + res =3D self.qmp_log('x-qemu-io', + filters=3D(filter_x_qemu_io,), **kwargs) else: res =3D self.qmp('x-qemu-io', **kwargs) return res.get('return', {}).get('human-readable-text', '') --=20 2.56.0.rc0.29.g47ce80527c56 From nobody Sat Sep 26 20:01:40 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=1790108470; cv=none; d=zohomail.com; s=zohoarc; b=eXDE1KNoJQ8KFv6y8ZM4ycXvy8wy29/j7c74i48zLUjh2xcXwB5HBymBVF8cbR7Kfcpq5rTT+Qm8oNL0aRnRezRhvRqOUwoEm3RH5WXISfEHWZD63GcEMl1sGDcFZ6pTatD1Cww1GQLAshei1+gyqEosGuAzhIS6mhvltfEGUD4= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1790108470; 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:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=aNGh1j8BNlQMzzH9Zq5A4MnslWOxyHVIf55UJ+B2Vzg=; b=U1nSXUzGFMkW5qWfZQhMYdAJOoCf0xwYn6SKZkdO+1h0tG/0z4pS674ijpzpHwn/DxvEZBmeKxwg3J3lXIwJONMJGs7uBEZT5g1cCHF8oWSadvIX/xDlarbOCsd03hZ4N8DxlLz/wTM+E+Q0NOpXe//bgUKEhMqiBnS/jzgFayU= 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 1790108470743972.8626187266553; Tue, 22 Sep 2026 13:21:10 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists1p.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1x96yV-0005jp-Ut; Tue, 22 Sep 2026 16:20:24 -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 1x96y5-0004Z1-35 for qemu-devel@nongnu.org; Tue, 22 Sep 2026 16:19:59 -0400 Received: from us-smtp-delivery-124.mimecast.com ([170.10.133.124]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1x96xz-00085J-83 for qemu-devel@nongnu.org; Tue, 22 Sep 2026 16:19:56 -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-68-Rin677QlPC-87uGqOFGCwQ-1; Tue, 22 Sep 2026 16:19:46 -0400 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-06.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id 52BD91800596; Tue, 22 Sep 2026 20:19:45 +0000 (UTC) Received: from localhost (headnet03.pony-001.prod.iad2.dc.redhat.com [10.2.32.114]) by mx-prod-int-08.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id 796C31800361; Tue, 22 Sep 2026 20:19:44 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1790108387; 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=aNGh1j8BNlQMzzH9Zq5A4MnslWOxyHVIf55UJ+B2Vzg=; b=iJiyqtb9svhU9jy6f+vyJN/vZOaOZljus7XDikK+CaaPcGW69fit3zWF4C3d6nexI++xwZ lgxKSe642RuDCl9pSBPPJVLON1ltf1htbgj2WRny/TfDbaEyvZqXzs3xY9H4bsIj0ag7Sm JokpSfVtQ5FgqulRla70OFuX29LqmRE= X-MC-Unique: Rin677QlPC-87uGqOFGCwQ-1 X-Mimecast-MFC-AGG-ID: Rin677QlPC-87uGqOFGCwQ_1790108385 From: =?utf-8?q?Marc-Andr=C3=A9_Lureau?= Date: Wed, 23 Sep 2026 00:17:17 +0400 Subject: [PATCH 10/88] tests/qemu-iotests: do no interpret backslash as escape MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Message-Id: <20260923-nohmp-v1-10-ebc029d4bd80@redhat.com> References: <20260923-nohmp-v1-0-ebc029d4bd80@redhat.com> In-Reply-To: <20260923-nohmp-v1-0-ebc029d4bd80@redhat.com> To: qemu-devel@nongnu.org Cc: Kevin Wolf , =?utf-8?q?Marc-Andr=C3=A9_Lureau?= , Hanna Reitz , qemu-block@nongnu.org X-Developer-Signature: v=1; a=openpgp-sha256; l=734; i=marcandre.lureau@redhat.com; h=from:subject:message-id; bh=0vJS6PzUtY3n6k3SocU+dXxAUgqKNBfyZx9jXyheUzU=; b=owEBbQKS/ZANAwAKAdro4Ql1lpzlAcsmYgBqsuKun8Ei0BYR8/VKKhreaW7rNvnU7M/+4Hg5Y IxQJzgyv1uJAjMEAAEKAB0WIQSHqb2TP4fGBtJ29i3a6OEJdZac5QUCarLirgAKCRDa6OEJdZac 5cDvEACITzyzemBc5A8mQSel8lvKf+5wR7CWMxK+xzMpjLd11oPQsJwLcZyWVtkN9fqYOFW4xVi +wn3bH6dp0yaA6Pqiaon0Sxwmwd1SRlfDBEHPYtwPDw5d4H7zOP1oSYGLkW//Gj038C9UIIfA1o 6yNze3RcSd5yE3i7YqecIs5gWjxQUfVWcm3Hvh/2+wQ0jVpQ2Lmq/vFeNqq4Kog6AaZiyNEg7S1 8DmZf5vmV2KiMcxXD5DZkgn6TuCXC3O9dGGdu2ZY7oidzaoGkN4yFTf4ouZpYND9Z8xdh/4ivMa jQ/rS7zqg3FLu8KAT3M64A5df9c70JE1wb32Q7G4X+mdM2E3rYrEP+WH12Qw986t/NhdRfZRysy 6eDgj3TYdFfLzXcGra9IwvZfHNqnXlK+TjCCCgNkfyC5nks+4FrLsdadDjgawYMTLtlsl62c2zJ kHKdJNvccAmgbncW5feEzcMmxWeo/vLSIF1O48YZmAhLk65NsiU7+tqJWU+p7VcN/u4Q8hI/ppe RVitWrdkNgtK2Jb+L1AsJiYUTvyIf9p7CYgsonfm1WrJ3OGvjvUeutur5PxcuTiPjbEpzCFM3W7 oCSb8fiUBHnqbdVEqrx2atl8wsNNKXntVb5GK7Fr0SC0I7QEGBKfJqTZVSt8Ld46mDpjEMDwG1N TuhOcAlVPWBq45g== X-Developer-Key: i=marcandre.lureau@redhat.com; a=openpgp; fpr=87A9BD933F87C606D276F62DDAE8E10975969CE5 X-Scanned-By: MIMEDefang 3.4.1 on 10.30.177.111 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.133.124; envelope-from=marcandre.lureau@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 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_H3=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: 1790108471853158500 \n in the JSON becomes just n. Fix read command output using -r. Signed-off-by: Marc-Andr=C3=A9 Lureau --- tests/qemu-iotests/common.qemu | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/qemu-iotests/common.qemu b/tests/qemu-iotests/common.qemu index 0f1fecc68edf..e5b6a6a87494 100644 --- a/tests/qemu-iotests/common.qemu +++ b/tests/qemu-iotests/common.qemu @@ -90,7 +90,7 @@ _timed_wait_for() read_timeout=3D fi =20 - while IFS=3D read ${read_timeout} resp <&${QEMU_OUT[$h]} + while IFS=3D read -r ${read_timeout} resp <&${QEMU_OUT[$h]} do if [ -n "$capture_events" ]; then capture=3D0 --=20 2.56.0.rc0.29.g47ce80527c56 From nobody Sat Sep 26 20:01:40 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=1790108468; cv=none; d=zohomail.com; s=zohoarc; b=aTHKFdF5ptA1FfRrdCIOirCh98VNNOtPV1N5x+ZTPje7bksaUTTPGAADDZWZWmvjVQzpaTtadJgYVbBstomIzmPlXdhJ4wGKgUYzfTBZfdkEha8hjxRySbRRb6xThgFOcQkFKgzbgWhN2a+CPbxVilWBGo38OVg/3x1FPPWKzOI= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1790108468; 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:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=yARMUEhkTm0zm/EPFmK122huIjj8b+N7QlWf0oDLLas=; b=bByaHaytj6x414Ge0PbXHWLKpGKNMMCVJ2Z37E8lY+cEyB62XSwvPDIoQvzRNMf4c3uSUxE8qIUbCKOVELfRlX6Z3OYrK/VCplhxqdiu0RLrJP/oOm36aOCI9oXUrYpMQAwc8xUFY8adq/nfV5HQ9+iJ+ItrTleIU+GnV5xuaQk= 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 1790108468667948.7413755999297; Tue, 22 Sep 2026 13:21:08 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists1p.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1x96yP-0005E7-73; Tue, 22 Sep 2026 16:20:17 -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 1x96y5-0004Z7-Dt for qemu-devel@nongnu.org; Tue, 22 Sep 2026 16:19:59 -0400 Received: from us-smtp-delivery-124.mimecast.com ([170.10.133.124]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1x96y1-00085p-2m for qemu-devel@nongnu.org; Tue, 22 Sep 2026 16:19:56 -0400 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-12-zF9PnEVvNnSef7abJPyjzQ-1; Tue, 22 Sep 2026 16:19:50 -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-03.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id 150131956069; Tue, 22 Sep 2026 20:19:49 +0000 (UTC) Received: from localhost (headnet03.pony-001.prod.iad2.dc.redhat.com [10.2.32.114]) by mx-prod-int-10.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id 1553141B; Tue, 22 Sep 2026 20:19:47 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1790108391; 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=yARMUEhkTm0zm/EPFmK122huIjj8b+N7QlWf0oDLLas=; b=GOGzr0dmBuVz9VeY+Gwks5DCKKZLmBRwlPPqovbQhFFhqhU16ymqvDPg6pJdsjW+s+86YE 0ogvvLQ1R4i77rU+uA8ELk3GbCHy2ObJ0fm1W+h5JsTLH9V6BiYHT2JV+23YhVT1Y6pcxq UE6aLnwqwdLfhAAiZ0Dzu0k5T0gv4XY= X-MC-Unique: zF9PnEVvNnSef7abJPyjzQ-1 X-Mimecast-MFC-AGG-ID: zF9PnEVvNnSef7abJPyjzQ_1790108389 From: =?utf-8?q?Marc-Andr=C3=A9_Lureau?= Date: Wed, 23 Sep 2026 00:17:18 +0400 Subject: [PATCH 11/88] tests/qemu-iotests: filter all generated node ids MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Message-Id: <20260923-nohmp-v1-11-ebc029d4bd80@redhat.com> References: <20260923-nohmp-v1-0-ebc029d4bd80@redhat.com> In-Reply-To: <20260923-nohmp-v1-0-ebc029d4bd80@redhat.com> To: qemu-devel@nongnu.org Cc: Kevin Wolf , =?utf-8?q?Marc-Andr=C3=A9_Lureau?= , Hanna Reitz , qemu-block@nongnu.org X-Developer-Signature: v=1; a=openpgp-sha256; l=602; i=marcandre.lureau@redhat.com; h=from:subject:message-id; bh=4bUuyWgCp4E6JwbHdJqjJiq4iDjRvflm3JhsS+TJ7Go=; b=owEBbQKS/ZANAwAKAdro4Ql1lpzlAcsmYgBqsuKuHHVlZyQDX+DrMiA30TDioxz9yUznNAx6H 8gNc01onyCJAjMEAAEKAB0WIQSHqb2TP4fGBtJ29i3a6OEJdZac5QUCarLirgAKCRDa6OEJdZac 5fn3D/46cXLUK6hQ88vfSGjq4DiWu7P5kB9TaALFFAQAMgCjKbRLqNv+nPBbe9M2xQk8++N1QP1 lCpudCAF44lGJGZhECDofQbnT36AeIZDqhdBtugnrG47A62qpWl4mu6o0k16ziaFCKh1T52XoWm wIV1QLo6anxIksVZTXVqaxYZWdBVTD+ZMWPTo8sYVZ2EJynZS5lp8bdKAC5921j2NS2f9dJ2nEH Yyx1xfQgjNGzGS4Eee86YgC6mQgISQJ9K6ueWZYUS/WnPg7Luxgxp9Yve28UiyXlT86dw5uoF9f xRmiAaJADFVNm8YHa5yONYlPilCkpNDao85TaZAscm8gsaeG1bES1BYjOxW3eJ9kUBuPQR7hTXa iY1inhVkCMcOdxM/q9UK0DwNny1vc2AQUK7X/GzpGXLmpIMrFIrnQFN5XTnjiWwM8MogIHOtS5i Wusl+0r3tS+Vt3fKNBmV7iOYmQh1wkzpKARTls9qMR83bfXnVlDaGfIJZuYNLRxdZVVtv2iFrwE e+thgW/WZvcNMVHcjMehMnRBEY0rC8rLU5u5NDJ7wE7TlDh+hyV6P+B+7PlFLmbbPeHlpmkKY1f 6dkisDB2x0vXfdL+rIV4hNriYI42/5qEcyS8NuiUJDpSBBQenqk0csxz96VepTFIqMQEk7nHyG8 jxpQGVzTuNdk/og== 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.133.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_H3=0.001, RCVD_IN_MSPIKE_WL=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-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: 1790108469870158500 Signed-off-by: Marc-Andr=C3=A9 Lureau --- tests/qemu-iotests/common.filter | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/qemu-iotests/common.filter b/tests/qemu-iotests/common.f= ilter index ce4213cb974a..f6d94f993691 100644 --- a/tests/qemu-iotests/common.filter +++ b/tests/qemu-iotests/common.filter @@ -32,7 +32,7 @@ _filter_vmstate_size() =20 _filter_generated_node_ids() { - sed -Ee 's/\#block[0-9]{3,}/NODE_NAME/' + sed -Ee 's/\#block[0-9]{3,}/NODE_NAME/g' } =20 _filter_qom_path() --=20 2.56.0.rc0.29.g47ce80527c56 From nobody Sat Sep 26 20:01:40 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=1790108454; cv=none; d=zohomail.com; s=zohoarc; b=m/0TJLfoOn3PrmcmGbd3GWTRKULfRSlwLNVzQ5OrzNRTL1Pc1QC8I5OWE6S9aWp8XAbL+gCcL0jePDwzaaLeqnMAUBhKiFCad/od055GhRz1SE6rvG9OXlw5gk9Xm1xc4GFv6s4SdfH2mIJZLSu23zvVYHimV4/4NGupy6q+uqU= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1790108454; 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:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=RPlnf4vOwH0lk+JYzT5+ypAwsqr9czf9Ndd8LFkbA5Q=; b=HmTx90Zj8o7Cz/cO2+yc4LkC5HPmMIOY4APKBEgridQ1kJiEGY+Ix3u6aBiSt+Dx6AnFTmDnmiLSP08RrCUuUDhybQpbZ3xQr3L/bz3AN66rpIrt8020vmY1Y8Dvdj854qiG/RtLA2M3XsWXJuKMqxffg0mITgIhovfS2PUru74= 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 1790108454931452.8754846595913; Tue, 22 Sep 2026 13:20:54 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists1p.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1x96yT-0005Wb-LR; Tue, 22 Sep 2026 16:20:21 -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 1x96y6-0004ZJ-GN for qemu-devel@nongnu.org; Tue, 22 Sep 2026 16:20:00 -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 1x96y4-000869-Qh for qemu-devel@nongnu.org; Tue, 22 Sep 2026 16:19:58 -0400 Received: from mx-prod-mc-05.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-295-KTQ7ewwRMqyrZIbgp7Wigg-1; Tue, 22 Sep 2026 16:19:53 -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-05.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id 786911955DC7; Tue, 22 Sep 2026 20:19:52 +0000 (UTC) Received: from localhost (headnet03.pony-001.prod.iad2.dc.redhat.com [10.2.32.114]) by mx-prod-int-10.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id 7B13F418; Tue, 22 Sep 2026 20:19:51 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1790108394; 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=RPlnf4vOwH0lk+JYzT5+ypAwsqr9czf9Ndd8LFkbA5Q=; b=f7swB/GGafMXYGupg2UHcYB40Xe3FGaAfVKU2Eynqy9jYwBhkd1RZ5cRzVqw1yvj/sO1/d xbJr7UYhvUyMGeeq0wPYrTUvFld4Mb7EHTdH9kBo3qq5c5orSdxgqBSaAddKRUaO8ygA30 fi5Msj9g7LHAhrODSCS2F32vW2n+5ZM= X-MC-Unique: KTQ7ewwRMqyrZIbgp7Wigg-1 X-Mimecast-MFC-AGG-ID: KTQ7ewwRMqyrZIbgp7Wigg_1790108392 From: =?utf-8?q?Marc-Andr=C3=A9_Lureau?= Date: Wed, 23 Sep 2026 00:17:19 +0400 Subject: [PATCH 12/88] qemu-iotests/216: migrate away from HMP MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Message-Id: <20260923-nohmp-v1-12-ebc029d4bd80@redhat.com> References: <20260923-nohmp-v1-0-ebc029d4bd80@redhat.com> In-Reply-To: <20260923-nohmp-v1-0-ebc029d4bd80@redhat.com> To: qemu-devel@nongnu.org Cc: Kevin Wolf , =?utf-8?q?Marc-Andr=C3=A9_Lureau?= , Hanna Reitz , qemu-block@nongnu.org X-Developer-Signature: v=1; a=openpgp-sha256; l=1677; i=marcandre.lureau@redhat.com; h=from:subject:message-id; bh=dBGKEZNeNd47WGb/fgyqvzVShRX06zcUsc4yIRp7Sq8=; b=owEBbQKS/ZANAwAKAdro4Ql1lpzlAcsmYgBqsuKuti3y/wHJoSwoBfs+/wCjgRQ7V2e2r5LMk 0QKH1sybUaJAjMEAAEKAB0WIQSHqb2TP4fGBtJ29i3a6OEJdZac5QUCarLirgAKCRDa6OEJdZac 5cBoD/sGM/HmcTPPS42YaaCIsiYN5IG38icrhIINSkSIyuw82A4Non3O7pCYyyBdmvCJTf76a5X CO/CE5hKqGR0QHc4fuKJneismSKkbzGWbZZGJSU2CAl7xRC83N2l6+uIpbcFtZ1+RMWf1Ik8Iv8 1dox9xrPQlRTlWz0wP7Ynin15iKdhZOR611vLlF0LSrS6AF5ttz56Hatbf2JLilad9UXBlCuF4u 7lIamjsROwkmyYFCX5Z2BgX14fKxE+blbSOMYjIK3c3sn7exJT6l5afM8zQH1QuNpLPliF0vArz dq4+x2BXEKRU84uJwHvKgCdruyZHkQasSnvEMmJrfKQ5HnqwdhRzrtKccLOjX1RTsGh9/NgzCQu V3m/FdzxZFTACTMXTfGNd08RXirqdDZ6f4dO6HqSzdpGDHTR/80FmoDxPXorSnMUsjo+vyz50JO S/x9YYJxKMIvOOsA77tKrmjCMoenCoj1TIaBBITQ5jc/Y7tgZKlcrq3+GI18Glk5MdKkNS19RkV OlzenQR8FRt9h4Y55FXdnYizwZFD838m/5KQIfaNj2XIuqf6XSYmAKXxvyBSAQyz3UMODFhHJy4 Tu+JzCFYV+NDvdJv0YqCnk/NUPI158/aJ1yQbR8kKWs01gnAUexUHOy1yex6JTxYAkJNBUwupfD 6J/HDimEig3PLzg== 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: 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-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: 1790108455784158500 Log command, although this is not strictly needed. Signed-off-by: Marc-Andr=C3=A9 Lureau --- tests/qemu-iotests/216 | 6 ++---- tests/qemu-iotests/216.out | 3 ++- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/tests/qemu-iotests/216 b/tests/qemu-iotests/216 index 4eabada9b35d..2d32b0f126ce 100755 --- a/tests/qemu-iotests/216 +++ b/tests/qemu-iotests/216 @@ -25,8 +25,7 @@ from iotests import log, qemu_img, qemu_io =20 # Need backing file support iotests.script_initialize(supported_fmts=3D['qcow2', 'qcow', 'qed', 'vmdk'= ], - supported_platforms=3D['linux'], - require_hmp=3DTrue) + supported_platforms=3D['linux']) =20 log('') log('=3D=3D=3D Copy-on-read across nodes =3D=3D=3D') @@ -102,8 +101,7 @@ with iotests.FilePath('base.img') as base_img_path, \ })) =20 # Trigger COR - log(vm.qmp('human-monitor-command', - command_line=3D'qemu-io node0 "read 0 64M"')) + vm.qmp_qemu_io('node0', 'read 0 64M', use_log=3DTrue) =20 vm.shutdown() =20 diff --git a/tests/qemu-iotests/216.out b/tests/qemu-iotests/216.out index a70aa5cdaeb9..c2d8101e8858 100644 --- a/tests/qemu-iotests/216.out +++ b/tests/qemu-iotests/216.out @@ -8,7 +8,8 @@ Done --- Doing COR --- =20 {"return": {}} -{"return": ""} +{"execute": "x-qemu-io", "arguments": {"command": "read 0 64M", "device": = "node0"}} +{"return": {"human-readable-text": "read 67108864/67108864 bytes at offset= 0\n64 MiB, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec)\n"}} =20 --- Checking COR result --- =20 --=20 2.56.0.rc0.29.g47ce80527c56 From nobody Sat Sep 26 20:01:40 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=1790108504; cv=none; d=zohomail.com; s=zohoarc; b=lFGYE4P/g/mxQQTFpSChBRX+ELs+fLL1v4coF2YUHQheePe5/6gdJ5DrVgkoq+Ctj2PiLBFlLx5WpV89VVt9HFpq88SKLFNTsZ8CnB2D5w/ulRmSrV5ay38H25UQkhG64Na//HfVliSiZb6ziZGwYHViTzWSirRbckOXkIONA2Q= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1790108504; 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:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=LeztknFzlnU/nDvbX1f8VmXzvYDUa2KjfzS9HwyEXkk=; b=Wpehtfb3l9closYB6O/US2xqYXb4v7+//l9uaeMwJO8SSr2DcLFPlw95wFJbdeY2IshDhizfB7Pzu36YMdB4ksYhuOixEPviuxkzMbV77+2IZuxK028sxLzq2qrP1rhhAgLppHpI1cw7+NEtb6Ue7JXsiCRCIG71J9FSFge87Cs= 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 1790108504705424.1590674843078; Tue, 22 Sep 2026 13:21:44 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists1p.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1x96yV-0005i7-MG; Tue, 22 Sep 2026 16:20:24 -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 1x96yB-0004es-AY for qemu-devel@nongnu.org; Tue, 22 Sep 2026 16:20:06 -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 1x96y7-00086w-Bx for qemu-devel@nongnu.org; Tue, 22 Sep 2026 16:20:02 -0400 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-163-zKdT4ZaxO7-zs40lp_lgCQ-1; Tue, 22 Sep 2026 16:19:57 -0400 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 3C6C51955F3F; Tue, 22 Sep 2026 20:19:56 +0000 (UTC) Received: from localhost (headnet03.pony-001.prod.iad2.dc.redhat.com [10.2.32.114]) by mx-prod-int-08.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id 38EF01800446; Tue, 22 Sep 2026 20:19:54 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1790108398; 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=LeztknFzlnU/nDvbX1f8VmXzvYDUa2KjfzS9HwyEXkk=; b=iXRRPTnscPuM3elN1xIoEFUsOKjUuqwr1WGhjgJYSoOj2AAZRkcHuGxRWUmeCNyCM6U26X mq+WP47tUwUk7QKEkauwLhL2JVL6tSR5Uprgbv9g6oXO0KuAx8bb4qP81uiil/wsxsch8s Lk2gBIxMSx9AWnS09X5+6iLQlLScmrY= X-MC-Unique: zKdT4ZaxO7-zs40lp_lgCQ-1 X-Mimecast-MFC-AGG-ID: zKdT4ZaxO7-zs40lp_lgCQ_1790108396 From: =?utf-8?q?Marc-Andr=C3=A9_Lureau?= Date: Wed, 23 Sep 2026 00:17:20 +0400 Subject: [PATCH 13/88] qemu-iotests/310: migrate away from HMP MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Message-Id: <20260923-nohmp-v1-13-ebc029d4bd80@redhat.com> References: <20260923-nohmp-v1-0-ebc029d4bd80@redhat.com> In-Reply-To: <20260923-nohmp-v1-0-ebc029d4bd80@redhat.com> To: qemu-devel@nongnu.org Cc: Kevin Wolf , =?utf-8?q?Marc-Andr=C3=A9_Lureau?= , Hanna Reitz , qemu-block@nongnu.org X-Developer-Signature: v=1; a=openpgp-sha256; l=1587; i=marcandre.lureau@redhat.com; h=from:subject:message-id; bh=aEEwoAgHbG3LoTAutO+AlDtApu6AteFRZg/C0d+T0WE=; b=owEBbQKS/ZANAwAKAdro4Ql1lpzlAcsmYgBqsuKuxHQI1VA43ebuJpGeVYMnZchuWb5w5uSpj K30XSGFPwOJAjMEAAEKAB0WIQSHqb2TP4fGBtJ29i3a6OEJdZac5QUCarLirgAKCRDa6OEJdZac 5dlFEACzu6Zc5x5jTfm6fb/dUKBA3oFSZa3lhjwsPsKoEDANpzNfi3RGY3Fj6o5jE8M9eVnluHi Jg6allSXmQ4Ujc8Rpcut4h7++trdMOl/xVCbGU7lrsiM/OBThUteBB7qq2jOc5KgdcDgcLXQgVZ DA1oT1SGtcGpu8daur1nNPZTsqWFaLNfmyTu3fMPK8vQmfs7p+CUJR4g5JF37PJuQAkHORZJL0o GHfT1kCwa8snMlnWrFSnznH4YsqVq/RkUNWhAdCq64Jko6zDphuMtIFfgZSZ7CpxsorMf0LxlRb JZjT9/j7NcY6QubqhDmYHPE2+0XhzVG5ksgwX7A7Lw0XLgPX6E2kRR5PHSbIcAUmIzVeIT5bbmq a0GLOHiS49oh8tmKCdxaqTeImDcMmZx+HJh6+JhM0CqaT3L6rCo2wluoi0Ikngx7TmyMJx6m+UT vdONsgTz3OCvfRSdd1N4TxOmkgU1Idth8JO0RGZopGeTtXZvs6lhE4869SeOWJ13eB+ILXnn7FV UQtYNPcRtV2deuL6ncDCdNZWSkfcGYMIKRnjUv51A4QYQlHKHDtNFrLKfl2IJjMuEFFa8hB4QNS XTSyLkTwQ5eRCWzSjllCmitFLXc+9PvbYDpI831NJDfBgWgIA8kiGwYa2Rjo9YE+989nIwTmNiw LO/+mFc2OV2Ztgw== X-Developer-Key: i=marcandre.lureau@redhat.com; a=openpgp; fpr=87A9BD933F87C606D276F62DDAE8E10975969CE5 X-Scanned-By: MIMEDefang 3.4.1 on 10.30.177.111 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: 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-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: 1790108506469158500 Signed-off-by: Marc-Andr=C3=A9 Lureau --- tests/qemu-iotests/310 | 6 ++---- tests/qemu-iotests/310.out | 3 ++- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/tests/qemu-iotests/310 b/tests/qemu-iotests/310 index 7f290898fea0..5ca59fda8706 100755 --- a/tests/qemu-iotests/310 +++ b/tests/qemu-iotests/310 @@ -25,8 +25,7 @@ from iotests import log, qemu_img, qemu_io =20 # Need backing file support iotests.script_initialize(supported_fmts=3D['qcow2'], - supported_platforms=3D['linux'], - require_hmp=3DTrue) + supported_platforms=3D['linux']) =20 log('') log('=3D=3D=3D Copy-on-read across nodes =3D=3D=3D') @@ -96,8 +95,7 @@ with iotests.FilePath('base.img') as base_img_path, \ })) =20 # Trigger COR - log(vm.qmp('human-monitor-command', - command_line=3D'qemu-io node0 "read 0 5M"')) + vm.qmp_qemu_io('node0', 'read 0 5M', use_log=3DTrue) =20 vm.shutdown() =20 diff --git a/tests/qemu-iotests/310.out b/tests/qemu-iotests/310.out index a70aa5cdaeb9..b15bb93281eb 100644 --- a/tests/qemu-iotests/310.out +++ b/tests/qemu-iotests/310.out @@ -8,7 +8,8 @@ Done --- Doing COR --- =20 {"return": {}} -{"return": ""} +{"execute": "x-qemu-io", "arguments": {"command": "read 0 5M", "device": "= node0"}} +{"return": {"human-readable-text": "read 5242880/5242880 bytes at offset 0= \n5 MiB, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec)\n"}} =20 --- Checking COR result --- =20 --=20 2.56.0.rc0.29.g47ce80527c56 From nobody Sat Sep 26 20:01:40 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=1790108463; cv=none; d=zohomail.com; s=zohoarc; b=USXiE8Lo3fJzcKAvTJsvkIow/mU8uuM/hWH9V/KHkns2eKWAyYzjcNL1DIlHjW0777ne41YttiTiqkXz2uc3gJBc2cDe7KzP8szJ5YDvze/R0iEbgnvBDVF39Iufh8NAyUc8U7Uwd81mM9aEb1arVAMSw11NGODgCtuSGpvLys8= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1790108463; 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:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=DbvdZhkW7P3RJl8KHoIPI4+OJx1tMoCy2xiHmREWJFc=; b=eNLBfHoHrQD6dJYfrqqevFb838xkb7pfUesgYHHHfYitMjs4qibnDRjl5j3l/XVLJhNK1D+j/Ar3GruTFFlSoSnGOJch0V5+kAf4+YTs84nWb+BbOvNYh0o/K+Vbxatj1MeLvl4TuEDfdP23TDIcsvZkxP41x2WKA7A2MLRb/2E= 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 1790108463212463.48810271882655; Tue, 22 Sep 2026 13:21:03 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists1p.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1x96yT-0005WZ-M0; Tue, 22 Sep 2026 16:20:21 -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 1x96yH-0004ki-ET for qemu-devel@nongnu.org; Tue, 22 Sep 2026 16:20:11 -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 1x96yD-00087q-1n for qemu-devel@nongnu.org; Tue, 22 Sep 2026 16:20:07 -0400 Received: from mx-prod-mc-05.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-441-Ct_cLCWSMceuomlaI7GxZw-1; Tue, 22 Sep 2026 16:20:00 -0400 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-05.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id 86AEC19539BF; Tue, 22 Sep 2026 20:19:59 +0000 (UTC) Received: from localhost (headnet03.pony-001.prod.iad2.dc.redhat.com [10.2.32.114]) by mx-prod-int-08.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id AD2311800446; Tue, 22 Sep 2026 20:19:58 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1790108404; 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=DbvdZhkW7P3RJl8KHoIPI4+OJx1tMoCy2xiHmREWJFc=; b=a4vJ8Ae6q9Ky+1z/z6Fi6Cu+t2EFXwaRQef+PrAysrjNtBbRhp3AtAUTy85YE/48tQXLp8 DPxU1t46EHPDw9gv3qdHkts/pDkGdCFdoa6Z2VUAylHHiUGKHK0E2W4Q68WBguof6CXQJJ 60UpcUgwi9VLeGjqWqx2o9j75QeYVls= X-MC-Unique: Ct_cLCWSMceuomlaI7GxZw-1 X-Mimecast-MFC-AGG-ID: Ct_cLCWSMceuomlaI7GxZw_1790108399 From: =?utf-8?q?Marc-Andr=C3=A9_Lureau?= Date: Wed, 23 Sep 2026 00:17:21 +0400 Subject: [PATCH 14/88] qemu-iotests/283: migrate away from HMP MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Message-Id: <20260923-nohmp-v1-14-ebc029d4bd80@redhat.com> References: <20260923-nohmp-v1-0-ebc029d4bd80@redhat.com> In-Reply-To: <20260923-nohmp-v1-0-ebc029d4bd80@redhat.com> To: qemu-devel@nongnu.org Cc: Kevin Wolf , =?utf-8?q?Marc-Andr=C3=A9_Lureau?= , Hanna Reitz , qemu-block@nongnu.org X-Developer-Signature: v=1; a=openpgp-sha256; l=1850; i=marcandre.lureau@redhat.com; h=from:subject:message-id; bh=4wfXrgoHBISHjBhPh5voZjfsyDCrj8SstNGTEm+Jqwo=; b=owEBbQKS/ZANAwAKAdro4Ql1lpzlAcsmYgBqsuKv5DIpZFeCsS+1ujc00F4lqUpbGlLWxYysV +f9/L6oh7eJAjMEAAEKAB0WIQSHqb2TP4fGBtJ29i3a6OEJdZac5QUCarLirwAKCRDa6OEJdZac 5Zh1D/4qrpZNCoFFzvnc6gM2gIy8QDESdHjHtMgsNhOS24dkD6kd1CA7AKoPyIE5cM9j0mt9F/7 MtWL2zlNqDv0bx//++Aj2psaaudaoLFdMr/VFF+qqLziQEV/UiW1EettztrDPpxMrCNsqmd5OyI G53+DxxqSUkELoo26U7TWdNe4yUloY/2b3TNLLa+c5fwrGJNexjOArSNCg9qob+0a4TDMJITRRd Q7PaUQ1ADnun98pyYXss9/BrjoqrLaM6IsX4lqLAD+7IL+d64OxMZKiaXb6KAz0Ypc4gh+b7ePy ZK10gbXEINIP6AKowsjUMvwNDaXenz+DeTSbECk7VN3PmSe1UawLbGmcxJx5h5Ikq2Ygf3E9ngT QD3umFsTQi52WpbAJG/J7H9zSjZ5K/fz6Vu3zueLISHueLKyjhSfmmeTdeGKbgInYkm7p52DoXh UwVv7AM8gcEaF1G/Rj5IUgb7uuOACORunCy9GwR4DZf6Z5MedXSnEFjmOIak/Y5CCLi8Abc31Pz Qib+GlDnvd0iUQe56KagNsJ0AMoWYOX0LrCRkwNOVVj3r61bag6WR2TrxhjAe5IqTTjE5VCDIxS aV0UcJH8E4RkfwCw//q9PNWNUa7aHMHvr10D1bmzXC5i2PpI1CAB60gyoxC6koUy/OYwIQ7gGQm 18ujRI1qpbPilyQ== X-Developer-Key: i=marcandre.lureau@redhat.com; a=openpgp; fpr=87A9BD933F87C606D276F62DDAE8E10975969CE5 X-Scanned-By: MIMEDefang 3.4.1 on 10.30.177.111 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: 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-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: 1790108463829158501 Signed-off-by: Marc-Andr=C3=A9 Lureau --- tests/qemu-iotests/283 | 4 +--- tests/qemu-iotests/283.out | 4 ++-- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/tests/qemu-iotests/283 b/tests/qemu-iotests/283 index 6d341d3e9745..d06edcdd7ae8 100755 --- a/tests/qemu-iotests/283 +++ b/tests/qemu-iotests/283 @@ -24,7 +24,6 @@ import iotests # The test is unrelated to formats, restrict it to qcow2 to avoid extra ru= ns iotests.script_initialize( supported_fmts=3D['qcow2'], - require_hmp=3DTrue, ) =20 size =3D 1024 * 1024 @@ -137,8 +136,7 @@ vm.event_wait('BLOCK_JOB_COMPLETED', 5.0) # The filter should be gone now. Check that by trying to access it # with qemu-io (which will most likely crash qemu if it is still # there.). -vm.qmp_log('human-monitor-command', - command_line=3D'qemu-io backup-filter "write 0 1M"') +vm.qmp_log('x-qemu-io', device=3D'backup-filter', command=3D'write 0 1M') =20 # (Also, do an explicit check.) assert vm.node_info('backup-filter') is None diff --git a/tests/qemu-iotests/283.out b/tests/qemu-iotests/283.out index 5e4f456db55c..1c12c8fad7df 100644 --- a/tests/qemu-iotests/283.out +++ b/tests/qemu-iotests/283.out @@ -17,7 +17,7 @@ {"return": {}} {"execute": "job-finalize", "arguments": {"id": "backup"}} {"return": {}} -{"execute": "human-monitor-command", "arguments": {"command-line": "qemu-i= o backup-filter \"write 0 1M\""}} -{"return": "Error: Cannot find device=3D'' nor node-name=3D'backup-filter'= \r\n"} +{"execute": "x-qemu-io", "arguments": {"command": "write 0 1M", "device": = "backup-filter"}} +{"error": {"class": "GenericError", "desc": "Cannot find device=3D'' nor n= ode-name=3D'backup-filter'"}} {"execute": "job-dismiss", "arguments": {"id": "backup"}} {"return": {}} --=20 2.56.0.rc0.29.g47ce80527c56 From nobody Sat Sep 26 20:01:40 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=1790108447; cv=none; d=zohomail.com; s=zohoarc; b=P7FqVPP41XUVaes5zEoKyRUZxA31mob7SaJ074o9ibMcP199nyNthHBkVrXVE1r5cOilIRjasQ41KQ12yNrsWENZ/8NqXNE2SGoOfJqIGo3ykYLtxVTEwE+4SRmmTaXr6BhZLbjs3LrCoWZ435yBqnWegdxmAkJoYlN4WDOGIww= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1790108447; 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:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=4GLoY4Zw+LeT4iB/oODQsrJ/ijf7cxwJruvuL54ie/E=; b=htKWb7cSeL4of02OLzxnfoMBDYjylYylFMi5iX2Gm1KM6aQRxJMoRtghyxTl+pepOmf0x/jW6QMSmoETAQeBXpnvaNc9ebpLCfk+xrPYOpy32dlu3ovgpE/vPeueMzY9yHPoP7uJfQDbsQqubu13ESCV7SjW4/AP+WQP0rMxYLA= 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 1790108447246116.67928824526257; Tue, 22 Sep 2026 13:20:47 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists1p.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1x96yY-0005uI-Sl; Tue, 22 Sep 2026 16:20:27 -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 1x96yJ-0004pJ-E0 for qemu-devel@nongnu.org; Tue, 22 Sep 2026 16:20:11 -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 1x96yG-00089B-Qj for qemu-devel@nongnu.org; Tue, 22 Sep 2026 16:20:11 -0400 Received: from mx-prod-mc-01.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-631-HW1yJrEXOkSzSIHaTqM0ng-1; Tue, 22 Sep 2026 16:20:04 -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-01.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id 16F141955F28; Tue, 22 Sep 2026 20:20:03 +0000 (UTC) Received: from localhost (headnet03.pony-001.prod.iad2.dc.redhat.com [10.2.32.114]) by mx-prod-int-10.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id 46743766; Tue, 22 Sep 2026 20:20:01 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1790108407; 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=4GLoY4Zw+LeT4iB/oODQsrJ/ijf7cxwJruvuL54ie/E=; b=CrBU88B6dlFEOaojZefGH6fWJk8Pd5CZJpyWw7POLHy+vJlCL75vLHU4jaVqQNWHdcl/VF LU3yVjwn/i4GO9XyV5DGMysQQMBGrwzYrHE7pULXbbZ0Gld9UA8Ua0Sx+Y5Fp2Btxv7u6I my5SC1J0JZejTz2BacMcXBia0s5RvEM= X-MC-Unique: HW1yJrEXOkSzSIHaTqM0ng-1 X-Mimecast-MFC-AGG-ID: HW1yJrEXOkSzSIHaTqM0ng_1790108403 From: =?utf-8?q?Marc-Andr=C3=A9_Lureau?= Date: Wed, 23 Sep 2026 00:17:22 +0400 Subject: [PATCH 15/88] qemu-iotests/281: migrate away from HMP MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Message-Id: <20260923-nohmp-v1-15-ebc029d4bd80@redhat.com> References: <20260923-nohmp-v1-0-ebc029d4bd80@redhat.com> In-Reply-To: <20260923-nohmp-v1-0-ebc029d4bd80@redhat.com> To: qemu-devel@nongnu.org Cc: Kevin Wolf , =?utf-8?q?Marc-Andr=C3=A9_Lureau?= , Hanna Reitz , qemu-block@nongnu.org X-Developer-Signature: v=1; a=openpgp-sha256; l=1814; i=marcandre.lureau@redhat.com; h=from:subject:message-id; bh=WbD4htSPwfv+XOHmp+8JUU8lEJZOKVWazxl8VoX/sgc=; b=owEBbQKS/ZANAwAKAdro4Ql1lpzlAcsmYgBqsuKvMUIgEUccnjbZxerqcx1rs/4KBJXOd7KEQ orzbP9EM82JAjMEAAEKAB0WIQSHqb2TP4fGBtJ29i3a6OEJdZac5QUCarLirwAKCRDa6OEJdZac 5Zi9D/9UKC1DH8vcQRmqF87R8cV2Dh5ml1h0an6O7qh3e9oZhy3cVi6PCSxxW68JFsl7Lv3sn1C s+LBzPzJPQ/3mYaCIUsryXxliVfcXdJ2JK1sJm/6Oig6QApcR7TBSvzTz50bThfVIkEub2EsJK3 Bim6QEFV5K7IzPAKbVA7kU1DGkjBTJ27pc8fZQNunOcBjuxznfGSOhg11DbOOENQJQQd0oBjDs6 vHWGqhQgfYWZffc01BbnnO1NrI5B41+UTBeP3YhGyIMSmVhEFw6xnhjyP/NWrLCcsEvG2fxiv+8 xxHDOzGl2dwkQaeko7Xs57bJ7sFUcXIdlqS4wYWJ6kc+SOr+79FE3nyJL4/z/etA1kc5B8DdetR n2iHOPc0otq4dgO1sc1YafIp91kE5P3O7MqQT6nzW1QdaAEGC9jrpIM/mTw20PFTIJWpNuRrVkk HuqcA1ulUT7rlTlDgLoVEDXW9eGpyykpNzWMZjlzJoCHc7LuaXWMjhk+RA1Tru6VNUHCAGI/hA4 h25F+/UG4iFfWOH40FTxw6lxS0stSVAKYLcj1cCGe0LC9ikxl8fCBDBjNy1nT0uVBf4H5uORRwc UzO0MsxK8BYx5wY3mDy0MlmdEyT6bp4R3jjYzhemR8BVvJp1nRxOCBuxlJM2kIHZaGb2OI8og4R HVS9ibsuIsmQnLA== 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: 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-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: 1790108449838158500 Signed-off-by: Marc-Andr=C3=A9 Lureau --- tests/qemu-iotests/281 | 11 +++-------- 1 file changed, 3 insertions(+), 8 deletions(-) diff --git a/tests/qemu-iotests/281 b/tests/qemu-iotests/281 index 5f3050f50d0b..65d34b427a43 100755 --- a/tests/qemu-iotests/281 +++ b/tests/qemu-iotests/281 @@ -273,9 +273,7 @@ class TestYieldingAndTimers(iotests.QMPTestCase): self.stop_nbd_export() self.create_nbd_export() =20 - result =3D self.vm.qmp('human-monitor-command', - command_line=3D'qemu-io nbd "write 0 512"') - self.assert_qmp(result, 'return', '') + self.vm.qmp_qemu_io('nbd', 'write 0 512') =20 # Reconnect is done, so the reconnect delay timer should be gone. # (This is similar to how the open timer should be gone after open, @@ -303,9 +301,7 @@ class TestYieldingAndTimers(iotests.QMPTestCase): # Do some I/O that will be throttled by the QSD, so that the netwo= rk # connection hopefully will yield here. When it is resumed, it mu= st # then be resumed in the I/O thread's AioContext. - result =3D self.vm.qmp('human-monitor-command', - command_line=3D'qemu-io nbd "read 0 128K"') - self.assert_qmp(result, 'return', '') + self.vm.qmp_qemu_io('nbd', 'read 0 128K') =20 def create_nbd_export(self): assert self.qsd is None @@ -336,5 +332,4 @@ class TestYieldingAndTimers(iotests.QMPTestCase): if __name__ =3D=3D '__main__': iotests.main(supported_fmts=3D['qcow2'], supported_protocols=3D['file'], - unsupported_imgopts=3D['compat'], - require_hmp=3DTrue) + unsupported_imgopts=3D['compat']) --=20 2.56.0.rc0.29.g47ce80527c56 From nobody Sat Sep 26 20:01:40 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=1790108555; cv=none; d=zohomail.com; s=zohoarc; b=X58tf9YMI8iA8XzzSOsvEyzT1FgIPQaTtpNk+WZHQpLB+0WRNjYZnbjCXVUyd8T9X5evy1KPXB2e68EN6v5IUqdBXto26Ek1sTTy08nasmAU58wkQ0XqzFo/IMFADgKeAHarpjq+Fz1JSdPqXUYWhT7lHEqeyPetoCQalbtl2K4= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1790108555; 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:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=RKvhBpJpZS5ZhCDI8kLKWLJbP/lCAKUoJKR82ZuccS8=; b=I6Oa6QGm3YD2cagFKIRC/OAmvpABW6FfDdOY4yoTnbIPaOV8HMA4cHxkc9wIDSJ73s4HDK3IGcTx8ZNPySoNm1KrZF5079WCzM0NYkHjvNkFt2Hp/45NhjpWKX2GonaiG5qS7nQ7Ahg24YWRLqfaGSTrJLpRxRJj1VUjeBBid3Y= 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 1790108555869416.7183725735324; Tue, 22 Sep 2026 13:22:35 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists1p.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1x96yw-0006HV-NF; Tue, 22 Sep 2026 16:20:52 -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 1x96yL-0004zr-CE for qemu-devel@nongnu.org; Tue, 22 Sep 2026 16:20:13 -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 1x96yJ-0008Aj-RD for qemu-devel@nongnu.org; Tue, 22 Sep 2026 16:20:13 -0400 Received: from mx-prod-mc-01.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-19-eoPdrLgoOuCAS5wjW6STzg-1; Tue, 22 Sep 2026 16:20:07 -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-01.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id AD0261955EAF; Tue, 22 Sep 2026 20:20:06 +0000 (UTC) Received: from localhost (headnet03.pony-001.prod.iad2.dc.redhat.com [10.2.32.114]) by mx-prod-int-10.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id 95D70427; Tue, 22 Sep 2026 20:20:05 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1790108411; 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=RKvhBpJpZS5ZhCDI8kLKWLJbP/lCAKUoJKR82ZuccS8=; b=HQMwSZ1aqGVicRtZ9SrRVRzVc2ER8ei5piWgumfQ1BY7CSVgPFEkpay//6lnB/LPyT6GcM rKFx9WMLxcrLn6kvgcZ+lhsG7I5dGKBFAzfD4m+NWdEQ4zKmIf9tg2hurNZSONK3C4cN7Z n3vo/aKKeyXwefmgZLXzZHJBUWIyfrM= X-MC-Unique: eoPdrLgoOuCAS5wjW6STzg-1 X-Mimecast-MFC-AGG-ID: eoPdrLgoOuCAS5wjW6STzg_1790108406 From: =?utf-8?q?Marc-Andr=C3=A9_Lureau?= Date: Wed, 23 Sep 2026 00:17:23 +0400 Subject: [PATCH 16/88] qemu-iotests/reopen-file: migrate away from HMP MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Message-Id: <20260923-nohmp-v1-16-ebc029d4bd80@redhat.com> References: <20260923-nohmp-v1-0-ebc029d4bd80@redhat.com> In-Reply-To: <20260923-nohmp-v1-0-ebc029d4bd80@redhat.com> To: qemu-devel@nongnu.org Cc: Kevin Wolf , =?utf-8?q?Marc-Andr=C3=A9_Lureau?= , Hanna Reitz , qemu-block@nongnu.org X-Developer-Signature: v=1; a=openpgp-sha256; l=1470; i=marcandre.lureau@redhat.com; h=from:subject:message-id; bh=Njh8uCzUxbmSD+8h/bjdMoOcXhbpPrw5kgwgHaSNEYw=; b=owEBbQKS/ZANAwAKAdro4Ql1lpzlAcsmYgBqsuKvCZ0rwnW8wt2i8JCGYIcPoyxYUTgyE9kOt LV5EX+brMuJAjMEAAEKAB0WIQSHqb2TP4fGBtJ29i3a6OEJdZac5QUCarLirwAKCRDa6OEJdZac 5dH9D/0aIlNE9fDFXdWkpySfsLKT0OnNxTB7wZgxs/PeiWVaiWK3OB69JCqUXSzCk8yszGElMzK /p+m912b1s/Ws+9TfH0JvTjhuq3BVjp73EAYQbNIZmpv3JyGvyjixy1jvzOcYTm2Jxc3dZpE4cA miForgaqLUyYnM+J2C6YFFI0G4UpEYvAY3CxBL9cghfFNUjzgnVswpgVFFnMY9If3wqORg7Ydtv IyUg85oiaYiwZSHVkRsaoYsM8ZM0rXdQPUVUn3swKfw2aYUvMxNkIa5JkI9qdHWaGiq7IezjCpo Hsl/1gXZcKv9Fc0jGPVszx7SUIvCTUIrNQ64hYLnfKQLZsFpW/H4M3LSeIHQkBYlgNEGmrK9sAy oiSWd0+77kSk2LDkkV+QH3sydGLuTmEgaHdVn9v/bL6MRVkTxHItJwXwdSMebm1mFRUtRr+l06C Bi20c6vETAfOLskeR/lwbGdcHXXb7ebv25aq9EWG5770Bhxev/3oV3J3MQq+hCDl6Tfd8PqMjyI 69I3td2xrmOwvgX5PJq/DxjNneOyUITAz3JtYNjOlCIQ95woZdBpmDAuLTYQlmrQTvPCqP8dxy+ MNJaIrenEQNg4ho8u3SlE2ls1Pl1yVWLbT/Kp51Q9oq+xZ1n1Wjm00QzB+QRc9Gj47Gx/eQWQsN iJHW6bkj4LE1kYw== 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: 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-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: 1790108556355158500 Signed-off-by: Marc-Andr=C3=A9 Lureau --- tests/qemu-iotests/tests/reopen-file | 12 +++--------- 1 file changed, 3 insertions(+), 9 deletions(-) diff --git a/tests/qemu-iotests/tests/reopen-file b/tests/qemu-iotests/test= s/reopen-file index f8812320ea8f..98b0f9e98e73 100755 --- a/tests/qemu-iotests/tests/reopen-file +++ b/tests/qemu-iotests/tests/reopen-file @@ -72,18 +72,12 @@ class TestReopenFile(QMPTestCase): =20 # Do some I/O to the image to see whether it still works # (Pattern verification will be checked by tearDown()) - result =3D self.vm.qmp('human-monitor-command', - command_line=3D'qemu-io format "write -P 42 0= 64k"') - self.assert_qmp(result, 'return', '') - - result =3D self.vm.qmp('human-monitor-command', - command_line=3D'qemu-io format "read -P 42 0 = 64k"') - self.assert_qmp(result, 'return', '') + self.vm.qmp_qemu_io('format', 'write -P 42 0 64k') + self.vm.qmp_qemu_io('format', 'read -P 42 0 64k') =20 =20 if __name__ =3D=3D '__main__': # Must support creating images and reopen iotests.main(supported_fmts=3D['qcow', 'qcow2', 'qed', 'raw', 'vdi', '= vhdx', 'vmdk', 'vpc'], - supported_protocols=3D['file'], - require_hmp=3DTrue) + supported_protocols=3D['file']) --=20 2.56.0.rc0.29.g47ce80527c56 From nobody Sat Sep 26 20:01:40 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=1790108600; cv=none; d=zohomail.com; s=zohoarc; b=dG68ggya5T/M191/JMVK0qW3XrQYtqV/HWU2ZxuyFIZ06XJUYaDSky4DyW1HW9Qt9yDRU40IfpB3FRHJDe+th/2uro7PHvKIwhYQCRvliSf9IRlkaEmIBEmTFeSXmF5JAoWBSmS+TOJt6DI2VQI1lXKCE5dx6accCyWIsurk47M= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1790108600; 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:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=/6lITpW/VHo8AukNHzioPNeCXb4rf1doh1fBnsC+4lc=; b=CRUVqwm6xeeULmTHgILU0Jw21M4iyWQSQ+QTHP4OcctOZrENff5LOmk4xuA9+A4OiIDp5wuJ2JDaEY/T13lva4sfDVsP3gwoXBveHEzqL452cZ6k5bgOqBxHR2m9OMFt9yIH/OoiyEjNzVRnv2yZgLESIgLtdDcOb4rgCAKypqM= 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 1790108600585599.4236735240816; Tue, 22 Sep 2026 13:23:20 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists1p.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1x96z1-0006YZ-NX; Tue, 22 Sep 2026 16:20:55 -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 1x96yN-00056v-8f for qemu-devel@nongnu.org; Tue, 22 Sep 2026 16:20:15 -0400 Received: from us-smtp-delivery-124.mimecast.com ([170.10.133.124]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1x96yL-0008Bc-Nn for qemu-devel@nongnu.org; Tue, 22 Sep 2026 16:20:14 -0400 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-444-pRd9r7RJMaaPDxggcqhCeg-1; Tue, 22 Sep 2026 16:20:11 -0400 Received: from mx-prod-int-01.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-01.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.4]) (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 8991C1955F3F; Tue, 22 Sep 2026 20:20:10 +0000 (UTC) Received: from localhost (headnet03.pony-001.prod.iad2.dc.redhat.com [10.2.32.114]) by mx-prod-int-01.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id 886C53000223; Tue, 22 Sep 2026 20:20:09 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1790108413; 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=/6lITpW/VHo8AukNHzioPNeCXb4rf1doh1fBnsC+4lc=; b=be8vNjIaDNhHLGdVIeqioZJijET680liEWDXFGcwTSHel1tDJwtwlnbpdzErNp4l7Ypsrf Zo7Ez3hsp1wFtHTIGrbypl/+rOxmX5qShWq2BM9ultopb354W5D3C96QUw1rJcaMRTVpcj JNAxxwiVbTBtzDGZsVBQVFvPg0Oe59k= X-MC-Unique: pRd9r7RJMaaPDxggcqhCeg-1 X-Mimecast-MFC-AGG-ID: pRd9r7RJMaaPDxggcqhCeg_1790108410 From: =?utf-8?q?Marc-Andr=C3=A9_Lureau?= Date: Wed, 23 Sep 2026 00:17:24 +0400 Subject: [PATCH 17/88] qemu-iotests/mirror-ready-cancel-error: migrate away from HMP MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Message-Id: <20260923-nohmp-v1-17-ebc029d4bd80@redhat.com> References: <20260923-nohmp-v1-0-ebc029d4bd80@redhat.com> In-Reply-To: <20260923-nohmp-v1-0-ebc029d4bd80@redhat.com> To: qemu-devel@nongnu.org Cc: Kevin Wolf , =?utf-8?q?Marc-Andr=C3=A9_Lureau?= , Hanna Reitz , qemu-block@nongnu.org X-Developer-Signature: v=1; a=openpgp-sha256; l=1426; i=marcandre.lureau@redhat.com; h=from:subject:message-id; bh=/FNCHaMS3AwzGhRQbZhKalN246kWRV4d/MKPqH6x+Yw=; b=owEBbQKS/ZANAwAKAdro4Ql1lpzlAcsmYgBqsuKvM4qAwwv1fArpxdvqRdmHFjQRhGTSgURWG JI6O8IAq2eJAjMEAAEKAB0WIQSHqb2TP4fGBtJ29i3a6OEJdZac5QUCarLirwAKCRDa6OEJdZac 5bElD/47r7IP36IHG5yAFWYyjqDDhtHyo/jmQe0Tiot3Aku91+3rfDzirKQTOYOfkz4ON79cjWe g5xrjZtJCabm9Fqp0CVVCpoxW8GONRxBldYroWJUebTtIIO5z/6g1W+yXVRt4CVK9Kgjcoravim QGl2hnHGFPQkIrahcxa6/5XgfjBFI8/QTIZdtvDYZ4b5WI8tXuzFN2zucB0cTiyt702Uu0N3FYk oL+PPkEKcHhEcTBOBOy162Aa4rxSwSs4qqJjI2q5/L417soexfqpXqOAq4LojSCCf0FHBO19S6o GuMU+jwexrIaPfra21kYrUXaJffqC3j/Vf10Fhuby86z8LA90HIXJtPc/vqPGO/0xx1cNShTxP+ ad68M+hQcYJR7EkEBU6vDdb6rxc8QqtdiEUfhf0J46Nenrs/lSxCOoBfFRyWXiJml9Udyy0I0RZ DZIoENS8oAaxZj7G/MSU+Ct/RTaMdfclcZ8n4y00w8Zu3FxtYFmfaKKdD+riiXfm2utpJqeHQWd 0sCVlTFeFZKWKDrRWKRyHCCg8dAm6wnrbeYVkNJHzxRlvR2FUZ6UvsvoDtNwuWZ5LEXB3zZIL0g vf727sSbLe3vjAdqmIoks4WfCkYSowSLLdYAcF9P6aDQOCacHT9ylUzpzqyyEm3TE6p3W+WnFGF HZA5c2tAaKkA5vQ== X-Developer-Key: i=marcandre.lureau@redhat.com; a=openpgp; fpr=87A9BD933F87C606D276F62DDAE8E10975969CE5 X-Scanned-By: MIMEDefang 3.4.1 on 10.30.177.4 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.133.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_H3=0.001, RCVD_IN_MSPIKE_WL=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-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: 1790108602681158500 Signed-off-by: Marc-Andr=C3=A9 Lureau --- tests/qemu-iotests/tests/mirror-ready-cancel-error | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/tests/qemu-iotests/tests/mirror-ready-cancel-error b/tests/qem= u-iotests/tests/mirror-ready-cancel-error index ffa045af2191..06ca8871327b 100755 --- a/tests/qemu-iotests/tests/mirror-ready-cancel-error +++ b/tests/qemu-iotests/tests/mirror-ready-cancel-error @@ -96,9 +96,7 @@ class TestMirrorReadyCancelError(iotests.QMPTestCase): =20 # Write something so will not leave the job immediately, but # flush first (which will fail, thanks to blkdebug) - res =3D self.vm.qmp('human-monitor-command', - command_line=3D'qemu-io mirror-top "write -P 2 0= 64k"') - self.assert_qmp(res, 'return', '') + self.vm.qmp_qemu_io('mirror-top', 'write -P 2 0 64k') =20 # Drain status change events while self.vm.event_wait('JOB_STATUS_CHANGE', timeout=3D0.0) is no= t None: @@ -139,5 +137,4 @@ if __name__ =3D=3D '__main__': # LUKS would require special key-secret handling in add_blockdevs() iotests.main(supported_fmts=3D['generic'], unsupported_fmts=3D['luks'], - supported_protocols=3D['file'], - require_hmp=3DTrue) + supported_protocols=3D['file']) --=20 2.56.0.rc0.29.g47ce80527c56 From nobody Sat Sep 26 20:01:40 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=1790108534; cv=none; d=zohomail.com; s=zohoarc; b=A/MCGpA4BCLMdzyOzThrYUmp3FKJFkHTzkxsjMa4zkD+STP+wC+HYSKRXBE61VNWVApWzMuFUDOKOhtBjrC5nI26X/676DPJEIGcdrNoZiil0uu79hkunP7V56OaHgUMtHv1Wj5bl66YEdR0gFhXyjbxPxe/onHer5jDo80Lc+Q= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1790108534; 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:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=CMj4KEXZfz4tiSaJe0KvxbeQ244z+EpGeq0s+eX68hY=; b=QhIA/c1eH764JrU1ThOmCytBz/7qFM/4qR9SeHu2aysF12bEOTjpJ18wX+LDKMiyBfs452yYSM8NpIKRtaNTq+isTpwnbjIEaJa3iyVACmGtvBd7g7pCbn4Hj8mN4B+PLVjapMNJ7XaBf8YpHPZ+wau6hT1ch4+L49uBmdHPAQc= 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 1790108534930600.9603963160256; Tue, 22 Sep 2026 13:22:14 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists1p.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1x96z5-0006pp-EY; Tue, 22 Sep 2026 16:21:00 -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 1x96yR-0005Re-FM for qemu-devel@nongnu.org; Tue, 22 Sep 2026 16:20:21 -0400 Received: from us-smtp-delivery-124.mimecast.com ([170.10.133.124]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1x96yO-0008CG-Vo for qemu-devel@nongnu.org; Tue, 22 Sep 2026 16:20:19 -0400 Received: from mx-prod-mc-08.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-332-t9jP9fpXNXaBhzJxBmf_oQ-1; Tue, 22 Sep 2026 16:20:14 -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-08.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id D6D44184B82E; Tue, 22 Sep 2026 20:20:13 +0000 (UTC) Received: from localhost (headnet03.pony-001.prod.iad2.dc.redhat.com [10.2.32.114]) by mx-prod-int-10.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id 1360441B; Tue, 22 Sep 2026 20:20:12 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1790108416; 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=CMj4KEXZfz4tiSaJe0KvxbeQ244z+EpGeq0s+eX68hY=; b=jVhar31EIevbbw8E6nx7synvwGuDg3yd+qj6KhzhH6bxXPYL1Sq6EWIeSw5BASCBTCcX1m k3eM31RAkRgwxryxeqBb3GQEaTo2e1sLKkfNSc7uacaqReeUpu5lPr22SjKhEMujR6w09h zpJwdCGxfQDwxlKn8pyydWwxhLHOmQ4= X-MC-Unique: t9jP9fpXNXaBhzJxBmf_oQ-1 X-Mimecast-MFC-AGG-ID: t9jP9fpXNXaBhzJxBmf_oQ_1790108414 From: =?utf-8?q?Marc-Andr=C3=A9_Lureau?= Date: Wed, 23 Sep 2026 00:17:25 +0400 Subject: [PATCH 18/88] qemu-iotests/copy-before-write: migrate away from HMP MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Message-Id: <20260923-nohmp-v1-18-ebc029d4bd80@redhat.com> References: <20260923-nohmp-v1-0-ebc029d4bd80@redhat.com> In-Reply-To: <20260923-nohmp-v1-0-ebc029d4bd80@redhat.com> To: qemu-devel@nongnu.org Cc: Kevin Wolf , =?utf-8?q?Marc-Andr=C3=A9_Lureau?= , Hanna Reitz , qemu-block@nongnu.org X-Developer-Signature: v=1; a=openpgp-sha256; l=10562; i=marcandre.lureau@redhat.com; h=from:subject:message-id; bh=gZ6eYAGzuabrd9QBiYidmKcCE4+jixZealXnUHXbfGs=; b=owEBbQKS/ZANAwAKAdro4Ql1lpzlAcsmYgBqsuKvhdwiIzt6gzPq3PVoFwhVI5TyO+cKMB1UT fRfp1jmIK2JAjMEAAEKAB0WIQSHqb2TP4fGBtJ29i3a6OEJdZac5QUCarLirwAKCRDa6OEJdZac 5YiyD/9fn6st++CdsMyJ+0zSwi9872eycqlPoOIMznJxA999GGBUhfIoANh9SIU90G7JPJzps1E E/qw3iBEfXYsRbss1PqWGFiYSg/sC7bq/CMWKyp5Uxt9nccBK0dsHCcTa0zAOHyBJEKFtjYI4Nl uojW0QdRjtyPyVbO5NDcAEti/C5s0FZZTNz3lkb7DMVMlX8pTuuDj0ipsPZXw/p/PMH8ENh0Va9 dIzZliAJvVp7VndTtMMj/w6BVKja0h3nutavNidq4uiy8ASKJhMA/K9qeclKQ/7xRialVRtuffF 5rken8cclHxomqpnNZtfcBV35BIxCq6BMtGJOvPSFJO7Fjl+nCAdUhczFsHKNZs+XdGqDX7jR+3 bKze1eeaq2IYaDkCtPC4USW5Mv4ujfOS5mO8fg9I6VioKsfLe6E+F/t+QltAYuNgt6b8LKTwgWc Y6sMBPEYAgD8Og2vHAJH4+DdCxe9UpqIefl5NAu/FDq+O7hKZrTAbN1SC6Fy0Ji7r7ygijgI4On ZnET6n+/f+KB3Y2Y24EGJAJv4WwKF+dCyXuooORZTxCNBFG8bujTn02f/OHF3K2VXBVXBCFwZA8 qwu9a0uzhJvZdRKdnaumGXi63brjKPO3YZpgs+ecV8zIaY8ubXqIIEE4UKlXsbUj9d4qMCK+mQ3 2oKYwGwm27+shKw== 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.133.124; envelope-from=marcandre.lureau@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 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_H3=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: 1790108536376158501 This test doesn't use iotests.VM presumably because it sets up qtest, conflicting with -machine none. Signed-off-by: Marc-Andr=C3=A9 Lureau --- tests/qemu-iotests/tests/copy-before-write | 130 +++++++++++++------------= ---- 1 file changed, 59 insertions(+), 71 deletions(-) diff --git a/tests/qemu-iotests/tests/copy-before-write b/tests/qemu-iotest= s/tests/copy-before-write index 5531ad8a4c0d..59ab96738d6d 100755 --- a/tests/qemu-iotests/tests/copy-before-write +++ b/tests/qemu-iotests/tests/copy-before-write @@ -32,6 +32,9 @@ size =3D '1M' =20 =20 class TestCbwError(iotests.QMPTestCase): + def qemu_io_result(self, res): + return iotests.filter_qemu_io(res['return']['human-readable-text']) + def tearDown(self): self.vm.shutdown() os.remove(temp_img) @@ -85,19 +88,14 @@ class TestCbwError(iotests.QMPTestCase): 'file': 'cbw' }) =20 - result =3D self.vm.qmp('human-monitor-command', - command_line=3D'qemu-io cbw "write 0 1M"') - write_res =3D result['return'] - - result =3D self.vm.qmp('human-monitor-command', - command_line=3D'qemu-io access "read 0 1M"') - read_res =3D result['return'] + write_res =3D self.vm.qmp('x-qemu-io', device=3D'cbw', + command=3D'write 0 1M') + read_res =3D self.vm.qmp('x-qemu-io', device=3D'access', + command=3D'read 0 1M') =20 self.vm.shutdown() - log =3D self.vm.get_log() - log =3D iotests.filter_qtest(log) - log =3D iotests.filter_qemu_io(log) - return log, write_res, read_res + self.assertEqual(self.vm.get_log(), '') + return write_res, read_res =20 def do_cbw_error_via_blockdev_backup(self, on_cbw_error=3DNone): self.vm.cmd('blockdev-add', { @@ -148,43 +146,37 @@ class TestCbwError(iotests.QMPTestCase): 'file': 'cbw' }) =20 - result =3D self.vm.qmp('human-monitor-command', - command_line=3D'qemu-io cbw "write 0 1M"') - write_res =3D result['return'] - - result =3D self.vm.qmp('human-monitor-command', - command_line=3D'qemu-io access "read 0 1M"') - read_res =3D result['return'] + write_res =3D self.vm.qmp('x-qemu-io', device=3D'cbw', + command=3D'write 0 1M') + read_res =3D self.vm.qmp('x-qemu-io', device=3D'access', + command=3D'read 0 1M') =20 self.vm.shutdown() - log =3D self.vm.get_log() - log =3D iotests.filter_qemu_io(log) - return log, write_res, read_res + self.assertEqual(self.vm.get_log(), '') + return write_res, read_res =20 def test_break_snapshot_on_cbw_error(self): """break-snapshot behavior: Guest write succeed, but further snapshot-read fails, as snapshot = is broken. """ - log, write_res, read_res =3D self.do_cbw_error('break-snapshot') - self.assertEqual(write_res, '') - self.assertIn('read failed: Permission denied', read_res) - - self.assertEqual(log, """\ + write_res, read_res =3D self.do_cbw_error('break-snapshot') + self.assertEqual(self.qemu_io_result(write_res), """\ wrote 1048576/1048576 bytes at offset 0 1 MiB, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec) """) + self.assertIn('read failed: Permission denied', + read_res['error']['desc']) =20 def test_break_guest_write_on_cbw_error(self): """break-guest-write behavior: Guest write fails, but snapshot-access continues working and furth= er snapshot-read succeeds. """ - log, write_res, read_res =3D self.do_cbw_error('break-guest-write') - self.assertIn('write failed: Input/output error', write_res) - self.assertEqual(read_res, '') - - self.assertEqual(log, """\ + write_res, read_res =3D self.do_cbw_error('break-guest-write') + self.assertIn('write failed: Input/output error', + write_res['error']['desc']) + self.assertEqual(self.qemu_io_result(read_res), """\ read 1048576/1048576 bytes at offset 0 1 MiB, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec) """) @@ -193,24 +185,24 @@ read 1048576/1048576 bytes at offset 0 """Ensure CBW filter accepts break-snapshot policy specified in blockdev-backup QMP command. """ - log, write_res, read_res =3D \ + write_res, read_res =3D \ self.do_cbw_error_via_blockdev_backup('break-snapshot') - self.assertEqual(write_res, '') - self.assertIn('read failed: Permission denied', read_res) - self.assertEqual(log, """\ + self.assertEqual(self.qemu_io_result(write_res), """\ wrote 1048576/1048576 bytes at offset 0 1 MiB, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec) """) + self.assertIn('read failed: Permission denied', + read_res['error']['desc']) =20 def test_break_guest_write_policy_forwarding(self): """Ensure CBW filter accepts break-guest-write policy specified in blockdev-backup QMP command. """ - log, write_res, read_res =3D \ + write_res, read_res =3D \ self.do_cbw_error_via_blockdev_backup('break-guest-write') - self.assertIn('write failed: Input/output error', write_res) - self.assertEqual(read_res, '') - self.assertEqual(log, """\ + self.assertIn('write failed: Input/output error', + write_res['error']['desc']) + self.assertEqual(self.qemu_io_result(read_res), """\ read 1048576/1048576 bytes at offset 0 1 MiB, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec) """) @@ -219,11 +211,11 @@ read 1048576/1048576 bytes at offset 0 """Ensure break-guest-write policy is used by default when on-cbw-error is not explicitly specified. """ - log, write_res, read_res =3D \ + write_res, read_res =3D \ self.do_cbw_error_via_blockdev_backup() - self.assertIn('write failed: Input/output error', write_res) - self.assertEqual(read_res, '') - self.assertEqual(log, """\ + self.assertIn('write failed: Input/output error', + write_res['error']['desc']) + self.assertEqual(self.qemu_io_result(read_res), """\ read 1048576/1048576 bytes at offset 0 1 MiB, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec) """) @@ -266,60 +258,56 @@ read 1048576/1048576 bytes at offset 0 'file': 'cbw' }) =20 - result =3D self.vm.qmp('human-monitor-command', - command_line=3D'qemu-io cbw "write 0 512K"') - write1_res =3D result['return'] + write1_res =3D self.vm.qmp('x-qemu-io', device=3D'cbw', + command=3D'write 0 512K') =20 # We need second write to trigger throttling - result =3D self.vm.qmp('human-monitor-command', - command_line=3D'qemu-io cbw "write 512K 512K"= ') - write2_res =3D result['return'] - - result =3D self.vm.qmp('human-monitor-command', - command_line=3D'qemu-io access "read 0 1M"') - read_res =3D result['return'] + write2_res =3D self.vm.qmp('x-qemu-io', device=3D'cbw', + command=3D'write 512K 512K') + read_res =3D self.vm.qmp('x-qemu-io', device=3D'access', + command=3D'read 0 1M') =20 self.vm.shutdown() log =3D self.vm.get_log() log =3D re.sub(r'^\[I \d+\.\d+\] OPENED\n', '', log) log =3D re.sub(r'\[I \+\d+\.\d+\] CLOSED\n?$', '', log) - log =3D iotests.filter_qemu_io(log) - return log, write1_res, write2_res, read_res + self.assertEqual(log, '') + return write1_res, write2_res, read_res =20 def test_timeout_break_guest(self): - log, write1_res, write2_res, read_res =3D \ + write1_res, write2_res, read_res =3D \ self.do_cbw_timeout('break-guest-write') - self.assertEqual(write1_res, '') + self.assertEqual(self.qemu_io_result(write1_res), """\ +wrote 524288/524288 bytes at offset 0 +512 KiB, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec) +""") # macOS and FreeBSD tend to represent ETIMEDOUT as # "Operation timed out", when Linux prefer # "Connection timed out" - write2_res =3D write2_res.replace('Operation timed out', - 'Connection timed out') - self.assertIn('write failed: Connection timed out', write2_res) - self.assertEqual(read_res, '') - self.assertEqual(log, """\ -wrote 524288/524288 bytes at offset 0 -512 KiB, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec) + write2_err =3D write2_res['error']['desc'].replace( + 'Operation timed out', 'Connection timed out') + self.assertIn('write failed: Connection timed out', write2_err) + self.assertEqual(self.qemu_io_result(read_res), """\ read 1048576/1048576 bytes at offset 0 1 MiB, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec) """) =20 def test_timeout_break_snapshot(self): - log, write1_res, write2_res, read_res =3D \ + write1_res, write2_res, read_res =3D \ self.do_cbw_timeout('break-snapshot') - self.assertEqual(write1_res, '') - self.assertEqual(write2_res, '') - self.assertIn('read failed: Permission denied', read_res) - self.assertEqual(log, """\ + self.assertEqual(self.qemu_io_result(write1_res), """\ wrote 524288/524288 bytes at offset 0 512 KiB, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec) +""") + self.assertEqual(self.qemu_io_result(write2_res), """\ wrote 524288/524288 bytes at offset 524288 512 KiB, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec) """) + self.assertIn('read failed: Permission denied', + read_res['error']['desc']) =20 =20 if __name__ =3D=3D '__main__': iotests.main(supported_fmts=3D['qcow2'], supported_protocols=3D['file'], - required_fmts=3D['copy-before-write'], - require_hmp=3DTrue) + required_fmts=3D['copy-before-write']) --=20 2.56.0.rc0.29.g47ce80527c56 From nobody Sat Sep 26 20:01:40 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=1790108458; cv=none; d=zohomail.com; s=zohoarc; b=CHCvJS7O2XuLLavF890kwYTje0zA5OPlo5gMMH5wdM6y/7aJ22zApxvyjivCgrhgE+/Dt/Igte+12INa5aVRMofcAVJ2pg2XdFbmafO7gbjVioSDwxVh0/C2aXTQ2NRE3qxWfee+iZsuymttRapJtE+6bKnszQY8AF/mtlIUnhY= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1790108458; 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:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=dhQjHRO6qWZ1O1wPhHBtI+lXselfh75tPs9LCDZGga4=; b=kWWN/Ixyqc6UhvLx2sIIcuTZ0QFjdQgEO5aXbQvIwcD0ifUy6vAfglJDZbuIV0OQn8xvzGdTqTye+xyWi/Haky7MEDYAP8z7rQcEs4tXbnOJ1SXbZ1MoEcf/M/EkCGs+qVKEO3Ytl7mLgvl1lzSitCEUTVonlqjAjUQtnHOQNfM= 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 1790108458657725.3522276801267; Tue, 22 Sep 2026 13:20:58 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists1p.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1x96yb-00065N-Fm; Tue, 22 Sep 2026 16:20:29 -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 1x96yW-0005oR-Qz for qemu-devel@nongnu.org; Tue, 22 Sep 2026 16:20:24 -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 1x96yV-0008Dd-0A for qemu-devel@nongnu.org; Tue, 22 Sep 2026 16:20:24 -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-645-6m61CBfeNCyK8PDdQD1yjw-1; Tue, 22 Sep 2026 16:20:18 -0400 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-06.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id 93FF81828AB1; Tue, 22 Sep 2026 20:20:17 +0000 (UTC) Received: from localhost (headnet03.pony-001.prod.iad2.dc.redhat.com [10.2.32.114]) by mx-prod-int-08.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id 9184B1800446; Tue, 22 Sep 2026 20:20:16 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1790108422; 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=dhQjHRO6qWZ1O1wPhHBtI+lXselfh75tPs9LCDZGga4=; b=GhWVvpP9gKRRF8RflOByPAAL4l0sawkuuQ0b8pKGsvLjpK96N+mJvhYRv1zOeoNx+gOhfj gehgyLRN7UKE/jXwICrKFFfM0X0UENQZeZbWtruXRDofsOcR7lERkFKTcH+Unn/B23XaCq YumnntNYToy5HbH3WUUe0JnzhhXvDk4= X-MC-Unique: 6m61CBfeNCyK8PDdQD1yjw-1 X-Mimecast-MFC-AGG-ID: 6m61CBfeNCyK8PDdQD1yjw_1790108417 From: =?utf-8?q?Marc-Andr=C3=A9_Lureau?= Date: Wed, 23 Sep 2026 00:17:26 +0400 Subject: [PATCH 19/88] qemu-iotests/132: migrate away from HMP MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Message-Id: <20260923-nohmp-v1-19-ebc029d4bd80@redhat.com> References: <20260923-nohmp-v1-0-ebc029d4bd80@redhat.com> In-Reply-To: <20260923-nohmp-v1-0-ebc029d4bd80@redhat.com> To: qemu-devel@nongnu.org Cc: Kevin Wolf , =?utf-8?q?Marc-Andr=C3=A9_Lureau?= , Hanna Reitz , qemu-block@nongnu.org X-Developer-Signature: v=1; a=openpgp-sha256; l=1105; i=marcandre.lureau@redhat.com; h=from:subject:message-id; bh=7eyieW/wITJ1M5v/DrsvYsKnJnzG3EuPfBVcjswiYjI=; b=owEBbQKS/ZANAwAKAdro4Ql1lpzlAcsmYgBqsuKv8AQBpJZ35TD9mUG/Oxlqz6rOBr22lln4P HOwa5NgaUWJAjMEAAEKAB0WIQSHqb2TP4fGBtJ29i3a6OEJdZac5QUCarLirwAKCRDa6OEJdZac 5SZ+D/47uNSjqKGbsQcLwXG6wVr+OlNzGxkPqo0fNelc8KatQWlz65xtdYMn+n6o4dcgIqSlN0r qKEHtOsLvIXfx/nj9kaJPzURVvlLgxmokoaq8+eHrDrntcq8q71xzthyXOLF7A+EHn3l/qmdw6z FJk8OL67cBZN10cMZ3fCEPxM6fOhtb+Op2eL7+cn5YASCos5uKxPWn1zoY1nPa5T/yB5mlfScGB Urv3AOW1tz8vQ5VGRndCPiMyjirEjhcarXaEKJVO6JSyMKIJGa2iBRoszZdX9wAMXgs9CxSXghc 2MW7lXAW5UbwFrP4va/NdwgZozpnk2FUFQqLQKhOU/g4/cBgmlNrFxbgNRh7KHhKr7NGWlDkrsA 9+Ha4RHyr7XX3UvuUo6DvUsQF+mafPTd9BQDbUlT15FKDAjqvq8mTb0j9WUmRVDJ7G5gNoZ1PkZ bqLzNSTTw8MyYJMBUUqb7f+4UGLjP59IwyFhSNHfVB0mm+0hfVn+7U+DywkuDBTaCOhxHi04qgn DYPNiNDtprLeoPA7/O9fRLcUiKRk5TvpMSsdGpMbQ493JFoIj6l5u9PEI4GOhZNul1ZIvHABIKG L/w20XJJHoMlRhY8sNhtP+8dBofwG0RocBEB877Pb7Bma4DG9Cm453F8KOEqIUd/aNiGrLpUd8V g4jXAt4z+UM9t5g== X-Developer-Key: i=marcandre.lureau@redhat.com; a=openpgp; fpr=87A9BD933F87C606D276F62DDAE8E10975969CE5 X-Scanned-By: MIMEDefang 3.4.1 on 10.30.177.111 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: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 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, SPF_HELO_PASS=-0.001, SPF_PASS=-0.001 autolearn=unavailable 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: 1790108459780158500 Signed-off-by: Marc-Andr=C3=A9 Lureau --- tests/qemu-iotests/132 | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/tests/qemu-iotests/132 b/tests/qemu-iotests/132 index 3756573a57c0..579f6a3bdd09 100755 --- a/tests/qemu-iotests/132 +++ b/tests/qemu-iotests/132 @@ -49,7 +49,7 @@ class TestSingleDrive(iotests.QMPTestCase): def test_mirror_discard(self): self.vm.cmd('drive-mirror', device=3D'drive0', sync=3D'full', target=3Dtarget_img) - self.vm.hmp_qemu_io('drive0', 'discard 0 64k') + self.vm.qmp_qemu_io('drive0', 'discard 0 64k') self.complete_and_wait('drive0') self.vm.shutdown() self.assertTrue(iotests.compare_images(test_img, target_img), @@ -57,5 +57,4 @@ class TestSingleDrive(iotests.QMPTestCase): =20 if __name__ =3D=3D '__main__': iotests.main(supported_fmts=3D['raw', 'qcow2'], - supported_protocols=3D['file'], - require_hmp=3DTrue) + supported_protocols=3D['file']) --=20 2.56.0.rc0.29.g47ce80527c56 From nobody Sat Sep 26 20:01:40 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=1790108593; cv=none; d=zohomail.com; s=zohoarc; b=QyE3om8GyUpyS+0LaIncf4fZtEjdpEaQJYoBb23JMyEaereLEUgtunZsYgRtqw0RHypIPapYPfDULNZScgIFb4OmHGCaXP/3SjcxbHzZ6hGo6ThA4dBR/8jnKQHdt/F90dsWOD7hpQO+lSmI/LpLK8ijjRV4ULwzQxgknA+wPyw= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1790108593; 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:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=uR0XPyXe0XDkCZ1aDXvNQKAOZQRc93eKEqjT8vUZN7w=; b=VbSfyvozqSDTya3XcxfDCxDVKISMsyBrm5+2/4Pj43fmSe98nclzHXrGuKar1DSkUE1u3I0caw0kWs+JcP2ZfBi1WSJBYQlTx2hny6ItEdQVcUSirHZVIMoDhd1AUlV4nIS4DLopA2y6KcERB8UIjwO9omdWx/BDKQK7wZ4f0KM= 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 1790108593750235.59423383943556; Tue, 22 Sep 2026 13:23:13 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists1p.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1x96z7-0006zn-GN; Tue, 22 Sep 2026 16:21:01 -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 1x96yX-0005tT-U7 for qemu-devel@nongnu.org; Tue, 22 Sep 2026 16:20:26 -0400 Received: from us-smtp-delivery-124.mimecast.com ([170.10.133.124]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1x96yW-0008Dm-2l for qemu-devel@nongnu.org; Tue, 22 Sep 2026 16:20:25 -0400 Received: from mx-prod-mc-05.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-370-k1ty7KX4N_-JUngWzuoNcw-1; Tue, 22 Sep 2026 16:20:21 -0400 Received: from mx-prod-int-01.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-01.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.4]) (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-05.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id D24C119772E0; Tue, 22 Sep 2026 20:20:20 +0000 (UTC) Received: from localhost (headnet03.pony-001.prod.iad2.dc.redhat.com [10.2.32.114]) by mx-prod-int-01.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id 06B373000223; Tue, 22 Sep 2026 20:20:19 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1790108423; 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=uR0XPyXe0XDkCZ1aDXvNQKAOZQRc93eKEqjT8vUZN7w=; b=Hx2Qg6jmBfmXbSml9/hvgXeLpysP5cYGjF+q4wiEIRfExWla9z3CZN2Dqd0TIGSogXCLAT oeNs+1WqI2XCWpFDPLVLzFgpS8tfsH1eCTXXO6aVNu0ryb8tdspNsan4E8wC42iSRPsE0y YeAgbqEMDafRFyiQyxY8ywnfVXfbcdc= X-MC-Unique: k1ty7KX4N_-JUngWzuoNcw-1 X-Mimecast-MFC-AGG-ID: k1ty7KX4N_-JUngWzuoNcw_1790108420 From: =?utf-8?q?Marc-Andr=C3=A9_Lureau?= Date: Wed, 23 Sep 2026 00:17:27 +0400 Subject: [PATCH 20/88] qemu-iotests/152: migrate away from HMP MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Message-Id: <20260923-nohmp-v1-20-ebc029d4bd80@redhat.com> References: <20260923-nohmp-v1-0-ebc029d4bd80@redhat.com> In-Reply-To: <20260923-nohmp-v1-0-ebc029d4bd80@redhat.com> To: qemu-devel@nongnu.org Cc: Kevin Wolf , =?utf-8?q?Marc-Andr=C3=A9_Lureau?= , Hanna Reitz , qemu-block@nongnu.org X-Developer-Signature: v=1; a=openpgp-sha256; l=1132; i=marcandre.lureau@redhat.com; h=from:subject:message-id; bh=rQHnLcpQ3QhJYge5M2jfPGIdeLJ1sVSbfbngwrhRV58=; b=owEBbQKS/ZANAwAKAdro4Ql1lpzlAcsmYgBqsuKvl5P0h5y3VCGGMXZ8KLb4Z+fgMwW41Qk6M FYpXH750cGJAjMEAAEKAB0WIQSHqb2TP4fGBtJ29i3a6OEJdZac5QUCarLirwAKCRDa6OEJdZac 5eXWD/4qT+r7CtMdFP4GpDjr5xIjJkKeP8Mcnt8VqUfHizSyUY4sxI0AKyx7L0doMinVM/Z0Hhv w8uwBLVk3TIoSAFGaNZa2JINmhQVNSqI1S8iYiQlSsCHo8BMZpSPK8dGQqZiIJucmi00YXbl8HE rSvava9zGE5pZFlZC8Z9gLEVBN+tyA1go5RO7UR66HlykSk6I4If1eYlvF13bbPAlYvMbq4zuki LxFULF8bhLSYdz0IveOS95EQ+UyugqPJlxm9bQ++TBaaL72ErUZVAVFpJdSbNCS7E9W+pwFeefe M6hVcR245ZlL4k4MwXJosYoiMttAEWvwaWIEzdHCTFaDALAVDek9i3NQyR0RNCEnCCzJhF9sSVF fo4QDGD82X3/H1kj0VZJiqAUGUd2YIkth29rseYhKzdlaZtMk22YBt87JLIqCyaQKUEib3+915r 2UZa2Z8Bqx2J1o9MtQYw6yc9/1XX3Txt7VW1FTzLRUaywtsn05DjseNwwXFWvcXeg+U180F0NTI GkUuZ83w1fNnd+TrTXPXUQEcmbW6V0YiE3UhdSNiE9BHvMyiGoDWZc9mWwg1v8DzCHPkHAlZTsn k6TK9j3/6855RrS2rvIMBMoMmq2s2mNtut8VkhgDsHXqPAwKmiHc8YlMwcPQn/PrFRcvkdwyHLg DcvAq8hZtOeaFjQ== X-Developer-Key: i=marcandre.lureau@redhat.com; a=openpgp; fpr=87A9BD933F87C606D276F62DDAE8E10975969CE5 X-Scanned-By: MIMEDefang 3.4.1 on 10.30.177.4 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.133.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_H3=0.001, RCVD_IN_MSPIKE_WL=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-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: 1790108594680158500 Signed-off-by: Marc-Andr=C3=A9 Lureau --- tests/qemu-iotests/152 | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/tests/qemu-iotests/152 b/tests/qemu-iotests/152 index d9170359213a..f25c706273a3 100755 --- a/tests/qemu-iotests/152 +++ b/tests/qemu-iotests/152 @@ -52,7 +52,7 @@ class TestUnaligned(iotests.QMPTestCase): self.vm.cmd('drive-mirror', device=3D'drive0', sync=3D'full', granularity=3D65536, target=3Dtarget_img) self.wait_ready() - self.vm.hmp_qemu_io('drive0', 'write 0 512') + self.vm.qmp_qemu_io('drive0', 'write 0 512') self.complete_and_wait(wait_ready=3DFalse) self.vm.shutdown() self.assertEqual(iotests.image_size(test_img), iotests.image_size(= target_img), @@ -61,5 +61,4 @@ class TestUnaligned(iotests.QMPTestCase): =20 if __name__ =3D=3D '__main__': iotests.main(supported_fmts=3D['raw', 'qcow2'], - supported_protocols=3D['file'], - require_hmp=3DTrue) + supported_protocols=3D['file']) --=20 2.56.0.rc0.29.g47ce80527c56 From nobody Sat Sep 26 20:01:40 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=1790108547; cv=none; d=zohomail.com; s=zohoarc; b=N+Z3eD1gfWOYDlbYGEAUYOV5IUNEhD+mZSPqgQEnPSJiBF3exoJ8NlRSrK2tgqm8Vu6T6o4p6QjRlWxg1Oe4xFm2blh1IJnkrmycLdPvdjxyawtGsBxRFF2F3nhEmFV9D+I+12Nvlj9XUXNjqKs3MxFUXxqeltexv0sO+kMXlA4= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1790108547; 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:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=jrtfu21CdEP6ZyTblZAk+CNFLsrij9QbZvxsWaJdcB8=; b=BQdouBEgGYzrI9AfWQD2BatQuZuKxh5/eFO+xxll3ycMGpbEuz9FF66t/oTu5ReRn0XoBujze45i7UfKYURU8LLLIJ6gyzM5LD2KR96RM/hYg/EQN6Z049X7pZxq8q5/n6xakN6IDIG/kiDWXJp5Xqnv5yXZYl1LlFf6DMoFbr4= 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 1790108547697774.2857874492598; Tue, 22 Sep 2026 13:22:27 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists1p.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1x96zD-0007Yz-HQ; Tue, 22 Sep 2026 16:21:08 -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 1x96yb-00066j-CY for qemu-devel@nongnu.org; Tue, 22 Sep 2026 16:20:29 -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 1x96yZ-0008EK-Ti for qemu-devel@nongnu.org; Tue, 22 Sep 2026 16:20:29 -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-549-QtylnnVEN2imHm8pKq6RUQ-1; Tue, 22 Sep 2026 16:20:25 -0400 Received: from mx-prod-int-06.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-06.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.93]) (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 8403E1800752; Tue, 22 Sep 2026 20:20:24 +0000 (UTC) Received: from localhost (headnet03.pony-001.prod.iad2.dc.redhat.com [10.2.32.114]) by mx-prod-int-06.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id 867811800370; Tue, 22 Sep 2026 20:20:23 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1790108427; 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=jrtfu21CdEP6ZyTblZAk+CNFLsrij9QbZvxsWaJdcB8=; b=DZpkOoIQJrA/1tigL2+g5Ahpxji6dZgjGUEyUIIoRBgimQB1QNgiamvmrpDeN0JVBQolII 6dKlDDvJOfb3LKR/Kgzy98BWF0jncW/+/W72S050wJd0EhWXlspUs9CIrtoMsnEkhfAg8X GCAnn7OIqgReEfQeYFeloRKQYRemMW0= X-MC-Unique: QtylnnVEN2imHm8pKq6RUQ-1 X-Mimecast-MFC-AGG-ID: QtylnnVEN2imHm8pKq6RUQ_1790108424 From: =?utf-8?q?Marc-Andr=C3=A9_Lureau?= Date: Wed, 23 Sep 2026 00:17:28 +0400 Subject: [PATCH 21/88] qemu-iotests/254: migrate away from HMP MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Message-Id: <20260923-nohmp-v1-21-ebc029d4bd80@redhat.com> References: <20260923-nohmp-v1-0-ebc029d4bd80@redhat.com> In-Reply-To: <20260923-nohmp-v1-0-ebc029d4bd80@redhat.com> To: qemu-devel@nongnu.org Cc: Kevin Wolf , =?utf-8?q?Marc-Andr=C3=A9_Lureau?= , Hanna Reitz , qemu-block@nongnu.org X-Developer-Signature: v=1; a=openpgp-sha256; l=1024; i=marcandre.lureau@redhat.com; h=from:subject:message-id; bh=X4DKkNJpiHkKAdxVmkQ/lkxp6RZzLg27sd897LDL1D0=; b=owEBbAKT/ZANAwAKAdro4Ql1lpzlAcsmYgBqsuKv3O8lUMpUa+cfPatWanfa+7D/1pmuoH2Di 9qyjp33kkWJAjIEAAEKAB0WIQSHqb2TP4fGBtJ29i3a6OEJdZac5QUCarLirwAKCRDa6OEJdZac 5SIyD/dN9VAW67R05KYhdgYQ3nXn+O7YVFhHiP7ePB9y7pbwVIIRCXWG+8oUcrXQFV0YMT+qorA CSujIxe05kIi13JpM7OiS2rH+14l4WV7jdu81L8pUieRI9JcypJ52Rj5xnPQL6BlGVNPU5JXxo0 7zWgSsKO2EeI7AbhrQFJhJrcp/YmVCDQKNGbZJBs8B9IjV5um89j4D/6HN6JzJgDC6RUD5Imcd/ F5w0iGVpKnVkMGYJXoLHcAifNnurzZQZPHN+jI5N/BYmY6T+6zLM/2PLDgOq5YfA4StJr3tqssM XaFLA98/gzjnCHXqjPs03ZAVCFfPO6FkomjmKgxox71TOYJyLfYUFB9cVxACkymRIUdS3TXi97C RKsxgdwLGJZzyNJr5RQwyXdiytFhNAg9AnxYFbVPwgD507atV7jr031Y6YAncTuoU+sfURgTaS4 UU5E+bWdkO/2G9r77IA0BgFjysa97ZLie/SJmALmYtcvz0zGc3L1YVvqdSjeipIoXnMiHoJo1sO zEVstj2vBGKhU7+a3FaKXPzxZYZYpvJzk1QTJbzHjmXqLH9bKq45dTr9pWVPUPUqQoszlnpqlym KfQ4mJFP9yIobh09x4kX40bY3SavmRzEDQBsfTS3gYTfESZ0snVzK3zbYKH2y188q9+22E3H7aT ahbmApEN/j0ci X-Developer-Key: i=marcandre.lureau@redhat.com; a=openpgp; fpr=87A9BD933F87C606D276F62DDAE8E10975969CE5 X-Scanned-By: MIMEDefang 3.4.1 on 10.30.177.93 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: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 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, 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: 1790108548261158500 Signed-off-by: Marc-Andr=C3=A9 Lureau --- tests/qemu-iotests/254 | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tests/qemu-iotests/254 b/tests/qemu-iotests/254 index d3d18a1bbf1f..0f49548b6226 100755 --- a/tests/qemu-iotests/254 +++ b/tests/qemu-iotests/254 @@ -24,7 +24,7 @@ from iotests import qemu_img_create, file_path, log =20 iotests.script_initialize(supported_fmts=3D['qcow2'], unsupported_imgopts=3D['compat'], - require_hmp=3DTrue) +) =20 disk, top =3D file_path('disk', 'top') size =3D 1024 * 1024 @@ -40,7 +40,7 @@ vm.qmp_log('block-dirty-bitmap-add', node=3D'drive0', nam= e=3D'bitmap1', vm.qmp_log('block-dirty-bitmap-add', node=3D'drive0', name=3D'bitmap2', persistent=3DTrue) =20 -vm.hmp_qemu_io('drive0', 'write 0 512K') +vm.qmp_qemu_io('drive0', 'write 0 512K') =20 vm.qmp_log('transaction', indent=3D2, actions=3D[ {'type': 'blockdev-snapshot-sync', --=20 2.56.0.rc0.29.g47ce80527c56 From nobody Sat Sep 26 20:01:40 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=1790108627; cv=none; d=zohomail.com; s=zohoarc; b=CRG+teH1eXqHsyeHcLSyMVfSeaTJ7gr7vkZ4BStk9V0Sh0N8yg95mZRjM7pWHgra0UFoviLFJ4TvEc1qIv/z0bNZRDvXbJHT3u7HDMiFZgR3QDSgmr335SY7g5EsNXSI7MZ0e7R8P1/SWRKjjIlbh+If+3cIg24xItGtjM/tlV8= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1790108627; 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:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=NubHi+pakNXPfkzbcYdUVILijVzX9mm7dOPZZmw6AIc=; b=CcpJYrVXaL7wu6c1Ena1/WTNqt/bWi/+NV4hhNxVmfjntAiDpWCHuNi78ZnnwdbC5/OGz0e/joNCbOMWTD68Cvlo2NmZQKxpWXezsjM12Hj2lQdJCN72SNOutESSruq/CkRARbsLqKK8NzbnBNut3RN54KZDj2hWqKJuvhHoJ1g= 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 1790108627738916.3757382962872; Tue, 22 Sep 2026 13:23:47 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists1p.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1x96z9-0007Cq-LK; Tue, 22 Sep 2026 16:21:04 -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 1x96ye-0006Bt-QA for qemu-devel@nongnu.org; Tue, 22 Sep 2026 16:20:33 -0400 Received: from us-smtp-delivery-124.mimecast.com ([170.10.133.124]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1x96yd-0008MM-AK for qemu-devel@nongnu.org; Tue, 22 Sep 2026 16:20:32 -0400 Received: from mx-prod-mc-08.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-540-CvPMqxxKNLGlCnScHLNlKA-1; Tue, 22 Sep 2026 16:20:29 -0400 Received: from mx-prod-int-05.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-05.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.17]) (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-08.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id D78D4185FD06; Tue, 22 Sep 2026 20:20:27 +0000 (UTC) Received: from localhost (headnet03.pony-001.prod.iad2.dc.redhat.com [10.2.32.114]) by mx-prod-int-05.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id E76D71956095; Tue, 22 Sep 2026 20:20:26 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1790108430; 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=NubHi+pakNXPfkzbcYdUVILijVzX9mm7dOPZZmw6AIc=; b=JfWQNT1XKH5/+466f6OctKhEi5jOkGt/Iuje6Rabnj1kWhXT0sdpNyz90Bs728viqeqcJw IGYr5Ee2KqZ2OqDTnixxrXDj2yb8sBHdWUtU9QYkc8Fk9S/nfEMN9gPYaRqWo4BXBD9tXX fzC6Be+RUz/4quSfVGG5deP/Yb5Fj2g= X-MC-Unique: CvPMqxxKNLGlCnScHLNlKA-1 X-Mimecast-MFC-AGG-ID: CvPMqxxKNLGlCnScHLNlKA_1790108428 From: =?utf-8?q?Marc-Andr=C3=A9_Lureau?= Date: Wed, 23 Sep 2026 00:17:29 +0400 Subject: [PATCH 22/88] qemu-iotests/264: migrate away from HMP MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Message-Id: <20260923-nohmp-v1-22-ebc029d4bd80@redhat.com> References: <20260923-nohmp-v1-0-ebc029d4bd80@redhat.com> In-Reply-To: <20260923-nohmp-v1-0-ebc029d4bd80@redhat.com> To: qemu-devel@nongnu.org Cc: Kevin Wolf , =?utf-8?q?Marc-Andr=C3=A9_Lureau?= , Hanna Reitz , qemu-block@nongnu.org X-Developer-Signature: v=1; a=openpgp-sha256; l=1000; i=marcandre.lureau@redhat.com; h=from:subject:message-id; bh=iPKD5bVUcdc3VcVaoNHWqoMNvay9dIJd6LmpfXzUzEA=; b=owEBbQKS/ZANAwAKAdro4Ql1lpzlAcsmYgBqsuKv4u0jmPQzHGWmCboKbs2mWxS6gov1aPNrQ 3rBW9ABoRSJAjMEAAEKAB0WIQSHqb2TP4fGBtJ29i3a6OEJdZac5QUCarLirwAKCRDa6OEJdZac 5XRPD/9sKeHb8OVWq8d9kMP3agXN+Y2+4lLJkT4XAUapn1+Zror+VG73HnzNtVAGAKirM6vLVui eGUurPc0s9UEK0mmQMT5Jcw6jY1eBmlungNRCCUSLd+ct1xCDXSy8X6RGdOncXTbvh6Nte6dxqE hPoEZbFOBk2IIca+VgPpyCFMFyeX3YMOeSQrHovrtwuih0Jjj0DlpM6p4U6+QamWv0p9mX3dkAu ii1QUvDP/692cR+6Yx66LRvClYaNRq9hJcckGLEyDeUuNBgsYaTPV+goyAZA9qvJuItAlXE/kU+ 0dX7GTGdy5gljBlRbfLMPx3/wQy8GPjapDZ88rt6cx+Govcy5hmULZE3DAEk/NrkeUHegf/FnI0 C57LnoAjroSDf4zD1fi0qjAnSr6ufE2sFgE4ctq4Z7Z9bK6hYMhdu2ccn8K8POensjYQ9b9+AO2 nD5Aq6tPXgw6jYnr46C00eF6NZ2MnDJvR5r9Ys0TGB4sUS7hEGwXIEAF5wnjb4mEPoFLBQc88w9 esIia561Wiwlc5IP/zsk8PyhGaiLhq97RDoHgbLEoLl3Z4RxScb0msjGZ8HlP8Xn6IOQBhlnPjW v5yXSl+ongmwzqg9lp2aOn8h7qarxihdW8VpGZuzbY0K1l3sPFDWQtUgBgm1wnuoU3oqrXCHy81 fBDbM7XiadWje3Q== X-Developer-Key: i=marcandre.lureau@redhat.com; a=openpgp; fpr=87A9BD933F87C606D276F62DDAE8E10975969CE5 X-Scanned-By: MIMEDefang 3.0 on 10.30.177.17 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.133.124; envelope-from=marcandre.lureau@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 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_H3=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: 1790108628740158500 Signed-off-by: Marc-Andr=C3=A9 Lureau --- tests/qemu-iotests/264 | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/tests/qemu-iotests/264 b/tests/qemu-iotests/264 index b621f11ab427..4b1fb67e1b4b 100755 --- a/tests/qemu-iotests/264 +++ b/tests/qemu-iotests/264 @@ -38,7 +38,7 @@ class TestNbdReconnect(iotests.QMPTestCase): qemu_img_create('-f', iotests.imgfmt, disk_b, str(disk_size)) self.vm =3D iotests.VM().add_drive(disk_a) self.vm.launch() - self.vm.hmp_qemu_io('drive0', 'write 0 {}'.format(disk_size)) + self.vm.qmp_qemu_io('drive0', 'write 0 {}'.format(disk_size)) =20 def tearDown(self): self.vm.shutdown() @@ -114,5 +114,4 @@ class TestNbdReconnect(iotests.QMPTestCase): =20 =20 if __name__ =3D=3D '__main__': - iotests.main(supported_fmts=3D['qcow2'], - require_hmp=3DTrue) + iotests.main(supported_fmts=3D['qcow2']) --=20 2.56.0.rc0.29.g47ce80527c56 From nobody Sat Sep 26 20:01:40 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=1790108539; cv=none; d=zohomail.com; s=zohoarc; b=dBYtZQW6neyQdBiXAz7MGs70ckcts4UC0zn9qWakd6GlSjVPScBCMVWdT4VDZIUVEHIC+FPRflDoZZ4uqz7t/kM0EGYOWkutbp7breIdEP1fQHjBobTsmnLB2n0GJZZEL9YNN9+NHHppCnKisUUWmxUXhyMQwaW5aj4sLnVW928= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1790108539; 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:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=CHEdj0GcnlcxwiOqQpGnbPXCAuaqrAXYLKJuueRJRsc=; b=cQyyrTNGikFEUu53Gwou0EKnDTKbjtJu6xOtd17HV2mlSFD8ETqWJvcS/7B7aHO3/gJMvU1rPodb3q1lsHVqsrF/L3J+pTxhDP5+8ldLX2YYJdO+P/+tTmse9RasVvk8jdl+g08WY6JWoFEkIZJSMYYRavfxMcLpeveoRPCijbA= 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 1790108539834181.11941445961224; Tue, 22 Sep 2026 13:22:19 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists1p.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1x96z5-0006po-Dw; Tue, 22 Sep 2026 16:20:59 -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 1x96yj-0006Em-Ce for qemu-devel@nongnu.org; Tue, 22 Sep 2026 16:20:44 -0400 Received: from us-smtp-delivery-124.mimecast.com ([170.10.133.124]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1x96yg-0008Q4-JT for qemu-devel@nongnu.org; Tue, 22 Sep 2026 16:20:36 -0400 Received: from mx-prod-mc-08.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-594-4QAPbNwDNpWp-2KtOjXr-g-1; Tue, 22 Sep 2026 16:20:32 -0400 Received: from mx-prod-int-03.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-03.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.12]) (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-08.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id CA4EB180AA59; Tue, 22 Sep 2026 20:20:31 +0000 (UTC) Received: from localhost (headnet03.pony-001.prod.iad2.dc.redhat.com [10.2.32.114]) by mx-prod-int-03.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id BD8BB1956087; Tue, 22 Sep 2026 20:20:30 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1790108434; 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=CHEdj0GcnlcxwiOqQpGnbPXCAuaqrAXYLKJuueRJRsc=; b=Av0SGR/TaSJL1U+B40qHfTMTuZlYuCGRbXHPp4ehzpRAlqg3hUM3T6xHQVjOlK05bxjymB /ikur37oW6mMUdrpuyI5EQ8LorzJFhTD4NxnYCEgBIMNoaKjGLdHiHcATjbFWacZt8aXcW fXESqfjBgxp/X+AxJsiZ4hSY3rLkeTg= X-MC-Unique: 4QAPbNwDNpWp-2KtOjXr-g-1 X-Mimecast-MFC-AGG-ID: 4QAPbNwDNpWp-2KtOjXr-g_1790108431 From: =?utf-8?q?Marc-Andr=C3=A9_Lureau?= Date: Wed, 23 Sep 2026 00:17:30 +0400 Subject: [PATCH 23/88] qemu-iotests/304: migrate away from HMP MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Message-Id: <20260923-nohmp-v1-23-ebc029d4bd80@redhat.com> References: <20260923-nohmp-v1-0-ebc029d4bd80@redhat.com> In-Reply-To: <20260923-nohmp-v1-0-ebc029d4bd80@redhat.com> To: qemu-devel@nongnu.org Cc: Kevin Wolf , =?utf-8?q?Marc-Andr=C3=A9_Lureau?= , Hanna Reitz , qemu-block@nongnu.org X-Developer-Signature: v=1; a=openpgp-sha256; l=1146; i=marcandre.lureau@redhat.com; h=from:subject:message-id; bh=hmBewzLbF0f7RzCbRQBkfnH1HJvAU9WW8KV+10yYRBE=; b=owEBbQKS/ZANAwAKAdro4Ql1lpzlAcsmYgBqsuKvS1StbXDHOwGqP0AO7idlgEYVybvOO1cYw 3WQxc0rHvmJAjMEAAEKAB0WIQSHqb2TP4fGBtJ29i3a6OEJdZac5QUCarLirwAKCRDa6OEJdZac 5e9jD/wKarRDoNIIn7l2FmfldJ8dWy+K/NL48bNs7Uj9G22FB6bl3sfZUeq5seTLSAvlubs4qFu KWeVa8EZ/TJkqtDmZK2LdExbSk/UxrBexMJT0/gM08xYCLMir+0Ha9vplsoAGAIslVLZyt42N0v EqCAu6mXWGftE5XWnGrU0NKWvcWBuiP443kt3JiLdyjIefNyIZNmxv4WKehUW0YlKg40vU0eLja Wm+RzaD0KcnuoHguLawT+Sse5a7HswpLndoAZPQczszKzDtkqmatSJKA78s5WyM7316qQtN8PU9 puHYiq2tqtp0C4kFP7ZnSgcP5Bi8GYZK+2NXe/uEzYkw2cl0FZqZnlAwxA3W91gHPmHTvK6sQJw 3OBzipycBlnht7XkgJ5d2NUma9g/jXJWgd88bOlJ2cL07OSu3F8rIBeWvbF+wi82YJ+rSgDke3B hxus32XATSriUfGx+OU7FcmLatx/wwh+u680pJ2IaRSTlkafTU6E3nXq+jxKa6wXJwApsZy9W4K TNC84H4nEos4wRc1IsMNB3uhLG1Oa3fWFdpCribHbmBnJbZRJpFILVbahlesVA3BKj6BuQwnygQ aSKLZf44l8nSVOhPeJm/WGXZ6rbix46XouiTt53HlOaN9S3bCEWY0cSXf+E76koKlaIRxDRQbBU ipMXkXMGR0CmUTw== X-Developer-Key: i=marcandre.lureau@redhat.com; a=openpgp; fpr=87A9BD933F87C606D276F62DDAE8E10975969CE5 X-Scanned-By: MIMEDefang 3.0 on 10.30.177.12 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.133.124; envelope-from=marcandre.lureau@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 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_H3=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: 1790108540217158500 Signed-off-by: Marc-Andr=C3=A9 Lureau --- tests/qemu-iotests/304 | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/tests/qemu-iotests/304 b/tests/qemu-iotests/304 index 03c7c1cbe3c8..2447fca99dbf 100755 --- a/tests/qemu-iotests/304 +++ b/tests/qemu-iotests/304 @@ -24,8 +24,7 @@ import iotests from iotests import qemu_img_create, qemu_img_log, file_path =20 iotests.script_initialize(supported_fmts=3D['qcow2', 'parallels'], - supported_protocols=3D['file'], - require_hmp=3DTrue) + supported_protocols=3D['file']) =20 test_img =3D file_path('test.qcow2') target_img =3D file_path('target.qcow2') @@ -41,8 +40,8 @@ vm =3D iotests.VM().add_drive(test_img) vm.launch() =20 # write to the entire image -vm.hmp_qemu_io('drive0', 'write -P0x16 0 4096'); -vm.hmp_qemu_io('drive0', 'write -P0x17 4096 1'); +vm.qmp_qemu_io('drive0', 'write -P0x16 0 4096'); +vm.qmp_qemu_io('drive0', 'write -P0x17 4096 1'); =20 # do backup and wait for completion vm.qmp('drive-backup', **{ --=20 2.56.0.rc0.29.g47ce80527c56 From nobody Sat Sep 26 20:01:40 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=1790108657; cv=none; d=zohomail.com; s=zohoarc; b=NXcX8XC4czChVjplA+S3PagAee40XWm7Pri/wV2FlVwzabzQ0EYpMpVagCu341YQXGjXwycnE8Z+ENOO37dkO1mUE3dZRoy6PEnwQi+ypPonkEnl/k6JmVOIy0rVdTo4BasXXiX4YbHwudooth/7+dIQqsdOx7uUKQYUF3iknWo= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1790108657; 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:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=k0apT/gXx7rU8wyQb5f0m3GWi6qWdtJHX1UbVLCJ6kc=; b=R1CRG6jSMx2PdhAX2NSTIfCi/xrIv/vby9WA0fGHHgmbzBB0oddIHoNmUSZiBuBdy6awlwqgsOd5gKp/JfFfjzVqiRyX5BTbQWQ7Bmo0YXPoHmyMnXrHCnf8YHc5MnixKyekT8bupUViM44wJF99TOFWuf7EA46/0tEhmDah+8s= 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 17901086572971002.2968944607799; Tue, 22 Sep 2026 13:24:17 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists1p.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1x96z8-00073M-Hg; Tue, 22 Sep 2026 16:21:02 -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 1x96yp-0006FT-6u for qemu-devel@nongnu.org; Tue, 22 Sep 2026 16:20:44 -0400 Received: from us-smtp-delivery-124.mimecast.com ([170.10.133.124]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1x96ym-0008Qx-Oj for qemu-devel@nongnu.org; Tue, 22 Sep 2026 16:20:42 -0400 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-622-4DOz1Xv3MSmaRWcuHmZtoA-1; Tue, 22 Sep 2026 16:20:36 -0400 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 9956A1944AA8; Tue, 22 Sep 2026 20:20:35 +0000 (UTC) Received: from localhost (headnet03.pony-001.prod.iad2.dc.redhat.com [10.2.32.114]) by mx-prod-int-08.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id 8C57D1800446; Tue, 22 Sep 2026 20:20:34 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1790108440; 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=k0apT/gXx7rU8wyQb5f0m3GWi6qWdtJHX1UbVLCJ6kc=; b=Z9JSrwTpeb1kRY9npykny9B791pA/jBZMyEtJUI1hbs3w8GCmrF20vSeB0SwLGaTKIORxQ 6hZb4Kb11yeCWMfCT9FRUlgbmKAlaEjtWR3Xpg3E0muabXzfBC+Kq7dcKP10lcOswH4wiE qZXjxnn/VuFDbUP+v726Kb2jeAEidTc= X-MC-Unique: 4DOz1Xv3MSmaRWcuHmZtoA-1 X-Mimecast-MFC-AGG-ID: 4DOz1Xv3MSmaRWcuHmZtoA_1790108435 From: =?utf-8?q?Marc-Andr=C3=A9_Lureau?= Date: Wed, 23 Sep 2026 00:17:31 +0400 Subject: [PATCH 24/88] qemu-iotests/300: replace hmp_qemu_io with qmp MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Message-Id: <20260923-nohmp-v1-24-ebc029d4bd80@redhat.com> References: <20260923-nohmp-v1-0-ebc029d4bd80@redhat.com> In-Reply-To: <20260923-nohmp-v1-0-ebc029d4bd80@redhat.com> To: qemu-devel@nongnu.org Cc: Kevin Wolf , =?utf-8?q?Marc-Andr=C3=A9_Lureau?= , Hanna Reitz , qemu-block@nongnu.org X-Developer-Signature: v=1; a=openpgp-sha256; l=882; i=marcandre.lureau@redhat.com; h=from:subject:message-id; bh=H+WsH3KZNTmX6EScia3y63CWp6drQdJUQvzqi6FpLN8=; b=owEBbQKS/ZANAwAKAdro4Ql1lpzlAcsmYgBqsuKva5FNfURg2r7PvyMngk3E397MhrYNVXhG+ dShVsiO9ISJAjMEAAEKAB0WIQSHqb2TP4fGBtJ29i3a6OEJdZac5QUCarLirwAKCRDa6OEJdZac 5X6tD/4gNIFRunYWHEvZ917aGUJjzc5MiKw4KVn2E66Uey0WVT2ubuWdPZcnMFBSHaISsdrnXTb PGPAQfWxqdbxHLRhJxX7CzqMA9lut5tcBoladKxACXw9dH4s1Lep5M5HhZ8KfiJTTzc3HXNsMn0 rYhDnpfo0xt1WmMvOSFqp1ooSChzL42yxOycQOXBKC7WTycUlcJI3FDAm6ZtgJQnBm5NqnZOrl5 Qp7A4XT/Od7u+M+C3IbdDv80dZ9X5DhG3QNdEt/wAHXztMFAz3F2Tw0aXg0XeNsmCYbGw65uLE8 gMf1dC5myqa98mUuD0oodjxYOH8JlAWSLRH/IzT1e4pDfoXVFLJJ1CAIbQ7hKM/FVjYczeR4f7N a2dIjsb6RVb0UTKv9xnhjvb9pi6OaXkEiHbuyelVF/qt/N1+7F5QZQEnbRQnMNaAsUSQnKlUIHF vrfuwPyEIQfWsvSLKwNVGGR4GZ3sVCtEoPvAB7x8jTJmjkolidKDqJd5G2OkOP25fpl69g+zCQw HxM5uIrWCj5oBFTbP3CQi25CWIYqjCmqM+fgwXqiKsjGMEhQO7d/+s0czDEmKC0NKApfC8gF68M DkWPC4+nlGO1+CKDnkVPquzPY+rhPvRPaS8cw88BVhR25me13IKbdAWqNL+5/wM3KItqr/9lpDf 9bXRqcbjCSVntgA== X-Developer-Key: i=marcandre.lureau@redhat.com; a=openpgp; fpr=87A9BD933F87C606D276F62DDAE8E10975969CE5 X-Scanned-By: MIMEDefang 3.4.1 on 10.30.177.111 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.133.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_H3=0.001, RCVD_IN_MSPIKE_WL=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-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: 1790108658866158500 There is still HMP usage left, addressed later. Signed-off-by: Marc-Andr=C3=A9 Lureau --- tests/qemu-iotests/300 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/qemu-iotests/300 b/tests/qemu-iotests/300 index df2ba326327d..bcc6fa972581 100755 --- a/tests/qemu-iotests/300 +++ b/tests/qemu-iotests/300 @@ -57,7 +57,7 @@ class TestDirtyBitmapMigration(iotests.QMPTestCase): # Dirty some random megabytes for _ in range(9): mb_ofs =3D random.randrange(1024) - self.vm_a.hmp_qemu_io(self.src_node_name, f'discard {mb_ofs}M = 1M') + self.vm_a.qmp_qemu_io(self.src_node_name, f'discard {mb_ofs}M = 1M') =20 result =3D self.vm_a.qmp('x-debug-block-dirty-bitmap-sha256', node=3Dself.src_node_name, --=20 2.56.0.rc0.29.g47ce80527c56 From nobody Sat Sep 26 20:01:40 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=1790108603; cv=none; d=zohomail.com; s=zohoarc; b=Kh17vhv4GU2wW1i+9wEyqG2FtwN5lGwBqftdrMsHp1aZZdUUcLg6MRrX5TplFWCwdh90bU9fQU9ACybIBC0AEtY7mNoz3mphIys4vn/0fNmcfB5yBV/2Cc2isDGosd1dwYCBEp4s0RBHS2C37WP7Iy7BqH4EVcWqq4kQJ4ceUjw= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1790108603; 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:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=P0XH0uLxI++XJ5Cay4xgn4RGFBykELuT80ck6dvsPn4=; b=f0QgH5otPCDfRwJ6UrG2OAXrAms/WO5+wX2CaCXTttHeIti4K1LGHNmFhc9zHiYaA6gWDDqnamL23BeafizZUAKSRWrA/TKJE+HJKvZCz7RN545cl128zpZUtkB+ckli0ht9+XU6WIEL9/Pm0g+N6SlWFV9ZFbwK/wmK/YexU0o= 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 17901086037911015.9471112944103; Tue, 22 Sep 2026 13:23:23 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists1p.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1x96zZ-0008N1-EE; Tue, 22 Sep 2026 16:21:30 -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 1x96yt-0006Oh-AC for qemu-devel@nongnu.org; Tue, 22 Sep 2026 16:20:50 -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 1x96yq-0008Rf-Ij for qemu-devel@nongnu.org; Tue, 22 Sep 2026 16:20:45 -0400 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-529-LvDF3dK1OomYuAzP1cRNHw-1; Tue, 22 Sep 2026 16:20:40 -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-03.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id 7C5F61944AA8; Tue, 22 Sep 2026 20:20:39 +0000 (UTC) Received: from localhost (headnet03.pony-001.prod.iad2.dc.redhat.com [10.2.32.114]) by mx-prod-int-10.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id 61BFC418; Tue, 22 Sep 2026 20:20:37 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1790108443; 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=P0XH0uLxI++XJ5Cay4xgn4RGFBykELuT80ck6dvsPn4=; b=Wg+lJ9LLD40/Oh1JqclMWG2/w5NYx2LpdoBW5HoTg/dZAi/WSkgqoDbV6+UQmr4GhuV8MJ akkYbUdISo8NfkeJ64aP8ciKKFayvXvq3+c9hYlBjw3w8N9nvSCHRcU2MnGfcRgBhf5Rt5 TAViShSX1Y0fCpXsG/lIgTNjh9AYnSg= X-MC-Unique: LvDF3dK1OomYuAzP1cRNHw-1 X-Mimecast-MFC-AGG-ID: LvDF3dK1OomYuAzP1cRNHw_1790108439 From: =?utf-8?q?Marc-Andr=C3=A9_Lureau?= Date: Wed, 23 Sep 2026 00:17:32 +0400 Subject: [PATCH 25/88] qemu-iotests/298: migrate away from HMP MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Message-Id: <20260923-nohmp-v1-25-ebc029d4bd80@redhat.com> References: <20260923-nohmp-v1-0-ebc029d4bd80@redhat.com> In-Reply-To: <20260923-nohmp-v1-0-ebc029d4bd80@redhat.com> To: qemu-devel@nongnu.org Cc: Kevin Wolf , =?utf-8?q?Marc-Andr=C3=A9_Lureau?= , Hanna Reitz , qemu-block@nongnu.org X-Developer-Signature: v=1; a=openpgp-sha256; l=1607; i=marcandre.lureau@redhat.com; h=from:subject:message-id; bh=PK60ryL7u5V0T+pSIiGWHm87fGvM3YmsFT8n1+/1cUE=; b=owEBbQKS/ZANAwAKAdro4Ql1lpzlAcsmYgBqsuKvtlx8WmIg6+69jZHhBtbZjKFKCg4MJWjXe 0QZVLPjFiqJAjMEAAEKAB0WIQSHqb2TP4fGBtJ29i3a6OEJdZac5QUCarLirwAKCRDa6OEJdZac 5SNQEACFuJRhPi03uozOYmWbcPnKiHd79QlfqfUFd1dZkojNNUixfOp/P5q73O/h/alRyztXrVZ deZNTrZXM8GmcanlX2biSYp9XDYvmVVH57secjfwy7yqubmY8hhYiXoLH3vcP3uZ7KHTsfkvTue hFL58vQwpDe9LLcjaphyX0bEEUMtm82cp5neYJoVk6cEAJwx6ZEOfdqI+qvPGrOiON2jS4lPcEu 8Uh61oVIsxmm8avTTJSSa9d9YsiaTc4SWQbLldywZuIi3zNvwDnEf2dzh1K2dE5qV0XobsT4X18 5IBxTlkLvRIOrlNGIp7GAD/5g8QAzbSu1Ia71YhoxDMxKg2AAbZcE7A4BQ/UJpHJjROBMv1CYap E4smxwNi22a6HzjB2H3/wY07qx1FV0ugefnRUKo4V5bi7e86p4WR5bJNq32IuuWSPlWkRWIrgtb sD94o3pLYH9vA21thtaIFtD8GW1cDS7oO/6R1rsyzyhS8xD+OYFLYS9ahtwxxC0Jy3T1GMw12vX L901qKce0QKs83pi/cy/NQltIFgWDNBfVJNnAmElZlzcDJp1CjaBXwJaefe4zrWCKfWuxk7tZp1 Q8zCvVhFps6EQ1eBXVwXaNfSLuZ2Q5wD9R04h4v8RTOFuNySet0dUKH/9e2zAmvLtOREkoeDZUt AH8FP6k2E4u+Kfw== 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: 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-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: 1790108604660158500 Signed-off-by: Marc-Andr=C3=A9 Lureau --- tests/qemu-iotests/298 | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/tests/qemu-iotests/298 b/tests/qemu-iotests/298 index f2b94077f43a..7258ae6f141f 100755 --- a/tests/qemu-iotests/298 +++ b/tests/qemu-iotests/298 @@ -74,7 +74,7 @@ class TestPreallocateFilter(TestPreallocateBase): super().tearDown() =20 def test_prealloc(self): - self.vm.hmp_qemu_io('drive0', 'write 0 1M') + self.vm.qmp_qemu_io('drive0', 'write 0 1M') self.check_big() =20 def test_external_snapshot(self): @@ -87,7 +87,7 @@ class TestPreallocateFilter(TestPreallocateBase): # on reopen to r-o base preallocation should be dropped self.check_small() =20 - self.vm.hmp_qemu_io('drive0', 'write 1M 1M') + self.vm.qmp_qemu_io('drive0', 'write 1M 1M') =20 self.vm.cmd('block-commit', device=3D'overlay') self.complete_and_wait() @@ -112,7 +112,7 @@ class TestPreallocateFilter(TestPreallocateBase): } }]) =20 - self.vm.hmp_qemu_io('drive0', 'write 0 1M') + self.vm.qmp_qemu_io('drive0', 'write 0 1M') self.assertTrue(os.path.getsize(disk) =3D=3D 25 * MiB) =20 =20 @@ -177,5 +177,4 @@ class TestTruncate(iotests.QMPTestCase): =20 =20 if __name__ =3D=3D '__main__': - iotests.main(supported_fmts=3D['qcow2'], required_fmts=3D['preallocate= '], - require_hmp=3DTrue) + iotests.main(supported_fmts=3D['qcow2'], required_fmts=3D['preallocate= ']) --=20 2.56.0.rc0.29.g47ce80527c56 From nobody Sat Sep 26 20:01:40 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=1790108898; cv=none; d=zohomail.com; s=zohoarc; b=TosGDZ0bLjice9c6QDDLJBNZiXfrZITIu38/Y+956WPaZQ8lST94jxI9HoSM99+COgNCuALyonOuPt+baY0opoOqsuJNn1BQMwTy9knyy3uRLmkAa3V/SEVZbCc+zVXS0mMmHC5rU5/0zzH7QMdMCnHtrKHfNPxSkRSlhC2I4PU= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1790108898; 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:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=oNTNz6KrVX/ozWfk5MRSWZBSIbp2YW2PBkhhWsFHwfw=; b=C6c1cqO9nsmzIdl8/yJFlgTufTSrJCGmM+rx1vyUrnPaF+/41u7g9LhuzPUPwsZiDQmYIwwP4TsxXdh8D3/oPkyCgdOuoZLILUCQbnC8j7rdZPzgzyL4bf5tJWoTK7A9DA56QD0/NcVt6iVHwLHD/jn5Xml9Bx1G2kIH4Il7gFk= 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 1790108898453790.9802627673154; Tue, 22 Sep 2026 13:28:18 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists1p.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1x96zK-00086G-Ev; Tue, 22 Sep 2026 16:21:14 -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 1x96yw-0006Q0-6A for qemu-devel@nongnu.org; Tue, 22 Sep 2026 16:20:52 -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 1x96yt-0008S9-Pm for qemu-devel@nongnu.org; Tue, 22 Sep 2026 16:20:49 -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-607-Cj3BAGVoO1KspDwTkS0c9A-1; Tue, 22 Sep 2026 16:20:43 -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 C37CC180059C; Tue, 22 Sep 2026 20:20:42 +0000 (UTC) Received: from localhost (headnet03.pony-001.prod.iad2.dc.redhat.com [10.2.32.114]) by mx-prod-int-10.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id 0135341D; Tue, 22 Sep 2026 20:20:41 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1790108447; 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=oNTNz6KrVX/ozWfk5MRSWZBSIbp2YW2PBkhhWsFHwfw=; b=EUiwpMjsPYXSXsT3/wVGngaZwcIb679sr8gS+Lp0+0Jp2kTRXiLFoftGZl0UMqV5OdzQg+ IPPC68sPtZXq9THfo2kZWE+6/ATyq1d7x7CUAIcSVVuKK4WltM3NPTfsEFfJL55CqOWQ5T UaB0sKUWmSIUY/dQgSWfJ8ZudUR046o= X-MC-Unique: Cj3BAGVoO1KspDwTkS0c9A-1 X-Mimecast-MFC-AGG-ID: Cj3BAGVoO1KspDwTkS0c9A_1790108442 From: =?utf-8?q?Marc-Andr=C3=A9_Lureau?= Date: Wed, 23 Sep 2026 00:17:33 +0400 Subject: [PATCH 26/88] qemu-iotests/056: migrate away from HMP MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Message-Id: <20260923-nohmp-v1-26-ebc029d4bd80@redhat.com> References: <20260923-nohmp-v1-0-ebc029d4bd80@redhat.com> In-Reply-To: <20260923-nohmp-v1-0-ebc029d4bd80@redhat.com> To: qemu-devel@nongnu.org Cc: Kevin Wolf , =?utf-8?q?Marc-Andr=C3=A9_Lureau?= , Hanna Reitz , qemu-block@nongnu.org X-Developer-Signature: v=1; a=openpgp-sha256; l=3653; i=marcandre.lureau@redhat.com; h=from:subject:message-id; bh=mUPtkQAbTTET8t6xkv0cjdeZxaf27wE7GZli+Z5Pbvk=; b=owEBbQKS/ZANAwAKAdro4Ql1lpzlAcsmYgBqsuKvSrC+nP6BxDJheoP2OltuNx4eU4IQpkoNo 16Q3btFDxGJAjMEAAEKAB0WIQSHqb2TP4fGBtJ29i3a6OEJdZac5QUCarLirwAKCRDa6OEJdZac 5YtID/wNzJ7cidxiRojJgwhFJEscG8xup0cMDpU2O5o4MMOoTtRjeWIU7HoHNkl+PNOCSQ0LjTV yTNHLqmozd0nnltkmvnoAgCNJrbtE1kTDUb1nzobi3gr1FSN2yLsjA0d/QKR4CoCTmm1G4//tA1 zGrLR6CIFy2Gs917QgVonIUVmQmi+6kzvA3+vqeiQxtU1S/2Pp6lLcnu17p3hNic/wHDFtHrt1h qetnTJye6Ebp5Kiq1Xb6+ChWHNe/Cg/fQda3IyyvjEe/G53WQWMmGBugdHkG4zPCjNtW9/Cbc49 rh1tncWql/FUtYm0mjbLmOYnOkrYGs6boawjlGx6DQF11mouIUJgNefq0zQaYIQnp+Fv3a/8zYY +OXY4BJlyxfmlPIiOxcddyMMzUzn5LHi+uQ1HHEbMhdaAIntilVRTvOfalqSN2/95BOBBIHAhOw fXtisD8KNmF1yC9F8ffQoelunE+D4QOBeexrjIcsKl++lbrD1hq2aDbMyUqU2JeNWUHtyd+ljYi yE5bOMI2hoJDAMybv6ZqApp40JXpEhz74ZLdPcmNjRbvj5Kzu5UEdbiUzTvhseAczWPXDtyNlqw teImFNHmy31CgrFlBgaOTTKqp2juQrU7ph75QNPSOJRcqdON8RFGfwcPTxT/xAxtz46RI+rzHcP 741ShoxYQGc+u1A== 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: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 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, SPF_HELO_PASS=-0.001, SPF_PASS=-0.001 autolearn=unavailable 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: 1790108900220158500 Signed-off-by: Marc-Andr=C3=A9 Lureau --- tests/qemu-iotests/056 | 21 ++++++++++----------- 1 file changed, 10 insertions(+), 11 deletions(-) diff --git a/tests/qemu-iotests/056 b/tests/qemu-iotests/056 index 7cc97486951c..b01b11522bb5 100755 --- a/tests/qemu-iotests/056 +++ b/tests/qemu-iotests/056 @@ -91,8 +91,8 @@ class TestSyncModesNoneAndTop(iotests.QMPTestCase): self.vm.cmd('drive-backup', device=3D'drive0', sync=3D'none', target=3Dtarget_img) time.sleep(1) - self.vm.hmp_qemu_io('drive0', 'write -P0x5e 0 512') - self.vm.hmp_qemu_io('drive0', 'aio_flush') + self.vm.qmp_qemu_io('drive0', 'write -P0x5e 0 512') + self.vm.qmp_qemu_io('drive0', 'aio_flush') # Verify that the original contents exist in the target image. =20 event =3D self.cancel_and_wait() @@ -119,7 +119,7 @@ class TestBeforeWriteNotifier(iotests.QMPTestCase): self.vm.cmd('block-job-pause', device=3D"drive0") # Speed is low enough that this must be an uncopied range, which w= ill # trigger the before write notifier - self.vm.hmp_qemu_io('drive0', 'aio_write -P 1 512512 512') + self.vm.qmp_qemu_io('drive0', 'aio_write -P 1 512512 512') self.vm.resume_drive("drive0") self.vm.cmd('block-job-resume', device=3D"drive0") event =3D self.cancel_and_wait() @@ -142,10 +142,10 @@ class BackupTest(iotests.QMPTestCase): try_remove(self.dest_img2) try_remove(self.ref_img) =20 - def hmp_io_writes(self, drive, patterns): + def qmp_io_writes(self, drive, patterns): for pattern in patterns: - self.vm.hmp_qemu_io(drive, 'write -P%s %s %s' % pattern) - self.vm.hmp_qemu_io(drive, 'flush') + self.vm.qmp_qemu_io(drive, 'write -P%s %s %s' % pattern) + self.vm.qmp_qemu_io(drive, 'flush') =20 def qmp_backup_and_wait(self, cmd=3D'drive-backup', serror=3DNone, aerror=3DNone, **kwargs): @@ -180,7 +180,7 @@ class BackupTest(iotests.QMPTestCase): =20 def test_overlapping_writes(self): # Write something to back up - self.hmp_io_writes('drive0', [('42', '0M', '2M')]) + self.qmp_io_writes('drive0', [('42', '0M', '2M')]) =20 # Create a reference backup self.qmp_backup_and_wait(device=3D'drive0', format=3Diotests.imgfm= t, @@ -201,7 +201,7 @@ class BackupTest(iotests.QMPTestCase): self.qmp_backup(device=3D'drive0', format=3Diotests.imgfmt, sync= =3D'full', target=3Dself.dest_img, speed=3D1, auto_dismiss=3D= False) =20 - self.hmp_io_writes('drive0', [('23', '%ik' % (1024 + 64), '64k'), + self.qmp_io_writes('drive0', [('23', '%ik' % (1024 + 64), '64k'), ('66', '1M', '1M')]) =20 # Let the job complete @@ -266,7 +266,7 @@ class BackupTest(iotests.QMPTestCase): res =3D self.vm.qmp('query-block-jobs') self.assert_qmp(res, 'return', []) # Give blkdebug something to chew on - self.hmp_io_writes('drive0', + self.qmp_io_writes('drive0', (('0x9a', 0, 512), ('0x55', '8M', '352k'), ('0x78', '15872k', '1M'))) @@ -332,5 +332,4 @@ class BackupTest(iotests.QMPTestCase): =20 if __name__ =3D=3D '__main__': iotests.main(supported_fmts=3D['qcow2', 'qed'], - supported_protocols=3D['file'], - require_hmp=3DTrue) + supported_protocols=3D['file']) --=20 2.56.0.rc0.29.g47ce80527c56 From nobody Sat Sep 26 20:01:40 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=1790108866; cv=none; d=zohomail.com; s=zohoarc; b=EK85zQD28aMdnEZHuHDHohfR6jGtJjKZFtXgqtR0uvw8c9XjG+eK0k2Dc2KlWQP/6+5OGZRBsbS/UGGba5cwRRgdzVw2ZuqTjtxqp2iCdl/4gzqtlVIwmko3FylykW+iqSLD17WYg55yzYJcxoUEbqimKv80B0L/LfDDrXZ2ORg= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1790108866; 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:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=f3xA0xoRq/MNApbxkwdGRgWCI3LD7zjCYZy/JqN8jy0=; b=NVyNBtgP7djjP+ILm7Rc8LJwScqj2du6AG0PdPhyKtHUV5+J94KVWRLovdTjWTt3mcP0GblwZ18W3NIIlFJiaHcIpQe6b1guSs7qrVyo1lDcdIOqhFpWKWOmYti1fTuA/0rQqS97jbUIa4Nf9QUL65SAAb3VUqF46pmstlpD5lM= 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 1790108866335589.5092356948585; Tue, 22 Sep 2026 13:27:46 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists1p.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1x96zj-0000Dc-AQ; Tue, 22 Sep 2026 16:21:39 -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 1x96z0-0006Vo-Aj for qemu-devel@nongnu.org; Tue, 22 Sep 2026 16:20:54 -0400 Received: from us-smtp-delivery-124.mimecast.com ([170.10.133.124]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1x96yy-0008Su-4i for qemu-devel@nongnu.org; Tue, 22 Sep 2026 16:20:53 -0400 Received: from mx-prod-mc-08.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-450-0ynaajIRNhC8tPTxD0gsiA-1; Tue, 22 Sep 2026 16:20:47 -0400 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-08.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id 6E3A4180A971; Tue, 22 Sep 2026 20:20:46 +0000 (UTC) Received: from localhost (headnet03.pony-001.prod.iad2.dc.redhat.com [10.2.32.114]) by mx-prod-int-08.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id 94251180034C; Tue, 22 Sep 2026 20:20:45 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1790108450; 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=f3xA0xoRq/MNApbxkwdGRgWCI3LD7zjCYZy/JqN8jy0=; b=bsL0o2M11Ec1XSCEuMZM57d50M5mvlU8eg12/lmoHrvHVwwIfjepWTw2tT1tg9mrE9cwEN /svY/fhFIkzWqBDrHFrpepb2k/U6G9RMvP3iyPEiit+KhhYLGU6hZ2pDBzDaQunSUEXlUq raEqwT4BlKKbBarMa7+q6vwsNkNeAAE= X-MC-Unique: 0ynaajIRNhC8tPTxD0gsiA-1 X-Mimecast-MFC-AGG-ID: 0ynaajIRNhC8tPTxD0gsiA_1790108446 From: =?utf-8?q?Marc-Andr=C3=A9_Lureau?= Date: Wed, 23 Sep 2026 00:17:34 +0400 Subject: [PATCH 27/88] qemu-iotests/093: migrate away from HMP MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Message-Id: <20260923-nohmp-v1-27-ebc029d4bd80@redhat.com> References: <20260923-nohmp-v1-0-ebc029d4bd80@redhat.com> In-Reply-To: <20260923-nohmp-v1-0-ebc029d4bd80@redhat.com> To: qemu-devel@nongnu.org Cc: Kevin Wolf , =?utf-8?q?Marc-Andr=C3=A9_Lureau?= , Hanna Reitz , qemu-block@nongnu.org X-Developer-Signature: v=1; a=openpgp-sha256; l=2758; i=marcandre.lureau@redhat.com; h=from:subject:message-id; bh=pCUKjqFpdxBVRp0DH1LmzQbC+ZZ/IH+lQmvSpCGndKI=; b=owEBbQKS/ZANAwAKAdro4Ql1lpzlAcsmYgBqsuKwmvRoHFjNB45gzqOHNCxKyyp15nSQ6jFci 3Ll+RtVumaJAjMEAAEKAB0WIQSHqb2TP4fGBtJ29i3a6OEJdZac5QUCarLisAAKCRDa6OEJdZac 5TrtD/9Sg0XpE/peJYq1QCSvexBIyKzxlssrWsMH2SiT7SzsNTyqYyepFvwiY4FQIbOUksXnAFi WmiQnPgYMf3Z5+v5BbVjNvowlKhZ89qdCqOSTORTBtBubzxgKOGNZAN9Mie7mi0TxcBzbZ+Wr/W BrFf790gzcNQknL/1a+onh0pxdaW7L2Q29TPIzRjuz5rPT36K61ZA1ybNBCmBcTiVYbwCIlMt8u bdJPWFl1/Z3WORZ5GfG2CBx90Ke567eMjp6tE7IqcDpZm2/d/LFzrmyUFG5DYC+aGbPY58ydo5O xNaMaz9Jzp2s4l5/JgovikdcabsiwgZHskKRvQ8Wlepu6hZDfGWQeaWor7+rYRz5FNWPLG1/7UW Pic/MYwR9u82jEQcZnumopAOf2i7JV33GuhaXXA+pvjwu5sCvHhrXrOTItfOsD7+to5SAaE563Q 51bcwg0oe+W0kfcZ8YpCPxWpDUkJgZjha+iqXvuDxbGvNaDrj9l+EUfDW1Cw1W2bSbTQ72OUi/a PS/vmIX6MnLN5MXcCTyYV/6QkVhmDnVnhaCyLtaT9DurJuWn4Fc31RgYtNGlSVUt0umDW1fS8OJ A8yqbD/OSlizpTZVAeqF9/mXpqOhFftlqAoc9LqcUr0LpTLI7Qv3Lq0pBBvSXWaUgy9xsOeGam2 O1xra79XoWhJX9Q== X-Developer-Key: i=marcandre.lureau@redhat.com; a=openpgp; fpr=87A9BD933F87C606D276F62DDAE8E10975969CE5 X-Scanned-By: MIMEDefang 3.4.1 on 10.30.177.111 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.133.124; envelope-from=marcandre.lureau@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 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_H3=0.001, RCVD_IN_MSPIKE_WL=0.001, SPF_HELO_PASS=-0.001, SPF_PASS=-0.001 autolearn=unavailable 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: 1790108868284158500 Signed-off-by: Marc-Andr=C3=A9 Lureau --- tests/qemu-iotests/093 | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) diff --git a/tests/qemu-iotests/093 b/tests/qemu-iotests/093 index 26ae6e2b2d56..5a22f672d8c2 100755 --- a/tests/qemu-iotests/093 +++ b/tests/qemu-iotests/093 @@ -90,13 +90,13 @@ class ThrottleTestCase(iotests.QMPTestCase): for i in range(rd_nr): for drive in range(0, ndrives): idx =3D first_drive + drive - self.vm.hmp_qemu_io("drive%d" % idx, "aio_read %d %d" % + self.vm.qmp_qemu_io("drive%d" % idx, "aio_read %d %d" % (i * rq_size, rq_size)) =20 for i in range(wr_nr): for drive in range(0, ndrives): idx =3D first_drive + drive - self.vm.hmp_qemu_io("drive%d" % idx, "aio_write %d %d" % + self.vm.qmp_qemu_io("drive%d" % idx, "aio_write %d %d" % (i * rq_size, rq_size)) =20 # We'll store the I/O stats for each drive in these arrays @@ -227,21 +227,21 @@ class ThrottleTestCase(iotests.QMPTestCase): self.configure_throttle(2, params) =20 # Read 4KB from drive0. This is performed immediately. - self.vm.hmp_qemu_io("drive0", "aio_read 0 4096") + self.vm.qmp_qemu_io("drive0", "aio_read 0 4096") =20 # Read 2KB. The I/O limit has been exceeded so this # request is throttled and a timer is set to wake it up. - self.vm.hmp_qemu_io("drive0", "aio_read 0 2048") + self.vm.qmp_qemu_io("drive0", "aio_read 0 2048") =20 # Read 2KB again. We're still over the I/O limit so this is # request is also throttled, but no new timer is set since # there's already one. - self.vm.hmp_qemu_io("drive0", "aio_read 0 2048") + self.vm.qmp_qemu_io("drive0", "aio_read 0 2048") =20 # Read from drive1. This request is also throttled, and no # timer is set in drive1 because there's already one in # drive0. - self.vm.hmp_qemu_io("drive1", "aio_read 0 4096") + self.vm.qmp_qemu_io("drive1", "aio_read 0 4096") =20 # At this point only the first 4KB have been read from drive0. # The other requests are throttled. @@ -419,5 +419,4 @@ class ThrottleTestRemovableMedia(iotests.QMPTestCase): if __name__ =3D=3D '__main__': if 'null-co' not in iotests.supported_formats(): iotests.notrun('null-co driver support missing') - iotests.main(supported_fmts=3D["raw"], - require_hmp=3DTrue) + iotests.main(supported_fmts=3D["raw"]) --=20 2.56.0.rc0.29.g47ce80527c56 From nobody Sat Sep 26 20:01:40 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=1790108600; cv=none; d=zohomail.com; s=zohoarc; b=fR7aMWAeykwYVe6XyHX8NRVP9I4ghOxwk0WvdSgcY5xZrxWjOPyYV1wrxvNVVS5Wvjnu4ErMC9RD+sherpWsHOdeqP5U16DNjZj6QsoK3v0c+06C3uODPVc6UxaCZJwf5RHnbYDFSp2iDHpA5GrjBSOQJ8fbE5ts29uyxAEjo1E= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1790108600; 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:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=9pnESmMHOg/motPjQXq6fH1cMueMeJF8C0Y6hiyubjY=; b=mlTFcgMjExm9Opw22pSvUsqM6uCJREdbdIM7cjn6SoOfvPb5PYPqZXAPlEYCAE2FQBO5xytNGwr9Q2Bk16K7+28ksYFPaZIz3GU/VrM3ZYRjBEBcFC5yYUtpgYFz1FThjlDLegQvIwYim5Y+25gv728ytHEdJxXDogTEEBOhFv4= 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 1790108600730860.0704021021709; Tue, 22 Sep 2026 13:23:20 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists1p.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1x96zD-0007YU-AN; Tue, 22 Sep 2026 16:21:07 -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 1x96z0-0006Vp-EN for qemu-devel@nongnu.org; Tue, 22 Sep 2026 16:20:54 -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 1x96yy-0008T1-I6 for qemu-devel@nongnu.org; Tue, 22 Sep 2026 16:20:54 -0400 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-103-1EmcM4erN4a5TknmNXQaMg-1; Tue, 22 Sep 2026 16:20:50 -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-03.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id 904441955F3F; Tue, 22 Sep 2026 20:20:49 +0000 (UTC) Received: from localhost (headnet03.pony-001.prod.iad2.dc.redhat.com [10.2.32.114]) by mx-prod-int-10.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id C0E245BC; Tue, 22 Sep 2026 20:20:48 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1790108451; 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=9pnESmMHOg/motPjQXq6fH1cMueMeJF8C0Y6hiyubjY=; b=X9DobBATY0pRzYA8hHJYcyUicWhNSu8SccwYcbvrAO1ufSfajsVYXfrh/DC7ItaXnMFBj1 PUUu2emC/f1ySjspab7UH8+FYg4+lrmGrJ5HPYleDGl0+VdQCOMSHOT3G6qbhjXwe0pGa+ kXZWLjDbM6+wq1pPqdm+wvwcJHXKfWE= X-MC-Unique: 1EmcM4erN4a5TknmNXQaMg-1 X-Mimecast-MFC-AGG-ID: 1EmcM4erN4a5TknmNXQaMg_1790108449 From: =?utf-8?q?Marc-Andr=C3=A9_Lureau?= Date: Wed, 23 Sep 2026 00:17:35 +0400 Subject: [PATCH 28/88] qemu-iotests/124: migrate away from HMP MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Message-Id: <20260923-nohmp-v1-28-ebc029d4bd80@redhat.com> References: <20260923-nohmp-v1-0-ebc029d4bd80@redhat.com> In-Reply-To: <20260923-nohmp-v1-0-ebc029d4bd80@redhat.com> To: qemu-devel@nongnu.org Cc: Kevin Wolf , =?utf-8?q?Marc-Andr=C3=A9_Lureau?= , Hanna Reitz , qemu-block@nongnu.org X-Developer-Signature: v=1; a=openpgp-sha256; l=6622; i=marcandre.lureau@redhat.com; h=from:subject:message-id; bh=UU/AFkO666+N3lSHF7TVz+V9GV5MRu/WHJ21aufEtoM=; b=owEBbQKS/ZANAwAKAdro4Ql1lpzlAcsmYgBqsuKwvWrgv3qqJ20/IahB5PAfcNH9vb7r6y0yG Eml+RjKUDOJAjMEAAEKAB0WIQSHqb2TP4fGBtJ29i3a6OEJdZac5QUCarLisAAKCRDa6OEJdZac 5cv2D/97JezwBcLN8ysHSieYs3UJ7JHKLKocd0E8KWDSIqzw0Fl8WHf+ed3aAzia1e8rcisgPmH 2Bpps/1kZINwayfqv3iqQnjiXfyTfv1K25+cEvMWrGM2ZBKSxomcZZdSn+szmn2WZ9ovy7d92E5 IhzPEKWfzvmHwUR49HjAftYuTjP2KadPHe6puvm6JOwoMFnmZI2L/25vs1FVxhreJwMf8oKw/Tu CUO5EbsSjkCTAs1NjolmeBHwYyf9fwuAmoz+QrNi0PBE77T0bQKLbBhqbbodzBPT/WSocWHZHnk 9zf+4AwQAeKZ5mk+bOBYeRyuiIab5NaTyPVGogaz2KQccyv66CJ109ULZYJpKVjDPvhkUcVUtTH 3kvhoH1D6CRf5BU1lXb/uYJ7PMeCUCaOiCvEA4Q+NV5W6IhJU6dXZFHkWvKBRdYFBdRbATnFvEg /Ou5ovWescRz+0I91XlNv2TFteuk7GgMPOzfs7HsWnKMmdhPcdeqefBx0xrAcJGtxbVuMifByZw J9OZn18TE15nH0ge5w4KSIdHDrwchS2IuFqoJvMZMhtCP7+LznhS0/sVwhhQzL2xocDO+236BZ1 e5TnH8v/vbN/aDebjUGotwq5xFu/crpMVRV9D7bkZk6/Xlw8brQpk/7ti+KXpKTUjLPvpO1Dnwi LxgkRr/odWUZ8Wg== 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: 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-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: 1790108602722158500 Signed-off-by: Marc-Andr=C3=A9 Lureau --- tests/qemu-iotests/124 | 33 ++++++++++++++++----------------- 1 file changed, 16 insertions(+), 17 deletions(-) diff --git a/tests/qemu-iotests/124 b/tests/qemu-iotests/124 index ab9ea4d8b59d..662cca71d6d7 100755 --- a/tests/qemu-iotests/124 +++ b/tests/qemu-iotests/124 @@ -249,10 +249,10 @@ class TestIncrementalBackupBase(iotests.QMPTestCase): self.assertTrue(iotests.compare_images(last, bitmap.drive['fil= e'])) =20 =20 - def hmp_io_writes(self, drive, patterns): + def qmp_io_writes(self, drive, patterns): for pattern in patterns: - self.vm.hmp_qemu_io(drive, 'write -P%s %s %s' % pattern) - self.vm.hmp_qemu_io(drive, 'flush') + self.vm.qmp_qemu_io(drive, 'write -P%s %s %s' % pattern) + self.vm.qmp_qemu_io(drive, 'flush') =20 =20 def do_incremental_simple(self, **kwargs): @@ -263,12 +263,12 @@ class TestIncrementalBackupBase(iotests.QMPTestCase): self.create_incremental() # Three writes: One complete overwrite, one new segment, # and one partial overlap. - self.hmp_io_writes(self.drives[0]['id'], (('0xab', 0, 512), + self.qmp_io_writes(self.drives[0]['id'], (('0xab', 0, 512), ('0xfe', '16M', '256k'), ('0x64', '32736k', '64k'= ))) self.create_incremental() # Three more writes, one of each kind, like above - self.hmp_io_writes(self.drives[0]['id'], (('0x9a', 0, 512), + self.qmp_io_writes(self.drives[0]['id'], (('0x9a', 0, 512), ('0x55', '8M', '352k'), ('0x78', '15872k', '1M')= )) self.create_incremental() @@ -337,7 +337,7 @@ class TestIncrementalBackup(TestIncrementalBackupBase): # overwrite [32736, 32799] which will dirty bitmap clusters at # 32M-64K and 32M. 32M+64K will be left undirtied. bitmap0 =3D self.add_bitmap('bitmap0', drive0) - self.hmp_io_writes(drive0['id'], + self.qmp_io_writes(drive0['id'], (('0xab', 0, 512), ('0xfe', '16M', '256k'), ('0x64', '32736k', '64k'))) @@ -382,7 +382,7 @@ class TestIncrementalBackup(TestIncrementalBackupBase): =20 drive0 =3D self.drives[0] bitmap0 =3D self.add_bitmap('bitmap0', drive0) - self.hmp_io_writes(drive0['id'], (('0xab', 0, 512), + self.qmp_io_writes(drive0['id'], (('0xab', 0, 512), ('0xfe', '16M', '256k'), ('0x64', '32736k', '64k'))) bitmap1 =3D self.add_bitmap('bitmap1', drive0) @@ -396,7 +396,7 @@ class TestIncrementalBackup(TestIncrementalBackupBase): self.wait_until_completed(drive0['id']) self.files.append(drive0['backup']) =20 - self.hmp_io_writes(drive0['id'], (('0x9a', 0, 512), + self.qmp_io_writes(drive0['id'], (('0x9a', 0, 512), ('0x55', '8M', '352k'), ('0x78', '15872k', '1M'))) # Both bitmaps should be correctly in sync. @@ -450,10 +450,10 @@ class TestIncrementalBackup(TestIncrementalBackupBase= ): =20 # Emulate some writes if not race: - self.hmp_io_writes(drive0['id'], (('0xab', 0, 512), + self.qmp_io_writes(drive0['id'], (('0xab', 0, 512), ('0xfe', '16M', '256k'), ('0x64', '32736k', '64k'))) - self.hmp_io_writes(drive1['id'], (('0xba', 0, 512), + self.qmp_io_writes(drive1['id'], (('0xba', 0, 512), ('0xef', '16M', '256k'), ('0x46', '32736k', '64k'))) =20 @@ -584,7 +584,7 @@ class TestIncrementalBackup(TestIncrementalBackupBase): size=3D(65 * 1048576)) =20 # Dirty the image past the old end - self.vm.hmp_qemu_io(self.drives[0]['id'], 'write 64M 64k') + self.vm.qmp_qemu_io(self.drives[0]['id'], 'write 64M 64k') =20 target =3D self.prepare_backup(size=3D'65M') self.create_incremental(target=3Dtarget) @@ -640,13 +640,13 @@ class TestIncrementalBackupBlkdebug(TestIncrementalBa= ckupBase): # Note: at this point, during a normal execution, # Assume that the VM resumes and begins issuing IO requests here. =20 - self.hmp_io_writes(drive0['id'], (('0xab', 0, 512), + self.qmp_io_writes(drive0['id'], (('0xab', 0, 512), ('0xfe', '16M', '256k'), ('0x64', '32736k', '64k'))) =20 result =3D self.create_incremental(validate=3DFalse) self.assertFalse(result) - self.hmp_io_writes(drive0['id'], (('0x9a', 0, 512), + self.qmp_io_writes(drive0['id'], (('0x9a', 0, 512), ('0x55', '8M', '352k'), ('0x78', '15872k', '1M'))) self.create_incremental() @@ -660,7 +660,7 @@ class TestIncrementalBackupBlkdebug(TestIncrementalBack= upBase): =20 drive0 =3D self.drives[0] # NB: The blkdebug script here looks for a "flush, read" pattern. - # The flush occurs in hmp_io_writes, and the read during the block= job. + # The flush occurs in qmp_io_writes, and the read during the block= job. self.vm.cmd('blockdev-add', node_name=3Ddrive0['id'], driver=3Ddrive0['fmt'], @@ -687,7 +687,7 @@ class TestIncrementalBackupBlkdebug(TestIncrementalBack= upBase): bitmap =3D self.add_bitmap('bitmap0', drive0) =20 # Emulate guest activity - self.hmp_io_writes(drive0['id'], (('0xab', 0, 512), + self.qmp_io_writes(drive0['id'], (('0xab', 0, 512), ('0xfe', '16M', '256k'), ('0x64', '32736k', '64k'))) =20 @@ -750,5 +750,4 @@ class TestIncrementalBackupBlkdebug(TestIncrementalBack= upBase): =20 if __name__ =3D=3D '__main__': iotests.main(supported_fmts=3D['qcow2'], - supported_protocols=3D['file'], - require_hmp=3DTrue) + supported_protocols=3D['file']) --=20 2.56.0.rc0.29.g47ce80527c56 From nobody Sat Sep 26 20:01:40 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=1790108585; cv=none; d=zohomail.com; s=zohoarc; b=iwcOX15W92ZMevfTzm+MdcehlOohKDM4fGrq5OQ7dcXnG5ntw3GE/VKPkGJOfaHpZy6QyROT4xfh6sjMGMhTQyvibX2VdS8UeLR2oBo/NIex4e0lHzNqqXE/5KgeIcmmXEm1eSXBay1+wfC6j/+M1w9dl9HFcfgBEgi+XH09oGE= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1790108585; 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:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=bi7dZ4qt/ZzCBLpMRm82EPHa9uugnkunqtqUY6z0ELI=; b=Ci7wcSmMT9ONhQhE4xuuWjusQYTVehAjTHTGBodBnqIxE43DpsgDj09UqFE+m6avaK/VD5mzijMi+CUmwXbpCUXPV+z9K8FmKHwNzjgTiK8cynR66N7X9M2SVwSCvyAzsKja6anH9Knl9lAm4iMQxuqLKN0KrOaSRZoxfX4yvOE= 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 1790108584838422.45341788273515; Tue, 22 Sep 2026 13:23:04 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists1p.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1x96zi-0000B6-OO; Tue, 22 Sep 2026 16:21:39 -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 1x96z5-0006us-PU for qemu-devel@nongnu.org; Tue, 22 Sep 2026 16:21:00 -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 1x96z4-0008Ts-7m for qemu-devel@nongnu.org; Tue, 22 Sep 2026 16:20:59 -0400 Received: from mx-prod-mc-08.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-437-B7aCff5QNymRb50vwSeCwA-1; Tue, 22 Sep 2026 16:20:54 -0400 Received: from mx-prod-int-05.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-05.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.17]) (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-08.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id 2C8D018052FB; Tue, 22 Sep 2026 20:20:53 +0000 (UTC) Received: from localhost (headnet03.pony-001.prod.iad2.dc.redhat.com [10.2.32.114]) by mx-prod-int-05.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id 3C89D1953941; Tue, 22 Sep 2026 20:20:51 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1790108457; 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=bi7dZ4qt/ZzCBLpMRm82EPHa9uugnkunqtqUY6z0ELI=; b=Drun3/SyueNh0jGqv6ZB3bOwO/sj0Ukd55OSb4Y8GmeAxB6KexduURKnW01umQ8wRBufqW 4GjmwW3YJQDL5gX9+NU8ZUgOGNM6nsmGTQ80joYS0Jg+PRkrrrEo/42HmODKU+LvrJLOsN IyNPvpytzGqez07K7iJA5Chd6VfUu+A= X-MC-Unique: B7aCff5QNymRb50vwSeCwA-1 X-Mimecast-MFC-AGG-ID: B7aCff5QNymRb50vwSeCwA_1790108453 From: =?utf-8?q?Marc-Andr=C3=A9_Lureau?= Date: Wed, 23 Sep 2026 00:17:36 +0400 Subject: [PATCH 29/88] qemu-iotests/136: migrate away from HMP MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Message-Id: <20260923-nohmp-v1-29-ebc029d4bd80@redhat.com> References: <20260923-nohmp-v1-0-ebc029d4bd80@redhat.com> In-Reply-To: <20260923-nohmp-v1-0-ebc029d4bd80@redhat.com> To: qemu-devel@nongnu.org Cc: Kevin Wolf , =?utf-8?q?Marc-Andr=C3=A9_Lureau?= , Hanna Reitz , qemu-block@nongnu.org X-Developer-Signature: v=1; a=openpgp-sha256; l=1194; i=marcandre.lureau@redhat.com; h=from:subject:message-id; bh=aKMfQJq5J4e81zVmwv/SsU+z1oiImBWtE1zBfRxQSaE=; b=owEBbQKS/ZANAwAKAdro4Ql1lpzlAcsmYgBqsuKwdK5MjLaHAFivAB+DKxxOnCeDYk39FMuz6 T931QxofJyJAjMEAAEKAB0WIQSHqb2TP4fGBtJ29i3a6OEJdZac5QUCarLisAAKCRDa6OEJdZac 5Z+REACvapr/wU4v0zJX7392vKJBWC1E58Su7q/tMO0q5iRkQP+J438+5/266zKfR2gxLyym6WT BIfk9sejXolqmUb0odXHVBE/rDON8XDR8tFTmRqjIx7ACne6LX79WfkeYG5Y1dW6BWvS8rVyrZ5 E05Qp6WQUAwozDPzlquZ6r3oOH/i3WvQVV1zWczTutMX8Os72PtWOFhQrTP/CbDkCAjdbvx7YLC +X0V7Xe3Xu+MNaAzrUHNsuTdW4xnQuIBgD1jpSAx1CYbG+ZdyCsy7z9ccytR7ktjN0d6shr6GKl l0wkAGtqgFMRGcIL4VKC3k1D83NTM/POsISNAicUwLOYXSE814Mv6UlvWDAzxyKwkvGWO28Erhp lGvMmdWHOGFMAzLeOalcio3Kdx9oErJU7FKFVsfGIchX4XjpGtafBMyrmsAWb6PXrH0l+Rc1FYG ++v6JdnvCJlCV4fOYuq5Z5sHopHt0g3rpSeMsmqAfHwupXNH766cUo8fPKmWlmikkrTgHoKj9gR kVDy0lOYeyVRk1tIhPRin70SJw5jkMQwzF7leMzuH5tVj52F/7yMtjCRHUyJ07mvk09OqLaP8tn JqyhACRk5xtCUAwMi9RMQksQwKMi+jB7U3S4cbyXTZSW4TwVQxijeQIFpvlzuPGgse7kLV+BMIv L5k5J3NCUi+l8rw== X-Developer-Key: i=marcandre.lureau@redhat.com; a=openpgp; fpr=87A9BD933F87C606D276F62DDAE8E10975969CE5 X-Scanned-By: MIMEDefang 3.0 on 10.30.177.17 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: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 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, SPF_HELO_PASS=-0.001, SPF_PASS=-0.001 autolearn=unavailable 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: 1790108586622158500 Signed-off-by: Marc-Andr=C3=A9 Lureau --- tests/qemu-iotests/136 | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/tests/qemu-iotests/136 b/tests/qemu-iotests/136 index 72fd638aa04d..32857990fa3e 100755 --- a/tests/qemu-iotests/136 +++ b/tests/qemu-iotests/136 @@ -58,9 +58,9 @@ class BlockDeviceStatsTestCase(iotests.QMPTestCase): =20 def qemu_io(self, cmd): if self.use_blockdev: - self.vm.hmp_qemu_io("virtio0/virtio-backend", cmd, qdev=3DTrue) + self.vm.qmp_qemu_io("virtio0/virtio-backend", cmd, qdev=3DTrue) else: - self.vm.hmp_qemu_io("drive0", cmd) + self.vm.qmp_qemu_io("drive0", cmd) =20 def create_blkdebug_file(self): file =3D open(blkdebug_file, 'w') @@ -410,5 +410,4 @@ class BlockDeviceStatsTestCoroutine(BlockDeviceStatsTes= tCase): if __name__ =3D=3D '__main__': if 'null-co' not in iotests.supported_formats(): iotests.notrun('null-co driver support missing') - iotests.main(supported_fmts=3D["raw"], - require_hmp=3DTrue) + iotests.main(supported_fmts=3D["raw"]) --=20 2.56.0.rc0.29.g47ce80527c56 From nobody Sat Sep 26 20:01:40 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=1790109139; cv=none; d=zohomail.com; s=zohoarc; b=ltKo6pjdEvsxnPyf54ZENkCV6Irb6ujc35JCxuRUTNWZPKPuVVyoQJw/DxxNb/7t1tk1xA+9UuIoscpPDC118LuAK/ULI+4K6UNXURFQbA38n2EE9+fWhPHKMxfO+Wfa7JAMo3lq7FmDSLmn+cnK42mmbW862HXShxEjtPMxQ74= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1790109139; 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:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=IWZxI8fbK11M+JjltBFpGEro0hKdHPYEyvSmjo3wgT8=; b=l53H7nJFLnglKwStWcdrattqkdyTm24q2/0ImwecUhYo36R4d+VoZkmFkJTPY1xJzZcJXB1YkcK8X0mJfRpuk2TEjjEe08tAXjwKhLyB3TsD/+sipJcRJwsLMuOIY/2eNzq1GsJ7LOkhlhG89Syq2TS+6Kt6tS4IwiBa+AuCH5E= 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 1790109139889401.38316299945734; Tue, 22 Sep 2026 13:32:19 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists1p.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1x96zn-0000Si-7q; Tue, 22 Sep 2026 16:21:43 -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 1x96z8-00078M-Jy for qemu-devel@nongnu.org; Tue, 22 Sep 2026 16:21:02 -0400 Received: from us-smtp-delivery-124.mimecast.com ([170.10.133.124]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1x96z6-0008UT-SJ for qemu-devel@nongnu.org; Tue, 22 Sep 2026 16:21:02 -0400 Received: from mx-prod-mc-05.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-466-_vfzsKamOiCi8hsFUA9-Dw-1; Tue, 22 Sep 2026 16:20:57 -0400 Received: from mx-prod-int-03.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-03.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.12]) (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-05.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id 862271955D88; Tue, 22 Sep 2026 20:20:56 +0000 (UTC) Received: from localhost (headnet03.pony-001.prod.iad2.dc.redhat.com [10.2.32.114]) by mx-prod-int-03.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id 91E7F1956086; Tue, 22 Sep 2026 20:20:55 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1790108460; 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=IWZxI8fbK11M+JjltBFpGEro0hKdHPYEyvSmjo3wgT8=; b=PjOFCB5YV6CORoacVemaeDoT1zls0MbWkmcwQJc7e3m9DPrerjnsEvJPXGZilRCFbWz7Bj xJjYgmaZ83OAu6b8IDKmtP2/5S/u/RLeMn4mj660och+sIwJTTl2gmUoe0K05hYIl1Ch/v NiayV1TbEMiVFnlLSmyC782kRblKkHE= X-MC-Unique: _vfzsKamOiCi8hsFUA9-Dw-1 X-Mimecast-MFC-AGG-ID: _vfzsKamOiCi8hsFUA9-Dw_1790108456 From: =?utf-8?q?Marc-Andr=C3=A9_Lureau?= Date: Wed, 23 Sep 2026 00:17:37 +0400 Subject: [PATCH 30/88] qemu-iotests/148: migrate away from HMP MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Message-Id: <20260923-nohmp-v1-30-ebc029d4bd80@redhat.com> References: <20260923-nohmp-v1-0-ebc029d4bd80@redhat.com> In-Reply-To: <20260923-nohmp-v1-0-ebc029d4bd80@redhat.com> To: qemu-devel@nongnu.org Cc: Kevin Wolf , =?utf-8?q?Marc-Andr=C3=A9_Lureau?= , Hanna Reitz , qemu-block@nongnu.org X-Developer-Signature: v=1; a=openpgp-sha256; l=2949; i=marcandre.lureau@redhat.com; h=from:subject:message-id; bh=ZYnyOlR6uu0xg5X8wWnKLYIbWiT1JT89Ji6/Ktix86Y=; b=owEBbQKS/ZANAwAKAdro4Ql1lpzlAcsmYgBqsuKwgZP3XBCUHSfaplGkbswY70HlqdTv1EhCq 421GGzBsDWJAjMEAAEKAB0WIQSHqb2TP4fGBtJ29i3a6OEJdZac5QUCarLisAAKCRDa6OEJdZac 5QZYD/40ZSZKGoBKrJRN7gzv97kuRTYEwTvArCMATZiGTOIi3F44qRqsiK08kA1IPj0p6PUfvSr o+5jLpoDXbyh2R6hjQKkmeZfsNnRvbqFTXXA1eXowy1XbAVAhNYNZ0tq6XrVt+pQ7OyuizcizbK aRcj+Z+PNHub7g5QASTt372PP13YlDOsHUjVuejsfTPYu+5ygeKmG20llb4wC4XlhaexAES/6kf 1w0W7dUIFI5u1ZLH3i/gmxm7cqo9bHu5yT6yJwUIo2xWsxVy6yP6A92vnGqgvgTfjm05nFgRHzv lU8cbjUZhW2iGgINWfj6Jue4/0P/YnV3tQ4jZnLCm8dgA69Ky1GE+2HY5On+D1jZuQtAI13k61v gMkNyIkc/BrrmvMuup1rXC9k9HX/5A8sEoyTIzfW+TuQlyyFqzr6nlKwZkpI+kf+Ug1hoZ+AVdG auw4hkLwdMapHaENk0YFeSUT9Phzcdvb6G2lNHH9QPE36BzQL2uvqAiUouyb0CGnDphz+xO0eMU ywvzYZQgyyymzwhVujHM0422P/r73kjmlA4+8J/FxXibkarFPxzockLYFFUPuHvWcdz+WISPzWw obog0dkZUstfwuaHvW6YB/kDOpUE4vGVKVIQyoSXUkCAxAatEMiogmKmp+eia0FbMVZF8mgGQhn fry1JtX3WL8QvJg== X-Developer-Key: i=marcandre.lureau@redhat.com; a=openpgp; fpr=87A9BD933F87C606D276F62DDAE8E10975969CE5 X-Scanned-By: MIMEDefang 3.0 on 10.30.177.12 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.133.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_H3=0.001, RCVD_IN_MSPIKE_WL=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-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: 1790109141527158500 Signed-off-by: Marc-Andr=C3=A9 Lureau --- tests/qemu-iotests/148 | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/tests/qemu-iotests/148 b/tests/qemu-iotests/148 index 4b092dccb7cc..0279386e3299 100755 --- a/tests/qemu-iotests/148 +++ b/tests/qemu-iotests/148 @@ -82,7 +82,7 @@ sector =3D "%d" =20 def testQuorum(self): # Generate an error and get an event - self.vm.hmp_qemu_io("drive0", "aio_read %d %d" % + self.vm.qmp_qemu_io("drive0", "aio_read %d %d" % (offset * sector_size, sector_size)) self.vm.qtest("clock_step 10") self.do_check_event('img0', offset) @@ -90,7 +90,7 @@ sector =3D "%d" # I/O errors in the same child: only one event is emitted delay =3D 10 for i in range(3): - self.vm.hmp_qemu_io("drive0", "aio_read %d %d" % + self.vm.qmp_qemu_io("drive0", "aio_read %d %d" % (offset * sector_size, sector_size)) self.vm.qtest("clock_step %d" % delay) self.do_check_event(None) @@ -102,7 +102,7 @@ sector =3D "%d" # I/O errors in the same child: all events are emitted delay =3D 2 * event_rate for i in range(3): - self.vm.hmp_qemu_io("drive0", "aio_read %d %d" % + self.vm.qmp_qemu_io("drive0", "aio_read %d %d" % (offset * sector_size, sector_size)) self.vm.qtest("clock_step %d" % delay) self.do_check_event('img0', offset) @@ -110,7 +110,7 @@ sector =3D "%d" # I/O errors in different children: all events are emitted delay =3D 10 for i in range(len(imgs)): - self.vm.hmp_qemu_io("drive0", "aio_read %d %d" % + self.vm.qmp_qemu_io("drive0", "aio_read %d %d" % ((offset + i) * sector_size, sector_size)) self.vm.qtest("clock_step %d" % delay) # In fifo mode only errors in the first child are detected @@ -122,7 +122,7 @@ sector =3D "%d" # I/O errors in different children: all events are emitted delay =3D 2 * event_rate for i in range(len(imgs)): - self.vm.hmp_qemu_io("drive0", "aio_read %d %d" % + self.vm.qmp_qemu_io("drive0", "aio_read %d %d" % ((offset + i) * sector_size, sector_size)) self.vm.qtest("clock_step %d" % delay) # In fifo mode only errors in the first child are detected @@ -140,5 +140,4 @@ class TestFifoQuorumEvents(TestQuorumEvents): if __name__ =3D=3D '__main__': iotests.verify_quorum() iotests.main(supported_fmts=3D["raw"], - supported_protocols=3D["file"], - require_hmp=3DTrue) + supported_protocols=3D["file"]) --=20 2.56.0.rc0.29.g47ce80527c56 From nobody Sat Sep 26 20:01:40 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=1790108585; cv=none; d=zohomail.com; s=zohoarc; b=KS9llQSipiaoBzId2EWYxn+6ssr44Ga6jASdbL548tiTtzVDHrCBCbCa5orV40+0bYFib6oIq03csZhgnYGpvMHI5baCMcXAUqx7D6sWV9+POdNp68QZudmknjRsmvjw3eTb80dP12dHKuSjzKCT138DBC1DOdQ8o3ij901aquA= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1790108585; 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:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=uWR/4wqOnTK5h6KoP4Jpw4AQp5HAuFP1gW4zx67zOAA=; b=ZZ32nhrAgyqdJc4v7cARvlGO8/wO/MV3616pgS7kzj1CykMdO4MaGjUokWOIrhtb4XBVAMfPcsWKqbtSROOzASDxrwdE/GVuw8l5JImHqb7U7UbnE4OvLN26nq75COpzTcL0eyfdR2XhEbt4DS4XBHUWo0z5CJIa6zSljfRLeXU= 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 1790108585714584.1136237658972; Tue, 22 Sep 2026 13:23:05 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists1p.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1x96zZ-0008Mb-EZ; Tue, 22 Sep 2026 16:21:30 -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 1x96zC-0007WZ-Cx for qemu-devel@nongnu.org; Tue, 22 Sep 2026 16:21:06 -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 1x96zA-0008Uu-4z for qemu-devel@nongnu.org; Tue, 22 Sep 2026 16:21:05 -0400 Received: from mx-prod-mc-08.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-3-MD1KucpnOLSTlX_jARHJTQ-1; Tue, 22 Sep 2026 16:21:01 -0400 Received: from mx-prod-int-06.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-06.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.93]) (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-08.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id 64FAB1834504; Tue, 22 Sep 2026 20:21:00 +0000 (UTC) Received: from localhost (headnet03.pony-001.prod.iad2.dc.redhat.com [10.2.32.114]) by mx-prod-int-06.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id 659A8180056E; Tue, 22 Sep 2026 20:20:59 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1790108463; 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=uWR/4wqOnTK5h6KoP4Jpw4AQp5HAuFP1gW4zx67zOAA=; b=Kkn7tX4vXYuxjeaGnfGkMcRMQWjy7aTOaSbBmh2OxFgYNtxu2jFzZoXSIMtRAm30Vzc4CN VAooxmL/oruiG8bkGjCk5mWDt76V7bjf8ydHhs1yUy775uFqsoONcvHiPACfj5U1RVeas4 /8LujS2fRhcME+V86U++XagIAMTKsj4= X-MC-Unique: MD1KucpnOLSTlX_jARHJTQ-1 X-Mimecast-MFC-AGG-ID: MD1KucpnOLSTlX_jARHJTQ_1790108460 From: =?utf-8?q?Marc-Andr=C3=A9_Lureau?= Date: Wed, 23 Sep 2026 00:17:38 +0400 Subject: [PATCH 31/88] qemu-iotests/151: migrate away from HMP MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Message-Id: <20260923-nohmp-v1-31-ebc029d4bd80@redhat.com> References: <20260923-nohmp-v1-0-ebc029d4bd80@redhat.com> In-Reply-To: <20260923-nohmp-v1-0-ebc029d4bd80@redhat.com> To: qemu-devel@nongnu.org Cc: Kevin Wolf , =?utf-8?q?Marc-Andr=C3=A9_Lureau?= , Hanna Reitz , qemu-block@nongnu.org X-Developer-Signature: v=1; a=openpgp-sha256; l=8052; i=marcandre.lureau@redhat.com; h=from:subject:message-id; bh=zEvqGlh2zD2RFuBVhoLhjUPWnMDJg7apnbI3daehNko=; b=owEBbQKS/ZANAwAKAdro4Ql1lpzlAcsmYgBqsuKwYsV3TtRW23onix5wkDraX5NpP60M5ajJg ggMVl5eq+2JAjMEAAEKAB0WIQSHqb2TP4fGBtJ29i3a6OEJdZac5QUCarLisAAKCRDa6OEJdZac 5Xx9D/9KF1bxDS3lC1AlGN/V0wr2+y6WbXGSyUMomDx8k5HMa2s+7Jve+HJnCUoL08nLhYpjaPu W6nps1DIQ7mTc/fK0jOyPyuzUH6y/n66fsu4URrH2q7bJcDWk3tVxCUZbye3MY+2x5Bz31mgptt WweOsW5y6GDBRR+08ZfYt8PaCe/XBPWLFHF21YSZSKBq6P/mjsRCSXGgibmBMp98S1WmtfIBqE+ 2zx1MP87nwpjOnWCB3HaMypYz6KqK/w4LGCQ7gMqPaDDLtB28NntyGWas1nn/58x89q1l4wrMdz M4HxasugRspEY49U06cQkxwvuu26klnvOziNdt6r9DbYQ0/Q1Fy2Izj9XKruugiKAi0LBZ3UIMk ybvwJZhNztJ+ZRybjaGLAFpLzah35n57syqg4pKVKZcxZrnWbllh1spjX2Cmhc8gbXQxCI3FMNF 1C6c8qKPVB/a/isgDJiwF+kQPGt8GxihLZsyNYiNwjWmNcBUAHFCnx51NJSc7t9Sya+H3OayjLU DGAOL/ZH5stxgAMYytgSFO6fiWff+Rc5PtYjUK4S6NC9R7vpRbeNhCsjZCth0c1whwldMtV5dlD Uwo0HmgvwldpsqV6W0MrYtyaVTZADKQkIT8cFoajyhqS8rgtyghenUkn8hZd3b/YvGGlMsA+T75 Cr9gIkGeLIL3WPg== X-Developer-Key: i=marcandre.lureau@redhat.com; a=openpgp; fpr=87A9BD933F87C606D276F62DDAE8E10975969CE5 X-Scanned-By: MIMEDefang 3.4.1 on 10.30.177.93 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: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 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, 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: 1790108586700158500 Signed-off-by: Marc-Andr=C3=A9 Lureau --- tests/qemu-iotests/151 | 51 +++++++++++++++++++++++++---------------------= ---- 1 file changed, 25 insertions(+), 26 deletions(-) diff --git a/tests/qemu-iotests/151 b/tests/qemu-iotests/151 index 204221a5738e..72f7bcaa0c60 100755 --- a/tests/qemu-iotests/151 +++ b/tests/qemu-iotests/151 @@ -69,14 +69,14 @@ class TestActiveMirror(iotests.QMPTestCase): =20 def doActiveIO(self, sync_source_and_target): # Fill the source image - self.vm.hmp_qemu_io('source', + self.vm.qmp_qemu_io('source', 'write -P 1 0 %i' % self.image_len); =20 # Start some background requests for offset in range(1 * self.image_len // 8, 3 * self.image_len //= 8, 1024 * 1024): - self.vm.hmp_qemu_io('source', 'aio_write -P 2 %i 1M' % offset) + self.vm.qmp_qemu_io('source', 'aio_write -P 2 %i 1M' % offset) for offset in range(2 * self.image_len // 8, 3 * self.image_len //= 8, 1024 * 1024): - self.vm.hmp_qemu_io('source', 'aio_write -z %i 1M' % offset) + self.vm.qmp_qemu_io('source', 'aio_write -z %i 1M' % offset) =20 # Start the block job self.vm.cmd('blockdev-mirror', @@ -89,9 +89,9 @@ class TestActiveMirror(iotests.QMPTestCase): =20 # Start some more requests for offset in range(3 * self.image_len // 8, 5 * self.image_len //= 8, 1024 * 1024): - self.vm.hmp_qemu_io('source', 'aio_write -P 3 %i 1M' % offset) + self.vm.qmp_qemu_io('source', 'aio_write -P 3 %i 1M' % offset) for offset in range(4 * self.image_len // 8, 5 * self.image_len //= 8, 1024 * 1024): - self.vm.hmp_qemu_io('source', 'aio_write -z %i 1M' % offset) + self.vm.qmp_qemu_io('source', 'aio_write -z %i 1M' % offset) =20 # Wait for the READY event self.wait_ready(drive=3D'mirror') @@ -101,14 +101,14 @@ class TestActiveMirror(iotests.QMPTestCase): # The mirror code itself asserts that the source BDS's dirty # bitmap will stay clean between READY and COMPLETED. for offset in range(5 * self.image_len // 8, 7 * self.image_len //= 8, 1024 * 1024): - self.vm.hmp_qemu_io('source', 'aio_write -P 3 %i 1M' % offset) + self.vm.qmp_qemu_io('source', 'aio_write -P 3 %i 1M' % offset) for offset in range(6 * self.image_len // 8, 7 * self.image_len //= 8, 1024 * 1024): - self.vm.hmp_qemu_io('source', 'aio_write -z %i 1M' % offset) + self.vm.qmp_qemu_io('source', 'aio_write -z %i 1M' % offset) =20 if sync_source_and_target: # If source and target should be in sync after the mirror, # we have to flush before completion - self.vm.hmp_qemu_io('source', 'aio_flush') + self.vm.qmp_qemu_io('source', 'aio_flush') self.potential_writes_in_flight =3D False =20 self.complete_and_wait(drive=3D'mirror', wait_ready=3DFalse) @@ -121,7 +121,7 @@ class TestActiveMirror(iotests.QMPTestCase): =20 def testUnalignedActiveIO(self): # Fill the source image - result =3D self.vm.hmp_qemu_io('source', 'write -P 1 0 2M') + result =3D self.vm.qmp_qemu_io('source', 'write -P 1 0 2M') =20 # Start the block job (very slowly) self.vm.cmd('blockdev-mirror', @@ -135,7 +135,7 @@ class TestActiveMirror(iotests.QMPTestCase): speed=3D1) =20 # Start an unaligned request to a dirty area - result =3D self.vm.hmp_qemu_io('source', 'write -P 2 %i 1' % (1048= 576 + 42)) + result =3D self.vm.qmp_qemu_io('source', 'write -P 2 %i 1' % (1048= 576 + 42)) =20 # Let the job finish self.vm.cmd('block-job-set-speed', device=3D'mirror', speed=3D0) @@ -145,7 +145,7 @@ class TestActiveMirror(iotests.QMPTestCase): =20 def testIntersectingActiveIO(self): # Fill the source image - result =3D self.vm.hmp_qemu_io('source', 'write -P 1 0 2M') + result =3D self.vm.qmp_qemu_io('source', 'write -P 1 0 2M') =20 # Start the block job (very slowly) self.vm.cmd('blockdev-mirror', @@ -157,23 +157,23 @@ class TestActiveMirror(iotests.QMPTestCase): copy_mode=3D'write-blocking', speed=3D1) =20 - self.vm.hmp_qemu_io('source', 'break write_aio A') - self.vm.hmp_qemu_io('source', 'aio_write 0 1M') # 1 - self.vm.hmp_qemu_io('source', 'wait_break A') - self.vm.hmp_qemu_io('source', 'aio_write 0 2M') # 2 - self.vm.hmp_qemu_io('source', 'aio_write 0 2M') # 3 + self.vm.qmp_qemu_io('source', 'break write_aio A') + self.vm.qmp_qemu_io('source', 'aio_write 0 1M') # 1 + self.vm.qmp_qemu_io('source', 'wait_break A') + self.vm.qmp_qemu_io('source', 'aio_write 0 2M') # 2 + self.vm.qmp_qemu_io('source', 'aio_write 0 2M') # 3 =20 # Now 2 and 3 are in mirror_wait_on_conflicts, waiting for 1 =20 - self.vm.hmp_qemu_io('source', 'break write_aio B') - self.vm.hmp_qemu_io('source', 'aio_write 1M 2M') # 4 - self.vm.hmp_qemu_io('source', 'wait_break B') + self.vm.qmp_qemu_io('source', 'break write_aio B') + self.vm.qmp_qemu_io('source', 'aio_write 1M 2M') # 4 + self.vm.qmp_qemu_io('source', 'wait_break B') =20 # 4 doesn't wait for 2 and 3, because they didn't yet set # in_flight_bitmap. So, nothing prevents 4 to go except for our # break-point B. =20 - self.vm.hmp_qemu_io('source', 'resume A') + self.vm.qmp_qemu_io('source', 'resume A') =20 # Now we resumed 1, so 2 and 3 goes to the next iteration of while= loop # in mirror_wait_on_conflicts(). They don't exit, as bitmap is dir= ty @@ -181,7 +181,7 @@ class TestActiveMirror(iotests.QMPTestCase): # In the past at that point 2 and 3 would wait for each other prod= ucing # a dead-lock. Now this is fixed and they will wait for request 4. =20 - self.vm.hmp_qemu_io('source', 'resume B') + self.vm.qmp_qemu_io('source', 'resume B') =20 # After resuming 4, one of 2 and 3 goes first and set in_flight_bi= tmap, # so the other will wait for it. @@ -193,7 +193,7 @@ class TestActiveMirror(iotests.QMPTestCase): =20 def testUnalignedSmallerThanGranularityWriteZeroes(self): # Fill the source image - self.vm.hmp_qemu_io('source', 'write -P 1 0 %i' % self.image_len); + self.vm.qmp_qemu_io('source', 'write -P 1 0 %i' % self.image_len); =20 # Start the block job self.vm.cmd('blockdev-mirror', @@ -208,7 +208,7 @@ class TestActiveMirror(iotests.QMPTestCase): self.wait_ready(drive=3D'mirror') =20 for offset in range(6 * self.image_len // 8, 7 * self.image_len //= 8, 1024 * 1024): - self.vm.hmp_qemu_io('source', 'aio_write -z %i 512' % (offset = + 512)) + self.vm.qmp_qemu_io('source', 'aio_write -z %i 512' % (offset = + 512)) =20 self.complete_and_wait(drive=3D'mirror', wait_ready=3DFalse) =20 @@ -323,7 +323,7 @@ class TestLowThrottledWithNbdExport(TestThrottledWithNb= dExportBase): # progress (because when the job was started, those areas were not # intended to be copied, so active mirroring will only lead to not # losing progress, but also not making any). - self.vm.hmp_qemu_io('source-node', + self.vm.qmp_qemu_io('source-node', f'aio_write -P 1 0 {self.image_len // 2}') self.vm.qtest(f'clock_step {1 * 1000 * 1000 * 1000}') =20 @@ -434,5 +434,4 @@ class TestHighThrottledWithNbdExport(TestThrottledWithN= bdExportBase): =20 if __name__ =3D=3D '__main__': iotests.main(supported_fmts=3D['qcow2', 'raw'], - supported_protocols=3D['file'], - require_hmp=3DTrue) + supported_protocols=3D['file']) --=20 2.56.0.rc0.29.g47ce80527c56 From nobody Sat Sep 26 20:01:40 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=1790108557; cv=none; d=zohomail.com; s=zohoarc; b=kuGma9PXGP8VE3RyZBs7Ocd7t83rnyNhU40Oy0zDWQ0X57elgYcJ0+R6Q+z+WnDOcPCrpFDn+yXWFwrxnlsereZPEg9/wCAlqCrYW58r3jDJXQOCX31kTt/WP0FuSXDjN9xkFa0ezn6r1zSx6GCcV+FMWE3od7WKKrGhRNK7kzQ= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1790108557; 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:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=seWtzgqeJn1gI0P0xYdXoTyLGs8by+U3ufozSMltnto=; b=ZwbWZfS1/dFmPj580RV4samnr2DkI4MX/g/YKB8KPGj1zi0BaEZydQlrAGL+NOYm3RUobohFLrDXWbQFqZp7U0WmnesjI2cFaWeoVpESJHerlnfrSAfq9J3zY+RGpv5QYf/5Iw0bg6PuI2Q7/zWzjfN6CDCQee7kb7AOla/9bEU= 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 1790108557722529.4780243339254; Tue, 22 Sep 2026 13:22:37 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists1p.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1x970H-0000yv-9G; Tue, 22 Sep 2026 16:22:13 -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 1x96zG-0007yy-JM for qemu-devel@nongnu.org; Tue, 22 Sep 2026 16:21:11 -0400 Received: from us-smtp-delivery-124.mimecast.com ([170.10.133.124]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1x96zE-0008Vi-Q6 for qemu-devel@nongnu.org; Tue, 22 Sep 2026 16:21:10 -0400 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-588-cAMpvAlVPLeTou0UyJZNzw-1; Tue, 22 Sep 2026 16:21:04 -0400 Received: from mx-prod-int-06.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-06.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.93]) (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 BFB8C1944B2E; Tue, 22 Sep 2026 20:21:03 +0000 (UTC) Received: from localhost (headnet03.pony-001.prod.iad2.dc.redhat.com [10.2.32.114]) by mx-prod-int-06.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id E71A6180056E; Tue, 22 Sep 2026 20:21:02 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1790108468; 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=seWtzgqeJn1gI0P0xYdXoTyLGs8by+U3ufozSMltnto=; b=NOMYb95Av027pJTmhhOrXn4Xqo0oyy+C9+fzvF5z0xIBslts0CR+2R0hIlnqdtKH+SDzmO 1OH+9OHCFAH8vSZZZwqCnr8lR9TwUPxFQyi29jV254qMRVxYF64rfa1z4xOt6I1Ffksu/3 k4OBI8cFzMqrs1Ea/KTXElGhQ+Y/ILk= X-MC-Unique: cAMpvAlVPLeTou0UyJZNzw-1 X-Mimecast-MFC-AGG-ID: cAMpvAlVPLeTou0UyJZNzw_1790108463 From: =?utf-8?q?Marc-Andr=C3=A9_Lureau?= Date: Wed, 23 Sep 2026 00:17:39 +0400 Subject: [PATCH 32/88] qemu-iotests/236: migrate away from HMP MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Message-Id: <20260923-nohmp-v1-32-ebc029d4bd80@redhat.com> References: <20260923-nohmp-v1-0-ebc029d4bd80@redhat.com> In-Reply-To: <20260923-nohmp-v1-0-ebc029d4bd80@redhat.com> To: qemu-devel@nongnu.org Cc: Kevin Wolf , =?utf-8?q?Marc-Andr=C3=A9_Lureau?= , Hanna Reitz , qemu-block@nongnu.org X-Developer-Signature: v=1; a=openpgp-sha256; l=2090; i=marcandre.lureau@redhat.com; h=from:subject:message-id; bh=kLIKc+93mA9l8lzVIzG4tw8CQ4RlO24YAy6CK6vsuRs=; b=owEBbQKS/ZANAwAKAdro4Ql1lpzlAcsmYgBqsuKwWFkWgE+g4GCAlu/BhaCCZL4c67rfTFeMz j1HE4HufKmJAjMEAAEKAB0WIQSHqb2TP4fGBtJ29i3a6OEJdZac5QUCarLisAAKCRDa6OEJdZac 5asvD/wMjMG61NIfs9UoU8Vy+plXxlaDDHAWXFA1T6arDjY+0qvCiLcfKswJ6xOWUElHN8uUeLl tCgjt7L+7j6OYa3kw/aWdKPiNKWJiCylQXRYAOWqbm+rCLe6gQp+GgyPC3/rCdI+VZOKyxU+raA dFeOUycy9olOZ2xW7xYHr21lc05NDU2c+UPM3mX0RPyOSyhFJWQBLlJygCfXXU8M2++m/yP8XES m0IilOIyFZ53Om7HSu1UuqyTHucHbgq/wEWSf4UrmZfITHmyuQPxmdCyw5ddi+TgAhClj0/5ymq MyjZYyjIQDQUhISQCsIm4QD4fkJfUnyhcNcxz5T35K+rWbZCzVNXNpc/NfjaFLNZ1X79AVo9k70 nSiFFNPGsKcNkaGjY1PGWTgddNQumFvj8DPU+ybClBU/jRjDMMlwhnhYpLWsYq/XOSrTe0B3wbk w3uxnx7Qh80C2IZ5dUKnC/D42ylDFlUwal98cHhoQj9ZzeFY4LT6q24HDLwXPMDFD7h2zf56bn+ 19iB4At1rG2YS/6dWoWz2daLv1xKk14SjVxONIr7V8S3I1mtJp1H/zUKSq2NEX9AKffLGov2kdc LsvkNyShEIRwDbIE/YPM9iwCc0MEDqrexUWY60u05IU1eD2qae2s8JFdIzrzWlCoyn8D1Bef6I3 1pPcX5nU+Oar5sg== X-Developer-Key: i=marcandre.lureau@redhat.com; a=openpgp; fpr=87A9BD933F87C606D276F62DDAE8E10975969CE5 X-Scanned-By: MIMEDefang 3.4.1 on 10.30.177.93 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.133.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_H3=0.001, RCVD_IN_MSPIKE_WL=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-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: 1790108558328158500 No need to log empty results, qmp_qemu_io() already checks for success. Signed-off-by: Marc-Andr=C3=A9 Lureau --- tests/qemu-iotests/236 | 7 +++---- tests/qemu-iotests/236.out | 8 -------- 2 files changed, 3 insertions(+), 12 deletions(-) diff --git a/tests/qemu-iotests/236 b/tests/qemu-iotests/236 index 3cf0de4043f6..0d2c1780df71 100755 --- a/tests/qemu-iotests/236 +++ b/tests/qemu-iotests/236 @@ -23,8 +23,7 @@ import iotests from iotests import log =20 -iotests.script_initialize(supported_fmts=3D['generic'], - require_hmp=3DTrue) +iotests.script_initialize(supported_fmts=3D['generic']) size =3D 64 * 1024 * 1024 granularity =3D 64 * 1024 =20 @@ -62,7 +61,7 @@ with iotests.FilePath('img') as img_path, \ for p in patterns: cmd =3D "write -P%s %s %s" % p log(cmd) - log(vm.hmp_qemu_io("drive0", cmd)) + vm.qmp_qemu_io("drive0", cmd) =20 log(query_bitmaps(vm), indent=3D2) =20 @@ -100,7 +99,7 @@ with iotests.FilePath('img') as img_path, \ for p in overwrite: cmd =3D "write -P%s %s %s" % p log(cmd) - log(vm.hmp_qemu_io("drive0", cmd)) + vm.qmp_qemu_io("drive0", cmd) =20 log('\n--- Disabling A & C ---\n') vm.qmp_log("transaction", indent=3D2, actions=3D[ diff --git a/tests/qemu-iotests/236.out b/tests/qemu-iotests/236.out index 7448ceea027e..aedac37931d7 100644 --- a/tests/qemu-iotests/236.out +++ b/tests/qemu-iotests/236.out @@ -11,13 +11,9 @@ --- Emulating writes --- =20 write -P0x5d 0 64k -{"return": ""} write -P0xd5 1M 64k -{"return": ""} write -P0xdc 32M 64k -{"return": ""} write -P0xcd 0x3ff0000 64k -{"return": ""} { "bitmaps": { "drive0": [ @@ -150,13 +146,9 @@ write -P0xcd 0x3ff0000 64k --- Emulating further writes --- =20 write -P0xab 0 64k -{"return": ""} write -P0xad 0x00f8000 64k -{"return": ""} write -P0x1d 0x2008000 64k -{"return": ""} write -P0xea 0x3fe0000 64k -{"return": ""} =20 --- Disabling A & C --- =20 --=20 2.56.0.rc0.29.g47ce80527c56 From nobody Sat Sep 26 20:01:40 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=1790108537; cv=none; d=zohomail.com; s=zohoarc; b=g3JyGxjrtxahdYvjdt4S1QQz+CgsUDJxYmAuC7ezF5YmQtZGOOvqoORr5nKRQ4kJfU0Va3REcVE9fBs8B/9xU/Vh5gKAmhht+/GtJWaNg5E9AGytgnl2N9uwCcG7o/0Pd1uaFGxEHGAB8ARLzl2tbJeONJtne24eEOMMty2wb1w= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1790108537; 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:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=m4kPwAT/JzOgtUvlnJvzazdlnSn9JZdF/APYaDFIaa4=; b=ZenIr4tBMS19Vh5evY/uESgzMwtu/n+pzIu3qUWXi18yEIUBb4CXmmyVlsnHP1i6sngJxdziaUFNJfB5XLBqUPHSp8eA+J5VCX7THaXZhJCj/iJK0uJPmvbmqHoL2AvBOzl3aE8NuvqNpWCCab0VjrtlxzdeLIasPMpMRlTRyVs= 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 1790108537754868.713956576857; Tue, 22 Sep 2026 13:22:17 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists1p.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1x970G-0000uA-OH; Tue, 22 Sep 2026 16:22:12 -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 1x96zK-00089T-AQ for qemu-devel@nongnu.org; Tue, 22 Sep 2026 16:21:14 -0400 Received: from us-smtp-delivery-124.mimecast.com ([170.10.133.124]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1x96zI-0008WV-Lt for qemu-devel@nongnu.org; Tue, 22 Sep 2026 16:21:13 -0400 Received: from mx-prod-mc-01.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-592-D08L2l0MOq-JO1PFOCg_Ug-1; Tue, 22 Sep 2026 16:21:08 -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-01.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id 6BA5C195D02F; Tue, 22 Sep 2026 20:21:07 +0000 (UTC) Received: from localhost (headnet03.pony-001.prod.iad2.dc.redhat.com [10.2.32.114]) by mx-prod-int-10.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id 6CBDA41B; Tue, 22 Sep 2026 20:21:06 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1790108471; 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=m4kPwAT/JzOgtUvlnJvzazdlnSn9JZdF/APYaDFIaa4=; b=bMamqDIdeJFOTse/VKu9jSUZGwR4TprKTq/E3n10ikisCOdZlzomWxdY0BRGTjAoztAXQb potf0DXn8s+aWLtufRPGR9LHkkP9L0e50uJCD8dVyQVvXK9lMOEZVzaALdTqDdbFjJH3Vd uVsNIMFEXAHtFxVo8ZBXxSTNKwgfPDg= X-MC-Unique: D08L2l0MOq-JO1PFOCg_Ug-1 X-Mimecast-MFC-AGG-ID: D08L2l0MOq-JO1PFOCg_Ug_1790108467 From: =?utf-8?q?Marc-Andr=C3=A9_Lureau?= Date: Wed, 23 Sep 2026 00:17:40 +0400 Subject: [PATCH 33/88] qemu-iotests/245: migrate away from HMP MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Message-Id: <20260923-nohmp-v1-33-ebc029d4bd80@redhat.com> References: <20260923-nohmp-v1-0-ebc029d4bd80@redhat.com> In-Reply-To: <20260923-nohmp-v1-0-ebc029d4bd80@redhat.com> To: qemu-devel@nongnu.org Cc: Kevin Wolf , =?utf-8?q?Marc-Andr=C3=A9_Lureau?= , Hanna Reitz , qemu-block@nongnu.org X-Developer-Signature: v=1; a=openpgp-sha256; l=2386; i=marcandre.lureau@redhat.com; h=from:subject:message-id; bh=5Hegh+2tKBHP8+vztqNh7etXOJEw7NMI56eYPtI3t34=; b=kA0DAAoB2ujhCXWWnOUByyZiAGqy4rCjENdmtMcG0zjAV67pcIAKVXzQERihLtWomiE+Xz/gN okCMwQAAQoAHRYhBIepvZM/h8YG0nb2Ldro4Ql1lpzlBQJqsuKwAAoJENro4Ql1lpzlg/kP/1ps h+eFnPJi9eCEAsufYfZFXarYVCvJLues2J/jv2kO5xxSqqqV2g086vKpPx/1NRGRgi+wn2viNI8 katYYSB4GVl33ChlLKJbBpYZN8jx0RN2WcuD/HDOSLwmA0bD7T4jmPdKmGZ7pX0typDXfVfSn+d nLQo8L1ztq8DMa9ZHdeWNQGrtf2a4mwShP+NqjfRXfumiRlkz35pSGlGqvxRIcbXvxz8m9HC0Od EuuRUoIM43Qda4B6ExlzQalwhFSilSsPwKsxBAp5OPdLbptiobsXwXfOGQfrARJbjtGfRPa4O6R FtQ6LQSzdvIbHF8POrry1OJ8Q7CSf/BkMf6HyNcibKjKnR5d8MRcSGcK5RWjNADXzn5DOXXarqQ ljwJH/JSr955MKpvQJETRYtnIX2BAMbCWJ11K1ggrw7W3I3E0yLFAGuxYQet1kUqlnwKRZ4wU44 U67OiLrVGJl0Rs7WSYTGVq0ToYo81bvMz7nhstYV0k60CCRfnBTSnKpwCdGxk3vWbabmRauSnbs Kqm7ZfQUFPdFuEio1ko4URpgy9XgMxY/LJmYEnWQSwfiS7kGqo+sEKpTK1MobS9+dkbySnL4f39 XcboJMLPtbgz2mJ/fKB5OpN4IkiwuPMWlIhAGaA8QavJNEzgmkzvfAIBWRbtTbNi5n9LDLxWoMh 0K08e 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.133.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_H3=0.001, RCVD_IN_MSPIKE_WL=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-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: 1790108538291158500 No need to wait until the VM is shut down to verify the output. Signed-off-by: Marc-Andr=C3=A9 Lureau --- tests/qemu-iotests/245 | 28 +++------------------------- 1 file changed, 3 insertions(+), 25 deletions(-) diff --git a/tests/qemu-iotests/245 b/tests/qemu-iotests/245 index 2f354d1d9205..3f4a87d2cd8a 100755 --- a/tests/qemu-iotests/245 +++ b/tests/qemu-iotests/245 @@ -58,34 +58,13 @@ class TestBlockdevReopen(iotests.QMPTestCase): =20 def tearDown(self): self.vm.shutdown() - self.check_qemu_io_errors() os.remove(hd_path[0]) os.remove(hd_path[1]) os.remove(hd_path[2]) =20 - # The output of qemu-io is not returned by vm.hmp_qemu_io() but - # it's stored in the log and can only be read when the VM has been - # shut down. This function runs qemu-io and keeps track of the - # number of times it's been called. def run_qemu_io(self, img, cmd): - result =3D self.vm.hmp_qemu_io(img, cmd) - self.assert_qmp(result, 'return', '') - self.total_io_cmds +=3D 1 - - # Once the VM is shut down we can parse the log and see if qemu-io - # ran without errors. - def check_qemu_io_errors(self): - self.assertFalse(self.vm.is_running()) - found =3D 0 - log =3D self.vm.get_log() - for line in log.split("\n"): - if line.startswith("Pattern verification failed"): - raise Exception("%s (command #%d)" % (line, found)) - if re.match("(read|wrote) .*/.* bytes at offset", line): - found +=3D 1 - self.assertEqual(found, self.total_io_cmds, - "Expected output of %d qemu-io commands, found %d= " % - (found, self.total_io_cmds)) + result =3D self.vm.qmp('x-qemu-io', device=3Dimg, command=3Dcmd) + self.assert_qmp_absent(result, 'error') =20 # Run blockdev-reopen on a list of block devices def reopenMultiple(self, opts, errmsg =3D None): @@ -1160,5 +1139,4 @@ class TestBlockdevReopen(iotests.QMPTestCase): if __name__ =3D=3D '__main__': iotests.activate_logging() iotests.main(supported_fmts=3D["qcow2"], - supported_protocols=3D["file"], - require_hmp=3DTrue) + supported_protocols=3D["file"]) --=20 2.56.0.rc0.29.g47ce80527c56 From nobody Sat Sep 26 20:01:40 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=1790108715; cv=none; d=zohomail.com; s=zohoarc; b=ddxbQM4jyWLiXnUaQPRBM0lq30mRXB80l4vK22dcHqirxxSY4gnmDI+ZGQk7A067i48QVOjscQZ+oNhYRI6usfBMTnikzH1zYEypauyjrBpO15wPgVpywU+QtottbRNV26M8oX9F9JllbpeRjYZyIpnWvUR00hViVszkLIPT9W4= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1790108715; 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:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=uxEfmRMQ5coRD+2iN7K2dmIzHXM/mLZ3d6+9S/sqJ10=; b=Po0ybN16kiKiLgTvIhR33zVKVAkJKIx4Qn75q4J1k8mWgxyk1G6r1OboquQrFG/2SgXEKrtOJYLeYHgySj0/CnAbd2CyMP7xl6CO6olcCRGf5ZHb80vweEplwVOUbxY4Ojoz26XWdEoN8aYlMkgwE5rTZHDehAaaH+M5qHNgfjo= 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 17901087151161007.4853580665136; Tue, 22 Sep 2026 13:25:15 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists1p.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1x9707-0000ho-I9; Tue, 22 Sep 2026 16:22:03 -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 1x96zL-0008C8-FT for qemu-devel@nongnu.org; Tue, 22 Sep 2026 16:21:17 -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 1x96zJ-000055-Mg for qemu-devel@nongnu.org; Tue, 22 Sep 2026 16:21:14 -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-663-orJqN7DNNZ-L2OQd5x9NIg-1; Tue, 22 Sep 2026 16:21:11 -0400 Received: from mx-prod-int-03.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-03.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.12]) (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 BACCB18007FD; Tue, 22 Sep 2026 20:21:10 +0000 (UTC) Received: from localhost (headnet03.pony-001.prod.iad2.dc.redhat.com [10.2.32.114]) by mx-prod-int-03.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id EA0621956087; Tue, 22 Sep 2026 20:21:09 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1790108473; 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=uxEfmRMQ5coRD+2iN7K2dmIzHXM/mLZ3d6+9S/sqJ10=; b=WpmAyncLAcHDZ9gUEOrMfBfURw5uAG+anQr0RQ0t3OceS/SAccGC6uPeupxBUdkWsexCXA 6JydKPj6NAAgIz3THu+lN1Ql+nzsHzzVqditTwuY0gMReLrGFu+FilierCQrPzEI5KJo/v LqEHut0qa/i7sFp4WTWDtPl/4KCQ1pE= X-MC-Unique: orJqN7DNNZ-L2OQd5x9NIg-1 X-Mimecast-MFC-AGG-ID: orJqN7DNNZ-L2OQd5x9NIg_1790108470 From: =?utf-8?q?Marc-Andr=C3=A9_Lureau?= Date: Wed, 23 Sep 2026 00:17:41 +0400 Subject: [PATCH 34/88] qemu-iotests/255: migrate away from HMP MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Message-Id: <20260923-nohmp-v1-34-ebc029d4bd80@redhat.com> References: <20260923-nohmp-v1-0-ebc029d4bd80@redhat.com> In-Reply-To: <20260923-nohmp-v1-0-ebc029d4bd80@redhat.com> To: qemu-devel@nongnu.org Cc: Kevin Wolf , =?utf-8?q?Marc-Andr=C3=A9_Lureau?= , Hanna Reitz , qemu-block@nongnu.org X-Developer-Signature: v=1; a=openpgp-sha256; l=1069; i=marcandre.lureau@redhat.com; h=from:subject:message-id; bh=8Z84kd9IBI3YkYaDGI67gcP+iGiek63bo9ma3Xr+cJU=; b=kA0DAAoB2ujhCXWWnOUByyZiAGqy4rCh1lrnLYBkwm2gD/ETzYbOZhzpCR7bNEE1b3Ui3WCCr YkCMwQAAQoAHRYhBIepvZM/h8YG0nb2Ldro4Ql1lpzlBQJqsuKwAAoJENro4Ql1lpzlXUEQAI9M K+ChiUw1iWimtZVhHMC9Kf7UVz/y7kMfmHlq4b+E3BdQu/G/r0FtwASJWjNPM36/RJbsU8nDjsM iBhzVfsq5w6JuPd4zusPc6MLteX2twSlms40yDByAA9pb3XmtyLWNnCng6OrR8lvlPoIZ9Ehx7U MzCDoa4M+4WqVFSynFIqy+CxkpkTawDDwW6j1UfGA0hyHp8xJ6lq2XF5rrndV3A/mW2M0MiOr51 U9N+rrLLM8hmzTWhKTRSekKA72BBmvwWkWqokwmDzk9yzBlwAX4d3Xxq2pGotDcMOjoKvICIIO1 sE4q8GU39gEJzYhEGZHFf79QwXJcFFUOLXQeDEBDpyw642OpjS+tI1/ySQWiotJBt+5jiVWJ7wf IiJxAT8ezDtdRheHcHHBkn8jSg1R0tvXvdLiKscSC0Jfo5iwCaZjknGRXfgPUdLlSidXOzxrzE1 iUFtRxSGZwV/hQclCmnMUVQhKymVNY0/0AdQ76i06GniUxRK4TYD6LRcpNhMIbJ+WVKqPOnFoWq XdJvV/6pxgnzC21UPYr9ZES6gP0mADNrhlBXPaJKaaOoT8SUykQoGO3u0HAYkkR7rIXtf+5AnU9 pSYWKWiv8aHiu4AKnKlMRSqE8R6oafqcelAO1+tLGHuxuRbpGCB4NSFxdblu55wExwcv9j65eop 2pYJc X-Developer-Key: i=marcandre.lureau@redhat.com; a=openpgp; fpr=87A9BD933F87C606D276F62DDAE8E10975969CE5 X-Scanned-By: MIMEDefang 3.0 on 10.30.177.12 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: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 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, 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: 1790108717199158500 Signed-off-by: Marc-Andr=C3=A9 Lureau --- tests/qemu-iotests/255 | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/tests/qemu-iotests/255 b/tests/qemu-iotests/255 index 8f88522f1e91..83c2246db3b2 100755 --- a/tests/qemu-iotests/255 +++ b/tests/qemu-iotests/255 @@ -24,8 +24,7 @@ import iotests from iotests import imgfmt =20 -iotests.script_initialize(supported_fmts=3D['qcow2'], - require_hmp=3DTrue) +iotests.script_initialize(supported_fmts=3D['qcow2']) =20 iotests.log('Finishing a commit job with background reads') iotests.log('=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D') @@ -62,8 +61,8 @@ with iotests.FilePath('t.qcow2') as disk_path, \ iotests.log("") =20 def start_requests(): - vm.hmp_qemu_io('overlay', 'aio_read 0 4k') - vm.hmp_qemu_io('overlay', 'aio_read 0 4k') + vm.qmp_qemu_io('overlay', 'aio_read 0 4k') + vm.qmp_qemu_io('overlay', 'aio_read 0 4k') =20 start_requests() =20 --=20 2.56.0.rc0.29.g47ce80527c56 From nobody Sat Sep 26 20:01:40 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=1790109102; cv=none; d=zohomail.com; s=zohoarc; b=Xi1+YmuHmjm/2WMho04+iFMRpeX/kGJC2jLg43EK5eu4y+Gdl+MH5ehS4kx+yrpOqytNDJShQZVtapsAcK6Z9gK7lBAN0Zm1eKE5TgQxJJBLF+jcxNWatld/olfRqNPx9gJleRDVvN7uFFrUUBJb4nRTrDtuzaN3oHr2GmCWg1U= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1790109102; 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:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=2C09zC/uamIYnbycxHJNEwP15ExC//N0HYyPC7wjyzU=; b=ctbHCdOiOmwybxx5g23u3RKJgoD7ct6gOryqizX1oidGntXZSV0ki1jH2c/7tKcLqkfbzD5bN/zwVi/bcQDT+gx+rtrPxRBIgTBXXJzFYD5c0JBvOQsdX2N12DfEZzG99oBoFAtHNlIFssxabZYBwe80ivBsru/qfLT6PiNhwgU= 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 1790109102129372.11321957887367; Tue, 22 Sep 2026 13:31:42 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists1p.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1x96zn-0000Qo-35; Tue, 22 Sep 2026 16:21:43 -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 1x96zT-0008Im-HG for qemu-devel@nongnu.org; Tue, 22 Sep 2026 16:21:25 -0400 Received: from us-smtp-delivery-124.mimecast.com ([170.10.133.124]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1x96zP-00006G-IT for qemu-devel@nongnu.org; Tue, 22 Sep 2026 16:21:22 -0400 Received: from mx-prod-mc-08.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-100-1NgG0gjKOLy39vlr9AqZMA-1; Tue, 22 Sep 2026 16:21:15 -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-08.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id 4FB4D185588D; Tue, 22 Sep 2026 20:21:14 +0000 (UTC) Received: from localhost (headnet03.pony-001.prod.iad2.dc.redhat.com [10.2.32.114]) by mx-prod-int-10.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id 7E93E418; Tue, 22 Sep 2026 20:21:13 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1790108479; 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=2C09zC/uamIYnbycxHJNEwP15ExC//N0HYyPC7wjyzU=; b=AMn2fw8yFBFQZeyUl5ypzFc7Hls37zBGnhU0AiqxMVuCj12MAcng1R8oR4mA6YynVlywty JXDANgk+cSGnDciQzRb2fO2tR3CKnOK6JxEDePjxga9C4u1JpicK5LSpCbEHANbRh0K2to 3g6qCkYQMGWUEwT/16v6I76PolPyQ4I= X-MC-Unique: 1NgG0gjKOLy39vlr9AqZMA-1 X-Mimecast-MFC-AGG-ID: 1NgG0gjKOLy39vlr9AqZMA_1790108474 From: =?utf-8?q?Marc-Andr=C3=A9_Lureau?= Date: Wed, 23 Sep 2026 00:17:42 +0400 Subject: [PATCH 35/88] qemu-iotests/257: migrate away from HMP MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Message-Id: <20260923-nohmp-v1-35-ebc029d4bd80@redhat.com> References: <20260923-nohmp-v1-0-ebc029d4bd80@redhat.com> In-Reply-To: <20260923-nohmp-v1-0-ebc029d4bd80@redhat.com> To: qemu-devel@nongnu.org Cc: Kevin Wolf , =?utf-8?q?Marc-Andr=C3=A9_Lureau?= , Hanna Reitz , qemu-block@nongnu.org X-Developer-Signature: v=1; a=openpgp-sha256; l=29463; i=marcandre.lureau@redhat.com; h=from:subject:message-id; bh=+Phsca7pI5y8NGKjPanX7AFd9YSEAFE4Ag0Bp83AGo4=; b=owEBbQKS/ZANAwAKAdro4Ql1lpzlAcsmYgBqsuKwsqh8Awx0wBkS1mWz3XL2h1T1JHpTspBS8 FCgjtYp9+CJAjMEAAEKAB0WIQSHqb2TP4fGBtJ29i3a6OEJdZac5QUCarLisAAKCRDa6OEJdZac 5VyWD/9epqfYQjglxJlCXsFenz0nAo2ha9sioic60W6RE+LKB0V/XJ4soPLn1MXmre/tfPhQACB J+Zhnpf336ee1LaTcu5+oSUgxw+Elhtewy1WtMF9wvkxF19soqO3Lir8ZUEIzTzIVcv6hW/svAb 1pshivodzHZuyS2LXZLnPt11DydsOtCZ3ax1MFva3OF+niydbV69o4osbYNwFkjKSkrecgReX9F L4OlLh9IwbeW/3RDwFAAzcHYVl9e4gdjOSUs77jCVB4kU1SwJFGdMerjPwSqtVP29YdDJAfw1t5 2J8fXukvwOUlFazcLf/cpxlvkNZgv1sLA0Rhvsl4O3HIL/bBPC7Ul7kLLykyy/4H9W0UT4UHu4k BymCZgwvuhVhwTsVRSlnYDIYH6uiOo7Z+n1ZSPlLyvLQgS/HpuiSsgZcdqmV3NLxhmra5r0PWcT GNLTnBuXUWIWcUjJ5fdgPXf7o5OKjAOWT2CG3tar56+4R/LXiM0ewHnRRbNNeBaoAhgNadnFQ8K a5BltOI+xMt5hwRCO32W1O+0fHdzYXtVdhbY30VmRsIYqfZQROMKFXJG0CulWDeaALQ5xelPxnk +uDZyVg0KOIKioHPlyjhTxqRWUBnoHU5TTsZs3Q7eYLWYC3SspcFKQvGCFIuL7LnX0cgPmzTVc6 YUtM1qThsQn6wKw== 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.133.124; envelope-from=marcandre.lureau@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 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_H3=0.001, RCVD_IN_MSPIKE_WL=0.001, SPF_HELO_PASS=-0.001, SPF_PASS=-0.001 autolearn=unavailable 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: 1790109105453158500 No need to log success, the qmp_qemu_io() command already checks for it. Signed-off-by: Marc-Andr=C3=A9 Lureau --- tests/qemu-iotests/257 | 7 +- tests/qemu-iotests/257.out | 315 -----------------------------------------= ---- 2 files changed, 3 insertions(+), 319 deletions(-) diff --git a/tests/qemu-iotests/257 b/tests/qemu-iotests/257 index 5e4dba02e769..3fbf24531a7d 100755 --- a/tests/qemu-iotests/257 +++ b/tests/qemu-iotests/257 @@ -227,7 +227,7 @@ def perform_writes(drive, n, filter_node_name=3DNone): pattern.offset, pattern.size) log(cmd) - log(drive.vm.hmp_qemu_io(filter_node_name or drive.node, cmd)) + drive.vm.qmp_qemu_io(filter_node_name or drive.node, cmd) bitmaps =3D drive.vm.query_bitmaps() log({'bitmaps': bitmaps}, indent=3D2) log('') @@ -354,7 +354,7 @@ def test_bitmap_sync(bsync_mode, msync_mode=3D'bitmap',= failure=3DNone): # 1 - Test Backup (w/ Optional induced failure) if failure =3D=3D 'intermediate': # Activate blkdebug induced failure for second-to-next read - log(vm.hmp_qemu_io(drive0.node, 'flush')) + vm.qmp_qemu_io(drive0.node, 'flush') log('') job =3D backup(drive0, 1, bsync1, msync_mode, bitmap=3D"bitmap0", bitmap_mode=3Dbsync_mode) @@ -533,5 +533,4 @@ def main(): =20 if __name__ =3D=3D '__main__': iotests.script_main(main, supported_fmts=3D['qcow2'], - supported_protocols=3D['file'], - require_hmp=3DTrue) + supported_protocols=3D['file']) diff --git a/tests/qemu-iotests/257.out b/tests/qemu-iotests/257.out index fb28333cb2fa..984dd7dbd73e 100644 --- a/tests/qemu-iotests/257.out +++ b/tests/qemu-iotests/257.out @@ -9,13 +9,9 @@ --- Write #0 --- =20 write -P0x49 0x0000000 0x10000 -{"return": ""} write -P0x6c 0x0100000 0x10000 -{"return": ""} write -P0x6f 0x2000000 0x10000 -{"return": ""} write -P0x76 0x3ff0000 0x10000 -{"return": ""} { "bitmaps": {} } @@ -42,13 +38,9 @@ write -P0x76 0x3ff0000 0x10000 --- Write #1 --- =20 write -P0x65 0x0000000 0x10000 -{"return": ""} write -P0x77 0x00f8000 0x10000 -{"return": ""} write -P0x72 0x2008000 0x10000 -{"return": ""} write -P0x69 0x3fe0000 0x10000 -{"return": ""} { "bitmaps": { "drive0": [ @@ -97,13 +89,9 @@ expecting 6 dirty sectors; have 6. OK! --- Write #2 --- =20 write -P0x74 0x0010000 0x10000 -{"return": ""} write -P0x69 0x00e8000 0x10000 -{"return": ""} write -P0x6e 0x2018000 0x10000 -{"return": ""} write -P0x67 0x3fe0000 0x20000 -{"return": ""} { "bitmaps": { "backup-top": [ @@ -180,13 +168,9 @@ expecting 10 dirty sectors; have 10. OK! --- Write #3 --- =20 write -P0xaa 0x0010000 0x30000 -{"return": ""} write -P0xbb 0x00d8000 0x10000 -{"return": ""} write -P0xcc 0x2028000 0x10000 -{"return": ""} write -P0xdd 0x3fc0000 0x10000 -{"return": ""} { "bitmaps": { "drive0": [ @@ -278,13 +262,9 @@ qemu_img compare "TEST_DIR/PID-img" "TEST_DIR/PID-fbac= kup2" =3D=3D> Identical, OK! --- Write #0 --- =20 write -P0x49 0x0000000 0x10000 -{"return": ""} write -P0x6c 0x0100000 0x10000 -{"return": ""} write -P0x6f 0x2000000 0x10000 -{"return": ""} write -P0x76 0x3ff0000 0x10000 -{"return": ""} { "bitmaps": {} } @@ -311,13 +291,9 @@ write -P0x76 0x3ff0000 0x10000 --- Write #1 --- =20 write -P0x65 0x0000000 0x10000 -{"return": ""} write -P0x77 0x00f8000 0x10000 -{"return": ""} write -P0x72 0x2008000 0x10000 -{"return": ""} write -P0x69 0x3fe0000 0x10000 -{"return": ""} { "bitmaps": { "drive0": [ @@ -350,7 +326,6 @@ expecting 6 dirty sectors; have 6. OK! {"return": {}} {"data": {"device": "ref_backup_1", "len": 67108864, "offset": 67108864, "= speed": 0, "type": "backup"}, "event": "BLOCK_JOB_COMPLETED", "timestamp": = {"microseconds": "USECS", "seconds": "SECS"}} =20 -{"return": ""} =20 --- Test Backup #1 --- =20 @@ -387,13 +362,9 @@ expecting 6 dirty sectors; have 6. OK! --- Write #3 --- =20 write -P0xaa 0x0010000 0x30000 -{"return": ""} write -P0xbb 0x00d8000 0x10000 -{"return": ""} write -P0xcc 0x2028000 0x10000 -{"return": ""} write -P0xdd 0x3fc0000 0x10000 -{"return": ""} { "bitmaps": { "drive0": [ @@ -485,13 +456,9 @@ qemu_img compare "TEST_DIR/PID-img" "TEST_DIR/PID-fbac= kup2" =3D=3D> Identical, OK! --- Write #0 --- =20 write -P0x49 0x0000000 0x10000 -{"return": ""} write -P0x6c 0x0100000 0x10000 -{"return": ""} write -P0x6f 0x2000000 0x10000 -{"return": ""} write -P0x76 0x3ff0000 0x10000 -{"return": ""} { "bitmaps": {} } @@ -518,13 +485,9 @@ write -P0x76 0x3ff0000 0x10000 --- Write #1 --- =20 write -P0x65 0x0000000 0x10000 -{"return": ""} write -P0x77 0x00f8000 0x10000 -{"return": ""} write -P0x72 0x2008000 0x10000 -{"return": ""} write -P0x69 0x3fe0000 0x10000 -{"return": ""} { "bitmaps": { "drive0": [ @@ -573,13 +536,9 @@ expecting 6 dirty sectors; have 6. OK! --- Write #2 --- =20 write -P0x74 0x0010000 0x10000 -{"return": ""} write -P0x69 0x00e8000 0x10000 -{"return": ""} write -P0x6e 0x2018000 0x10000 -{"return": ""} write -P0x67 0x3fe0000 0x20000 -{"return": ""} { "bitmaps": { "backup-top": [ @@ -656,13 +615,9 @@ expecting 10 dirty sectors; have 10. OK! --- Write #3 --- =20 write -P0xaa 0x0010000 0x30000 -{"return": ""} write -P0xbb 0x00d8000 0x10000 -{"return": ""} write -P0xcc 0x2028000 0x10000 -{"return": ""} write -P0xdd 0x3fc0000 0x10000 -{"return": ""} { "bitmaps": { "drive0": [ @@ -754,13 +709,9 @@ qemu_img compare "TEST_DIR/PID-img" "TEST_DIR/PID-fbac= kup2" =3D=3D> Identical, OK! --- Write #0 --- =20 write -P0x49 0x0000000 0x10000 -{"return": ""} write -P0x6c 0x0100000 0x10000 -{"return": ""} write -P0x6f 0x2000000 0x10000 -{"return": ""} write -P0x76 0x3ff0000 0x10000 -{"return": ""} { "bitmaps": {} } @@ -787,13 +738,9 @@ write -P0x76 0x3ff0000 0x10000 --- Write #1 --- =20 write -P0x65 0x0000000 0x10000 -{"return": ""} write -P0x77 0x00f8000 0x10000 -{"return": ""} write -P0x72 0x2008000 0x10000 -{"return": ""} write -P0x69 0x3fe0000 0x10000 -{"return": ""} { "bitmaps": { "drive0": [ @@ -842,13 +789,9 @@ expecting 6 dirty sectors; have 6. OK! --- Write #2 --- =20 write -P0x74 0x0010000 0x10000 -{"return": ""} write -P0x69 0x00e8000 0x10000 -{"return": ""} write -P0x6e 0x2018000 0x10000 -{"return": ""} write -P0x67 0x3fe0000 0x20000 -{"return": ""} { "bitmaps": { "backup-top": [ @@ -925,13 +868,9 @@ expecting 10 dirty sectors; have 10. OK! --- Write #3 --- =20 write -P0xaa 0x0010000 0x30000 -{"return": ""} write -P0xbb 0x00d8000 0x10000 -{"return": ""} write -P0xcc 0x2028000 0x10000 -{"return": ""} write -P0xdd 0x3fc0000 0x10000 -{"return": ""} { "bitmaps": { "drive0": [ @@ -1023,13 +962,9 @@ qemu_img compare "TEST_DIR/PID-img" "TEST_DIR/PID-fba= ckup2" =3D=3D> Identical, OK! --- Write #0 --- =20 write -P0x49 0x0000000 0x10000 -{"return": ""} write -P0x6c 0x0100000 0x10000 -{"return": ""} write -P0x6f 0x2000000 0x10000 -{"return": ""} write -P0x76 0x3ff0000 0x10000 -{"return": ""} { "bitmaps": {} } @@ -1056,13 +991,9 @@ write -P0x76 0x3ff0000 0x10000 --- Write #1 --- =20 write -P0x65 0x0000000 0x10000 -{"return": ""} write -P0x77 0x00f8000 0x10000 -{"return": ""} write -P0x72 0x2008000 0x10000 -{"return": ""} write -P0x69 0x3fe0000 0x10000 -{"return": ""} { "bitmaps": { "drive0": [ @@ -1095,7 +1026,6 @@ expecting 6 dirty sectors; have 6. OK! {"return": {}} {"data": {"device": "ref_backup_1", "len": 67108864, "offset": 67108864, "= speed": 0, "type": "backup"}, "event": "BLOCK_JOB_COMPLETED", "timestamp": = {"microseconds": "USECS", "seconds": "SECS"}} =20 -{"return": ""} =20 --- Test Backup #1 --- =20 @@ -1132,13 +1062,9 @@ expecting 6 dirty sectors; have 6. OK! --- Write #3 --- =20 write -P0xaa 0x0010000 0x30000 -{"return": ""} write -P0xbb 0x00d8000 0x10000 -{"return": ""} write -P0xcc 0x2028000 0x10000 -{"return": ""} write -P0xdd 0x3fc0000 0x10000 -{"return": ""} { "bitmaps": { "drive0": [ @@ -1230,13 +1156,9 @@ qemu_img compare "TEST_DIR/PID-img" "TEST_DIR/PID-fb= ackup2" =3D=3D> Identical, OK! --- Write #0 --- =20 write -P0x49 0x0000000 0x10000 -{"return": ""} write -P0x6c 0x0100000 0x10000 -{"return": ""} write -P0x6f 0x2000000 0x10000 -{"return": ""} write -P0x76 0x3ff0000 0x10000 -{"return": ""} { "bitmaps": {} } @@ -1263,13 +1185,9 @@ write -P0x76 0x3ff0000 0x10000 --- Write #1 --- =20 write -P0x65 0x0000000 0x10000 -{"return": ""} write -P0x77 0x00f8000 0x10000 -{"return": ""} write -P0x72 0x2008000 0x10000 -{"return": ""} write -P0x69 0x3fe0000 0x10000 -{"return": ""} { "bitmaps": { "drive0": [ @@ -1318,13 +1236,9 @@ expecting 6 dirty sectors; have 6. OK! --- Write #2 --- =20 write -P0x74 0x0010000 0x10000 -{"return": ""} write -P0x69 0x00e8000 0x10000 -{"return": ""} write -P0x6e 0x2018000 0x10000 -{"return": ""} write -P0x67 0x3fe0000 0x20000 -{"return": ""} { "bitmaps": { "backup-top": [ @@ -1401,13 +1315,9 @@ expecting 7 dirty sectors; have 7. OK! --- Write #3 --- =20 write -P0xaa 0x0010000 0x30000 -{"return": ""} write -P0xbb 0x00d8000 0x10000 -{"return": ""} write -P0xcc 0x2028000 0x10000 -{"return": ""} write -P0xdd 0x3fc0000 0x10000 -{"return": ""} { "bitmaps": { "drive0": [ @@ -1499,13 +1409,9 @@ qemu_img compare "TEST_DIR/PID-img" "TEST_DIR/PID-fb= ackup2" =3D=3D> Identical, OK! --- Write #0 --- =20 write -P0x49 0x0000000 0x10000 -{"return": ""} write -P0x6c 0x0100000 0x10000 -{"return": ""} write -P0x6f 0x2000000 0x10000 -{"return": ""} write -P0x76 0x3ff0000 0x10000 -{"return": ""} { "bitmaps": {} } @@ -1532,13 +1438,9 @@ write -P0x76 0x3ff0000 0x10000 --- Write #1 --- =20 write -P0x65 0x0000000 0x10000 -{"return": ""} write -P0x77 0x00f8000 0x10000 -{"return": ""} write -P0x72 0x2008000 0x10000 -{"return": ""} write -P0x69 0x3fe0000 0x10000 -{"return": ""} { "bitmaps": { "drive0": [ @@ -1587,13 +1489,9 @@ expecting 6 dirty sectors; have 6. OK! --- Write #2 --- =20 write -P0x74 0x0010000 0x10000 -{"return": ""} write -P0x69 0x00e8000 0x10000 -{"return": ""} write -P0x6e 0x2018000 0x10000 -{"return": ""} write -P0x67 0x3fe0000 0x20000 -{"return": ""} { "bitmaps": { "backup-top": [ @@ -1670,13 +1568,9 @@ expecting 7 dirty sectors; have 7. OK! --- Write #3 --- =20 write -P0xaa 0x0010000 0x30000 -{"return": ""} write -P0xbb 0x00d8000 0x10000 -{"return": ""} write -P0xcc 0x2028000 0x10000 -{"return": ""} write -P0xdd 0x3fc0000 0x10000 -{"return": ""} { "bitmaps": { "drive0": [ @@ -1768,13 +1662,9 @@ qemu_img compare "TEST_DIR/PID-img" "TEST_DIR/PID-fb= ackup2" =3D=3D> Identical, OK! --- Write #0 --- =20 write -P0x49 0x0000000 0x10000 -{"return": ""} write -P0x6c 0x0100000 0x10000 -{"return": ""} write -P0x6f 0x2000000 0x10000 -{"return": ""} write -P0x76 0x3ff0000 0x10000 -{"return": ""} { "bitmaps": {} } @@ -1801,13 +1691,9 @@ write -P0x76 0x3ff0000 0x10000 --- Write #1 --- =20 write -P0x65 0x0000000 0x10000 -{"return": ""} write -P0x77 0x00f8000 0x10000 -{"return": ""} write -P0x72 0x2008000 0x10000 -{"return": ""} write -P0x69 0x3fe0000 0x10000 -{"return": ""} { "bitmaps": { "drive0": [ @@ -1840,7 +1726,6 @@ expecting 6 dirty sectors; have 6. OK! {"return": {}} {"data": {"device": "ref_backup_1", "len": 67108864, "offset": 67108864, "= speed": 0, "type": "backup"}, "event": "BLOCK_JOB_COMPLETED", "timestamp": = {"microseconds": "USECS", "seconds": "SECS"}} =20 -{"return": ""} =20 --- Test Backup #1 --- =20 @@ -1877,13 +1762,9 @@ expecting 5 dirty sectors; have 5. OK! --- Write #3 --- =20 write -P0xaa 0x0010000 0x30000 -{"return": ""} write -P0xbb 0x00d8000 0x10000 -{"return": ""} write -P0xcc 0x2028000 0x10000 -{"return": ""} write -P0xdd 0x3fc0000 0x10000 -{"return": ""} { "bitmaps": { "drive0": [ @@ -1975,13 +1856,9 @@ qemu_img compare "TEST_DIR/PID-img" "TEST_DIR/PID-fb= ackup2" =3D=3D> Identical, OK! --- Write #0 --- =20 write -P0x49 0x0000000 0x10000 -{"return": ""} write -P0x6c 0x0100000 0x10000 -{"return": ""} write -P0x6f 0x2000000 0x10000 -{"return": ""} write -P0x76 0x3ff0000 0x10000 -{"return": ""} { "bitmaps": {} } @@ -2008,13 +1885,9 @@ write -P0x76 0x3ff0000 0x10000 --- Write #1 --- =20 write -P0x65 0x0000000 0x10000 -{"return": ""} write -P0x77 0x00f8000 0x10000 -{"return": ""} write -P0x72 0x2008000 0x10000 -{"return": ""} write -P0x69 0x3fe0000 0x10000 -{"return": ""} { "bitmaps": { "drive0": [ @@ -2063,13 +1936,9 @@ expecting 6 dirty sectors; have 6. OK! --- Write #2 --- =20 write -P0x74 0x0010000 0x10000 -{"return": ""} write -P0x69 0x00e8000 0x10000 -{"return": ""} write -P0x6e 0x2018000 0x10000 -{"return": ""} write -P0x67 0x3fe0000 0x20000 -{"return": ""} { "bitmaps": { "backup-top": [ @@ -2146,13 +2015,9 @@ expecting 7 dirty sectors; have 7. OK! --- Write #3 --- =20 write -P0xaa 0x0010000 0x30000 -{"return": ""} write -P0xbb 0x00d8000 0x10000 -{"return": ""} write -P0xcc 0x2028000 0x10000 -{"return": ""} write -P0xdd 0x3fc0000 0x10000 -{"return": ""} { "bitmaps": { "drive0": [ @@ -2244,13 +2109,9 @@ qemu_img compare "TEST_DIR/PID-img" "TEST_DIR/PID-fb= ackup2" =3D=3D> Identical, OK! --- Write #0 --- =20 write -P0x49 0x0000000 0x10000 -{"return": ""} write -P0x6c 0x0100000 0x10000 -{"return": ""} write -P0x6f 0x2000000 0x10000 -{"return": ""} write -P0x76 0x3ff0000 0x10000 -{"return": ""} { "bitmaps": {} } @@ -2277,13 +2138,9 @@ write -P0x76 0x3ff0000 0x10000 --- Write #1 --- =20 write -P0x65 0x0000000 0x10000 -{"return": ""} write -P0x77 0x00f8000 0x10000 -{"return": ""} write -P0x72 0x2008000 0x10000 -{"return": ""} write -P0x69 0x3fe0000 0x10000 -{"return": ""} { "bitmaps": { "drive0": [ @@ -2332,13 +2189,9 @@ expecting 6 dirty sectors; have 6. OK! --- Write #2 --- =20 write -P0x74 0x0010000 0x10000 -{"return": ""} write -P0x69 0x00e8000 0x10000 -{"return": ""} write -P0x6e 0x2018000 0x10000 -{"return": ""} write -P0x67 0x3fe0000 0x20000 -{"return": ""} { "bitmaps": { "backup-top": [ @@ -2415,13 +2268,9 @@ expecting 10 dirty sectors; have 10. OK! --- Write #3 --- =20 write -P0xaa 0x0010000 0x30000 -{"return": ""} write -P0xbb 0x00d8000 0x10000 -{"return": ""} write -P0xcc 0x2028000 0x10000 -{"return": ""} write -P0xdd 0x3fc0000 0x10000 -{"return": ""} { "bitmaps": { "drive0": [ @@ -2513,13 +2362,9 @@ qemu_img compare "TEST_DIR/PID-img" "TEST_DIR/PID-fb= ackup2" =3D=3D> Identical, OK! --- Write #0 --- =20 write -P0x49 0x0000000 0x10000 -{"return": ""} write -P0x6c 0x0100000 0x10000 -{"return": ""} write -P0x6f 0x2000000 0x10000 -{"return": ""} write -P0x76 0x3ff0000 0x10000 -{"return": ""} { "bitmaps": {} } @@ -2546,13 +2391,9 @@ write -P0x76 0x3ff0000 0x10000 --- Write #1 --- =20 write -P0x65 0x0000000 0x10000 -{"return": ""} write -P0x77 0x00f8000 0x10000 -{"return": ""} write -P0x72 0x2008000 0x10000 -{"return": ""} write -P0x69 0x3fe0000 0x10000 -{"return": ""} { "bitmaps": { "drive0": [ @@ -2585,7 +2426,6 @@ expecting 6 dirty sectors; have 6. OK! {"return": {}} {"data": {"device": "ref_backup_1", "len": 67108864, "offset": 67108864, "= speed": 0, "type": "backup"}, "event": "BLOCK_JOB_COMPLETED", "timestamp": = {"microseconds": "USECS", "seconds": "SECS"}} =20 -{"return": ""} =20 --- Test Backup #1 --- =20 @@ -2622,13 +2462,9 @@ expecting 6 dirty sectors; have 6. OK! --- Write #3 --- =20 write -P0xaa 0x0010000 0x30000 -{"return": ""} write -P0xbb 0x00d8000 0x10000 -{"return": ""} write -P0xcc 0x2028000 0x10000 -{"return": ""} write -P0xdd 0x3fc0000 0x10000 -{"return": ""} { "bitmaps": { "drive0": [ @@ -2720,13 +2556,9 @@ qemu_img compare "TEST_DIR/PID-img" "TEST_DIR/PID-fb= ackup2" =3D=3D> Identical, OK! --- Write #0 --- =20 write -P0x49 0x0000000 0x10000 -{"return": ""} write -P0x6c 0x0100000 0x10000 -{"return": ""} write -P0x6f 0x2000000 0x10000 -{"return": ""} write -P0x76 0x3ff0000 0x10000 -{"return": ""} { "bitmaps": {} } @@ -2753,13 +2585,9 @@ write -P0x76 0x3ff0000 0x10000 --- Write #1 --- =20 write -P0x65 0x0000000 0x10000 -{"return": ""} write -P0x77 0x00f8000 0x10000 -{"return": ""} write -P0x72 0x2008000 0x10000 -{"return": ""} write -P0x69 0x3fe0000 0x10000 -{"return": ""} { "bitmaps": { "drive0": [ @@ -2808,13 +2636,9 @@ expecting 6 dirty sectors; have 6. OK! --- Write #2 --- =20 write -P0x74 0x0010000 0x10000 -{"return": ""} write -P0x69 0x00e8000 0x10000 -{"return": ""} write -P0x6e 0x2018000 0x10000 -{"return": ""} write -P0x67 0x3fe0000 0x20000 -{"return": ""} { "bitmaps": { "backup-top": [ @@ -2891,13 +2715,9 @@ expecting 7 dirty sectors; have 7. OK! --- Write #3 --- =20 write -P0xaa 0x0010000 0x30000 -{"return": ""} write -P0xbb 0x00d8000 0x10000 -{"return": ""} write -P0xcc 0x2028000 0x10000 -{"return": ""} write -P0xdd 0x3fc0000 0x10000 -{"return": ""} { "bitmaps": { "drive0": [ @@ -2989,13 +2809,9 @@ qemu_img compare "TEST_DIR/PID-img" "TEST_DIR/PID-fb= ackup2" =3D=3D> Identical, OK! --- Write #0 --- =20 write -P0x49 0x0000000 0x10000 -{"return": ""} write -P0x6c 0x0100000 0x10000 -{"return": ""} write -P0x6f 0x2000000 0x10000 -{"return": ""} write -P0x76 0x3ff0000 0x10000 -{"return": ""} { "bitmaps": {} } @@ -3022,13 +2838,9 @@ write -P0x76 0x3ff0000 0x10000 --- Write #1 --- =20 write -P0x65 0x0000000 0x10000 -{"return": ""} write -P0x77 0x00f8000 0x10000 -{"return": ""} write -P0x72 0x2008000 0x10000 -{"return": ""} write -P0x69 0x3fe0000 0x10000 -{"return": ""} { "bitmaps": { "drive0": [ @@ -3077,13 +2889,9 @@ expecting 6 dirty sectors; have 6. OK! --- Write #2 --- =20 write -P0x74 0x0010000 0x10000 -{"return": ""} write -P0x69 0x00e8000 0x10000 -{"return": ""} write -P0x6e 0x2018000 0x10000 -{"return": ""} write -P0x67 0x3fe0000 0x20000 -{"return": ""} { "bitmaps": { "backup-top": [ @@ -3160,13 +2968,9 @@ expecting 7 dirty sectors; have 7. OK! --- Write #3 --- =20 write -P0xaa 0x0010000 0x30000 -{"return": ""} write -P0xbb 0x00d8000 0x10000 -{"return": ""} write -P0xcc 0x2028000 0x10000 -{"return": ""} write -P0xdd 0x3fc0000 0x10000 -{"return": ""} { "bitmaps": { "drive0": [ @@ -3258,13 +3062,9 @@ qemu_img compare "TEST_DIR/PID-img" "TEST_DIR/PID-fb= ackup2" =3D=3D> Identical, OK! --- Write #0 --- =20 write -P0x49 0x0000000 0x10000 -{"return": ""} write -P0x6c 0x0100000 0x10000 -{"return": ""} write -P0x6f 0x2000000 0x10000 -{"return": ""} write -P0x76 0x3ff0000 0x10000 -{"return": ""} { "bitmaps": {} } @@ -3291,13 +3091,9 @@ write -P0x76 0x3ff0000 0x10000 --- Write #1 --- =20 write -P0x65 0x0000000 0x10000 -{"return": ""} write -P0x77 0x00f8000 0x10000 -{"return": ""} write -P0x72 0x2008000 0x10000 -{"return": ""} write -P0x69 0x3fe0000 0x10000 -{"return": ""} { "bitmaps": { "drive0": [ @@ -3330,7 +3126,6 @@ expecting 6 dirty sectors; have 6. OK! {"return": {}} {"data": {"device": "ref_backup_1", "len": 67108864, "offset": 67108864, "= speed": 0, "type": "backup"}, "event": "BLOCK_JOB_COMPLETED", "timestamp": = {"microseconds": "USECS", "seconds": "SECS"}} =20 -{"return": ""} =20 --- Test Backup #1 --- =20 @@ -3367,13 +3162,9 @@ expecting 1009 dirty sectors; have 1009. OK! --- Write #3 --- =20 write -P0xaa 0x0010000 0x30000 -{"return": ""} write -P0xbb 0x00d8000 0x10000 -{"return": ""} write -P0xcc 0x2028000 0x10000 -{"return": ""} write -P0xdd 0x3fc0000 0x10000 -{"return": ""} { "bitmaps": { "drive0": [ @@ -3465,13 +3256,9 @@ qemu_img compare "TEST_DIR/PID-img" "TEST_DIR/PID-fb= ackup2" =3D=3D> Identical, OK! --- Write #0 --- =20 write -P0x49 0x0000000 0x10000 -{"return": ""} write -P0x6c 0x0100000 0x10000 -{"return": ""} write -P0x6f 0x2000000 0x10000 -{"return": ""} write -P0x76 0x3ff0000 0x10000 -{"return": ""} { "bitmaps": {} } @@ -3498,13 +3285,9 @@ write -P0x76 0x3ff0000 0x10000 --- Write #1 --- =20 write -P0x65 0x0000000 0x10000 -{"return": ""} write -P0x77 0x00f8000 0x10000 -{"return": ""} write -P0x72 0x2008000 0x10000 -{"return": ""} write -P0x69 0x3fe0000 0x10000 -{"return": ""} { "bitmaps": { "drive0": [ @@ -3553,13 +3336,9 @@ expecting 6 dirty sectors; have 6. OK! --- Write #2 --- =20 write -P0x74 0x0010000 0x10000 -{"return": ""} write -P0x69 0x00e8000 0x10000 -{"return": ""} write -P0x6e 0x2018000 0x10000 -{"return": ""} write -P0x67 0x3fe0000 0x20000 -{"return": ""} { "bitmaps": { "backup-top": [ @@ -3636,13 +3415,9 @@ expecting 7 dirty sectors; have 7. OK! --- Write #3 --- =20 write -P0xaa 0x0010000 0x30000 -{"return": ""} write -P0xbb 0x00d8000 0x10000 -{"return": ""} write -P0xcc 0x2028000 0x10000 -{"return": ""} write -P0xdd 0x3fc0000 0x10000 -{"return": ""} { "bitmaps": { "drive0": [ @@ -3734,13 +3509,9 @@ qemu_img compare "TEST_DIR/PID-img" "TEST_DIR/PID-fb= ackup2" =3D=3D> Identical, OK! --- Write #0 --- =20 write -P0x49 0x0000000 0x10000 -{"return": ""} write -P0x6c 0x0100000 0x10000 -{"return": ""} write -P0x6f 0x2000000 0x10000 -{"return": ""} write -P0x76 0x3ff0000 0x10000 -{"return": ""} { "bitmaps": {} } @@ -3767,13 +3538,9 @@ write -P0x76 0x3ff0000 0x10000 --- Write #1 --- =20 write -P0x65 0x0000000 0x10000 -{"return": ""} write -P0x77 0x00f8000 0x10000 -{"return": ""} write -P0x72 0x2008000 0x10000 -{"return": ""} write -P0x69 0x3fe0000 0x10000 -{"return": ""} { "bitmaps": { "drive0": [ @@ -3822,13 +3589,9 @@ expecting 6 dirty sectors; have 6. OK! --- Write #2 --- =20 write -P0x74 0x0010000 0x10000 -{"return": ""} write -P0x69 0x00e8000 0x10000 -{"return": ""} write -P0x6e 0x2018000 0x10000 -{"return": ""} write -P0x67 0x3fe0000 0x20000 -{"return": ""} { "bitmaps": { "backup-top": [ @@ -3905,13 +3668,9 @@ expecting 10 dirty sectors; have 10. OK! --- Write #3 --- =20 write -P0xaa 0x0010000 0x30000 -{"return": ""} write -P0xbb 0x00d8000 0x10000 -{"return": ""} write -P0xcc 0x2028000 0x10000 -{"return": ""} write -P0xdd 0x3fc0000 0x10000 -{"return": ""} { "bitmaps": { "drive0": [ @@ -4003,13 +3762,9 @@ qemu_img compare "TEST_DIR/PID-img" "TEST_DIR/PID-fb= ackup2" =3D=3D> Identical, OK! --- Write #0 --- =20 write -P0x49 0x0000000 0x10000 -{"return": ""} write -P0x6c 0x0100000 0x10000 -{"return": ""} write -P0x6f 0x2000000 0x10000 -{"return": ""} write -P0x76 0x3ff0000 0x10000 -{"return": ""} { "bitmaps": {} } @@ -4036,13 +3791,9 @@ write -P0x76 0x3ff0000 0x10000 --- Write #1 --- =20 write -P0x65 0x0000000 0x10000 -{"return": ""} write -P0x77 0x00f8000 0x10000 -{"return": ""} write -P0x72 0x2008000 0x10000 -{"return": ""} write -P0x69 0x3fe0000 0x10000 -{"return": ""} { "bitmaps": { "drive0": [ @@ -4075,7 +3826,6 @@ expecting 6 dirty sectors; have 6. OK! {"return": {}} {"data": {"device": "ref_backup_1", "len": 67108864, "offset": 67108864, "= speed": 0, "type": "backup"}, "event": "BLOCK_JOB_COMPLETED", "timestamp": = {"microseconds": "USECS", "seconds": "SECS"}} =20 -{"return": ""} =20 --- Test Backup #1 --- =20 @@ -4112,13 +3862,9 @@ expecting 6 dirty sectors; have 6. OK! --- Write #3 --- =20 write -P0xaa 0x0010000 0x30000 -{"return": ""} write -P0xbb 0x00d8000 0x10000 -{"return": ""} write -P0xcc 0x2028000 0x10000 -{"return": ""} write -P0xdd 0x3fc0000 0x10000 -{"return": ""} { "bitmaps": { "drive0": [ @@ -4210,13 +3956,9 @@ qemu_img compare "TEST_DIR/PID-img" "TEST_DIR/PID-fb= ackup2" =3D=3D> Identical, OK! --- Write #0 --- =20 write -P0x49 0x0000000 0x10000 -{"return": ""} write -P0x6c 0x0100000 0x10000 -{"return": ""} write -P0x6f 0x2000000 0x10000 -{"return": ""} write -P0x76 0x3ff0000 0x10000 -{"return": ""} { "bitmaps": {} } @@ -4243,13 +3985,9 @@ write -P0x76 0x3ff0000 0x10000 --- Write #1 --- =20 write -P0x65 0x0000000 0x10000 -{"return": ""} write -P0x77 0x00f8000 0x10000 -{"return": ""} write -P0x72 0x2008000 0x10000 -{"return": ""} write -P0x69 0x3fe0000 0x10000 -{"return": ""} { "bitmaps": { "drive0": [ @@ -4298,13 +4036,9 @@ expecting 6 dirty sectors; have 6. OK! --- Write #2 --- =20 write -P0x74 0x0010000 0x10000 -{"return": ""} write -P0x69 0x00e8000 0x10000 -{"return": ""} write -P0x6e 0x2018000 0x10000 -{"return": ""} write -P0x67 0x3fe0000 0x20000 -{"return": ""} { "bitmaps": { "backup-top": [ @@ -4381,13 +4115,9 @@ expecting 7 dirty sectors; have 7. OK! --- Write #3 --- =20 write -P0xaa 0x0010000 0x30000 -{"return": ""} write -P0xbb 0x00d8000 0x10000 -{"return": ""} write -P0xcc 0x2028000 0x10000 -{"return": ""} write -P0xdd 0x3fc0000 0x10000 -{"return": ""} { "bitmaps": { "drive0": [ @@ -4479,13 +4209,9 @@ qemu_img compare "TEST_DIR/PID-img" "TEST_DIR/PID-fb= ackup2" =3D=3D> Identical, OK! --- Write #0 --- =20 write -P0x49 0x0000000 0x10000 -{"return": ""} write -P0x6c 0x0100000 0x10000 -{"return": ""} write -P0x6f 0x2000000 0x10000 -{"return": ""} write -P0x76 0x3ff0000 0x10000 -{"return": ""} { "bitmaps": {} } @@ -4512,13 +4238,9 @@ write -P0x76 0x3ff0000 0x10000 --- Write #1 --- =20 write -P0x65 0x0000000 0x10000 -{"return": ""} write -P0x77 0x00f8000 0x10000 -{"return": ""} write -P0x72 0x2008000 0x10000 -{"return": ""} write -P0x69 0x3fe0000 0x10000 -{"return": ""} { "bitmaps": { "drive0": [ @@ -4567,13 +4289,9 @@ expecting 6 dirty sectors; have 6. OK! --- Write #2 --- =20 write -P0x74 0x0010000 0x10000 -{"return": ""} write -P0x69 0x00e8000 0x10000 -{"return": ""} write -P0x6e 0x2018000 0x10000 -{"return": ""} write -P0x67 0x3fe0000 0x20000 -{"return": ""} { "bitmaps": { "backup-top": [ @@ -4650,13 +4368,9 @@ expecting 7 dirty sectors; have 7. OK! --- Write #3 --- =20 write -P0xaa 0x0010000 0x30000 -{"return": ""} write -P0xbb 0x00d8000 0x10000 -{"return": ""} write -P0xcc 0x2028000 0x10000 -{"return": ""} write -P0xdd 0x3fc0000 0x10000 -{"return": ""} { "bitmaps": { "drive0": [ @@ -4748,13 +4462,9 @@ qemu_img compare "TEST_DIR/PID-img" "TEST_DIR/PID-fb= ackup2" =3D=3D> Identical, OK! --- Write #0 --- =20 write -P0x49 0x0000000 0x10000 -{"return": ""} write -P0x6c 0x0100000 0x10000 -{"return": ""} write -P0x6f 0x2000000 0x10000 -{"return": ""} write -P0x76 0x3ff0000 0x10000 -{"return": ""} { "bitmaps": {} } @@ -4781,13 +4491,9 @@ write -P0x76 0x3ff0000 0x10000 --- Write #1 --- =20 write -P0x65 0x0000000 0x10000 -{"return": ""} write -P0x77 0x00f8000 0x10000 -{"return": ""} write -P0x72 0x2008000 0x10000 -{"return": ""} write -P0x69 0x3fe0000 0x10000 -{"return": ""} { "bitmaps": { "drive0": [ @@ -4820,7 +4526,6 @@ expecting 6 dirty sectors; have 6. OK! {"return": {}} {"data": {"device": "ref_backup_1", "len": 67108864, "offset": 67108864, "= speed": 0, "type": "backup"}, "event": "BLOCK_JOB_COMPLETED", "timestamp": = {"microseconds": "USECS", "seconds": "SECS"}} =20 -{"return": ""} =20 --- Test Backup #1 --- =20 @@ -4857,13 +4562,9 @@ expecting 6 dirty sectors; have 6. OK! --- Write #3 --- =20 write -P0xaa 0x0010000 0x30000 -{"return": ""} write -P0xbb 0x00d8000 0x10000 -{"return": ""} write -P0xcc 0x2028000 0x10000 -{"return": ""} write -P0xdd 0x3fc0000 0x10000 -{"return": ""} { "bitmaps": { "drive0": [ @@ -4955,13 +4656,9 @@ qemu_img compare "TEST_DIR/PID-img" "TEST_DIR/PID-fb= ackup2" =3D=3D> Identical, OK! --- Write #0 --- =20 write -P0x49 0x0000000 0x10000 -{"return": ""} write -P0x6c 0x0100000 0x10000 -{"return": ""} write -P0x6f 0x2000000 0x10000 -{"return": ""} write -P0x76 0x3ff0000 0x10000 -{"return": ""} { "bitmaps": {} } @@ -4988,13 +4685,9 @@ write -P0x76 0x3ff0000 0x10000 --- Write #1 --- =20 write -P0x65 0x0000000 0x10000 -{"return": ""} write -P0x77 0x00f8000 0x10000 -{"return": ""} write -P0x72 0x2008000 0x10000 -{"return": ""} write -P0x69 0x3fe0000 0x10000 -{"return": ""} { "bitmaps": { "drive0": [ @@ -5043,13 +4736,9 @@ expecting 6 dirty sectors; have 6. OK! --- Write #2 --- =20 write -P0x74 0x0010000 0x10000 -{"return": ""} write -P0x69 0x00e8000 0x10000 -{"return": ""} write -P0x6e 0x2018000 0x10000 -{"return": ""} write -P0x67 0x3fe0000 0x20000 -{"return": ""} { "bitmaps": { "backup-top": [ @@ -5126,13 +4815,9 @@ expecting 7 dirty sectors; have 7. OK! --- Write #3 --- =20 write -P0xaa 0x0010000 0x30000 -{"return": ""} write -P0xbb 0x00d8000 0x10000 -{"return": ""} write -P0xcc 0x2028000 0x10000 -{"return": ""} write -P0xdd 0x3fc0000 0x10000 -{"return": ""} { "bitmaps": { "drive0": [ --=20 2.56.0.rc0.29.g47ce80527c56 From nobody Sat Sep 26 20:01:40 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=1790108556; cv=none; d=zohomail.com; s=zohoarc; b=Icv9GfecMU4vRECLntkk7hpKZ+3KkVYMug5y4UgyO9hca441u2uyC6vJ03QqlDpo+DhzptuA0S0s/FAEhHmcyQ/B7pETUbN1nBdBpU5b0UJ/36J/VACgCUBGbqFVjDULgnbTw8ues0ohCq85FaS2tv4UD5ISB5D/sM1lMtoRye8= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1790108556; 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:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=Ckm8SRSEwWZmPHm+F+FppvMG9LDEDyj4aXRm9+5O/+E=; b=Bva85WPwX0kcz5VbzfU0+4UcNGayXNssW8Qpx0fsFYfU2W+P9qk99buzeuUY4jAOIWxCKnqOMMfeaVI5zCDeMZi4Z/lLlEICqRrbdXolTi+Ah1wAzmF/JrrymlCgI8ciwYrxnveE4C9a607xZqGVDD7ku/fnxWRFmx19bXvX3Qs= 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 1790108556451800.4966477907604; Tue, 22 Sep 2026 13:22:36 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists1p.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1x970I-00014w-TL; Tue, 22 Sep 2026 16:22:14 -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 1x96zT-0008In-HO for qemu-devel@nongnu.org; Tue, 22 Sep 2026 16:21:25 -0400 Received: from us-smtp-delivery-124.mimecast.com ([170.10.133.124]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1x96zR-00006V-Ef for qemu-devel@nongnu.org; Tue, 22 Sep 2026 16:21:22 -0400 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-450-Chg8JXWLPoSr6q87RZUVnQ-1; Tue, 22 Sep 2026 16:21:18 -0400 Received: from mx-prod-int-06.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-06.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.93]) (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 DBE2A1955DDF; Tue, 22 Sep 2026 20:21:17 +0000 (UTC) Received: from localhost (headnet03.pony-001.prod.iad2.dc.redhat.com [10.2.32.114]) by mx-prod-int-06.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id 9D7D9180056E; Tue, 22 Sep 2026 20:21:16 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1790108480; 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=Ckm8SRSEwWZmPHm+F+FppvMG9LDEDyj4aXRm9+5O/+E=; b=RWz/qC+cXAXmgwCQx4D5RjJL9bQmyyEHhZoPwj6jc7UnqsgTp0Znkj36VBHwbPk5cAGaQQ /fb3yKheXmkgrYS3mLxO4AOmn+DM4lIv8jjez7EeH77T9OQPRDxkqF+EXKCs+mQSgJh4p2 9iNLkpv0hwFbMTXRWhwqGfzWN4gZNR8= X-MC-Unique: Chg8JXWLPoSr6q87RZUVnQ-1 X-Mimecast-MFC-AGG-ID: Chg8JXWLPoSr6q87RZUVnQ_1790108478 From: =?utf-8?q?Marc-Andr=C3=A9_Lureau?= Date: Wed, 23 Sep 2026 00:17:43 +0400 Subject: [PATCH 36/88] qemu-iotests/260: migrate away from HMP MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Message-Id: <20260923-nohmp-v1-36-ebc029d4bd80@redhat.com> References: <20260923-nohmp-v1-0-ebc029d4bd80@redhat.com> In-Reply-To: <20260923-nohmp-v1-0-ebc029d4bd80@redhat.com> To: qemu-devel@nongnu.org Cc: Kevin Wolf , =?utf-8?q?Marc-Andr=C3=A9_Lureau?= , Hanna Reitz , qemu-block@nongnu.org X-Developer-Signature: v=1; a=openpgp-sha256; l=1608; i=marcandre.lureau@redhat.com; h=from:subject:message-id; bh=ZKFxBDshMVxG1zhikar5BA4VB71xRdLmWyUDaDJZA7w=; b=owEBbQKS/ZANAwAKAdro4Ql1lpzlAcsmYgBqsuKwrK+ZRWzSYelnjbtFKao6LWvsTSjvyw9+x 1+VT+gmnsuJAjMEAAEKAB0WIQSHqb2TP4fGBtJ29i3a6OEJdZac5QUCarLisAAKCRDa6OEJdZac 5T8NEACLBYdE//nzNcmmRxreFcXGJQY2bpBt7CdtXkH+NqBtMfkzBsjm3lPQmCgoCocf1+S4LCO BhcPLF97oH0wtd7F8iR7st+QIJHOepkGktE+wQ56Ra/fRE+kuFD5khMEQ0xbyQKI++wGwR27807 jc9YgxMwPLkD9b5ncB5RnaxuxJUGHL1Z95cp6NFBRsjCbbruFoAZHp4UPu5M5anhsXYVRk90w5L zfDvMXmsWYngiZQclIUkPvwZGbTDLLY+0D1yEfmULHhdTZGhUJLfQC5kXjH+4YQQacEm0juv2i9 GS97I6Z3Owf+9hAiZoPBsBPgT6mu/HVSQZaeGrFYLwVhdWyTWuGUo9N1oqspXoAgRYxm9x8LHSW /p4FZL7bKhyvOfeNCv/uWudJ5MlhQhekwyoqyhtQWxtC13lqumGMVEFnZyYuf9oofmA7HnqvXaT GhL2aAtM+7rI+2b3Lm1+95T0e9/mYN2xJnqibcswywB7C+QNjqZayTqVrT6LD78F8IZu0GECevk MfnGPBWaKhdr6kx0yLc43k34VydWwflP2pssnQFX3A/aJu6SSP2LEiXNX2oJUaJGeopIXvbNdUu TmLkdvvQNgsVI66VsQC/Aw/I/c13C/c4nmrWSA9qNJe5jyJ0gOZaUm2Tlo3Pokpde983Y4RLUeI vCM/Y0xC7vS3nnA== X-Developer-Key: i=marcandre.lureau@redhat.com; a=openpgp; fpr=87A9BD933F87C606D276F62DDAE8E10975969CE5 X-Scanned-By: MIMEDefang 3.4.1 on 10.30.177.93 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.133.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_H3=0.001, RCVD_IN_MSPIKE_WL=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-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: 1790108558317158500 Signed-off-by: Marc-Andr=C3=A9 Lureau --- tests/qemu-iotests/260 | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/tests/qemu-iotests/260 b/tests/qemu-iotests/260 index 65165446607c..6ca173aa020b 100755 --- a/tests/qemu-iotests/260 +++ b/tests/qemu-iotests/260 @@ -24,8 +24,7 @@ from iotests import qemu_img_create, file_path, log, filt= er_qmp_event =20 iotests.script_initialize( supported_fmts=3D['qcow2'], - unsupported_imgopts=3D['compat'], - require_hmp=3DTrue, + unsupported_imgopts=3D['compat'] ) =20 base, top =3D file_path('base', 'top') @@ -55,12 +54,12 @@ def test(persistent, restart): =20 vm.qmp_log('block-dirty-bitmap-add', node=3D'drive0', name=3D'bitmap0', persistent=3Dpersistent) - vm.hmp_qemu_io('drive0', 'write 0 64K') + vm.qmp_qemu_io('drive0', 'write 0 64K') print_bitmap('initial bitmap', vm) =20 vm.qmp_log('blockdev-snapshot-sync', device=3D'drive0', snapshot_file= =3Dtop, format=3Diotests.imgfmt, filters=3D[iotests.filter_qmp_test= files]) - vm.hmp_qemu_io('drive0', 'write 64K 512') + vm.qmp_qemu_io('drive0', 'write 64K 512') print_bitmap('check that no bitmaps are in snapshot', vm) =20 if restart: @@ -84,7 +83,7 @@ def test(persistent, restart): log(filter_qmp_event(ev)) print_bitmap('check bitmap after commit', vm) =20 - vm.hmp_qemu_io('drive0', 'write 128K 64K') + vm.qmp_qemu_io('drive0', 'write 128K 64K') print_bitmap('check updated bitmap', vm) =20 vm.shutdown() --=20 2.56.0.rc0.29.g47ce80527c56 From nobody Sat Sep 26 20:01:40 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=1790108542; cv=none; d=zohomail.com; s=zohoarc; b=TE7c9Uw3kISRPQRRPSybv/2v5ZoEFgVSi36/dcwVjWmpOUyNHRh9CbMdKED7mLpEemAhnF85nRoBxlHgTpNEz5jHLYZALcENIiGZ8wUafkdZcW+vTOLDjTOoHNO6nw3x3oPQZHA7TjQ3jNtFmwkRjho0M9i+zSjwsbZEPEGJOTM= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1790108542; 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:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=ABpGnhIDfNKzqYdINzfYJMCU6HBL2aMayBYhgJ4Ixu8=; b=ZXEVMHQZ63vcTIQhFHVk0BEC/CwnoD0kYUSHEP2TJUJG4SkYXEMWmXxL71u9tpSV/U4Lc/ujB0ovJBuGax/GZliXAyALie7mnT0faXLpCEmlzHwT6Q5T4qPlpB1Clw+Jtlk0EGTTrQrr/ZqzTuIensIRa+n01JVkoY0d0faEHBM= 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 1790108542663508.62752010334805; Tue, 22 Sep 2026 13:22:22 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists1p.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1x970M-0001PC-VJ; Tue, 22 Sep 2026 16:22:19 -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 1x96zZ-0008Sr-Ke for qemu-devel@nongnu.org; Tue, 22 Sep 2026 16:21:30 -0400 Received: from us-smtp-delivery-124.mimecast.com ([170.10.133.124]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1x96zX-00007J-0J for qemu-devel@nongnu.org; Tue, 22 Sep 2026 16:21:28 -0400 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-80-eUnoQOn4OUaNDgwvR-czqg-1; Tue, 22 Sep 2026 16:21:22 -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-03.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id C156A1955DDF; Tue, 22 Sep 2026 20:21:21 +0000 (UTC) Received: from localhost (headnet03.pony-001.prod.iad2.dc.redhat.com [10.2.32.114]) by mx-prod-int-10.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id EB359418; Tue, 22 Sep 2026 20:21:20 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1790108486; 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=ABpGnhIDfNKzqYdINzfYJMCU6HBL2aMayBYhgJ4Ixu8=; b=gTIH58ksgiSb2BQfzigcotNUTidfAOQRFVbOcnguA9R3QHNzwNL07dMgYww6nNYKS8VsMV i3pV+jB2AkpH4fQPVcGNLz0e0Dfj+ZGDa6+E/jHsTFGIEqTyBbodwZDXWrVRCf5oAqFEe6 hruU6snoJfzka+Zkwq6/7raUFIOj84o= X-MC-Unique: eUnoQOn4OUaNDgwvR-czqg-1 X-Mimecast-MFC-AGG-ID: eUnoQOn4OUaNDgwvR-czqg_1790108481 From: =?utf-8?q?Marc-Andr=C3=A9_Lureau?= Date: Wed, 23 Sep 2026 00:17:44 +0400 Subject: [PATCH 37/88] qemu-iotests/280: migrate away from HMP MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Message-Id: <20260923-nohmp-v1-37-ebc029d4bd80@redhat.com> References: <20260923-nohmp-v1-0-ebc029d4bd80@redhat.com> In-Reply-To: <20260923-nohmp-v1-0-ebc029d4bd80@redhat.com> To: qemu-devel@nongnu.org Cc: Kevin Wolf , =?utf-8?q?Marc-Andr=C3=A9_Lureau?= , Hanna Reitz , qemu-block@nongnu.org X-Developer-Signature: v=1; a=openpgp-sha256; l=1940; i=marcandre.lureau@redhat.com; h=from:subject:message-id; bh=nUnRmZ69+LiHtt2jIqUYo9fP0QqIV0Jh7e1i5aDHxfU=; b=owEBbQKS/ZANAwAKAdro4Ql1lpzlAcsmYgBqsuKwtKyuesQfD4TMOTvwqQgf3ZLMCjEah5Vf9 Gpxj17y30uJAjMEAAEKAB0WIQSHqb2TP4fGBtJ29i3a6OEJdZac5QUCarLisAAKCRDa6OEJdZac 5eZvD/9xaMYthRqJg0/FaORMeXZWV5+HqzVi33GZwohlpzwTuUT4Z1Mo0Y7oehDkds+EgfpGqiO EM59h9y0+37IGivGEryom9twFVETtTvg2cMcSTyGS2JMdISEkKM55Le3iuqz57WCk3u4H80kBXX F+bnAv77CMFJWjLmsDKiJa/Pou2h5WD+VjVVCapnAlsqigZt6KVsGOyhOgC2d5C7UVKVZCXe/sN dc1TsUuVkY1MHofDEIFGniTbP1zI9dbwHTbPyAK6uznis2ZSTZ8Rb3LRRT+j5ZCnC92pK1skx9v cvWn4awxNBS3IEBZt6dehL2zk8aJZIBRGuxCIWBuwV2I4EvyyzRptl+Gyhpqynv/NM/i9rPrjWJ J7dgrj4WmxzSDCHnkC0cevRBBftvAHxaLJh0nswGuiSKRT+AebLsSft1UnTtkLSWikdkNyyia1z auAof/zD9glRrbSeZDaUTckQLZB5jrcdFbUF3VHkokxQ8DzJZ5ch2BFk8h7smdTu86mFjz1cq3y tK80HeNn43kP8Ns7LeqDOjT9ciAsXYY8at92M1P/TuVnGtWfwi4XZX2CLBsPWxPSHIp8tkFrDEt evJ8E0WtbTI22PPd+BUCYjEJBQrVMdGqnXNTXuQy4w35CinIBeKbiIxNwcJCflNJypzadMcvD9F Vu61/f54AHH+Z3Q== 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.133.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_H3=0.001, RCVD_IN_MSPIKE_WL=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-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: 1790108544215158500 For consistency with the rest of the test, we use use_log=3DTrue, although it is not stricly necessary. Signed-off-by: Marc-Andr=C3=A9 Lureau --- tests/qemu-iotests/280 | 3 +-- tests/qemu-iotests/280.out | 3 ++- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/tests/qemu-iotests/280 b/tests/qemu-iotests/280 index 8f4750de074b..ccd94905e045 100755 --- a/tests/qemu-iotests/280 +++ b/tests/qemu-iotests/280 @@ -27,7 +27,6 @@ iotests.script_initialize( supported_fmts=3D['qcow2'], supported_protocols=3D['file'], supported_platforms=3D['linux'], - require_hmp=3DTrue, ) =20 with iotests.FilePath('base') as base_path , \ @@ -77,7 +76,7 @@ with iotests.FilePath('base') as base_path , \ =20 iotests.log('\n=3D=3D=3D Resume the VM and simulate a write request = =3D=3D=3D') vm.qmp_log('cont') - iotests.log(vm.hmp_qemu_io('-d vda/virtio-backend', 'write 4k 4k')) + vm.qmp_qemu_io('vda/virtio-backend', 'write 4k 4k', use_log=3DTrue, qd= ev=3DTrue) =20 iotests.log('\n=3D=3D=3D Commit it to the backing file =3D=3D=3D') result =3D vm.qmp_log('block-commit', job_id=3D'job0', auto_dismiss=3D= False, diff --git a/tests/qemu-iotests/280.out b/tests/qemu-iotests/280.out index 37411144cafe..21eff12585c1 100644 --- a/tests/qemu-iotests/280.out +++ b/tests/qemu-iotests/280.out @@ -36,7 +36,8 @@ completed =3D=3D=3D Resume the VM and simulate a write request =3D=3D=3D {"execute": "cont", "arguments": {}} {"return": {}} -{"return": ""} +{"execute": "x-qemu-io", "arguments": {"command": "write 4k 4k", "qdev": "= vda/virtio-backend"}} +{"return": {"human-readable-text": "wrote 4096/4096 bytes at offset 4096\n= 4 KiB, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec)\n"}} =20 =3D=3D=3D Commit it to the backing file =3D=3D=3D {"execute": "block-commit", "arguments": {"auto-dismiss": false, "device":= "top-fmt", "job-id": "job0", "top-node": "top-fmt"}} --=20 2.56.0.rc0.29.g47ce80527c56 From nobody Sat Sep 26 20:01:40 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=1790108599; cv=none; d=zohomail.com; s=zohoarc; b=AXFHQf6A7prUbVBFmaEEmvuGiTYUCeu+VC5LqYC6f5Fle1l3KDI5JBpwPRzQkRT4kpKy3gBvoTVnIWeVWz/rAMF0SApHQNq2flcGBOBPKY985iJhziECbpkvsfIRwmpQ/v5IDzzoPVrb9S7EBi9Taim4zclR+0RoYtCK7RdbsAE= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1790108599; 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:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=LdyaC8s5gFy9tJwN9G7tD+ROBpHwjrC1/cCo+mIKUWg=; b=ak/0HH4QA2fsqeRFLISYORG6wxzR9cR2rZux2olJXP5HmRG/Gpw+IlcOGy52aWU5Qc12XDDDcfSqNC+LKRishzITaZH1JBKjr1Uq62uGkcrcvhpMwO7etVzwiflPMDFJk8fEwE53Kntib0RwT7asZX1pj+oYUSA4RHwc3ao48eA= 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 1790108599845505.1915473299198; Tue, 22 Sep 2026 13:23:19 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists1p.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1x970P-0001dm-Az; Tue, 22 Sep 2026 16:22:21 -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 1x96zc-0008Vl-75 for qemu-devel@nongnu.org; Tue, 22 Sep 2026 16:21:32 -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 1x96za-00007v-Au for qemu-devel@nongnu.org; Tue, 22 Sep 2026 16:21:31 -0400 Received: from mx-prod-mc-08.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-445-9o43IuLJO3y79R8X3pbTiw-1; Tue, 22 Sep 2026 16:21:26 -0400 Received: from mx-prod-int-01.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-01.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.4]) (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-08.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id 361321855882; Tue, 22 Sep 2026 20:21:25 +0000 (UTC) Received: from localhost (headnet03.pony-001.prod.iad2.dc.redhat.com [10.2.32.114]) by mx-prod-int-01.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id 34110300106D; Tue, 22 Sep 2026 20:21:23 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1790108489; 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=LdyaC8s5gFy9tJwN9G7tD+ROBpHwjrC1/cCo+mIKUWg=; b=eVOnZhmSjNH8THkIHiVlq9WNYpb/xoIQfRk2IB1yZRXtSUARzh7f7Gm8Ucwk196F50tYde kRKGIhhotbtfgCwdAJz3WjMgmla58LuyEU7pSy4px2HHHr/FHLtCwZpK7qn3AcHdCoBJe0 c4ro3d5QU0MD73PCVhcpAzz2uqZwtzs= X-MC-Unique: 9o43IuLJO3y79R8X3pbTiw-1 X-Mimecast-MFC-AGG-ID: 9o43IuLJO3y79R8X3pbTiw_1790108485 From: =?utf-8?q?Marc-Andr=C3=A9_Lureau?= Date: Wed, 23 Sep 2026 00:17:45 +0400 Subject: [PATCH 38/88] qemu-iotests/backup-discard-source: migrate away from HMP MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Message-Id: <20260923-nohmp-v1-38-ebc029d4bd80@redhat.com> References: <20260923-nohmp-v1-0-ebc029d4bd80@redhat.com> In-Reply-To: <20260923-nohmp-v1-0-ebc029d4bd80@redhat.com> To: qemu-devel@nongnu.org Cc: Kevin Wolf , =?utf-8?q?Marc-Andr=C3=A9_Lureau?= , Hanna Reitz , qemu-block@nongnu.org X-Developer-Signature: v=1; a=openpgp-sha256; l=2294; i=marcandre.lureau@redhat.com; h=from:subject:message-id; bh=XO32CZqVvuhFJJUFHhtvp2qCCH+LyQpThQt01K+i+rI=; b=owEBbQKS/ZANAwAKAdro4Ql1lpzlAcsmYgBqsuKw0WKuTXFPu4etsxk+IZ4Zad8QbNHVnz6ao snq+YJM/niJAjMEAAEKAB0WIQSHqb2TP4fGBtJ29i3a6OEJdZac5QUCarLisAAKCRDa6OEJdZac 5bXOD/4o6vWhaluegacNe88ax0WVbD3Ii76ND0hd7MtSd0l0FCTJ6z5wkih07B+Q0SM1Jx2kTsw iV+5DaNiIoqK8UncvUG7Dq0Kt5MUum8+HZX5WSiDTtHThqlUKCe8+s4bhk+Y+Hg3CijeXuu6Rpn xKdkYh+0Y2Lqt/4OcWEqoI6fjcbgyXukFpHHx+H+zfA4wBnuzC5jcvIItjnWa3L1kMJGUcRhq9s ZDIQY/2Uf7xWzoKG7RUp4trRQOtPeXZffg+/3PD0g3x+/Q4GwlTlqUUx4PL9ECMcZy0KAhWLxnb n7bJSVLXG4SlbLQIPNoy5rPvR5UnuB7UU9NliO7G1ijqOgimo58tqBdPrVfQBfuP/B3vMfrLz/N EtAQP5OmOGjRKkCjBiTG6ZK2As8RPlkCavjN82Msd3Nd/pYioZd1ChDoTUfmSc7pBiJIkXz2E5c WClPNAipA4tyY8auNCgMkQANaXPvmnJHS1gPObcFMRr/OJPCe5VL2tNzYkVPzn1CfZ+p6ALqddz TwEkPiFDUWJ/bcfge2fZTg/sF/fS9ACq2i8gjb/Nc10Gm/V+GHmCczJtRXURmJ6zs/VKqhllfPO 6fELTCADoE/dkCNiOmK6O3h9/levr9oBNcohcURFnwR9P/8IUX7z6HmxUfErDm/yu7azNLUyUYK WjOWpcU3wiVfH4w== X-Developer-Key: i=marcandre.lureau@redhat.com; a=openpgp; fpr=87A9BD933F87C606D276F62DDAE8E10975969CE5 X-Scanned-By: MIMEDefang 3.4.1 on 10.30.177.4 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: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 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, SPF_HELO_PASS=-0.001, SPF_PASS=-0.001 autolearn=unavailable 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: 1790108600609158500 Signed-off-by: Marc-Andr=C3=A9 Lureau --- tests/qemu-iotests/tests/backup-discard-source | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) diff --git a/tests/qemu-iotests/tests/backup-discard-source b/tests/qemu-io= tests/tests/backup-discard-source index 80ea32c46e3f..3ccd616d197e 100755 --- a/tests/qemu-iotests/tests/backup-discard-source +++ b/tests/qemu-iotests/tests/backup-discard-source @@ -87,11 +87,13 @@ class TestBackup(iotests.QMPTestCase): =20 def tearDown(self): # That should fail, because region is discarded - result =3D self.vm.hmp_qemu_io('access', 'read 0 1M') + result =3D self.vm.qmp('x-qemu-io', device=3D'access', + command=3D'read 0 1M') =20 self.vm.shutdown() =20 - self.assertIn('read failed: Permission denied', result['return']) + self.assertIn('read failed: Permission denied', + result['error']['desc']) =20 # Final check that temp image is empty mapping =3D qemu_img_map(temp_img) @@ -127,8 +129,7 @@ class TestBackup(iotests.QMPTestCase): removed from temp """ # Trigger copy-before-write operation - result =3D self.vm.hmp_qemu_io('cbw', 'write 0 1M') - self.assert_qmp(result, 'return', '') + self.vm.qmp_qemu_io('cbw', 'write 0 1M') =20 # Check that data is written to temporary image self.assertEqual(self.get_bitmap_count(), size) @@ -150,8 +151,7 @@ class TestBackup(iotests.QMPTestCase): self.vm.cmd('block-dirty-bitmap-clear', self.bitmap) =20 # Try trigger copy-before-write operation - result =3D self.vm.hmp_qemu_io('cbw', 'write 0 1M') - self.assert_qmp(result, 'return', '') + self.vm.qmp_qemu_io('cbw', 'write 0 1M') =20 # Check that data is not written to temporary image, as region # is discarded from copy-before-write process @@ -160,5 +160,4 @@ class TestBackup(iotests.QMPTestCase): =20 if __name__ =3D=3D '__main__': iotests.main(supported_fmts=3D['qcow2'], - supported_protocols=3D['file'], - require_hmp=3DTrue) + supported_protocols=3D['file']) --=20 2.56.0.rc0.29.g47ce80527c56 From nobody Sat Sep 26 20:01:40 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=1790108590; cv=none; d=zohomail.com; s=zohoarc; b=H26UpGio9wQeiyOxsq6dKxlIfdWAyxlMSpdCBPj75xSH3Rka8YlEOZPnpMMlKKDYOXFpJN70aCCtyegD71cXYpQVPU63iFXo6Nm5Fw1rYpE28nshdvThuOY2GzU6Z2JG7xrnrRA5vvcGQ2RwaKAaTaARxStzs3Vpya1stkCa2lA= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1790108590; 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:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=RH0wxBTe94pOM5GfZrIQM3kcsli8tprvI/EcvABYvlo=; b=LEVwygrSZuotxuWr59lRh07Xyt0OWDvQRCrz9YbwZ3oZG3W8cb0FKIslEml2c+z8zoQU772Wi3leNO6Q99AaMfh5wFmCh49pg6HJbMm+ZT7lRVgapc+tjY5lrg7dHwnBgcbw57wK6BwIaTZkSJa4kRHLnbzn13SzXWtDTp6MjYM= 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 1790108590338477.6694226944967; Tue, 22 Sep 2026 13:23:10 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists1p.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1x970N-0001XG-OI; Tue, 22 Sep 2026 16:22:19 -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 1x96zd-00006X-PL for qemu-devel@nongnu.org; Tue, 22 Sep 2026 16:21:34 -0400 Received: from us-smtp-delivery-124.mimecast.com ([170.10.133.124]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1x96zb-00008A-V7 for qemu-devel@nongnu.org; Tue, 22 Sep 2026 16:21:33 -0400 Received: from mx-prod-mc-05.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-204-h0XYdurHOd-gzOnDoAjRmQ-1; Tue, 22 Sep 2026 16:21:30 -0400 Received: from mx-prod-int-06.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-06.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.93]) (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-05.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id 0E37F19772DE; Tue, 22 Sep 2026 20:21:29 +0000 (UTC) Received: from localhost (headnet03.pony-001.prod.iad2.dc.redhat.com [10.2.32.114]) by mx-prod-int-06.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id 119081800370; Tue, 22 Sep 2026 20:21:27 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1790108491; 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=RH0wxBTe94pOM5GfZrIQM3kcsli8tprvI/EcvABYvlo=; b=i1mfL3A9rpj+Lzy5FPItj5sZEkXkw777lgRNKQjm8gdZcjDvC2b6hb3Aklwc6iw1qLMacb ipKyBJYfotWBiKAewgcLG9FQs/xxtpNtoRvEa8pR97lD04KbFuqWdO5JwUARydfjNg7HPM /mOTyIx6lJH/qIrPESmO8utBvHMWl+A= X-MC-Unique: h0XYdurHOd-gzOnDoAjRmQ-1 X-Mimecast-MFC-AGG-ID: h0XYdurHOd-gzOnDoAjRmQ_1790108489 From: =?utf-8?q?Marc-Andr=C3=A9_Lureau?= Date: Wed, 23 Sep 2026 00:17:46 +0400 Subject: [PATCH 39/88] qemu-iotests/qsd-migrate: migrate away from HMP MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Message-Id: <20260923-nohmp-v1-39-ebc029d4bd80@redhat.com> References: <20260923-nohmp-v1-0-ebc029d4bd80@redhat.com> In-Reply-To: <20260923-nohmp-v1-0-ebc029d4bd80@redhat.com> To: qemu-devel@nongnu.org Cc: Kevin Wolf , =?utf-8?q?Marc-Andr=C3=A9_Lureau?= , Hanna Reitz , qemu-block@nongnu.org X-Developer-Signature: v=1; a=openpgp-sha256; l=7933; i=marcandre.lureau@redhat.com; h=from:subject:message-id; bh=xenZorm4NUjxrHwnhJUq3la4DbYRVWCbOjBEiUifD7A=; b=kA0DAAoB2ujhCXWWnOUByyZiAGqy4rChEr5DicDIU85zbbEiipMHxmHIc4ftefazwkZt/4Iwv 4kCMwQAAQoAHRYhBIepvZM/h8YG0nb2Ldro4Ql1lpzlBQJqsuKwAAoJENro4Ql1lpzlS5oQAKlx j2elU3MVkaEntPWgjMaURh2h/663t4nQSrJOVrj7l7vDYJTUnS1fDhTd+A8I2wyvI2+53WW1cmm /AmQzdrgDY8efe91WFKWl53/GUtQy54Vvuc6wj7ZXTvf7zIo7ggB1ieiSQsmb2qkRXziImFtQeT QBp84aZY0m1zEXVNvke+TYxeyT0YJqjgy/R2CJv0yTocOc697KB8ySSfu2uJxwomuUfx5czgBg2 uZNu7S3t9EBBY6QHUsFbJbEIVvirZXDZm84EAZAkdpTiJGadgADTFXHSSrEp7uV8O9YhUEuE8pD x5mjaNxQjigNjEnTwT15XL8jbSqNVpYImPt5IMGLTJyuumDLg7Q2hrrIWxwQ5NOMnennZBfptUE yyQfCw2CkcCTPksAb/CnIznxzKZ54pxctzxmcwTeXgQ3L1MIz1rRL9LIwpa8C23EPcj+YxY03Vl hmuFIvFkECzHoDjYY7M+8UlHZBGDo0zFnx4ESWULVh+Ooa71sHZjTYRNGoBldk8GOzruQfXbtGL a+MDe7FUAMCiZF8SWDsRqYyyQWYQG3bkfl4MIclZhYOdOg8kccWPLNpXtTooHA4CSpObGcPi/5F 10JRlv11G/LNSGhBWijilyAmWY/Est2tmis1nw7DVs5PqwxZ1UkTjmTi4MdTsxgH66QqVb1kS9A EtwGg X-Developer-Key: i=marcandre.lureau@redhat.com; a=openpgp; fpr=87A9BD933F87C606D276F62DDAE8E10975969CE5 X-Scanned-By: MIMEDefang 3.4.1 on 10.30.177.93 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.133.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_H3=0.001, RCVD_IN_MSPIKE_WL=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-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: 1790108592645158500 Keep the vm_src/vm_dst log, even if they should be empty now. Signed-off-by: Marc-Andr=C3=A9 Lureau --- tests/qemu-iotests/tests/qsd-migrate | 23 ++++++++--------- tests/qemu-iotests/tests/qsd-migrate.out | 44 ++++++++++++----------------= ---- 2 files changed, 27 insertions(+), 40 deletions(-) diff --git a/tests/qemu-iotests/tests/qsd-migrate b/tests/qemu-iotests/test= s/qsd-migrate index d76278b576c2..e0b0a8f1c914 100755 --- a/tests/qemu-iotests/tests/qsd-migrate +++ b/tests/qemu-iotests/tests/qsd-migrate @@ -20,12 +20,11 @@ =20 import iotests =20 -from iotests import filter_qemu_io, filter_qtest +from iotests import filter_qtest =20 iotests.script_initialize(supported_fmts=3D['qcow2', 'qed', 'raw'], supported_protocols=3D['file'], - supported_platforms=3D['linux'], - require_hmp=3DTrue) + supported_platforms=3D['linux']) =20 with iotests.FilePath('disk.img') as path, \ iotests.FilePath('nbd-src.sock', base_dir=3Diotests.sock_dir) as nbd_= src, \ @@ -75,9 +74,9 @@ with iotests.FilePath('disk.img') as path, \ vm_dst.launch() =20 iotests.log('\nTest I/O on the source') - vm_src.hmp_qemu_io('virtio0/virtio-backend', 'write -P 0x11 0 4k', + vm_src.qmp_qemu_io('virtio0/virtio-backend', 'write -P 0x11 0 4k', use_log=3DTrue, qdev=3DTrue) - vm_src.hmp_qemu_io('virtio0/virtio-backend', 'read -P 0x11 0 4k', + vm_src.qmp_qemu_io('virtio0/virtio-backend', 'read -P 0x11 0 4k', use_log=3DTrue, qdev=3DTrue) =20 iotests.log('\nStarting migration...') @@ -100,9 +99,9 @@ with iotests.FilePath('disk.img') as path, \ =20 # Reading is okay from both sides while the image is inactive. Note th= at # the destination may have stale data until it activates the image, th= ough. - vm_src.hmp_qemu_io('virtio0/virtio-backend', 'read -P 0x11 0 4k', + vm_src.qmp_qemu_io('virtio0/virtio-backend', 'read -P 0x11 0 4k', use_log=3DTrue, qdev=3DTrue) - vm_dst.hmp_qemu_io('virtio0/virtio-backend', 'read 0 4k', + vm_dst.qmp_qemu_io('virtio0/virtio-backend', 'read 0 4k', use_log=3DTrue, qdev=3DTrue) =20 iotests.log(qsd_dst.qmp('blockdev-set-active', {'active': True})) @@ -115,13 +114,13 @@ with iotests.FilePath('disk.img') as path, \ iotests.log('\nTest I/O on the destination') =20 # Now the destination must see what the source wrote - vm_dst.hmp_qemu_io('virtio0/virtio-backend', 'read -P 0x11 0 4k', + vm_dst.qmp_qemu_io('virtio0/virtio-backend', 'read -P 0x11 0 4k', use_log=3DTrue, qdev=3DTrue) =20 # And be able to overwrite it - vm_dst.hmp_qemu_io('virtio0/virtio-backend', 'write -P 0x22 0 4k', + vm_dst.qmp_qemu_io('virtio0/virtio-backend', 'write -P 0x22 0 4k', use_log=3DTrue, qdev=3DTrue) - vm_dst.hmp_qemu_io('virtio0/virtio-backend', 'read -P 0x22 0 4k', + vm_dst.qmp_qemu_io('virtio0/virtio-backend', 'read -P 0x22 0 4k', use_log=3DTrue, qdev=3DTrue) =20 iotests.log('\nDone') @@ -130,12 +129,12 @@ with iotests.FilePath('disk.img') as path, \ iotests.log('\n--- vm_src log ---') log =3D vm_src.get_log() if log: - iotests.log(log, [filter_qtest, filter_qemu_io]) + iotests.log(log, [filter_qtest]) qsd_src.stop() =20 vm_dst.shutdown() iotests.log('\n--- vm_dst log ---') log =3D vm_dst.get_log() if log: - iotests.log(log, [filter_qtest, filter_qemu_io]) + iotests.log(log, [filter_qtest]) qsd_dst.stop() diff --git a/tests/qemu-iotests/tests/qsd-migrate.out b/tests/qemu-iotests/= tests/qsd-migrate.out index 4a5241e5d40f..e606e857ce9c 100644 --- a/tests/qemu-iotests/tests/qsd-migrate.out +++ b/tests/qemu-iotests/tests/qsd-migrate.out @@ -5,10 +5,10 @@ Launching destination QSD... Launching destination VM... =20 Test I/O on the source -{"execute": "human-monitor-command", "arguments": {"command-line": "qemu-i= o -d virtio0/virtio-backend \"write -P 0x11 0 4k\""}} -{"return": ""} -{"execute": "human-monitor-command", "arguments": {"command-line": "qemu-i= o -d virtio0/virtio-backend \"read -P 0x11 0 4k\""}} -{"return": ""} +{"execute": "x-qemu-io", "arguments": {"command": "write -P 0x11 0 4k", "q= dev": "virtio0/virtio-backend"}} +{"return": {"human-readable-text": "wrote 4096/4096 bytes at offset 0\n4 K= iB, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec)\n"}} +{"execute": "x-qemu-io", "arguments": {"command": "read -P 0x11 0 4k", "qd= ev": "virtio0/virtio-backend"}} +{"return": {"human-readable-text": "read 4096/4096 bytes at offset 0\n4 Ki= B, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec)\n"}} =20 Starting migration... {"execute": "migrate-set-capabilities", "arguments": {"capabilities": [{"c= apability": "events", "state": true}, {"capability": "pause-before-switchov= er", "state": true}]}} @@ -20,10 +20,10 @@ Starting migration... =20 Pre-switchover: Reconfigure QSD instances {"return": {}} -{"execute": "human-monitor-command", "arguments": {"command-line": "qemu-i= o -d virtio0/virtio-backend \"read -P 0x11 0 4k\""}} -{"return": ""} -{"execute": "human-monitor-command", "arguments": {"command-line": "qemu-i= o -d virtio0/virtio-backend \"read 0 4k\""}} -{"return": ""} +{"execute": "x-qemu-io", "arguments": {"command": "read -P 0x11 0 4k", "qd= ev": "virtio0/virtio-backend"}} +{"return": {"human-readable-text": "read 4096/4096 bytes at offset 0\n4 Ki= B, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec)\n"}} +{"execute": "x-qemu-io", "arguments": {"command": "read 0 4k", "qdev": "vi= rtio0/virtio-backend"}} +{"return": {"human-readable-text": "read 4096/4096 bytes at offset 0\n4 Ki= B, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec)\n"}} {"return": {}} =20 Completing migration... @@ -31,29 +31,17 @@ Completing migration... {"return": {}} =20 Test I/O on the destination -{"execute": "human-monitor-command", "arguments": {"command-line": "qemu-i= o -d virtio0/virtio-backend \"read -P 0x11 0 4k\""}} -{"return": ""} -{"execute": "human-monitor-command", "arguments": {"command-line": "qemu-i= o -d virtio0/virtio-backend \"write -P 0x22 0 4k\""}} -{"return": ""} -{"execute": "human-monitor-command", "arguments": {"command-line": "qemu-i= o -d virtio0/virtio-backend \"read -P 0x22 0 4k\""}} -{"return": ""} +{"execute": "x-qemu-io", "arguments": {"command": "read -P 0x11 0 4k", "qd= ev": "virtio0/virtio-backend"}} +{"return": {"human-readable-text": "read 4096/4096 bytes at offset 0\n4 Ki= B, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec)\n"}} +{"execute": "x-qemu-io", "arguments": {"command": "write -P 0x22 0 4k", "q= dev": "virtio0/virtio-backend"}} +{"return": {"human-readable-text": "wrote 4096/4096 bytes at offset 0\n4 K= iB, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec)\n"}} +{"execute": "x-qemu-io", "arguments": {"command": "read -P 0x22 0 4k", "qd= ev": "virtio0/virtio-backend"}} +{"return": {"human-readable-text": "read 4096/4096 bytes at offset 0\n4 Ki= B, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec)\n"}} =20 Done =20 --- vm_src log --- -wrote 4096/4096 bytes at offset 0 -4 KiB, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec) -read 4096/4096 bytes at offset 0 -4 KiB, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec) -read 4096/4096 bytes at offset 0 -4 KiB, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec) + =20 --- vm_dst log --- -read 4096/4096 bytes at offset 0 -4 KiB, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec) -read 4096/4096 bytes at offset 0 -4 KiB, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec) -wrote 4096/4096 bytes at offset 0 -4 KiB, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec) -read 4096/4096 bytes at offset 0 -4 KiB, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec) + --=20 2.56.0.rc0.29.g47ce80527c56 From nobody Sat Sep 26 20:01:40 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=1790108923; cv=none; d=zohomail.com; s=zohoarc; b=WZLrpYH6LYBikZTj76hThCStRt9o6+TXy6Ni1DXv97m7dqONeTxx9AdzfC2ixohiG3ohLpsuI933XFpgihLJgtBe91kRHgvuY7ou9sbm0jXA1uUqGcRwwSzbOzigq0JPMWbL1SpzJ5aSV69j6VqsyGUmZOKrbnUMndyy+F5Vtd8= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1790108923; 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:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=4qblk7JBMw4nsyFWPNZsBsjuJnK7G0DNZ04KPgRIT1g=; b=HNtYz3UDaZotO5LriQ1FCLVWhCvY15KGuAI1sdmv7yb+nsWqgfwKXJdvvm779pL9fdrkPqrf9acAwSQ9nF0QmzhX3NMoBwl2AAVviaJY2f7PAWuUOU/WqHftF6m2jhCSs6N6AR7nZzijTvS7aCI+lbGnIP46RghsAIDn6yJemrc= 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 1790108923354623.7506649013268; Tue, 22 Sep 2026 13:28:43 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists1p.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1x970Q-0001lc-Cu; Tue, 22 Sep 2026 16:22:22 -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 1x96zj-0000Gi-8m for qemu-devel@nongnu.org; Tue, 22 Sep 2026 16:21:39 -0400 Received: from us-smtp-delivery-124.mimecast.com ([170.10.133.124]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1x96zh-00008v-Oa for qemu-devel@nongnu.org; Tue, 22 Sep 2026 16:21:39 -0400 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-682-ZvKGnNMiOqavCZ60id-Ssw-1; Tue, 22 Sep 2026 16:21:33 -0400 Received: from mx-prod-int-01.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-01.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.4]) (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 83FAC1956069; Tue, 22 Sep 2026 20:21:32 +0000 (UTC) Received: from localhost (headnet03.pony-001.prod.iad2.dc.redhat.com [10.2.32.114]) by mx-prod-int-01.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id 8A9913000223; Tue, 22 Sep 2026 20:21:31 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1790108496; 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=4qblk7JBMw4nsyFWPNZsBsjuJnK7G0DNZ04KPgRIT1g=; b=EX1RA+9KbkaqLvu82q/ZiJkOY4/rDk8Lz/vRB8wZj6dSySB/ixd6au65Mukon6E8/MBatC NMIo9rhVFxcULFtZrDJC24pjvAMEovsdXO2UGyvB8qtwsgJu/ASoMoDoBEW5MetadUvNan D/l7u6Auw+lExOkJ/zJhKQSR+AKu/6Y= X-MC-Unique: ZvKGnNMiOqavCZ60id-Ssw-1 X-Mimecast-MFC-AGG-ID: ZvKGnNMiOqavCZ60id-Ssw_1790108492 From: =?utf-8?q?Marc-Andr=C3=A9_Lureau?= Date: Wed, 23 Sep 2026 00:17:47 +0400 Subject: [PATCH 40/88] qemu-iotests/mirror-change-copy-mode: migrate away from HMP MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Message-Id: <20260923-nohmp-v1-40-ebc029d4bd80@redhat.com> References: <20260923-nohmp-v1-0-ebc029d4bd80@redhat.com> In-Reply-To: <20260923-nohmp-v1-0-ebc029d4bd80@redhat.com> To: qemu-devel@nongnu.org Cc: Kevin Wolf , =?utf-8?q?Marc-Andr=C3=A9_Lureau?= , Hanna Reitz , qemu-block@nongnu.org X-Developer-Signature: v=1; a=openpgp-sha256; l=2696; i=marcandre.lureau@redhat.com; h=from:subject:message-id; bh=MI58I8YC289QjxqhVLUxIVtkbJ0Lcb8tu722GBguSwI=; b=owEBbAKT/ZANAwAKAdro4Ql1lpzlAcsmYgBqsuKxlK6M05fkcT4Vo+ejnwVS4OTpgXPzBMb1x CiHRbYIIKGJAjIEAAEKAB0WIQSHqb2TP4fGBtJ29i3a6OEJdZac5QUCarLisQAKCRDa6OEJdZac 5TcAD/dKGEJTjwG2l3GiGCv1GKsyjnBPJkZC0ia18KRU27zL02MfZWsmqOctaVgCFFhEa2e6fj6 PxJ9XH9b+9XhTuVIqsYh+CEyXo/OBdGjZANc79w/REoymBMOgQr7ryrgKhs+a4fFz/ft5Kp1tmr yx08rFPuPTxZnfkcL1eWwYGGN6Qk+PcAPHLFh22nlYhayQU9T7Q6kNjVbKSUJtq7fHqskFHDOAq EES6l57u1//gBMVK28q9b+miBrHvqz1hEd+ZXTXokB/aDjGyUXIUAs9iMd2QMEKok8fsJG4I5X6 oaZhRUiD5uUOF1xcs729M8u+UDVQLnE+/dg/ibZXsmjTCEbC10pKpdiHgzmgX1O9dqhuv+6oqB4 bqa+FZ9BM15lz3WsmxqbrsDdpQxZGyCWhPyyGwncFJ441GbmG6XLoucOV6GmTANLIMcR8z5ln2+ jGF13PetoHtp72xQkcAy4DwiApXshEYdl5trqhKod6uIhSXV+whkYnVRSnxE6daAuJZk7PoQNLq mGuumuaBeB8CGCV7zr4MS8GVhI1GL7VNbgyB6KmLiK0vzelgiJ+2KmCYSGSc/J/ZTx+ETVeyIIH tmltaWJLN5F29bFZhNBhL1MOm60J+BBG1oYNchZsZlEyJ+rhv0o9vqTE0x3lfmdCI2lbG7MNqtc qp1S9IOr6UOV0 X-Developer-Key: i=marcandre.lureau@redhat.com; a=openpgp; fpr=87A9BD933F87C606D276F62DDAE8E10975969CE5 X-Scanned-By: MIMEDefang 3.4.1 on 10.30.177.4 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.133.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_H3=0.001, RCVD_IN_MSPIKE_WL=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-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: 1790108924310158501 Signed-off-by: Marc-Andr=C3=A9 Lureau --- tests/qemu-iotests/tests/mirror-change-copy-mode | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) diff --git a/tests/qemu-iotests/tests/mirror-change-copy-mode b/tests/qemu-= iotests/tests/mirror-change-copy-mode index c9c345f1397c..79a6a7396450 100755 --- a/tests/qemu-iotests/tests/mirror-change-copy-mode +++ b/tests/qemu-iotests/tests/mirror-change-copy-mode @@ -119,8 +119,8 @@ class TestMirrorChangeCopyMode(iotests.QMPTestCase): copy_mode=3D'background') =20 def test_background_to_active(self): - self.vm.hmp_qemu_io('source', f'write 0 {image_size}') - self.vm.hmp_qemu_io('target', f'write 0 {image_size}') + self.vm.qmp_qemu_io('source', f'write 0 {image_size}') + self.vm.qmp_qemu_io('target', f'write 0 {image_size}') =20 self.start_mirror() =20 @@ -137,7 +137,7 @@ class TestMirrorChangeCopyMode(iotests.QMPTestCase): req_size =3D image_size // reqs for i in range(0, reqs): req =3D f'aio_write -P 7 {req_size * i} {req_size}' - self.vm.hmp_qemu_io('source', req) + self.vm.qmp_qemu_io('source', req) =20 # Wait for the first few requests. time.sleep(1) @@ -174,15 +174,15 @@ class TestMirrorChangeCopyMode(iotests.QMPTestCase): req_size =3D image_size // 2 // reqs for i in range(0, reqs): req =3D f'aio_write -P 19 {req_size * i} {req_size}' - self.vm.hmp_qemu_io('source', req) + self.vm.qmp_qemu_io('source', req) =20 # Now issue a synchronous write in the second half of the image and # immediately verify that it was written to the target too. This w= ould # fail without switching the copy mode. Note that this only produc= es a # log line and the actual checking happens during tearDown(). req_args =3D f'-P 37 {3 * (image_size // 4)} {req_size}' - self.vm.hmp_qemu_io('source', f'write {req_args}') - self.vm.hmp_qemu_io('target', f'read {req_args}') + self.vm.qmp_qemu_io('source', f'write {req_args}') + self.vm.qmp_qemu_io('target', f'read {req_args}') =20 self.vm.cmd('block-job-cancel', device=3D'mirror') while len(self.vm.cmd('query-block-jobs')) > 0: @@ -190,5 +190,4 @@ class TestMirrorChangeCopyMode(iotests.QMPTestCase): =20 if __name__ =3D=3D '__main__': iotests.main(supported_fmts=3D['qcow2', 'raw'], - supported_protocols=3D['file'], - require_hmp=3DTrue) + supported_protocols=3D['file']) --=20 2.56.0.rc0.29.g47ce80527c56 From nobody Sat Sep 26 20:01:40 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=1790108607; cv=none; d=zohomail.com; s=zohoarc; b=EbFVp7sb3Tk9+CB2RmIU2WBNmJZk4yTLjxgwmwW92JL9PYDX3QsmBjO7T123tKyyyshKdh5QFVgHsoQV+sWIEhMcezqomSk8yYGmUX6qkgFhQ8Jd9FZTnAe8I8XegcvAywQPJP9OOBZAwbFMQ1IeD9IMjP3RIxDbgQyLSmcE9HM= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1790108607; 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:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=mamSw4xslryVG87aKbgwluYltQ8ZgmHZJA6qPnUeK5k=; b=bIcex4baxBQ8VIq6CVIsO+VYOV3jBGgY/znugMS3/HdCKuwj6UJIxh5pLoZ1cAdzq9tAOM5NQPL7A16vw6BUq9i7Ufahpw1WL6qumUZ29PIjs/KuqhKaVGq8obLTVK2HPIQ2vtbQ24nJ6abvtdxbL/saTa+RUGQjt883eS4ADzw= 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 1790108607041142.9107337618425; Tue, 22 Sep 2026 13:23:27 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists1p.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1x970T-000248-Bj; Tue, 22 Sep 2026 16:22:25 -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 1x96zn-0000V2-9D for qemu-devel@nongnu.org; Tue, 22 Sep 2026 16:21:43 -0400 Received: from us-smtp-delivery-124.mimecast.com ([170.10.133.124]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1x96zl-0000Aq-LQ for qemu-devel@nongnu.org; Tue, 22 Sep 2026 16:21:42 -0400 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-610--6i9s0gHMgihQWH9-_tMIg-1; Tue, 22 Sep 2026 16:21:37 -0400 Received: from mx-prod-int-06.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-06.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.93]) (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 B95DA19352F1; Tue, 22 Sep 2026 20:21:36 +0000 (UTC) Received: from localhost (headnet03.pony-001.prod.iad2.dc.redhat.com [10.2.32.114]) by mx-prod-int-06.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id 99BDD180056E; Tue, 22 Sep 2026 20:21:35 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1790108501; 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=mamSw4xslryVG87aKbgwluYltQ8ZgmHZJA6qPnUeK5k=; b=IfH10vrYroiGLa29ul+nJ54n2dlyqR5xRuJm+03USxxLErJRWR2frjGuXW1h/7e5Oqzu3v XrmOv6PNMR6jmZ9Qbb+PmPLeiFbq1TTX8CO/iIKh4tVfm/WWI/u5s0Z7V7Zj36F283fZEz liyOQf0iws7iIy2D+XteZELsWoz7Qhk= X-MC-Unique: -6i9s0gHMgihQWH9-_tMIg-1 X-Mimecast-MFC-AGG-ID: -6i9s0gHMgihQWH9-_tMIg_1790108496 From: =?utf-8?q?Marc-Andr=C3=A9_Lureau?= Date: Wed, 23 Sep 2026 00:17:48 +0400 Subject: [PATCH 41/88] qemu-iotests/migrate-bitmaps-test: migrate away from HMP MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Message-Id: <20260923-nohmp-v1-41-ebc029d4bd80@redhat.com> References: <20260923-nohmp-v1-0-ebc029d4bd80@redhat.com> In-Reply-To: <20260923-nohmp-v1-0-ebc029d4bd80@redhat.com> To: qemu-devel@nongnu.org Cc: Kevin Wolf , =?utf-8?q?Marc-Andr=C3=A9_Lureau?= , Hanna Reitz , qemu-block@nongnu.org X-Developer-Signature: v=1; a=openpgp-sha256; l=1868; i=marcandre.lureau@redhat.com; h=from:subject:message-id; bh=nAgdlKU5ANKjTdVkSB54qAiNNbbto0h3s+g1JsdYYNw=; b=owEBbQKS/ZANAwAKAdro4Ql1lpzlAcsmYgBqsuKxVno/0vxwm2JR3MrF2s5DmefBK/lpZhhV5 1ubkcSvsHSJAjMEAAEKAB0WIQSHqb2TP4fGBtJ29i3a6OEJdZac5QUCarLisQAKCRDa6OEJdZac 5eSND/91psQdzLRp6fpsVivIPVtijTHXiFcb/oBTJW99kT8itGX/K9ZJ85HY1JklDXQWpAZX90c JuvyoUfZ4pyKWcjEx1rxNIhYXxfYbHyR+yvzBg5bG0G+L2nndDj2UzHjPiLt7VVf+3e4qQ4rsad XJn4AlnA2GpIev1XNNx1ewYFCyPv8+U7TlKPAuRaMrxv3IAvvIw2nIib7NQUWMGHBTpth9thot3 7bsg4PdO1A9znf6WYJ6Lh4iZhDJJdWg3SCt0rD6ThsIZlHqJk2sVj2UxpAKnByXMwl2fH85i0Jw nfoNAtirnmCZSNsC6Upsrajk9oPEf60P2ei+Yz6wNDBUrJqWx8jz065MZkhNFfNfSGezqN4NhQY Qi2q/R+vp18RfC44d8KuWR6cawco250JfgnnZwZWVsbwplhlPa4u2O2sXOiSI5mT+8Lzb/VkHR+ JHyhEHpa/bu6UjpDBrqOGrtoOG1qzbHYWKilc7JCeh/fudNJTh2XD20WPKsZUhpAyh3IIIpiYrr bsXIgJq/Csjwi6KVngMM+ZCO5FbbGXsIa1IoOcf6jV1CnPrJYkPxJ2Bqh8JU6wpvhFtY63bck4A 2LKZBcV/BMcf2joXV17Z5D7ZeBJrDTorfdH41HB94LtffuxknT5JX7f5TcX1+z8CWzETmETATsR EAtQ4dJHrDwxBPg== X-Developer-Key: i=marcandre.lureau@redhat.com; a=openpgp; fpr=87A9BD933F87C606D276F62DDAE8E10975969CE5 X-Scanned-By: MIMEDefang 3.4.1 on 10.30.177.93 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.133.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_H3=0.001, RCVD_IN_MSPIKE_WL=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-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: 1790108608623158500 Signed-off-by: Marc-Andr=C3=A9 Lureau --- tests/qemu-iotests/tests/migrate-bitmaps-test | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/tests/qemu-iotests/tests/migrate-bitmaps-test b/tests/qemu-iot= ests/tests/migrate-bitmaps-test index 25439c9eb773..f386e960afa8 100755 --- a/tests/qemu-iotests/tests/migrate-bitmaps-test +++ b/tests/qemu-iotests/tests/migrate-bitmaps-test @@ -95,7 +95,7 @@ class TestDirtyBitmapMigration(iotests.QMPTestCase): =20 self.add_bitmap(self.vm_a, granularity, persistent) for r in regions: - self.vm_a.hmp_qemu_io('drive0', 'write %d %d' % r) + self.vm_a.qmp_qemu_io('drive0', 'write %d %d' % r) sha256 =3D get_bitmap_hash(self.vm_a) =20 self.vm_a.cmd('migrate', uri=3Dmig_cmd) @@ -159,7 +159,7 @@ class TestDirtyBitmapMigration(iotests.QMPTestCase): =20 self.add_bitmap(self.vm_a, granularity, persistent) for r in regions: - self.vm_a.hmp_qemu_io('drive0', 'write %d %d' % r) + self.vm_a.qmp_qemu_io('drive0', 'write %d %d' % r) sha256 =3D get_bitmap_hash(self.vm_a) =20 if pre_shutdown: @@ -215,7 +215,7 @@ class TestDirtyBitmapMigration(iotests.QMPTestCase): self.vm_b.add_drive(disk_b, 'read-only=3Don') =20 self.add_bitmap(self.vm_a, granularity, True) - self.vm_a.hmp_qemu_io('drive0', 'write 0 4096') + self.vm_a.qmp_qemu_io('drive0', 'write 0 4096') =20 self.vm_a.cmd('migrate-set-capabilities', capabilities=3Dmig_caps) self.vm_a.cmd('migrate', uri=3Dmig_cmd) @@ -330,7 +330,6 @@ def main() -> None: supported_fmts=3D['qcow2'], supported_protocols=3D['file'], unsupported_imgopts=3D['compat'], - require_hmp=3DTrue, ) =20 =20 --=20 2.56.0.rc0.29.g47ce80527c56 From nobody Sat Sep 26 20:01:40 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=1790108619; cv=none; d=zohomail.com; s=zohoarc; b=Pc8PwyTK+3xV8xHde4u3HrMZgPuKr3P1c6E7XV9qY0sdqRDWcoCnJs+DjCkMMLpwYJsiFxMxi7pnbEIOUud/bnjwkHB73jES5wjp5/nkOJf0otysYc8mHUxwMRXQB7WMOppVpmKIoEi9cvN9pomuHfCYJ8ZmueQ4uJ5yhZLw6ms= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1790108619; 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:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=X7TnWQ01G3TcbEQFLUIQl0E9NjvtZ2FR4jPTkDRy3h4=; b=oF/X6j6FCf24tNUPYBqRyLR/Rti6pL+9FJBCQkB+xAPDPLK4nyIP+ZbeYfqrZKyZChsygH27puAH6KgutqVJrSBDgdLw0077f79hRcS2LWZ+o2FRGbcs8N+jOdl9KcY5tF4Yc57pYxax0eRVjPOgZ/mxrSUpwNqtetDrIWZPLRE= 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 179010861941886.32372707650586; Tue, 22 Sep 2026 13:23:39 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists1p.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1x970c-0002VO-Df; Tue, 22 Sep 2026 16:22:34 -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 1x96zr-0000fJ-N1 for qemu-devel@nongnu.org; Tue, 22 Sep 2026 16:21:49 -0400 Received: from us-smtp-delivery-124.mimecast.com ([170.10.133.124]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1x96zq-0000BF-1M for qemu-devel@nongnu.org; Tue, 22 Sep 2026 16:21:47 -0400 Received: from mx-prod-mc-05.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-600-itxKMNkLMf235DJlbiw5Bg-1; Tue, 22 Sep 2026 16:21:41 -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-05.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id 22E941955EA5; Tue, 22 Sep 2026 20:21:40 +0000 (UTC) Received: from localhost (headnet03.pony-001.prod.iad2.dc.redhat.com [10.2.32.114]) by mx-prod-int-10.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id 2373E756; Tue, 22 Sep 2026 20:21:38 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1790108504; 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=X7TnWQ01G3TcbEQFLUIQl0E9NjvtZ2FR4jPTkDRy3h4=; b=hSLryurBN7oGdXh3ezPV6EYFrU+BE9e4WFQ+fbqjxV83JsoLwqEs6fQEMd4DTXiDv/PkRo YrARpkHp3Vkqm6BKjd/hGJG85koGctwHWNtyza/nmZv9SGOONZkkkSdzf1JVmzd6cVbPth auquVMKHDEjUeQ+L8g2v6GwSZ/c/vEo= X-MC-Unique: itxKMNkLMf235DJlbiw5Bg-1 X-Mimecast-MFC-AGG-ID: itxKMNkLMf235DJlbiw5Bg_1790108500 From: =?utf-8?q?Marc-Andr=C3=A9_Lureau?= Date: Wed, 23 Sep 2026 00:17:49 +0400 Subject: [PATCH 42/88] qemu-iotests/image-fleecing: migrate away from HMP MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Message-Id: <20260923-nohmp-v1-42-ebc029d4bd80@redhat.com> References: <20260923-nohmp-v1-0-ebc029d4bd80@redhat.com> In-Reply-To: <20260923-nohmp-v1-0-ebc029d4bd80@redhat.com> To: qemu-devel@nongnu.org Cc: Kevin Wolf , =?utf-8?q?Marc-Andr=C3=A9_Lureau?= , Hanna Reitz , qemu-block@nongnu.org X-Developer-Signature: v=1; a=openpgp-sha256; l=3352; i=marcandre.lureau@redhat.com; h=from:subject:message-id; bh=3GzLtrngC5uDQhLaBblYQ9KxPJ9xR1689fuMdHIqCFM=; b=owEBbQKS/ZANAwAKAdro4Ql1lpzlAcsmYgBqsuKxLps5xVgvL72IPNUYPjIlS7vRou4jtxma3 LHi39UUht6JAjMEAAEKAB0WIQSHqb2TP4fGBtJ29i3a6OEJdZac5QUCarLisQAKCRDa6OEJdZac 5eVAD/9qAALzc5M3UPpbI5pvxeJ2Y2cdR1rX7XGKvs9ZwJsmyDUH3bJcvXg5DuDuj/EJbj2jDFS FPyk1KMh9ofdtZq9o/VFTeFo4xQyjSefpQAG1x63oHqtOu/MgCgqJakDLdeKJPrIN1hPfwGOxuX l9/+LLVtO8rvaZxFIlzbEjIPMEJmiU9n2cAnUEeLcvm4F9eO7WE03tQhHjBHyrXOrk6RErs573R HE0N1LrBcx2UgalvCjdvIck/BD9d/XUVk/IEmYwemcH/CY+/y8kv6xY5t2g6LUjEL52X1TVj5Fm GlVPbmbHB8I1TaJ732V7fPnL+2y0Q8erwPH07vFvD2mMgbVipKU+hRv/LG57oGkrLHf9XiNxzMb Jm1PyD4q07yD2Mk2seZkCIUTIYau8xd7XUANa3gtyO0ukB06Hq30kYiFdf6BRSITpFr402MboYq yaC5QWWYfnFNpjLP0fijKTewwin0cFwE2rSryyiitjtfXHHtply2M+BznyBtlEvHraJZ/E6gmgj lpp7QfWHSheu2LBfo7GvLcP60GDePM81Qs8p3ZYfQ15jIkRUzfodBoJ6htNgDoidXoWICS+2p05 gKVNU8kjt6hL3NEMn/c43ZLOrscr5DXXWi6xdGiZwUdjagSN+6ZMGzqOWCnp+4YJrepe42xw/qI eQIwl9WoBGnhwJA== 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.133.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_H3=0.001, RCVD_IN_MSPIKE_WL=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-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: 1790108620714158500 No need to log success. Signed-off-by: Marc-Andr=C3=A9 Lureau --- tests/qemu-iotests/tests/image-fleecing | 5 ++--- tests/qemu-iotests/tests/image-fleecing.out | 20 -------------------- 2 files changed, 2 insertions(+), 23 deletions(-) diff --git a/tests/qemu-iotests/tests/image-fleecing b/tests/qemu-iotests/t= ests/image-fleecing index 0142289843a8..5dff00977d3e 100755 --- a/tests/qemu-iotests/tests/image-fleecing +++ b/tests/qemu-iotests/tests/image-fleecing @@ -32,7 +32,6 @@ iotests.script_initialize( supported_platforms=3D['linux'], required_fmts=3D['copy-before-write'], unsupported_imgopts=3D['compat'], - require_hmp=3DTrue, ) =20 patterns =3D [('0x5d', '0', '64k'), @@ -209,12 +208,12 @@ def do_test(vm, use_cbw, use_snapshot_access_filter, = base_img_path, for p in overwrite: cmd =3D 'write -P%s %s %s' % p log(cmd) - log(vm.hmp_qemu_io(qom_path, cmd, qdev=3DTrue)) + vm.qmp_qemu_io(qom_path, cmd, qdev=3DTrue) =20 if push_backup: # Check that previous operations were done during backup, not after # If backup is already finished, it's possible that it was finished - # even before hmp qemu_io write, and we didn't actually test + # even before qemu_io write, and we didn't actually test # copy-before-write operation. This should not happen, as we use # speed=3D1. But worth checking. result =3D vm.qmp('query-block-jobs') diff --git a/tests/qemu-iotests/tests/image-fleecing.out b/tests/qemu-iotes= ts/tests/image-fleecing.out index acfc89ff0e99..a8c19615fc6b 100644 --- a/tests/qemu-iotests/tests/image-fleecing.out +++ b/tests/qemu-iotests/tests/image-fleecing.out @@ -31,13 +31,9 @@ read -P0 0x3fe0000 64k --- Testing COW --- =20 write -P0xab 0 64k -{"return": ""} write -P0xad 0x00f8000 64k -{"return": ""} write -P0x1d 0x2008000 64k -{"return": ""} write -P0xea 0x3fe0000 64k -{"return": ""} =20 --- Verifying Data --- =20 @@ -101,13 +97,9 @@ read -P0 0x3fe0000 64k --- Testing COW --- =20 write -P0xab 0 64k -{"return": ""} write -P0xad 0x00f8000 64k -{"return": ""} write -P0x1d 0x2008000 64k -{"return": ""} write -P0xea 0x3fe0000 64k -{"return": ""} =20 --- Verifying Data --- =20 @@ -172,13 +164,9 @@ read -P0 0x3fe0000 64k --- Testing COW --- =20 write -P0xab 0 64k -{"return": ""} write -P0xad 0x00f8000 64k -{"return": ""} write -P0x1d 0x2008000 64k -{"return": ""} write -P0xea 0x3fe0000 64k -{"return": ""} =20 --- Verifying Data --- =20 @@ -250,13 +238,9 @@ read failed: Invalid argument --- Testing COW --- =20 write -P0xab 0 64k -{"return": ""} write -P0xad 0x00f8000 64k -{"return": ""} write -P0x1d 0x2008000 64k -{"return": ""} write -P0xea 0x3fe0000 64k -{"return": ""} =20 --- Verifying Data --- =20 @@ -318,13 +302,9 @@ Done --- Testing COW --- =20 write -P0xab 0 64k -{"return": ""} write -P0xad 0x00f8000 64k -{"return": ""} write -P0x1d 0x2008000 64k -{"return": ""} write -P0xea 0x3fe0000 64k -{"return": ""} {"data": {"device": "push-backup", "len": 67108864, "offset": 67108864, "s= peed": 0, "type": "backup"}, "event": "BLOCK_JOB_COMPLETED", "timestamp": {= "microseconds": "USECS", "seconds": "SECS"}} {"return": {}} =20 --=20 2.56.0.rc0.29.g47ce80527c56 From nobody Sat Sep 26 20:01:40 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=1790108620; cv=none; d=zohomail.com; s=zohoarc; b=C3unssN+KNSc6vsn2x74mijnrP3aFhiqss9j0dr7NELWh71mStZGM8NB3jpkcf/vk7zWn0pbUB1V2rUvXCv9TfZDNH9375pJgJ2/98AQUYSS+BlahLkX+6cmcYuUynARUk3Hf4vNjZwoOLV8/ltzRKhVnrEJ6Rzcd/4h7vJAlRE= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1790108620; 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:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=9mHSvPtN3hZH9rGpeo544uzNKq13EcVXgfFduNXgYqY=; b=d4shL5Uf3nnosiIDk4zd583ERuJhEPCgBsHGkWvHBiBA7vgg/Rs8Ip9pSDVNhWYKPLe+G6WWJcowR41id5KmtFjCl1flWCpDpnLDk3OuibSgylctc3sJBW63XIEIzo3qUF8yqYGnmsavXQjef9SU4wqv5TnqN8cAs8/TNiwadFI= 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 1790108620186401.01823701361036; Tue, 22 Sep 2026 13:23:40 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists1p.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1x9715-00033r-3n; Tue, 22 Sep 2026 16:23:03 -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 1x96zt-0000gB-QW for qemu-devel@nongnu.org; Tue, 22 Sep 2026 16:21: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 1x96zs-0000Bh-HV for qemu-devel@nongnu.org; Tue, 22 Sep 2026 16:21:49 -0400 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-EbnIl61dMIO35ZcJpHcN9A-1; Tue, 22 Sep 2026 16:21:44 -0400 Received: from mx-prod-int-05.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-05.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.17]) (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 AF15E1956076; Tue, 22 Sep 2026 20:21:43 +0000 (UTC) Received: from localhost (headnet03.pony-001.prod.iad2.dc.redhat.com [10.2.32.114]) by mx-prod-int-05.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id BFD621956095; Tue, 22 Sep 2026 20:21:42 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1790108507; 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=9mHSvPtN3hZH9rGpeo544uzNKq13EcVXgfFduNXgYqY=; b=fkE/gik5hIkHq+XcFQgvAP2TPVM1B0tQ/XQxrXCyVnYhgtDDNub7oeoOcWQblDYubhLqiZ 4UCiP4FeBje0UKZ4rztcf0zU1srhf8+CV/U7mSK+AkKu/TZj1n2Zk7lUrEo/GD5/5kJTV9 eJqYKbNgD8ppceRbVo7uSA/hTiKUti8= X-MC-Unique: EbnIl61dMIO35ZcJpHcN9A-1 X-Mimecast-MFC-AGG-ID: EbnIl61dMIO35ZcJpHcN9A_1790108503 From: =?utf-8?q?Marc-Andr=C3=A9_Lureau?= Date: Wed, 23 Sep 2026 00:17:50 +0400 Subject: [PATCH 43/88] qemu-iotests/migrate-bitmaps-postcopy: migrate away from HMP MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Message-Id: <20260923-nohmp-v1-43-ebc029d4bd80@redhat.com> References: <20260923-nohmp-v1-0-ebc029d4bd80@redhat.com> In-Reply-To: <20260923-nohmp-v1-0-ebc029d4bd80@redhat.com> To: qemu-devel@nongnu.org Cc: Kevin Wolf , =?utf-8?q?Marc-Andr=C3=A9_Lureau?= , Hanna Reitz , qemu-block@nongnu.org X-Developer-Signature: v=1; a=openpgp-sha256; l=1071; i=marcandre.lureau@redhat.com; h=from:subject:message-id; bh=93v1+Cu93S6tBlovISKkf7Y5VFd6MBEP62R51quWea0=; b=owEBbQKS/ZANAwAKAdro4Ql1lpzlAcsmYgBqsuKx94grBDo8DpvCTeLRzWIUs7g/GCrupjspq wBbng+XPtqJAjMEAAEKAB0WIQSHqb2TP4fGBtJ29i3a6OEJdZac5QUCarLisQAKCRDa6OEJdZac 5R6uD/9sjdjucQNjtoLIr/Jgk0SJcb3UMxUbuEgr13EUCSt6CfAZ0AYK61AgXDKVjsbqT5/Uvdy e6+Vj3qIJ3ZGeNTecRbZenJGKDZdsBVuXZ2lHLf+cEC9etVfetV2AxAuC/ET+afma8o/nNYW1QZ 3qlOUYhW5P42aNYXhPwU5FpGbF7fmoGQ5A1qtMNsir6+2zoCUpjX4vA+OxuRad+2AU2nFbgAqsg XJq9i0W10vMl+H/AIZ/IRukwmJJ9cRL/2bFQ47zkeVqRdlrmmpNyekXEUU5GCzVLUHpqn+taoxc CaB3dAZFoAZbcEcOQ5rJR84I+3ny/bLbZLFzMokksYIcRuMPnVUCcT5TIWugmGsOi18e9/MxInW y2MOfNvLlVJUG3kZJQRqlUP2CbMFx2FJRZXgJSUxMUhfKnTBzdrh/T4j/bZm+ofnqSJXSlsLeCw z9Y1d5dU8vp9W+r8Y6f0BfCaHFUlrwb03Fu0+fkGpdw8MVrOqYnZybYbIQQNnlKbLjjF3AWNolB kLa/3AvvKXAZTaXYNt54JcP5ZvAYJoDFNrq4cWWEgJdoQaENAuJpGFY9W4Hr6Ax55cAU0eDD9ci K8n/6bbgFCVKJxWVg9kLJlLMpeyP+96NKA6vusMkCYAULYMxpGq1ASlo4WODCQLSojtrxUvtPOd mp0/3evflXEvnCQ== X-Developer-Key: i=marcandre.lureau@redhat.com; a=openpgp; fpr=87A9BD933F87C606D276F62DDAE8E10975969CE5 X-Scanned-By: MIMEDefang 3.0 on 10.30.177.17 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: 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-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: 1790108620646158500 Signed-off-by: Marc-Andr=C3=A9 Lureau --- tests/qemu-iotests/tests/migrate-bitmaps-postcopy-test | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/tests/qemu-iotests/tests/migrate-bitmaps-postcopy-test b/tests= /qemu-iotests/tests/migrate-bitmaps-postcopy-test index b2b37ada4b27..6a424835d9f1 100755 --- a/tests/qemu-iotests/tests/migrate-bitmaps-postcopy-test +++ b/tests/qemu-iotests/tests/migrate-bitmaps-postcopy-test @@ -52,7 +52,7 @@ discards2 =3D ( =20 def apply_discards(vm, discards): for d in discards: - vm.hmp_qemu_io('drive0', 'discard {} {}'.format(*d)) + vm.qmp_qemu_io('drive0', 'discard {} {}'.format(*d)) =20 =20 def event_seconds(event): @@ -279,5 +279,4 @@ class TestDirtyBitmapPostcopyMigration(iotests.QMPTestC= ase): =20 if __name__ =3D=3D '__main__': iotests.main(supported_fmts=3D['qcow2'], - unsupported_imgopts=3D['compat'], - require_hmp=3DTrue) + unsupported_imgopts=3D['compat']) --=20 2.56.0.rc0.29.g47ce80527c56 From nobody Sat Sep 26 20:01:40 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=1790108954; cv=none; d=zohomail.com; s=zohoarc; b=IaOY1718FTb/5PXfEcbBKOoXC6m0GsUKSVSOgEBO5P9EIQ7yq7fcCLjD3MR935xhEcm4MEpQqOJ91yfifJjDCHqxB8E7V4Aw8q1N3PxY5KFWmcehA4Sx/Ajj9nKm44rirMO6c7F2+l1Aidol8MWG3K9SZPg9NYf23t6V9Q5gPIo= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1790108954; 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:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=dlfm1Ii5r1HQH8gstT18nSCgINLXBXF6zaLLHJdleD0=; b=jUIsHdb81gS7fPkPe8eeayUojmmHWQmPsRQ1hJZ/0m3ok3D6/zmmLOOy8yAQ3jsnuINE5tqFqqdMW4mtK1S1zHMRySGj9ZWZe/R/qbpuMRKWXwmAQ3cgJADnwzQzDkN8gt//Lv7jgzYbzpaZnqQJd78/d6yHmC/etabfZwc021Y= 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 1790108954542867.0591963733212; Tue, 22 Sep 2026 13:29:14 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists1p.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1x970Q-0001li-C8; Tue, 22 Sep 2026 16:22:22 -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 1x9701-0000kT-Im for qemu-devel@nongnu.org; Tue, 22 Sep 2026 16:22:01 -0400 Received: from us-smtp-delivery-124.mimecast.com ([170.10.133.124]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1x96zx-0000CO-Mc for qemu-devel@nongnu.org; Tue, 22 Sep 2026 16:21:56 -0400 Received: from mx-prod-mc-05.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-86-09t5XYLmPqKc5eD_NrduOg-1; Tue, 22 Sep 2026 16:21:48 -0400 Received: from mx-prod-int-01.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-01.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.4]) (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-05.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id 38BDF195609D; Tue, 22 Sep 2026 20:21:47 +0000 (UTC) Received: from localhost (headnet03.pony-001.prod.iad2.dc.redhat.com [10.2.32.114]) by mx-prod-int-01.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id 37CE1300106D; Tue, 22 Sep 2026 20:21:45 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1790108511; 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=dlfm1Ii5r1HQH8gstT18nSCgINLXBXF6zaLLHJdleD0=; b=BZaOv1lILvi1+NujObJ9ov1DXUJMQYHtFMhLpOkdgOk9+KMa3w0Ys3n6z6IrZyfh0LrRiJ h6mBxjRGw0KiykqBxn55glQkte58e+UoqOUf0EUzbnNJyfbVoImHxgpVWtiAs0XsKTZpAQ glovOKFjbBcGxYWG2YBO7dHyXhmtTxY= X-MC-Unique: 09t5XYLmPqKc5eD_NrduOg-1 X-Mimecast-MFC-AGG-ID: 09t5XYLmPqKc5eD_NrduOg_1790108507 From: =?utf-8?q?Marc-Andr=C3=A9_Lureau?= Date: Wed, 23 Sep 2026 00:17:51 +0400 Subject: [PATCH 44/88] qemu-iotests/165: migrate away from HMP MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Message-Id: <20260923-nohmp-v1-44-ebc029d4bd80@redhat.com> References: <20260923-nohmp-v1-0-ebc029d4bd80@redhat.com> In-Reply-To: <20260923-nohmp-v1-0-ebc029d4bd80@redhat.com> To: qemu-devel@nongnu.org Cc: Kevin Wolf , =?utf-8?q?Marc-Andr=C3=A9_Lureau?= , Hanna Reitz , qemu-block@nongnu.org X-Developer-Signature: v=1; a=openpgp-sha256; l=1686; i=marcandre.lureau@redhat.com; h=from:subject:message-id; bh=AQS7vsAJ7TUlM8UXHoSCARVjIDS9/6IH7oxVsB2PKKY=; b=owEBbQKS/ZANAwAKAdro4Ql1lpzlAcsmYgBqsuKxSjCMLODihdsZ+qU1zBq5QMIJLMZb1zDxG sZ49bVROxaJAjMEAAEKAB0WIQSHqb2TP4fGBtJ29i3a6OEJdZac5QUCarLisQAKCRDa6OEJdZac 5WQuD/9btQdwN0FFpAAqgOWyDGSIzvMC+rgQhduPZJrn5S2wiDShFChAkiiLqFvjNLhjndqXYkw ZXtBr+70SHMamGlhvIe9p86ixbQZhpMsEqF1Y9RFIOKBJ17IzyFYJ46hBcR466LHBGmL7JNpnhJ pNWvBscr0r+S3NI4Vc2MW7bIWuYYfmyIV4OVD+EjB4JyjRS1qOLwLaR7puRNjKLm5tmIxqQ7o8i E17/WjEKG+pLdGj7EDwduaYXzvrMu/BW8u9U5Ltc6Ph7n1NQKjXOLkKazr6p+98lP2fKF4dR0zH /rVVSDDuCtyg/sXWSa9k+Zq7CJBPeemJZdfy/pDC0we1DtdTD50vEQXjNO+A4g/4l3LFpUQcZip Sjc1PH0knVzPe3xqivUWjG1xZTIyUBO+a0uyJ/RX5pck4maRX2g5pzmC80oys5uysppBCx9V4Gk btHZUOan/RP62TO0aVtTTVl33cW1WXuw+MUAtZ8nUQoU38cSRs1XA3Oj5GvTh3W/t/VGyTZhCjo ZBYYAydYbB8Xy69/LDmkHSLzPSlDlUjedq1van4hvpQVSlXLKyKFjNiGWTxv5IIfz0/U5DDdIdC 5S6fj2oqLrhKN95BM2Ydnmk2S/0VhY4/Gy5MAh2pCYO3yGusNkucCOAgPniP24dOZbiuN5HSsgs l7ZyYqmmAzXkkGQ== X-Developer-Key: i=marcandre.lureau@redhat.com; a=openpgp; fpr=87A9BD933F87C606D276F62DDAE8E10975969CE5 X-Scanned-By: MIMEDefang 3.4.1 on 10.30.177.4 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.133.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_H3=0.001, RCVD_IN_MSPIKE_WL=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-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: 1790108956531158500 For the read-only write test, call qmp() directly and assert the expected GenericError, since qmp_qemu_io() assumes success. Signed-off-by: Marc-Andr=C3=A9 Lureau --- tests/qemu-iotests/165 | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/tests/qemu-iotests/165 b/tests/qemu-iotests/165 index 13b784fcc64d..e1e557424cec 100755 --- a/tests/qemu-iotests/165 +++ b/tests/qemu-iotests/165 @@ -66,7 +66,7 @@ class TestPersistentDirtyBitmap(iotests.QMPTestCase): =20 def writeRegions(self, regions): for r in regions: - self.vm.hmp_qemu_io('drive0', + self.vm.qmp_qemu_io('drive0', 'write %d %d' % r) =20 def qmpAddBitmap(self): @@ -138,7 +138,10 @@ class TestPersistentDirtyBitmap(iotests.QMPTestCase): assert sha256_1 =3D=3D self.getSha256() =20 # Check that we are in RO mode and can't modify bitmap. - self.writeRegions(regions2) + for r in regions2: + result =3D self.vm.qmp('x-qemu-io', device=3D'drive0', + command=3D'write %d %d' % r) + self.assert_qmp(result, 'error/class', 'GenericError') assert sha256_1 =3D=3D self.getSha256() =20 # Reopen to RW @@ -162,5 +165,4 @@ class TestPersistentDirtyBitmap(iotests.QMPTestCase): if __name__ =3D=3D '__main__': iotests.main(supported_fmts=3D['qcow2', 'parallels'], supported_protocols=3D['file'], - unsupported_imgopts=3D['compat'], - require_hmp=3DTrue) + unsupported_imgopts=3D['compat']) --=20 2.56.0.rc0.29.g47ce80527c56 From nobody Sat Sep 26 20:01:40 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=1790108608; cv=none; d=zohomail.com; s=zohoarc; b=UqpAzvAz409UlrY3W1TH3bLYH1BApMt0oHJgScTjR96JJ5NySNqY+OkzoFIPCx2DsUm6w6GYQwVIPxOiUyK/0QIt3y3mpShOuQJr8ZiYIY7HX4lp9CDdK6QZoKwuLg7Zj7YAbKVD0so7tJ2lhO2MUF2AJv3wK2ycpouJfcpDFZQ= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1790108608; 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:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=oAUeWAG/sMzqfzbZKjFlT8bLd4yW86qBnoWJQkgaWNo=; b=JmvZS/p24bLVOEBKAqLrLLP4QGMJu0vbWKljklzXsBJzDkWpZ+GvicbtbBSzFhmEJelyTLhgY6SzZx0caQnp02cJ4yP2Dxd/YgUOdUWn4CV5HbIYdjNaZoh0ag2tZd/rTXG2y0tbx0bRF9/6viuUBLE7wsdddcTNbveQfYvaQZE= 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 179010860813080.46796245806672; Tue, 22 Sep 2026 13:23:28 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists1p.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1x971H-0004Zt-K5; Tue, 22 Sep 2026 16:23:15 -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 1x9702-0000kj-U2 for qemu-devel@nongnu.org; Tue, 22 Sep 2026 16:22:01 -0400 Received: from us-smtp-delivery-124.mimecast.com ([170.10.133.124]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1x9701-0000Cq-Ao for qemu-devel@nongnu.org; Tue, 22 Sep 2026 16:21:58 -0400 Received: from mx-prod-mc-08.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-10-R7ehMu6aMqmVsyMUBxwXaQ-1; Tue, 22 Sep 2026 16:21:51 -0400 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-08.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id F0D4A1834504; Tue, 22 Sep 2026 20:21:50 +0000 (UTC) Received: from localhost (headnet03.pony-001.prod.iad2.dc.redhat.com [10.2.32.114]) by mx-prod-int-08.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id EE21B180034C; Tue, 22 Sep 2026 20:21:49 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1790108515; 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=oAUeWAG/sMzqfzbZKjFlT8bLd4yW86qBnoWJQkgaWNo=; b=TMn+8b6eifPNdDVyPQvjVJI6J8fpqTigCb09vYVFQozzYw38ino3aJsM1cHcaPyCJOdpns 8H/Wii6ZqMr0j4+zZtnBi7797tVnmswsO3FaVJ74qIbgS8XMcx04lOTOKEppbLyxOGZ6iI YZ7RzwZMeEpt5LNlRVA/kAnYbyOlyYE= X-MC-Unique: R7ehMu6aMqmVsyMUBxwXaQ-1 X-Mimecast-MFC-AGG-ID: R7ehMu6aMqmVsyMUBxwXaQ_1790108511 From: =?utf-8?q?Marc-Andr=C3=A9_Lureau?= Date: Wed, 23 Sep 2026 00:17:52 +0400 Subject: [PATCH 45/88] qemu-iotests/iothreads-create: doesn't actually depend on HMP MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Message-Id: <20260923-nohmp-v1-45-ebc029d4bd80@redhat.com> References: <20260923-nohmp-v1-0-ebc029d4bd80@redhat.com> In-Reply-To: <20260923-nohmp-v1-0-ebc029d4bd80@redhat.com> To: qemu-devel@nongnu.org Cc: Kevin Wolf , =?utf-8?q?Marc-Andr=C3=A9_Lureau?= , Hanna Reitz , qemu-block@nongnu.org X-Developer-Signature: v=1; a=openpgp-sha256; l=929; i=marcandre.lureau@redhat.com; h=from:subject:message-id; bh=Q4eKZ6YKOzR/5nSmc3Z6JIhVY2m795xMmLa7w9CCs/I=; b=owEBbQKS/ZANAwAKAdro4Ql1lpzlAcsmYgBqsuKxxn02cPtV5cQXLj28amL3A6z4dzud+G2nP B8nwZAFtTSJAjMEAAEKAB0WIQSHqb2TP4fGBtJ29i3a6OEJdZac5QUCarLisQAKCRDa6OEJdZac 5VnVEACjMassW+LA8hkhwz1y4j5n1mjIZ8SZ6fiTEGaWQL8rYjLxOgUgXGkYFm9pvN+J7QLa/J0 kwfUDQC2q63pSaxDuoYPd0bKkAtHT0cIhfOHwShWZHJFHYlhM2kTWGam3lqBlNWSbmkaJ/PSFJG izjAuTQpr/hGSAtUaODKmZAelCteNelt+QKJPNSEx/oNYgG4qix4Hu6y4jaRoY8lEkxPLMgcX+O ynv6sf806KQtyFdoHHFWOCcvva+wnrXdvqUOHlH0rqQRM0nX4QsQ6lwE4B2+5hD9OZRT4p7xvXy WVaKmgnRUrMZ8vTE8IBIBzegPXJEUG9Ju1MphDcScp8KI/pRxCS8Vl3Gwg4evzpguovUeTXyZSO GPHs2ogxZ+Ncav7183eMqyL6ZwwOiXZgHPokXPi0fPHHPmj2JW5YVcFUqJMT8veyifJ1TcXfiII nc2sjtw6qbUeeTqk4T96JFRgdSFSYBQkSGkEwsHTMXZjbhbWNdbaVON7w2W68N4NosMq2osrKE+ yIjVw2zOxdnUTx69Bc4tDeMqhoEXfkT+u7jpa/fVuMPxHRR8rn5q2kEia5qFV+JdMV1ermlYpTD i/qVlgENzYqQZKEMYXa8icxpQcTx6cVbBVKlyxnKW5pFFGQjFCmx97TPKhVsx5Y9FtUyIpcRd7V YRqW7paZbSGDPog== X-Developer-Key: i=marcandre.lureau@redhat.com; a=openpgp; fpr=87A9BD933F87C606D276F62DDAE8E10975969CE5 X-Scanned-By: MIMEDefang 3.4.1 on 10.30.177.111 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.133.124; envelope-from=marcandre.lureau@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 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_H3=0.001, RCVD_IN_MSPIKE_WL=0.001, SPF_HELO_PASS=-0.001, SPF_PASS=-0.001 autolearn=unavailable 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: 1790108608613158500 Fixes: 73baa14be2d5 ("tests: skip HMP-dependent tests when HMP is disabled") Signed-off-by: Marc-Andr=C3=A9 Lureau --- tests/qemu-iotests/tests/iothreads-create | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/tests/qemu-iotests/tests/iothreads-create b/tests/qemu-iotests= /tests/iothreads-create index 09fe57a09ac0..0c862d73f20e 100755 --- a/tests/qemu-iotests/tests/iothreads-create +++ b/tests/qemu-iotests/tests/iothreads-create @@ -22,8 +22,7 @@ import asyncio import iotests =20 iotests.script_initialize(supported_fmts=3D['qcow2', 'qcow', 'qed', 'vdi', - 'vmdk', 'parallels'], - require_hmp=3DTrue) + 'vmdk', 'parallels']) iotests.verify_virtio_scsi_pci_or_ccw() =20 with iotests.FilePath('disk.img') as img_path, \ --=20 2.56.0.rc0.29.g47ce80527c56 From nobody Sat Sep 26 20:01:40 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=1790108846; cv=none; d=zohomail.com; s=zohoarc; b=DGjRPTQdHzPqur7sQX1W+8DQnuHmnWircCrCvvBXYjt+DrSgecapAqOohIIr8sE0p6aRCZBWp4LSJ7sLhPkKkoGTk0epWhT0xiXAHze+zh22XKnk3BuL86E9d/9GnJNmZ/osLyRNh/ngr2H2uSuC83zu3byRK2QrD9PwcoSn7lA= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1790108846; 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:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=rQa6XhXtb1+ZMGZ4MhGugj32QXAj+5WVMmQLmGE8YHc=; b=VwQbcOTHUhaovtioH1wQj9QxGp6Vx9Fn6bxFyrbnLdq/FrvCrI+4neQmJsV1iaKYnqIgUogoHpeJ1Ias2w6U257+nDNKIRXJC4R/S9EKYC2K1XlWe9U8Jwtdt+mqpLXPZa75AjzAg+Mk309C0J93Eh86+rV9L2tLSAUT9Y+OPns= 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 1790108846596263.0821209733946; Tue, 22 Sep 2026 13:27:26 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists1p.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1x9715-00033e-1i; Tue, 22 Sep 2026 16:23:03 -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 1x9702-0000kl-VX for qemu-devel@nongnu.org; Tue, 22 Sep 2026 16:22:01 -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 1x9701-0000Cy-Di for qemu-devel@nongnu.org; Tue, 22 Sep 2026 16:21:58 -0400 Received: from mx-prod-mc-08.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-257-vut-i7QeO0SYW_36wUy2gA-1; Tue, 22 Sep 2026 16:21:55 -0400 Received: from mx-prod-int-03.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-03.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.12]) (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-08.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id 38C7A18052FB; Tue, 22 Sep 2026 20:21:54 +0000 (UTC) Received: from localhost (headnet03.pony-001.prod.iad2.dc.redhat.com [10.2.32.114]) by mx-prod-int-03.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id 48A4F1956086; Tue, 22 Sep 2026 20:21:52 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1790108516; 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=rQa6XhXtb1+ZMGZ4MhGugj32QXAj+5WVMmQLmGE8YHc=; b=DV6smoooD/7vzxe+fZiob3Q7mBbwno52+prTPcI5GT73Op6JxKykIOrTehqAbVwgGddnMq tOZKxuJ+BwjIHCMgz9pCucCSfty36j87FOMeaUWgd/oZkM4xCMDoA08Ur/tPXbLwkdd7eK yRtnYlcLw8iddz8ZRgfjc087A1Ttw+c= X-MC-Unique: vut-i7QeO0SYW_36wUy2gA-1 X-Mimecast-MFC-AGG-ID: vut-i7QeO0SYW_36wUy2gA_1790108514 From: =?utf-8?q?Marc-Andr=C3=A9_Lureau?= Date: Wed, 23 Sep 2026 00:17:53 +0400 Subject: [PATCH 46/88] qemu-iotests/045: remove HMP monitor dependency MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Message-Id: <20260923-nohmp-v1-46-ebc029d4bd80@redhat.com> References: <20260923-nohmp-v1-0-ebc029d4bd80@redhat.com> In-Reply-To: <20260923-nohmp-v1-0-ebc029d4bd80@redhat.com> To: qemu-devel@nongnu.org Cc: Kevin Wolf , =?utf-8?q?Marc-Andr=C3=A9_Lureau?= , John Snow , Cleber Rosa , Hanna Reitz , qemu-block@nongnu.org X-Developer-Signature: v=1; a=openpgp-sha256; l=1994; i=marcandre.lureau@redhat.com; h=from:subject:message-id; bh=vYFoYJohKePFv62rocApwamuDP/2pLkNn5nYJ8SnQeI=; b=owEBbQKS/ZANAwAKAdro4Ql1lpzlAcsmYgBqsuKxz5e8cfmwRs1YIaCLbDq70I59THWuICB08 FQ3UtzTZSuJAjMEAAEKAB0WIQSHqb2TP4fGBtJ29i3a6OEJdZac5QUCarLisQAKCRDa6OEJdZac 5TJAD/44F7NAMZpDlc8Ub1iPSYeJM/4T/3lY3Bo9LPonMHtto3irpMDabA+uJ/NpQ5I6eYHvN7W DjC6XmVDuUhS62tDUz/inkdI4PSp6vz7ex4qf4CRji28iDzot8SxDurBM25I8smMWavnH71T/OE aDmWG8DegV1OkLRX5aOIuBQGq+NUEPPRc0kYhJ+XKOx51/3DYvJJF+o+uAhj9aJkjwUx/CA+VqD Itllk18GrKxWI/fxICFosZP3WRFSw//WnavpIjtFk198tij1BugKrwVtxBEnbbObMYGFoMY/q1d ApfUEkfMug7tcamKIkf0RLuualhXmlSSsYWU7DFjmFHtU2dVpn5Qt4T7mjhU7+12gWqqoOnABBd V16+8KLceOlxSkCUcXJCmTFNKXblIo5Vi0cgLmhhMbS8QjyUqulvHqH1R/l10jYcK3fTGOkVVQV 5ALMxPS1Hl/Fbq3IO+l35OEqVOrnNtEorPCZVmp0JM/5+QccBaB45EFfvyXAg2jb5XtBBBfJLaD oUcmx1UMF9rsScZX8K7wsa5ScARM9T6zQnTBJrsZAE8i9cU2izCDruT+a21r69F+ZbvRHegzDMC DFiVbP1h6ZfVLe1rVwwqrLWLx/DexT9vr4+/QN2i8Whs/sfHpo4q4/+Yd1l3Nz4Gb+JakDkea1+ h2iyrp2LI8hmX9g== X-Developer-Key: i=marcandre.lureau@redhat.com; a=openpgp; fpr=87A9BD933F87C606D276F62DDAE8E10975969CE5 X-Scanned-By: MIMEDefang 3.0 on 10.30.177.12 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: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 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, 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: 1790108848018158501 Test 045 (TestSCMFd) is adding a null HMP monitor via add_monitor_null() to exercise fd operations with two monitors present. With HMP disabled, -monitor null is no longer valid. Remove the add_monitor_null() call and the now-unused method from the Python machine module. Signed-off-by: Marc-Andr=C3=A9 Lureau --- python/qemu/machine/machine.py | 7 ------- tests/qemu-iotests/045 | 6 +----- 2 files changed, 1 insertion(+), 12 deletions(-) diff --git a/python/qemu/machine/machine.py b/python/qemu/machine/machine.py index 393750655589..71b4696227f6 100644 --- a/python/qemu/machine/machine.py +++ b/python/qemu/machine/machine.py @@ -202,13 +202,6 @@ def __exit__(self, exc_tb: Optional[TracebackType]) -> None: self.shutdown() =20 - def add_monitor_null(self) -> None: - """ - This can be used to add an unused monitor instance. - """ - self._args.append('-monitor') - self._args.append('null') - def add_fd(self: _T, fd: int, fdset: int, opaque: str, opts: str =3D '') -> _T: """ diff --git a/tests/qemu-iotests/045 b/tests/qemu-iotests/045 index cd1b35edb17f..900bf85220f7 100755 --- a/tests/qemu-iotests/045 +++ b/tests/qemu-iotests/045 @@ -129,9 +129,6 @@ class TestSCMFd(iotests.QMPTestCase): def setUp(self): self.vm =3D iotests.VM() qemu_img('create', '-f', iotests.imgfmt, image0, '128K') - # Add an unused monitor, to verify it works fine when two monitor - # instances present - self.vm.add_monitor_null() self.vm.launch() =20 def tearDown(self): @@ -172,5 +169,4 @@ class TestSCMFd(iotests.QMPTestCase): =20 if __name__ =3D=3D '__main__': iotests.main(supported_fmts=3D['raw'], - supported_protocols=3D['file'], - require_hmp=3DTrue) + supported_protocols=3D['file']) --=20 2.56.0.rc0.29.g47ce80527c56 From nobody Sat Sep 26 20:01:40 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=1790108910; cv=none; d=zohomail.com; s=zohoarc; b=OGOUDeh5GncNdHP1z5uF/doHwsv0D9dEkA+INOMPFQ9LQ/KMQ0Gqrw6fVksFB6qk5QAFzn0RT8/F0d4s40TD0KxNbtSIiHxJDEkli912aG7Yw+T0VVotutW3T8iSrsmzYlOtjVYZDs0ziMc6WRiD2HEeh8wCLg1XX3QBrxWuV4g= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1790108910; 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:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=j/8mCljoIIKMRnd7CZUzZNg47KUXUjpcxfTM9raGuq8=; b=POhzakwGtnTM4TgksvYzKRkbampkSb1zwAX6ILTfOCVP/5xGgL//fe04tzcYJORyd5+rqRy7NT/Llw7+Sa8VLb+U6iCreqAdSNmLInjG9NlOOpsw4mP5PKZUFWxg6W0eAvYeFuW9Q48+PVcj2L2TCO4IbT41YY1DEcID0kL3IIw= 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 1790108910970376.7987762340979; Tue, 22 Sep 2026 13:28:30 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists1p.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1x970N-0001Wm-MJ; Tue, 22 Sep 2026 16:22:19 -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 1x9706-0000mt-FF for qemu-devel@nongnu.org; Tue, 22 Sep 2026 16:22:03 -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 1x9705-0000Dw-1t for qemu-devel@nongnu.org; Tue, 22 Sep 2026 16:22:02 -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-277-1SzI8z_dMCif6onyBwfZjg-1; Tue, 22 Sep 2026 16:21:59 -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 1D9B41800DA1; Tue, 22 Sep 2026 20:21:58 +0000 (UTC) Received: from localhost (headnet03.pony-001.prod.iad2.dc.redhat.com [10.2.32.114]) by mx-prod-int-10.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id 1F469427; Tue, 22 Sep 2026 20:21:56 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1790108520; 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=j/8mCljoIIKMRnd7CZUzZNg47KUXUjpcxfTM9raGuq8=; b=alpMZ2RYl1inQdSVpC9exldkOspszBDotHhUiMgP29IQHNSzNIDztqiAWHDKmVD8Fx2e1q 1lCF07Lf/KjzKS6lz+rYBW3avUXjkYGOSod54uaI3TXNGbR5t0ehVLFWdH5XdWuSSA73ND 6ynnVMyrPGd8k8EHfwGKsexo1/6I+jA= X-MC-Unique: 1SzI8z_dMCif6onyBwfZjg-1 X-Mimecast-MFC-AGG-ID: 1SzI8z_dMCif6onyBwfZjg_1790108518 From: =?utf-8?q?Marc-Andr=C3=A9_Lureau?= Date: Wed, 23 Sep 2026 00:17:54 +0400 Subject: [PATCH 47/88] qemu-iotests/common: add _run_qmp_job helper MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Message-Id: <20260923-nohmp-v1-47-ebc029d4bd80@redhat.com> References: <20260923-nohmp-v1-0-ebc029d4bd80@redhat.com> In-Reply-To: <20260923-nohmp-v1-0-ebc029d4bd80@redhat.com> To: qemu-devel@nongnu.org Cc: Kevin Wolf , =?utf-8?q?Marc-Andr=C3=A9_Lureau?= , Hanna Reitz , qemu-block@nongnu.org X-Developer-Signature: v=1; a=openpgp-sha256; l=1082; i=marcandre.lureau@redhat.com; h=from:subject:message-id; bh=ZZjY+h/qr5B205OnmbNuj2LVY7kx9S/yDs2MAU+JAbs=; b=owEBbQKS/ZANAwAKAdro4Ql1lpzlAcsmYgBqsuKxEc1Pukb2kI2nBDED0ugR/mSdWJ6rwk1c5 D/hoU2Ziz+JAjMEAAEKAB0WIQSHqb2TP4fGBtJ29i3a6OEJdZac5QUCarLisQAKCRDa6OEJdZac 5ZAsEACRC6qLCWbLBtmr3cQsRUpLIE4eefDHGObAf5yZYU5LVLMbGhIBSG6Z/uTOBmFWxHtrK3P fZOEUpaPzxy0uNf6dATeQRuez/2QvJZBKV2/soOi+QbNSnt1C7iaW7FFu1mEUKl7in8XToeZpVG 55NANRj2ogj0NQOGPrITTfDn48B02Lv2nISgP/VWPNt5FrnCa+ESWfPNCyJiRRUgHWVGd5tocKP tXVepuy4cbapEvu0A4vQUYn4xL7pUBtMuTa3og+JW/hyigblUcHwGoc3TqC0UaletJ/kxf3FWkU gleUExPk1fBUGZbVdIFeXikhDGMZFLMAyl5/MNweAcm/uYy0GmlipQgGtCL/mPYpm1ZydiReo2s R4yBlqEg3NEa1IrGZ1zjbtLiHM7xOkhyLj2Ei637z88KvCk1Rc2UH2oFNSzeXNuJtRTd/Eoyqnk p6A/82A/tSHGLcyOAuwmMIHuQHbPyW/ZojU6j/GC8niq3vnPpo/dSRLcg25/vHYMo919QukrvJa WoPP9q1XOd5hhisMaw2pW1+qISNX4zAHnVFxbmLVJMcUNiId5T+GoJlRdoVYG9UNloQo7RHqWJC QZUPlER2R+CjMIW9jH5w+6gf1CFIcLnIFe7thXwBY2qGsT31gIQ9wPrDdar9CQt3hvI9G8BY72p L4lUoSkGvYxdPpw== 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: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 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, 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: 1790108912270158500 Signed-off-by: Marc-Andr=C3=A9 Lureau --- tests/qemu-iotests/common.qemu | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) diff --git a/tests/qemu-iotests/common.qemu b/tests/qemu-iotests/common.qemu index e5b6a6a87494..458ea9566818 100644 --- a/tests/qemu-iotests/common.qemu +++ b/tests/qemu-iotests/common.qemu @@ -287,6 +287,28 @@ _wait_event() done } =20 +# Run a QMP job command and wait for it to complete +# +# Sends the given QMP command, waits for the job to reach +# "concluded" status, then dismisses it. +# +# $1: QEMU handle +# $2: Job ID (must match the job-id in the command) +# $3: QMP command string to send +_run_qmp_job() +{ + local h=3D${1} + local job_id=3D${2} + local cmd=3D${3} + + _send_qemu_cmd $h "$cmd" 'return' + _send_qemu_cmd $h '' '"concluded"' + _send_qemu_cmd $h \ + "{ 'execute': 'job-dismiss', + 'arguments': { 'id': '$job_id' } }" 'return' +} + + # Launch a QEMU process. # # Input parameters: --=20 2.56.0.rc0.29.g47ce80527c56 From nobody Sat Sep 26 20:01:40 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=1790108680; cv=none; d=zohomail.com; s=zohoarc; b=TzSkaAUQmEbDBAH4qQGZb031EEQRPmNKKXCVFUhgALKOOt5sWcKY1SifB9FqTFJDXUcTwxDxfbXCHfplH1laJPuDHQsUtQGq0FTsNnk6Y+wGzK7ywdw0sJ89YlZ2rGxwb9fLd6jFFzqXnXxjnFVjrG6GfaRh4q+mYTgk8tppXGs= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1790108680; 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:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=j3kQNBjYU/mWOL9sUSYAoZn1cB4PUxK+hUiKnkfGjfI=; b=UVr4FgOboq2fXXyfFAGUX8TJ5HdwPXKwmW7rZtq5n094bgBvpRgJ5wKDU0JiJe6lXHJUnv9TZiEqPb8deyGV2mwFc+ImrNnAVnRJ6JMk4pv1b+Bc8fsCEXYgIk4qKyMuMyZCqGwrkmMPD5Pw0PCKJL5vjzxLrTjUWC/hSFU4kYE= 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 1790108680465523.9387428320397; Tue, 22 Sep 2026 13:24:40 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists1p.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1x971D-0003zl-Qi; Tue, 22 Sep 2026 16:23: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 1x970B-0000qw-PD for qemu-devel@nongnu.org; Tue, 22 Sep 2026 16:22:09 -0400 Received: from us-smtp-delivery-124.mimecast.com ([170.10.133.124]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1x970A-0000EV-6b for qemu-devel@nongnu.org; Tue, 22 Sep 2026 16:22:07 -0400 Received: from mx-prod-mc-01.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-518-WkMufaeBPXqu3OsQ7DTyHg-1; Tue, 22 Sep 2026 16:22:02 -0400 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-01.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id 6281E195D013; Tue, 22 Sep 2026 20:22:01 +0000 (UTC) Received: from localhost (headnet03.pony-001.prod.iad2.dc.redhat.com [10.2.32.114]) by mx-prod-int-08.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id 8462D1800446; Tue, 22 Sep 2026 20:22:00 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1790108525; 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=j3kQNBjYU/mWOL9sUSYAoZn1cB4PUxK+hUiKnkfGjfI=; b=G38NOg23HOdEID0hh+P7uCl/Y1R8+3dgKWA7ZC2EZmBmHO/9T0ViqZETq24beFfq0MmJtq 1b25zUU6Itj3FDCpuF9Bq6LIn6TUSzIZrI2qr0bL0rbjWdiDCddN5hSIYenZ2doY30siE6 39+fhq7wbLIdgm3WQ/6xM8FIE5wZ+ds= X-MC-Unique: WkMufaeBPXqu3OsQ7DTyHg-1 X-Mimecast-MFC-AGG-ID: WkMufaeBPXqu3OsQ7DTyHg_1790108521 From: =?utf-8?q?Marc-Andr=C3=A9_Lureau?= Date: Wed, 23 Sep 2026 00:17:55 +0400 Subject: [PATCH 48/88] qemu-iotests/007: migrate away from HMP MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Message-Id: <20260923-nohmp-v1-48-ebc029d4bd80@redhat.com> References: <20260923-nohmp-v1-0-ebc029d4bd80@redhat.com> In-Reply-To: <20260923-nohmp-v1-0-ebc029d4bd80@redhat.com> To: qemu-devel@nongnu.org Cc: Kevin Wolf , =?utf-8?q?Marc-Andr=C3=A9_Lureau?= , Hanna Reitz , qemu-block@nongnu.org X-Developer-Signature: v=1; a=openpgp-sha256; l=1853; i=marcandre.lureau@redhat.com; h=from:subject:message-id; bh=bbrdnb+ya+FVaVNWV+jV9hfsjFL4W8ap1a0JI7znIBQ=; b=owEBbQKS/ZANAwAKAdro4Ql1lpzlAcsmYgBqsuKxYnqmvkl2mYjD8aexiuLBpcCqGyAtD/ncW ILvPx/KPXaJAjMEAAEKAB0WIQSHqb2TP4fGBtJ29i3a6OEJdZac5QUCarLisQAKCRDa6OEJdZac 5QfMD/95VqQJaHpC6PauCTPhOWFVUjxh0YyoAoGiWtTsu5cSb7GcxAW0HWqLzBZoiRESu19IV5z 7eJ275d6Jk+AL/UsUcqOGVZYCUCZK0OnRFckFaBuvKHsqYwAboQv24vNZm5Hmybukx2o8N39Fr+ Hwga0vvgP/ND+ejNwMvKiR9dRaxKKKl8Shr2A/gHcl/hopRCo092YaZsfy3qYdP38awUNgAWmk5 zU0IIrDC/G5OcexrSWbntDYpbrfBbWYagIVVUTSl/dogYfUih+QEi68PC5fcuw77pOWZW9cvV4o as8LRLiM+lfqmECGoybCys7gu5/JzjIZ6LnoPZGOn/RbkKfhU2pbkTH4Ww5rvJqZ+qUf2FTBNSF 3CKGy53wEc7X1USKJ2iVblsYQzLlJ5omQ4mzPPSMYxf2zX3Ik2xOYT5l852rEDPbIJWr6dZ9+FA 58Fu29+HEK1NRgme2NPapy5EidVJDwmQ5+3J0CuCM4Iv1LBCr04fbDYoAq1H4Q6QBmNPljM34R8 XEHpl6ZgQmK9cwKdTZPI63XEbh3N9yQ7DDeCmX13qXx2VtprlVr4EkXPyft7L6rB1ZocKA11tTt uRTcqv6JRZhmlitnCFFuUtMtFqpTxbX/waBFSbWnxz2RJLek15Nq3JuNpEo6VfqhR820mdgKcTY HJbBQLbzJ2rIQRg== X-Developer-Key: i=marcandre.lureau@redhat.com; a=openpgp; fpr=87A9BD933F87C606D276F62DDAE8E10975969CE5 X-Scanned-By: MIMEDefang 3.4.1 on 10.30.177.111 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.133.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_H3=0.001, RCVD_IN_MSPIKE_WL=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-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: 1790108682997158500 Replace HMP 'savevm' with QMP 'snapshot-save' job-based API. Use _launch_qemu/_send_qemu_cmd for proper QMP interaction. Signed-off-by: Marc-Andr=C3=A9 Lureau --- tests/qemu-iotests/007 | 25 +++++++++++++++++++------ 1 file changed, 19 insertions(+), 6 deletions(-) diff --git a/tests/qemu-iotests/007 b/tests/qemu-iotests/007 index 936d3f14fbad..06096149ce83 100755 --- a/tests/qemu-iotests/007 +++ b/tests/qemu-iotests/007 @@ -29,6 +29,7 @@ status=3D1 # failure is the default! =20 _cleanup() { + _cleanup_qemu _cleanup_test_img true } @@ -37,6 +38,7 @@ trap "_cleanup; exit \$status" 0 1 2 3 15 # get standard environment, filters and checks . ./common.rc . ./common.filter +. ./common.qemu =20 # currently only qcow2 allows for consistency checks using qemu-img _supported_fmt qcow2 @@ -50,12 +52,23 @@ echo echo "creating image" _make_test_img 1M =20 -for ((i=3D1;i<=3D10;i++)); do - echo "savevm $i" - $QEMU -nographic -hda "$TEST_IMG" -serial none -monitor stdio >/dev/nu= ll 2>&1 < (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 17901089315031019.3294820561736; Tue, 22 Sep 2026 13:28:51 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists1p.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1x971L-00052f-QN; Tue, 22 Sep 2026 16:23:20 -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 1x970F-0000u2-Ba for qemu-devel@nongnu.org; Tue, 22 Sep 2026 16:22:11 -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 1x970D-0000Eq-S8 for qemu-devel@nongnu.org; Tue, 22 Sep 2026 16:22:11 -0400 Received: from mx-prod-mc-01.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-49-_lXkap0RNGKJtn4lP8yxPw-1; Tue, 22 Sep 2026 16:22:06 -0400 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-01.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id 169EF1956064; Tue, 22 Sep 2026 20:22:05 +0000 (UTC) Received: from localhost (headnet03.pony-001.prod.iad2.dc.redhat.com [10.2.32.114]) by mx-prod-int-08.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id 40B411800446; Tue, 22 Sep 2026 20:22:03 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1790108529; 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=1v1iyeoNL86Z2eZXyPgjMLqKh/q+InPVG4GkqRw5nfY=; b=Z1z+jd3jyuhJybR7gqDqCSSagPF8bMvyrk3KNiv26xvgm8KtZKCSXsFKSH1p4e1j+58B8w cYG9MVzduIga6UYlSvp6EAxgM0prmcBDcGpocatEqYuLFOgJSiVXWyCla7jghA9W2eC6+R KsXB+cqIZ3C7AY2ueVWDESeSHRfxFI0= X-MC-Unique: _lXkap0RNGKJtn4lP8yxPw-1 X-Mimecast-MFC-AGG-ID: _lXkap0RNGKJtn4lP8yxPw_1790108525 From: =?utf-8?q?Marc-Andr=C3=A9_Lureau?= Date: Wed, 23 Sep 2026 00:17:56 +0400 Subject: [PATCH 49/88] qemu-iotests/028: migrate away from HMP MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Message-Id: <20260923-nohmp-v1-49-ebc029d4bd80@redhat.com> References: <20260923-nohmp-v1-0-ebc029d4bd80@redhat.com> In-Reply-To: <20260923-nohmp-v1-0-ebc029d4bd80@redhat.com> To: qemu-devel@nongnu.org Cc: Kevin Wolf , =?utf-8?q?Marc-Andr=C3=A9_Lureau?= , Hanna Reitz , qemu-block@nongnu.org X-Developer-Signature: v=1; a=openpgp-sha256; l=3528; i=marcandre.lureau@redhat.com; h=from:subject:message-id; bh=hIWR+ick5mR5I1w2Xcka5W5ImcOurs2E5rx0Nz2RL/Q=; b=owEBbQKS/ZANAwAKAdro4Ql1lpzlAcsmYgBqsuKx4qKsCQQTAbq4ogD53cf9+Fmk14FFnkys3 xcsDGzul76JAjMEAAEKAB0WIQSHqb2TP4fGBtJ29i3a6OEJdZac5QUCarLisQAKCRDa6OEJdZac 5V7+EACHKwIU2b7TBkTvxdAUegllEriRSZMaPPff7JMqCb3bPly8ZAEM8nauKKr0dGXLiUhOCVB fgO8sh0r/N+FXfpcA9vUZVUrOchFhX1SB3Eq43IsjW6yFt+4j532ywrBYW2sNfCHgvTOAwwNMbq 9rJliE9tFG3umieOacIXsdFr/I8vrC9qqw//COB2/+CirHSne2LIc9KpquuW84Wp5lhslOquAYz 0RYU3CKPY7394YTO2RhdnhYJxbutkkECJnEOqpw1zc3lIpTWAkyS8umQPMsXtQzdW6wNN8XTAqu MdgE2qchfw4paqDcEXGtn2h+w7274Cf9LhMBlglAtQT0xzMeMP+bwRryUYPCBAtp7oIU+NJszhg APVAwIzJI8oBeGDBaRw0QqwL0OhxuwvAfHGxW4ALd4uxJgH4znElYcmRnuV9C15WfW2dALAxLAx y5F28lRvhibJBWq3C0QvCzXqrHEuNsOzmY4975u9aGlivlf02DmQa1Dov0f2c799qYe4cmH/Th2 4TDxbS3SHmfA2BoSMhrJA6pmU+tC5drzgtj+34q351PCdOIlObQVeyoxqzvc5PzAamy9wPy61Ud B+JNRosYj94Uer9AnCPNW00cbHGpliBibuTOjYmxV2zeYPwY41t+4s4kJEYBVhf5UlEHQhUh7tg EgfkNCtcVWneTWw== X-Developer-Key: i=marcandre.lureau@redhat.com; a=openpgp; fpr=87A9BD933F87C606D276F62DDAE8E10975969CE5 X-Scanned-By: MIMEDefang 3.4.1 on 10.30.177.111 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: 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-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: 1790108934306158500 Replace HMP drive_backup, info block-jobs, and quit with their QMP equivalents (drive-backup, query-block-jobs, quit). Capture BLOCK_JOB_COMPLETED and JOB_STATUS_CHANGE events during polling to keep the output clean. Signed-off-by: Marc-Andr=C3=A9 Lureau Reviewed-by: Stefan Hajnoczi --- tests/qemu-iotests/028 | 27 ++++++++++++++++++++------- tests/qemu-iotests/028.out | 17 +++++++++++++---- 2 files changed, 33 insertions(+), 11 deletions(-) diff --git a/tests/qemu-iotests/028 b/tests/qemu-iotests/028 index 28f01439c525..e570c3d303d5 100755 --- a/tests/qemu-iotests/028 +++ b/tests/qemu-iotests/028 @@ -49,7 +49,6 @@ trap "_cleanup; exit \$status" 0 1 2 3 15 _supported_fmt qcow2 qed _supported_proto file fuse _supported_os Linux -_require_hmp =20 # Choose a size that is not necessarily a cluster size multiple for image # formats that use clusters. This will ensure that the base image doesn't= end @@ -109,7 +108,6 @@ echo echo block-backup echo =20 -qemu_comm_method=3D"monitor" _launch_qemu -drive file=3D"${TEST_IMG}",cache=3D${CACHEMODE},aio=3D${AIOM= ODE},id=3Ddisk h=3D$QEMU_HANDLE if [ "${VALGRIND_QEMU}" =3D=3D "y" ]; then @@ -119,12 +117,27 @@ else fi =20 TEST_IMG=3D"$TEST_IMG.copy" _make_test_img $image_size -_send_qemu_cmd $h "drive_backup -n disk ${TEST_IMG}.copy" "(qemu)" \ - | _filter_imgfmt =20 -silent=3Dy qemu_cmd_repeat=3D20 _send_qemu_cmd $h "info block-jobs" "No ac= tive jobs" -_send_qemu_cmd $h "info block-jobs" "No active jobs" -_send_qemu_cmd $h 'quit' "" +_send_qemu_cmd $h "{ 'execute': 'qmp_capabilities' }" 'return' + +capture_events=3D"BLOCK_JOB_COMPLETED JOB_STATUS_CHANGE" \ +_send_qemu_cmd $h \ + "{ 'execute': 'drive-backup', + 'arguments': { 'device': 'disk', + 'target': '${TEST_IMG}.copy', + 'sync': 'full', + 'mode': 'existing' } }" \ + "return" + +capture_events=3D"BLOCK_JOB_COMPLETED JOB_STATUS_CHANGE" \ +silent=3Dy qemu_cmd_repeat=3D20 _send_qemu_cmd $h \ + '{"execute":"query-block-jobs"}' '"return": \[\]' + +capture_events=3D"BLOCK_JOB_COMPLETED JOB_STATUS_CHANGE" \ +_send_qemu_cmd $h '{"execute":"query-block-jobs"}' '"return": \[\]' + +_send_qemu_cmd $h '{"execute":"quit"}' 'return' +wait=3D1 _cleanup_qemu =20 # Base image sectors TEST_IMG=3D"${TEST_IMG}.copy" io readv $(( offset )) 512 1024 32 diff --git a/tests/qemu-iotests/028.out b/tests/qemu-iotests/028.out index e58048821686..0c63b15360f3 100644 --- a/tests/qemu-iotests/028.out +++ b/tests/qemu-iotests/028.out @@ -469,10 +469,19 @@ No errors were found on the image. block-backup =20 Formatting 'TEST_DIR/t.IMGFMT.copy', fmt=3DIMGFMT size=3D4294968832 -QEMU X.Y.Z monitor - type 'help' for more information -(qemu) drive_backup -n disk TEST_DIR/t.IMGFMT.copy -(qemu) info block-jobs -No active jobs +{ 'execute': 'qmp_capabilities' } +{"return": {}} +{ 'execute': 'drive-backup', + 'arguments': { 'device': 'disk', + 'target': 'TEST_DIR/t.IMGFMT.copy', + 'sync': 'full', + 'mode': 'existing' } } +{"return": {}} +{"execute":"query-block-jobs"} +{"return": []} +{"execute":"quit"} +{"timestamp": {"seconds": TIMESTAMP, "microseconds": TIMESTAMP}, "event"= : "SHUTDOWN", "data": {"guest": false, "reason": "host-qmp-quit"}} +{"return": {}} =3D=3D=3D IO: pattern 195 read 512/512 bytes at offset 3221194240 512 bytes, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec) --=20 2.56.0.rc0.29.g47ce80527c56 From nobody Sat Sep 26 20:01:40 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=1790108748; cv=none; d=zohomail.com; s=zohoarc; b=BNL8PzifFafINgxYLCZs1GIPZwqrZtgn9gx0l4qPkKxZweHQxRm1qMUme2XjEFSPqRTHhaNwGfxMPpvHRIDsHp+bHq8OXIDW2gDDukEbbzdUWZPIS5pL/knMMvoVA3TJNXLfMiBSdqPH9XIG648yiW5jKj3AjSlVZ851f6Vvcg4= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1790108748; 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:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=eZMz0Rf3aYpV07pIkVoHF40DR9YsmBk7X+QywefybOk=; b=Wslqp83YHikusuMrw8h8spIkIx3AI34A/Df8lpv+Jiy0OZm0Nrh3sS+0V8y5yIaQnsyTqTxgvtMLgZYMzzmyWB8aq6R01bM15ujY5bGVaUqj0ft4oSUokuDLf+7uOmfCko1M+pJe9Kf6VWiTJHnr9x5jO0/fuaiFHoUwdAU1VkE= 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 1790108748620692.9074148899448; Tue, 22 Sep 2026 13:25:48 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists1p.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1x9718-0003Lj-ME; Tue, 22 Sep 2026 16:23:06 -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 1x970J-00019I-1f for qemu-devel@nongnu.org; Tue, 22 Sep 2026 16:22:15 -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 1x970H-0000FN-6A for qemu-devel@nongnu.org; Tue, 22 Sep 2026 16:22:14 -0400 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-609-WGqJDP4uPTKOJ4Oa4Izw7w-1; Tue, 22 Sep 2026 16:22:09 -0400 Received: from mx-prod-int-03.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-03.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.12]) (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 4F1521955DC8; Tue, 22 Sep 2026 20:22:08 +0000 (UTC) Received: from localhost (headnet03.pony-001.prod.iad2.dc.redhat.com [10.2.32.114]) by mx-prod-int-03.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id 7C16D1956086; Tue, 22 Sep 2026 20:22:07 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1790108532; 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=eZMz0Rf3aYpV07pIkVoHF40DR9YsmBk7X+QywefybOk=; b=PAi9Ulb18kmWWyFJjupc7odIsf8beVZ1r1AcfmeXvq8sAR4Uk9s9UvvIfALWzQi0IBCcFv iugN8djIoCBy4twpyDviwHjUoHp5ibz4ZIkBDY+ON1NtsG7uy6pWBQ6UGUZOAdd86NAuRK UhjNhOpEzDl492LORVjbsQ/h1FNzAsE= X-MC-Unique: WGqJDP4uPTKOJ4Oa4Izw7w-1 X-Mimecast-MFC-AGG-ID: WGqJDP4uPTKOJ4Oa4Izw7w_1790108528 From: =?utf-8?q?Marc-Andr=C3=A9_Lureau?= Date: Wed, 23 Sep 2026 00:17:57 +0400 Subject: [PATCH 50/88] qemu-iotests/225: migrate away from HMP MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Message-Id: <20260923-nohmp-v1-50-ebc029d4bd80@redhat.com> References: <20260923-nohmp-v1-0-ebc029d4bd80@redhat.com> In-Reply-To: <20260923-nohmp-v1-0-ebc029d4bd80@redhat.com> To: qemu-devel@nongnu.org Cc: Kevin Wolf , =?utf-8?q?Marc-Andr=C3=A9_Lureau?= , Hanna Reitz , qemu-block@nongnu.org X-Developer-Signature: v=1; a=openpgp-sha256; l=4361; i=marcandre.lureau@redhat.com; h=from:subject:message-id; bh=D13aCsEA6yKRmysb2YyOf2AAylfBectFhDOwcTxGw2E=; b=owEBbQKS/ZANAwAKAdro4Ql1lpzlAcsmYgBqsuKx2TSsCfFvqoNnc2muQD+kgOZXvDC8rTxyC TjRl9DFkwmJAjMEAAEKAB0WIQSHqb2TP4fGBtJ29i3a6OEJdZac5QUCarLisQAKCRDa6OEJdZac 5c+jD/0Sc6CROJ1Gzwpxv0TB2b0xz/n5Eeuikc/zRlQemhCISmA+H0UtI/n8qSXuaITQHDPCdCk gTH69IrdANnYbENyBOsMHwlM9MHIPBoE6XHaL9hdFLs4y+ZkbxNHYqH3FZd1uMpE/hafQOAGLkz OC9NlIckNMiIxgsySG+cDYmU/esPCUlZblQV3zkstY7WNeQNeInRVFCtBAdS1WI75ZqzqySM3ke Bk119vkPgC4ku7lC0Ad0uBFCZWI8twmq6gky/3u1DXqdeu64ewhj10sw60NKHa4we3bH5tb6Bv1 yz9eM3zHt4bAuZ85TS8PCcPWRuW1qcIlgRKFi8sch7x7k1MNiSwjZ7vD3auAuTVX5GFwJ71V8qT AYCUWqvHAS1Mzzsko4SntnQADww0C+k/g1hF6Hfc8iZR6pM98o14r7xunPjAjuygVT4kMhqlj7C 3S4+iq7fvJz7kePrp0/q6yVrWIyS7HlCXR1a4L1XS3SpvBs5T1wy1q7tWp+ExeLgJKe2WR7HZXD y7Z0CLKUjLhyn2e6ES1bXgzIeSHSx5mLERBdP1MK9ztamftUevzN26s0s93TN1hJq5bgyPHxA6K 9K055EGQI1b9tLAMPB+3XP5CosHK0UW9H6WVn/m2mWV1y2mX5X52auoMQlpetA5ZwCmwRnoEC81 T0Ppy4uludYyijg== X-Developer-Key: i=marcandre.lureau@redhat.com; a=openpgp; fpr=87A9BD933F87C606D276F62DDAE8E10975969CE5 X-Scanned-By: MIMEDefang 3.0 on 10.30.177.12 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: 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-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: 1790108749424158500 Signed-off-by: Marc-Andr=C3=A9 Lureau --- tests/qemu-iotests/225 | 28 ++++++++++++++++++---------- tests/qemu-iotests/225.out | 25 +++++++++++++++---------- 2 files changed, 33 insertions(+), 20 deletions(-) diff --git a/tests/qemu-iotests/225 b/tests/qemu-iotests/225 index 8128d583d609..9ec2741ecd8e 100755 --- a/tests/qemu-iotests/225 +++ b/tests/qemu-iotests/225 @@ -46,7 +46,6 @@ _supported_os Linux _unsupported_imgopts "subformat=3DmonolithicFlat" \ "subformat=3DtwoGbMaxExtentFlat" \ "subformat=3DtwoGbMaxExtentSparse" -_require_hmp =20 TEST_IMG=3D"$TEST_IMG.base" _make_test_img 1M TEST_IMG=3D"$TEST_IMG.not_base" _make_test_img 1M @@ -83,11 +82,14 @@ echo echo '=3D=3D=3D Testing fitting VMDK backing image =3D=3D=3D' echo =20 -qemu_comm_method=3Dmonitor \ - _launch_qemu -blockdev "$base_opts" -blockdev "$overlay_opts" +_launch_qemu -blockdev "$base_opts" -blockdev "$overlay_opts" +_send_qemu_cmd $QEMU_HANDLE "{ 'execute': 'qmp_capabilities' }" "return" =20 # Should not return an error -_send_qemu_cmd $QEMU_HANDLE 'qemu-io overlay "read 0 512"' 'ops' +_send_qemu_cmd $QEMU_HANDLE \ + "{ 'execute': 'x-qemu-io', + 'arguments': { 'device': 'overlay', 'command': 'read 0 512' } }" \ + "return" =20 _cleanup_qemu =20 @@ -96,11 +98,14 @@ echo echo '=3D=3D=3D Testing unrelated VMDK backing image =3D=3D=3D' echo =20 -qemu_comm_method=3Dmonitor \ - _launch_qemu -blockdev "$not_base_opts" -blockdev "$overlay_opts" +_launch_qemu -blockdev "$not_base_opts" -blockdev "$overlay_opts" +_send_qemu_cmd $QEMU_HANDLE "{ 'execute': 'qmp_capabilities' }" "return" =20 # Should fail (gracefully) -_send_qemu_cmd $QEMU_HANDLE 'qemu-io overlay "read 0 512"' 'failed' +_send_qemu_cmd $QEMU_HANDLE \ + "{ 'execute': 'x-qemu-io', + 'arguments': { 'device': 'overlay', 'command': 'read 0 512' } }" \ + "error" =20 _cleanup_qemu =20 @@ -118,11 +123,14 @@ echo # this a FIXME because with -blockdev, you cannot specify "partial" # options, so setting file.filename but leaving the rest as specified # by the user does not make sense. -qemu_comm_method=3Dmonitor \ - _launch_qemu -blockdev "$not_vmdk_opts" -blockdev "$overlay_opts" +_launch_qemu -blockdev "$not_vmdk_opts" -blockdev "$overlay_opts" +_send_qemu_cmd $QEMU_HANDLE "{ 'execute': 'qmp_capabilities' }" "return" =20 # Should fail (gracefully) -_send_qemu_cmd $QEMU_HANDLE 'qemu-io overlay "read 0 512"' 'failed' +_send_qemu_cmd $QEMU_HANDLE \ + "{ 'execute': 'x-qemu-io', + 'arguments': { 'device': 'overlay', 'command': 'read 0 512' } }" \ + "error" =20 _cleanup_qemu =20 diff --git a/tests/qemu-iotests/225.out b/tests/qemu-iotests/225.out index beb8c23bd330..a5815afd0f0c 100644 --- a/tests/qemu-iotests/225.out +++ b/tests/qemu-iotests/225.out @@ -5,20 +5,25 @@ Formatting 'TEST_DIR/t.IMGFMT', fmt=3DIMGFMT size=3D10485= 76 backing_file=3DTEST_DIR/t. =20 =3D=3D=3D Testing fitting VMDK backing image =3D=3D=3D =20 -QEMU X.Y.Z monitor - type 'help' for more information -(qemu) qemu-io overlay "read 0 512" -read 512/512 bytes at offset 0 -512 bytes, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec) +{ 'execute': 'qmp_capabilities' } +{"return": {}} +{ 'execute': 'x-qemu-io', + 'arguments': { 'device': 'overlay', 'command': 'read 0 512' } } +{"return": {"human-readable-text": "read 512/512 bytes at offset 0\n512 by= tes, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec)\n"}} =20 =3D=3D=3D Testing unrelated VMDK backing image =3D=3D=3D =20 -QEMU X.Y.Z monitor - type 'help' for more information -(qemu) qemu-io overlay "read 0 512" -Error: read failed: Invalid argument +{ 'execute': 'qmp_capabilities' } +{"return": {}} +{ 'execute': 'x-qemu-io', + 'arguments': { 'device': 'overlay', 'command': 'read 0 512' } } +{"error": {"class": "GenericError", "desc": "read failed: Invalid argument= "}} =20 =3D=3D=3D Testing non-VMDK backing image =3D=3D=3D =20 -QEMU X.Y.Z monitor - type 'help' for more information -(qemu) qemu-io overlay "read 0 512" -Error: read failed: Invalid argument +{ 'execute': 'qmp_capabilities' } +{"return": {}} +{ 'execute': 'x-qemu-io', + 'arguments': { 'device': 'overlay', 'command': 'read 0 512' } } +{"error": {"class": "GenericError", "desc": "read failed: Invalid argument= "}} *** done --=20 2.56.0.rc0.29.g47ce80527c56 From nobody Sat Sep 26 20:01:40 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=1790108855; cv=none; d=zohomail.com; s=zohoarc; b=R9Tdl2j9HYj4eGN5J7AEa02y3cvUJFeGRCvjFvnCzaL6pAGjwkC0T4dpZJ5pWsHwFY2Gw+GfTeijJ7lxtVNfkop8pw6bv+fvo36gEn+R1GzImYOdfzKX85yMP40f0Rqt9E15zKy8w6/TfFX3iYIMBmKgDBzsLuTi/Kr7IAuRejQ= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1790108855; 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:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=JUuXliWp734quSaNvNUDA6qjChfAYzCXNyUYL5PAT1I=; b=P/q4FbNMCYBRDL3NtosPXNqNpMdk6S+GaG6oIxl1Rlq7+uGB5qMpQwe9zAAY/37kMgilBEfxD/wX4WB9Lh7BgOvBMFvdcxZqoocn8B9nsbKyubX3G5ZvwWOXvDXtHHzxA+37pD8EB6wfWEfy7OhitPRqRtc/40T7VBYicb7jiOk= 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 1790108855032254.07830642549288; Tue, 22 Sep 2026 13:27:35 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists1p.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1x9710-0002vc-Ko; Tue, 22 Sep 2026 16:23:00 -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 1x970K-0001IA-MQ for qemu-devel@nongnu.org; Tue, 22 Sep 2026 16:22:16 -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 1x970J-0000FZ-4Q for qemu-devel@nongnu.org; Tue, 22 Sep 2026 16:22:16 -0400 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-637-QVCG-KgNMQ6ap6iM2lw-Ww-1; Tue, 22 Sep 2026 16:22:13 -0400 Received: from mx-prod-int-03.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-03.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.12]) (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 1B6501935335; Tue, 22 Sep 2026 20:22:12 +0000 (UTC) Received: from localhost (headnet03.pony-001.prod.iad2.dc.redhat.com [10.2.32.114]) by mx-prod-int-03.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id 2BAB41956086; Tue, 22 Sep 2026 20:22:10 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1790108534; 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=JUuXliWp734quSaNvNUDA6qjChfAYzCXNyUYL5PAT1I=; b=MBKcGBFNmMlj8z8QmwNER6tINb0K1yrsQFhP8bZbVbz52z8q0Rne4CX2sQT6LquxogvxlE L3JwKX8084leJrCtoExFrCsNYn8i4zQfQwaMBf4LRXAarcmgsZUZUu4C7eUaB+1q8bc5cZ 8KAPy+MI6vb78XKrTaRfqQQXSVDuPSQ= X-MC-Unique: QVCG-KgNMQ6ap6iM2lw-Ww-1 X-Mimecast-MFC-AGG-ID: QVCG-KgNMQ6ap6iM2lw-Ww_1790108532 From: =?utf-8?q?Marc-Andr=C3=A9_Lureau?= Date: Wed, 23 Sep 2026 00:17:58 +0400 Subject: [PATCH 51/88] qemu-iotests/300: migrate away from HMP MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Message-Id: <20260923-nohmp-v1-51-ebc029d4bd80@redhat.com> References: <20260923-nohmp-v1-0-ebc029d4bd80@redhat.com> In-Reply-To: <20260923-nohmp-v1-0-ebc029d4bd80@redhat.com> To: qemu-devel@nongnu.org Cc: Kevin Wolf , =?utf-8?q?Marc-Andr=C3=A9_Lureau?= , Hanna Reitz , qemu-block@nongnu.org X-Developer-Signature: v=1; a=openpgp-sha256; l=2958; i=marcandre.lureau@redhat.com; h=from:subject:message-id; bh=0eoIxhURmoezbw0lX1uJddsbqu8+ijpOzKc1ZxiN8BQ=; b=owEBbQKS/ZANAwAKAdro4Ql1lpzlAcsmYgBqsuKxqGijIf8j1dEEGrZdHXeSaUoDJOMmiRR0F dwm4wcOCJKJAjMEAAEKAB0WIQSHqb2TP4fGBtJ29i3a6OEJdZac5QUCarLisQAKCRDa6OEJdZac 5eNBD/91c/hEgzLHhPVxY2QYE32WzcZPhQGTJS6uKpk3+QKXFoYVaoYB8MLKp1swgAEyqCkHMsq BEdVfhHHwR0ZQkCTbnC6YcowPMYPBdrXraGrPGbzxqchf4dwwq9j8FcJkD+dOEM9Ob4tUrEgKgQ x4clvrXJfuBFWn5GYKLE35hDnsse6BwwOQIzCQd+1I8vio0mGEk2AGaBk7vQG1toIfR2C3TdD+i 6e8XBMqOhkEddN7Qb3nMaycD4JUSyeiBFODsdang0IkiuW6AE6xA1jUspt4OMRj/xQDTZWV1+8j Cr8Rwr/WdeSycjAWwt/i5+7cbTfS319UCcyGFjricPbm+vdfcEpy33jh7M+5hsAk0PT9pHXm7W7 Dn39y/J1uf2Ndr30kICTtclNQTNIeUaN53jtO+QqLKAKcC8CuON33QypOqAuPbDjgRkB56ACKr8 Ewft/O/ggr1p/yLffxYD4rcxdkmuulMWrcbi9BVSNHFN77lYea3nZCUgBvkLeOFzl59+/h+Ut7G xoakWXD/nWzh9do9+PKlcJxDss0tJ2D3IyCh/0R2sma60jKLuypxut/1W9Y5pna2GJgS0QuTeSF NDoIzZ7O80MNSOIm/w9tVFecTKkqkGU2Fn1xfSUPywTZQNLBnzD/6xQRgUFdX6AO2ooIlTSAWo8 f1N+ydJbZEde4bw== X-Developer-Key: i=marcandre.lureau@redhat.com; a=openpgp; fpr=87A9BD933F87C606D276F62DDAE8E10975969CE5 X-Scanned-By: MIMEDefang 3.0 on 10.30.177.12 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: 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-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: 1790108855976158500 Migrate away from HMP "info migrate_parameters", and use QMP query-migrate-parameters instead. We no longer check HMP formatting output though, but this is not meant to be a testable interface. Signed-off-by: Marc-Andr=C3=A9 Lureau --- tests/qemu-iotests/300 | 32 ++++++-------------------------- 1 file changed, 6 insertions(+), 26 deletions(-) diff --git a/tests/qemu-iotests/300 b/tests/qemu-iotests/300 index bcc6fa972581..c6a7519b67ce 100755 --- a/tests/qemu-iotests/300 +++ b/tests/qemu-iotests/300 @@ -21,7 +21,6 @@ =20 import os import random -import re from typing import Dict, List, Optional =20 import iotests @@ -136,8 +135,8 @@ class TestDirtyBitmapMigration(iotests.QMPTestCase): Invoke migrate-set-parameters on @vm to set the given @mapping. Check for success if @error is None, or verify the error message if it is not. - On success, verify that "info migrate_parameters" on HMP returns - our mapping. (Just to check its formatting code.) + On success, verify that query-migrate-parameters returns + our mapping. """ result =3D vm.qmp('migrate-set-parameters', block_bitmap_mapping=3Dmapping) @@ -145,30 +144,12 @@ class TestDirtyBitmapMigration(iotests.QMPTestCase): if error is None: self.assert_qmp(result, 'return', {}) =20 - result =3D vm.qmp('human-monitor-command', - command_line=3D'info migrate_parameters') - - m =3D re.search(r'^block-bitmap-mapping:\r?(\n .*)*\n', - result['return'], flags=3Dre.MULTILINE) - hmp_mapping =3D m.group(0).replace('\r', '') if m else None - - self.assertEqual(hmp_mapping, self.to_hmp_mapping(mapping)) + result =3D vm.qmp('query-migrate-parameters') + qmp_mapping =3D result['return'].get('block-bitmap-mapping') + self.assertEqual(qmp_mapping, mapping) else: self.assert_qmp(result, 'error/desc', error) =20 - @staticmethod - def to_hmp_mapping(mapping: BlockBitmapMapping) -> str: - result =3D 'block-bitmap-mapping:\n' - - for node in mapping: - result +=3D f" '{node['node-name']}' -> '{node['alias']}'\n" - - assert isinstance(node['bitmaps'], list) - for bitmap in node['bitmaps']: - result +=3D f" '{bitmap['name']}' -> '{bitmap['alias']}= '\n" - - return result - =20 class TestAliasMigration(TestDirtyBitmapMigration): src_node_name =3D 'node0' @@ -683,5 +664,4 @@ class TestAliasTransformMigration(TestDirtyBitmapMigrat= ion): self.verify_dest_error(None) =20 if __name__ =3D=3D '__main__': - iotests.main(supported_protocols=3D['file'], - require_hmp=3DTrue) + iotests.main(supported_protocols=3D['file']) --=20 2.56.0.rc0.29.g47ce80527c56 From nobody Sat Sep 26 20:01:40 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=1790108805; cv=none; d=zohomail.com; s=zohoarc; b=jw06KXW+zn9/PrAA0fR2yJXU5dtE9Eb6zCpmIfXgdc0pgi0ciX1uRRpaqwmaeIqD1GEfUaQD4JO5GXJ+/WJK2gdhj6xSP7V386Qtcg3nR8Jh/MgPANyBpd1rIecApfpjvkaMILGn/8voTyDsvxPPCW0NBRZ2IMdDBJUSQXOaBJ0= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1790108805; 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:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=HTe4G7jBG9AAaRJLDixw2fc4uEWZ9fiZ87WTE8GiHC0=; b=jfaZev8/1V5/YLx8IMVJAwGfvL8Y6TuWqmJvreBe2iRw1ZLVZ9LWGGgS7S7EnwflEN+FCp1yreCOkiWBB0jShjX9zdOCzf2HKW/EreIgEeC9dQzyEp+AiF+KWj1Q2rMw6Q3ntxQ7R1+DkguIcHnssSy9TVgbLJoJouVjZSzLjEw= 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 1790108805933810.755273242093; Tue, 22 Sep 2026 13:26:45 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists1p.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1x971E-0004Aa-Dt; Tue, 22 Sep 2026 16:23:12 -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 1x970P-0001kq-O6 for qemu-devel@nongnu.org; Tue, 22 Sep 2026 16:22:21 -0400 Received: from us-smtp-delivery-124.mimecast.com ([170.10.133.124]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1x970O-0000GF-6C for qemu-devel@nongnu.org; Tue, 22 Sep 2026 16:22:21 -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-456-TNpjK11JNpeV4tBSfa0xGw-1; Tue, 22 Sep 2026 16:22:16 -0400 Received: from mx-prod-int-05.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-05.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.17]) (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 5665D1800634; Tue, 22 Sep 2026 20:22:15 +0000 (UTC) Received: from localhost (headnet03.pony-001.prod.iad2.dc.redhat.com [10.2.32.114]) by mx-prod-int-05.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id 677061956095; Tue, 22 Sep 2026 20:22:14 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1790108539; 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=HTe4G7jBG9AAaRJLDixw2fc4uEWZ9fiZ87WTE8GiHC0=; b=i9Lm375JsUiwD2gz3BmcF+PUJ9IKynqV4/KO+jjoHDDPUHlCG6isRreS/GuxfPsUObETDt HEDKhzcxVoeS0TLbcI4CoknTiBuTsvyjMKhw/CpncJ+ZoQwFRhuqkXFZ0+QA98/ygu8iD1 ZA0jsycmwn8eYbcNDBaowEW52NpvpSs= X-MC-Unique: TNpjK11JNpeV4tBSfa0xGw-1 X-Mimecast-MFC-AGG-ID: TNpjK11JNpeV4tBSfa0xGw_1790108535 From: =?utf-8?q?Marc-Andr=C3=A9_Lureau?= Date: Wed, 23 Sep 2026 00:17:59 +0400 Subject: [PATCH 52/88] qemu-iotests/286: migrate away from HMP MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Message-Id: <20260923-nohmp-v1-52-ebc029d4bd80@redhat.com> References: <20260923-nohmp-v1-0-ebc029d4bd80@redhat.com> In-Reply-To: <20260923-nohmp-v1-0-ebc029d4bd80@redhat.com> To: qemu-devel@nongnu.org Cc: Kevin Wolf , =?utf-8?q?Marc-Andr=C3=A9_Lureau?= , Hanna Reitz , qemu-block@nongnu.org X-Developer-Signature: v=1; a=openpgp-sha256; l=2757; i=marcandre.lureau@redhat.com; h=from:subject:message-id; bh=n3hpqjipntq2EdIp7ypds4WHL/NuysC86fXwJJTYW7k=; b=owEBbQKS/ZANAwAKAdro4Ql1lpzlAcsmYgBqsuKxaNHBiphnE+WbzxmYOM2YR1HxEgMb6DaBv oezVy61Z2KJAjMEAAEKAB0WIQSHqb2TP4fGBtJ29i3a6OEJdZac5QUCarLisQAKCRDa6OEJdZac 5c28D/4z4/MTmFrA9ohpCwL1FvMsC31NeoKz1+M35eHbbErHsBZjxJ6758G65l6ua//9m6WYJlY hOxWa32BTK/dlZU7qhlntP3SdgqD1h6XPlu6pt0nHDJFQB2Ow8iWLCaaBLlw/yQAe0H0BSBjlm0 XI3Iqq2t81jJ7AYUX3bG/liwTBdSiEvVWXL4+7ymtRkBYlrcG/QV7SmQzuenrNldn0JC+qNR4MR zLkbnb9gHuHxSXlYuG+zxxvaSOACpxOn2j2+mpkXOFG6MhLXC5uktmgtWZqBpDaln+crayXG/Gt PFhQs3IBWvkKoEeVTt8B9nPNiaUDPNgqBAk+28tr7TWPMAQ4I4kMNpO/PgAjdZl2e8NwK71nQqF 37xOXyxsU5x+D0WRc64a7zrWYZRwEADQFQtcJjTxSueNhbVAquwV3CXGxf3//04/CtqeDFPsb9V ihKcKeaFE6dNmhG4Dm86l+hZ4Hqk+YcQ80iMLM+X58W5F7SFrsm+2yD/lQC2VnTsS4pHSuFnk2X Gcvda3U9dTTRg4KMYN+e1M7Mb81X1zpkp69KgQc5nOD/yD5/HlPfI1+p2MqL0aCimeH1mElWpw6 zFtLC1gdjun9Vy6DeH9uLNV5RTTuwvGvmiAtAkCf3ybjowNiz5iN/dC3MaH8rSOw/fG985fQMpL POSlxSZ6BmktCQA== X-Developer-Key: i=marcandre.lureau@redhat.com; a=openpgp; fpr=87A9BD933F87C606D276F62DDAE8E10975969CE5 X-Scanned-By: MIMEDefang 3.0 on 10.30.177.17 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.133.124; envelope-from=marcandre.lureau@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 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_H3=0.001, RCVD_IN_MSPIKE_WL=0.001, SPF_HELO_PASS=-0.001, SPF_PASS=-0.001 autolearn=unavailable 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: 1790108808009158500 Replaced qemu_comm_method=3Dmonitor _launch_qemu -m 512 "$TEST_IMG" with _launch_qemu using -blockdev to set explicit node names (disk0-file and disk0), and HMP savevm with QMP snapshot-save (job-based), waiting for "concluded" status. Signed-off-by: Marc-Andr=C3=A9 Lureau --- tests/qemu-iotests/286 | 15 +++++++++++---- tests/qemu-iotests/286.out | 8 +++++--- 2 files changed, 16 insertions(+), 7 deletions(-) diff --git a/tests/qemu-iotests/286 b/tests/qemu-iotests/286 index 3b030ec58aa0..565a960e9eb3 100755 --- a/tests/qemu-iotests/286 +++ b/tests/qemu-iotests/286 @@ -40,7 +40,6 @@ _supported_proto file fuse # Internal snapshots are (currently) impossible with refcount_bits=3D1, # and generally impossible with external data files _unsupported_imgopts 'refcount_bits=3D1[^0-9]' data_file -_require_hmp =20 _make_test_img 64M =20 @@ -49,10 +48,18 @@ sn_name=3Dabcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrs= tuvwxyz =20 # More memory will give us a larger VM state, i.e. one above 1 MB. # This way, we get a number with a decimal point. -qemu_comm_method=3Dmonitor _launch_qemu -m 512 "$TEST_IMG" +_launch_qemu -m 512 \ + -blockdev driver=3Dfile,filename=3D"$TEST_IMG",node-name=3Ddisk0-file \ + -blockdev driver=3D$IMGFMT,file=3Ddisk0-file,node-name=3Ddisk0 =20 -_send_qemu_cmd $QEMU_HANDLE "savevm $sn_name" '(qemu)' -_send_qemu_cmd $QEMU_HANDLE 'quit' '(qemu)' +_send_qemu_cmd $QEMU_HANDLE "{ 'execute': 'qmp_capabilities' }" 'return' +silent=3Dyes _run_qmp_job $QEMU_HANDLE 'save0' \ + "{ 'execute': 'snapshot-save', + 'arguments': { 'job-id': 'save0', + 'tag': '$sn_name', + 'vmstate': 'disk0', + 'devices': ['disk0'] } }" +_send_qemu_cmd $QEMU_HANDLE "{ 'execute': 'quit' }" 'return' wait=3Dyes _cleanup_qemu =20 # Check that all fields are separated by spaces. diff --git a/tests/qemu-iotests/286.out b/tests/qemu-iotests/286.out index bb04748e0808..33f1905a45ce 100644 --- a/tests/qemu-iotests/286.out +++ b/tests/qemu-iotests/286.out @@ -1,8 +1,10 @@ QA output created by 286 Formatting 'TEST_DIR/t.IMGFMT', fmt=3DIMGFMT size=3D67108864 -QEMU X.Y.Z monitor - type 'help' for more information -(qemu) savevm abcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyz -(qemu) quit +{ 'execute': 'qmp_capabilities' } +{"return": {}} +{ 'execute': 'quit' } +{"timestamp": {"seconds": TIMESTAMP, "microseconds": TIMESTAMP}, "event"= : "SHUTDOWN", "data": {"guest": false, "reason": "host-qmp-quit"}} +{"return": {}} Output structure: (snapshot ID) (snapshot name) (VM state size value) (VM state size unit) (= snapshot date) (snapshot time) (VM clock) (icount) *** done --=20 2.56.0.rc0.29.g47ce80527c56 From nobody Sat Sep 26 20:01:40 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=1790109118; cv=none; d=zohomail.com; s=zohoarc; b=BOFMNaWFV7iv6m8oeXQRRvnaYj1EEdNSdr9GvbA41QL3rMIvXmYITSHP/dEpcgWGdtEOenSqQxgP7w+DJGldy4zkPs2KjQPgxFcZ3666h6ZnYpUF9MLj0mpD0ByW1RKe3Y0MjSLr8AjMRVEZK9bboClew3AZkHCCJ2wQQ8yzjkA= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1790109118; 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:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=N8llSEfTpI770lJBMMM4akJ3fs76CK7fy8J4w0GKZ0k=; b=EWX1IvVeTUyU4hrsJfgKbB1neEKnje3S0O0SAhCfyfI8Am5CQu2n+GU3ZoAzTl1CAfklKmlTWk2sq4aZMVFHCMJBpcnkjtPifBjfFFbrtipFybHpSlzBOxK3PvAQ9sZ1/Jl/SNSBrplH2T5vsUSJvoDdnDFDDTZD68URoTgNn2M= 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 1790109118546574.3169586061695; Tue, 22 Sep 2026 13:31:58 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists1p.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1x971X-00066z-5L; Tue, 22 Sep 2026 16:23:31 -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 1x970V-0002PR-5G for qemu-devel@nongnu.org; Tue, 22 Sep 2026 16:22:28 -0400 Received: from us-smtp-delivery-124.mimecast.com ([170.10.133.124]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1x970R-0000GW-4s for qemu-devel@nongnu.org; Tue, 22 Sep 2026 16:22:26 -0400 Received: from mx-prod-mc-08.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-422-Ok_oRx2_M7-CUzNHfPtKzw-1; Tue, 22 Sep 2026 16:22:20 -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-08.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id 342EE1801A0B; Tue, 22 Sep 2026 20:22:19 +0000 (UTC) Received: from localhost (headnet03.pony-001.prod.iad2.dc.redhat.com [10.2.32.114]) by mx-prod-int-10.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id 3271E418; Tue, 22 Sep 2026 20:22:17 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1790108542; 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=N8llSEfTpI770lJBMMM4akJ3fs76CK7fy8J4w0GKZ0k=; b=enoCUoC7u7+uZcqMSRN05swg0BWqf9yd1rKUhfNwObUJaglW93jalFA6I5At2YMkPousyi /OJC5bftsrOYpmLFsKnd30PPdlsTeIlKGem49K4RvoFH27tkT7KJOcvY86+kvht6XlW1PU y12CwJ1S+aJ+QE+q5Er8rh/YlM37XT8= X-MC-Unique: Ok_oRx2_M7-CUzNHfPtKzw-1 X-Mimecast-MFC-AGG-ID: Ok_oRx2_M7-CUzNHfPtKzw_1790108539 From: =?utf-8?q?Marc-Andr=C3=A9_Lureau?= Date: Wed, 23 Sep 2026 00:18:00 +0400 Subject: [PATCH 53/88] qemu-iotests/142: migrate away from HMP MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Message-Id: <20260923-nohmp-v1-53-ebc029d4bd80@redhat.com> References: <20260923-nohmp-v1-0-ebc029d4bd80@redhat.com> In-Reply-To: <20260923-nohmp-v1-0-ebc029d4bd80@redhat.com> To: qemu-devel@nongnu.org Cc: Kevin Wolf , =?utf-8?q?Marc-Andr=C3=A9_Lureau?= , Hanna Reitz , qemu-block@nongnu.org X-Developer-Signature: v=1; a=openpgp-sha256; l=21030; i=marcandre.lureau@redhat.com; h=from:subject:message-id; bh=mhhIqeP7SFwjwjcM2BGNOxOGWwNaZVl9dOgVnA9nFhA=; b=owEBbQKS/ZANAwAKAdro4Ql1lpzlAcsmYgBqsuKypLqEbstmRM6a4AMu4idllBlDHDfucFPm0 Z+JpfhKhzWJAjMEAAEKAB0WIQSHqb2TP4fGBtJ29i3a6OEJdZac5QUCarLisgAKCRDa6OEJdZac 5SMKEACsQ0CND8ZyJ+Ao9BtGwJwf7K7j20jHmipRuq1hwEAgJQgI/9Ip5qkMqJg+aTixF9gWpZN 1BYzSW9DbXMare+TpAMk9PTwOT9wqHtrPq/wVSQ7mnE9vnuNflUbtZKz6a57JQd8x2OVpQEGdR2 GJUxNSZAqHhY22nsXB1FkOVcpjm1kGJHR+lluHEZYldtzysSJp+npDttSGy9bWlxHeES/hmuUhC kuRlOQJer+HNa0nnEX4tHSFibAVRB9TPxuHEtBIJrBVGejKT0HEHjsWEQhm8UjfU4rhxhwKUxjd OzTiQX0X+hX/ouvd3o6/oMTQzV167KfK7VIiViDdtxPqP5r7GjTIswfvBwIkNubyZvp+0HVW0Yx gIfTjxtBAMeh2YZhV5njBTZojdM91MgX5auPahhH1e0TkYiuuq/4IaQs/ZVvk0Ncl+OL8Yv0+Wd Ji0YxrvoiKv3TniMuJbx/hbIZFM6bkniPYWMRIkTlis4Fs0kNIHEAroHCeFOAdCNvtsdLNpWxU5 DmJKiBZ5lSWfmOlsJEKZqanInTdxYw3h8RjqgI2Zno/Z2WK9y2BIrAMjuTKIFnn0mLbrdyMtgbR TMKaYczTVQXwBhXD0jp71V1V1kQT1EbF8NDpF6yBh5DPLEW5UU/uPXtAx4AzI0jXTMpwOtJuNQE hwGPfI2AQgqL+zg== 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.133.124; envelope-from=marcandre.lureau@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 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_H3=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: 1790109119498158500 Replace the HMP monitor (-monitor stdio) with QMP (-qmp stdio) for testing cache mode configuration and inheritance. The main changes are: - Use query-block and query-named-block-nodes QMP commands instead of HMP "info block" to retrieve cache settings. - Introduce _filter_qmp_cache(), a Python helper that parses QMP responses and prints cache modes. Device names are looked up in query-block (backend-level cache) while node names are looked up in query-named-block-nodes (BDS-level cache), preserving the same semantics as HMP "info block ". - Use QMP blockdev-snapshot-sync instead of HMP snapshot_blkdev. - Use QMP x-qemu-io instead of HMP qemu-io for reopen operations. The expected output changes only in formatting (QMP banners and JSON responses replacing HMP banners). Signed-off-by: Marc-Andr=C3=A9 Lureau --- tests/qemu-iotests/142 | 233 ++++++++++++++++++++++++++---------------= ---- tests/qemu-iotests/142.out | 30 ++++-- 2 files changed, 157 insertions(+), 106 deletions(-) diff --git a/tests/qemu-iotests/142 b/tests/qemu-iotests/142 index 8538a727ac08..7a88c63d4acb 100755 --- a/tests/qemu-iotests/142 +++ b/tests/qemu-iotests/142 @@ -43,25 +43,92 @@ _supported_proto file # We test all cache modes anyway, but O_DIRECT needs to be supported _default_cache_mode none _supported_cache_modes none directsync -_require_hmp =20 do_run_qemu() { - echo Testing: "$@" ( + echo "{ 'execute': 'qmp_capabilities' }" if ! test -t 0; then while read cmd; do - echo $cmd + echo "$cmd" done fi - echo quit - ) | $QEMU -nographic -monitor stdio -nodefaults "$@" - echo + echo "{ 'execute': 'quit' }" + ) | $QEMU -nographic -qmp stdio -nodefaults "$@" 2>&1 } =20 run_qemu() { - do_run_qemu "$@" 2>&1 | _filter_testdir | _filter_qemu | _filter_hmp + ( + echo Testing: "$@" + do_run_qemu "$@" | _filter_qmp + ) | _filter_testdir | _filter_qemu + echo +} + +# Extract cache info from query-block and query-named-block-nodes QMP +# output. For each name passed as argument, prints its cache mode. +# Device names are looked up in query-block (backend-level cache). +# Node names are looked up in query-named-block-nodes (BDS-level cache). +# Non-JSON lines (startup errors) are passed through. +_filter_qmp_cache() +{ + local nodes=3D("$@") + python3 -c ' +import sys, json + +nodes =3D sys.argv[1:] +lines =3D sys.stdin.read().strip().split("\n") + +cache_map =3D {} +for line in lines: + line =3D line.strip() + if not line.startswith("{"): + if line and not line.startswith("Formatting"): + print(line) + continue + try: + resp =3D json.loads(line) + except json.JSONDecodeError: + continue + if "error" in resp: + print(resp["error"]["desc"]) + continue + ret =3D resp.get("return") + if not isinstance(ret, list): + continue + for entry in ret: + if not isinstance(entry, dict): + continue + device =3D entry.get("device") + inserted =3D entry.get("inserted") if device is not None else entry + if inserted is None: + continue + cache =3D inserted.get("cache") + if cache is None: + continue + node_name =3D inserted.get("node-name", "") + if device is not None and device in nodes: + cache_map[device] =3D cache + elif device is None and node_name in nodes and node_name not in ca= che_map: + cache_map[node_name] =3D cache + +for name in nodes: + if name in cache_map: + c =3D cache_map[name] + mode =3D "writeback" if c["writeback"] else "writethrough" + if c["direct"]: + mode +=3D ", direct" + if c["no-flush"]: + mode +=3D ", ignore flushes" + print(" Cache mode: %s" % mode) +' "${nodes[@]}" +} + +run_qemu_cache() +{ + do_run_qemu "$@" | _filter_qmp_cache $cache_nodes | \ + _filter_testdir | _filter_qemu } =20 size=3D128M @@ -88,42 +155,45 @@ echo files=3D"if=3Dnone,file=3D$TEST_IMG,backing.file.filename=3D$TEST_IMG.base" ids=3D"node-name=3Dimage,backing.node-name=3Dbacking,backing.file.node-nam= e=3Dbacking-file,file.node-name=3Dfile" =20 +qmp_query=3D"{ 'execute': 'query-block' } +{ 'execute': 'query-named-block-nodes' }" + check_cache_all() { # cache.direct is supposed to be inherited by both bs->file and # bs->backing =20 printf "cache.direct=3Don on none0\n" - echo "$hmp_cmds" | run_qemu -drive "$files","$ids",cache.direct=3Don |= grep -e "Cache" -e "[Cc]annot|[Cc]ould not|[Cc]an't" + echo "$qmp_cmds" | run_qemu_cache -drive "$files","$ids",cache.direct= =3Don printf "\ncache.direct=3Don on file\n" - echo "$hmp_cmds" | run_qemu -drive "$files","$ids",file.cache.direct= =3Don | grep -e "Cache" -e "[Cc]annot|[Cc]ould not|[Cc]an't" + echo "$qmp_cmds" | run_qemu_cache -drive "$files","$ids",file.cache.di= rect=3Don printf "\ncache.direct=3Don on backing\n" - echo "$hmp_cmds" | run_qemu -drive "$files","$ids",backing.cache.direc= t=3Don | grep -e "Cache" -e "[Cc]annot|[Cc]ould not|[Cc]an't" + echo "$qmp_cmds" | run_qemu_cache -drive "$files","$ids",backing.cache= .direct=3Don printf "\ncache.direct=3Don on backing-file\n" - echo "$hmp_cmds" | run_qemu -drive "$files","$ids",backing.file.cache.= direct=3Don | grep -e "Cache" -e "[Cc]annot|[Cc]ould not|[Cc]an't" + echo "$qmp_cmds" | run_qemu_cache -drive "$files","$ids",backing.file.= cache.direct=3Don =20 # cache.writeback is supposed to be inherited by bs->backing; bs->file # always gets cache.writeback=3Don =20 printf "\n\ncache.writeback=3Doff on none0\n" - echo "$hmp_cmds" | run_qemu -drive "$files","$ids",cache.writeback=3Do= ff | grep -e "Cache" -e "[Cc]annot\|[Cc]ould not\|[Cc]an't" + echo "$qmp_cmds" | run_qemu_cache -drive "$files","$ids",cache.writeba= ck=3Doff printf "\ncache.writeback=3Doff on file\n" - echo "$hmp_cmds" | run_qemu -drive "$files","$ids",file.cache.writebac= k=3Doff | grep -e "doesn't" -e "does not" + echo "$qmp_cmds" | run_qemu_cache -drive "$files","$ids",file.cache.wr= iteback=3Doff printf "\ncache.writeback=3Doff on backing\n" - echo "$hmp_cmds" | run_qemu -drive "$files","$ids",backing.cache.write= back=3Doff | grep -e "doesn't" -e "does not" + echo "$qmp_cmds" | run_qemu_cache -drive "$files","$ids",backing.cache= .writeback=3Doff printf "\ncache.writeback=3Doff on backing-file\n" - echo "$hmp_cmds" | run_qemu -drive "$files","$ids",backing.file.cache.= writeback=3Doff | grep -e "doesn't" -e "does not" + echo "$qmp_cmds" | run_qemu_cache -drive "$files","$ids",backing.file.= cache.writeback=3Doff =20 # cache.no-flush is supposed to be inherited by both bs->file and bs->= backing =20 printf "\n\ncache.no-flush=3Don on none0\n" - echo "$hmp_cmds" | run_qemu -drive "$files","$ids",cache.no-flush=3Don= | grep -e "Cache" -e "[Cc]annot\|[Cc]ould not\|[Cc]an't" + echo "$qmp_cmds" | run_qemu_cache -drive "$files","$ids",cache.no-flus= h=3Don printf "\ncache.no-flush=3Don on file\n" - echo "$hmp_cmds" | run_qemu -drive "$files","$ids",file.cache.no-flush= =3Don | grep -e "Cache" -e "[Cc]annot\|[Cc]ould not\|[Cc]an't" + echo "$qmp_cmds" | run_qemu_cache -drive "$files","$ids",file.cache.no= -flush=3Don printf "\ncache.no-flush=3Don on backing\n" - echo "$hmp_cmds" | run_qemu -drive "$files","$ids",backing.cache.no-fl= ush=3Don | grep -e "Cache" -e "[Cc]annot\|[Cc]ould not\|[Cc]an't" + echo "$qmp_cmds" | run_qemu_cache -drive "$files","$ids",backing.cache= .no-flush=3Don printf "\ncache.no-flush=3Don on backing-file\n" - echo "$hmp_cmds" | run_qemu -drive "$files","$ids",backing.file.cache.= no-flush=3Don | grep -e "Cache" -e "[Cc]annot\|[Cc]ould not\|[Cc]an't" + echo "$qmp_cmds" | run_qemu_cache -drive "$files","$ids",backing.file.= cache.no-flush=3Don } =20 echo @@ -132,11 +202,8 @@ echo =20 # First check the inherited cache mode after opening the image. =20 -hmp_cmds=3D"info block none0 -info block image -info block file -info block backing -info block backing-file" +qmp_cmds=3D"$qmp_query" +cache_nodes=3D"none0 image file backing backing-file" =20 check_cache_all =20 @@ -146,12 +213,9 @@ echo =20 # Then trigger a reopen and check that the cache modes are still the same. =20 -hmp_cmds=3D"snapshot_blkdev -n none0 $TEST_IMG.snap $IMGFMT -info block -info block image -info block file -info block backing -info block backing-file" +qmp_cmds=3D"{ 'execute': 'blockdev-snapshot-sync', 'arguments': { 'device'= : 'none0', 'snapshot-file': '$TEST_IMG.snap', 'format': '$IMGFMT' } } +$qmp_query" +cache_nodes=3D"none0 image file backing backing-file" =20 check_cache_all =20 @@ -162,12 +226,9 @@ echo # This one actually changes the cache mode with the reopen. For this test,= the # new cache mode is specified in the flags, not as an option. =20 -hmp_cmds=3D'qemu-io none0 "reopen -c none" -info block none0 -info block image -info block file -info block backing -info block backing-file' +qmp_cmds=3D"{ 'execute': 'x-qemu-io', 'arguments': { 'device': 'none0', 'c= ommand': 'reopen -c none' } } +$qmp_query" +cache_nodes=3D"none0 image file backing backing-file" =20 check_cache_all =20 @@ -178,12 +239,9 @@ echo # This one actually changes the cache mode with the reopen. For this test,= the # new cache mode is specified as an option, not in the flags. =20 -hmp_cmds=3D'qemu-io none0 "reopen -o cache.direct=3Don" -info block none0 -info block image -info block file -info block backing -info block backing-file' +qmp_cmds=3D"{ 'execute': 'x-qemu-io', 'arguments': { 'device': 'none0', 'c= ommand': 'reopen -o cache.direct=3Don' } } +$qmp_query" +cache_nodes=3D"none0 image file backing backing-file" =20 check_cache_all =20 @@ -193,13 +251,10 @@ echo =20 # This checks that the original image doesn't inherit from the snapshot =20 -hmp_cmds=3D"snapshot_blkdev -n none0 $TEST_IMG.snap $IMGFMT -qemu-io none0 \"reopen -c none\" -info block none0 -info block image -info block file -info block backing -info block backing-file" +qmp_cmds=3D"{ 'execute': 'blockdev-snapshot-sync', 'arguments': { 'device'= : 'none0', 'snapshot-file': '$TEST_IMG.snap', 'format': '$IMGFMT' } } +{ 'execute': 'x-qemu-io', 'arguments': { 'device': 'none0', 'command': 're= open -c none' } } +$qmp_query" +cache_nodes=3D"none0 image file backing backing-file" =20 check_cache_all =20 @@ -214,13 +269,11 @@ echo # BDS initialised with the json: pseudo-protocol, but still have it inherit # options from its parent node. =20 -hmp_cmds=3D"qemu-io none0 \"reopen -o cache.direct=3Don,cache.no-flush=3Do= n\" -info block none0 -info block image -info block blkdebug -info block file" +qmp_cmds=3D"{ 'execute': 'x-qemu-io', 'arguments': { 'device': 'none0', 'c= ommand': 'reopen -o cache.direct=3Don,cache.no-flush=3Don' } } +$qmp_query" +cache_nodes=3D"none0 image blkdebug file" =20 -echo "$hmp_cmds" | run_qemu -drive if=3Dnone,file=3D"blkdebug::json:{\"fil= ename\":\"$TEST_IMG\",,\"cache\":{\"direct\":false}}",node-name=3Dimage,fil= e.node-name=3Dblkdebug,file.image.node-name=3Dfile | grep "Cache" +echo "$qmp_cmds" | run_qemu_cache -drive if=3Dnone,file=3D"blkdebug::json:= {\"filename\":\"$TEST_IMG\",,\"cache\":{\"direct\":false}}",node-name=3Dima= ge,file.node-name=3Dblkdebug,file.image.node-name=3Dfile =20 echo echo "=3D=3D=3D Check that referenced BDSes don't inherit =3D=3D=3D" @@ -236,35 +289,35 @@ check_cache_all_separate() # Check cache.direct =20 printf "cache.direct=3Don on blk\n" - echo "$hmp_cmds" | run_qemu -drive "$drv_bkfile" -drive "$drv_bk" -dri= ve "$drv_file" -drive "$drv_img",cache.direct=3Don | grep -e "Cache" -e "[C= c]annot\|[Cc]ould not\|[Cc]an't" + echo "$qmp_cmds" | run_qemu_cache -drive "$drv_bkfile" -drive "$drv_bk= " -drive "$drv_file" -drive "$drv_img",cache.direct=3Don printf "\ncache.direct=3Don on file\n" - echo "$hmp_cmds" | run_qemu -drive "$drv_bkfile" -drive "$drv_bk" -dri= ve "$drv_file",cache.direct=3Don -drive "$drv_img" | grep -e "Cache" -e "[C= c]annot\|[Cc]ould not\|[Cc]an't" + echo "$qmp_cmds" | run_qemu_cache -drive "$drv_bkfile" -drive "$drv_bk= " -drive "$drv_file",cache.direct=3Don -drive "$drv_img" printf "\ncache.direct=3Don on backing\n" - echo "$hmp_cmds" | run_qemu -drive "$drv_bkfile" -drive "$drv_bk",cach= e.direct=3Don -drive "$drv_file" -drive "$drv_img" | grep -e "Cache" -e "[C= c]annot\|[Cc]ould not\|[Cc]an't" + echo "$qmp_cmds" | run_qemu_cache -drive "$drv_bkfile" -drive "$drv_bk= ",cache.direct=3Don -drive "$drv_file" -drive "$drv_img" printf "\ncache.direct=3Don on backing-file\n" - echo "$hmp_cmds" | run_qemu -drive "$drv_bkfile",cache.direct=3Don -dr= ive "$drv_bk" -drive "$drv_file" -drive "$drv_img" | grep -e "Cache" -e "[C= c]annot\|[Cc]ould not\|[Cc]an't" + echo "$qmp_cmds" | run_qemu_cache -drive "$drv_bkfile",cache.direct=3D= on -drive "$drv_bk" -drive "$drv_file" -drive "$drv_img" =20 # Check cache.writeback =20 printf "\n\ncache.writeback=3Doff on blk\n" - echo "$hmp_cmds" | run_qemu -drive "$drv_bkfile" -drive "$drv_bk" -dri= ve "$drv_file" -drive "$drv_img",cache.writeback=3Doff | grep -e "Cache" -e= "[Cc]annot\|[Cc]ould not\|[Cc]an't" + echo "$qmp_cmds" | run_qemu_cache -drive "$drv_bkfile" -drive "$drv_bk= " -drive "$drv_file" -drive "$drv_img",cache.writeback=3Doff printf "\ncache.writeback=3Doff on file\n" - echo "$hmp_cmds" | run_qemu -drive "$drv_bkfile" -drive "$drv_bk" -dri= ve "$drv_file",cache.writeback=3Doff -drive "$drv_img" | grep -e "Cache" -e= "[Cc]annot\|[Cc]ould not\|[Cc]an't" + echo "$qmp_cmds" | run_qemu_cache -drive "$drv_bkfile" -drive "$drv_bk= " -drive "$drv_file",cache.writeback=3Doff -drive "$drv_img" printf "\ncache.writeback=3Doff on backing\n" - echo "$hmp_cmds" | run_qemu -drive "$drv_bkfile" -drive "$drv_bk",cach= e.writeback=3Doff -drive "$drv_file" -drive "$drv_img" | grep -e "Cache" -e= "[Cc]annot\|[Cc]ould not\|[Cc]an't" + echo "$qmp_cmds" | run_qemu_cache -drive "$drv_bkfile" -drive "$drv_bk= ",cache.writeback=3Doff -drive "$drv_file" -drive "$drv_img" printf "\ncache.writeback=3Doff on backing-file\n" - echo "$hmp_cmds" | run_qemu -drive "$drv_bkfile",cache.writeback=3Doff= -drive "$drv_bk" -drive "$drv_file" -drive "$drv_img" | grep -e "Cache" -e= "[Cc]annot\|[Cc]ould not\|[Cc]an't" + echo "$qmp_cmds" | run_qemu_cache -drive "$drv_bkfile",cache.writeback= =3Doff -drive "$drv_bk" -drive "$drv_file" -drive "$drv_img" =20 # Check cache.no-flush =20 printf "\n\ncache.no-flush=3Don on blk\n" - echo "$hmp_cmds" | run_qemu -drive "$drv_bkfile" -drive "$drv_bk" -dri= ve "$drv_file" -drive "$drv_img",cache.no-flush=3Don | grep -e "Cache" -e "= [Cc]annot\|[Cc]ould not\|[Cc]an't" + echo "$qmp_cmds" | run_qemu_cache -drive "$drv_bkfile" -drive "$drv_bk= " -drive "$drv_file" -drive "$drv_img",cache.no-flush=3Don printf "\ncache.no-flush=3Don on file\n" - echo "$hmp_cmds" | run_qemu -drive "$drv_bkfile" -drive "$drv_bk" -dri= ve "$drv_file",cache.no-flush=3Don -drive "$drv_img" | grep -e "Cache" -e "= [Cc]annot\|[Cc]ould not\|[Cc]an't" + echo "$qmp_cmds" | run_qemu_cache -drive "$drv_bkfile" -drive "$drv_bk= " -drive "$drv_file",cache.no-flush=3Don -drive "$drv_img" printf "\ncache.no-flush=3Don on backing\n" - echo "$hmp_cmds" | run_qemu -drive "$drv_bkfile" -drive "$drv_bk",cach= e.no-flush=3Don -drive "$drv_file" -drive "$drv_img" | grep -e "Cache" -e "= [Cc]annot\|[Cc]ould not\|[Cc]an't" + echo "$qmp_cmds" | run_qemu_cache -drive "$drv_bkfile" -drive "$drv_bk= ",cache.no-flush=3Don -drive "$drv_file" -drive "$drv_img" printf "\ncache.no-flush=3Don on backing-file\n" - echo "$hmp_cmds" | run_qemu -drive "$drv_bkfile",cache.no-flush=3Don -= drive "$drv_bk" -drive "$drv_file" -drive "$drv_img" | grep -e "Cache" -e "= [Cc]annot\|[Cc]ould not\|[Cc]an't" + echo "$qmp_cmds" | run_qemu_cache -drive "$drv_bkfile",cache.no-flush= =3Don -drive "$drv_bk" -drive "$drv_file" -drive "$drv_img" } =20 echo @@ -273,10 +326,8 @@ echo =20 # First check the inherited cache mode after opening the image. =20 -hmp_cmds=3D"info block image -info block file -info block backing -info block backing-file" +qmp_cmds=3D"$qmp_query" +cache_nodes=3D"image file backing backing-file" =20 check_cache_all_separate =20 @@ -286,12 +337,9 @@ echo =20 # Then trigger a reopen and check that the cache modes are still the same. =20 -hmp_cmds=3D"snapshot_blkdev -n blk $TEST_IMG.snap $IMGFMT -info block blk -info block image -info block file -info block backing -info block backing-file" +qmp_cmds=3D"{ 'execute': 'blockdev-snapshot-sync', 'arguments': { 'device'= : 'blk', 'snapshot-file': '$TEST_IMG.snap', 'format': '$IMGFMT' } } +$qmp_query" +cache_nodes=3D"blk image file backing backing-file" =20 check_cache_all_separate =20 @@ -302,11 +350,9 @@ echo # This one actually changes the cache mode with the reopen. For this test,= the # new cache mode is specified as flags, not as option. =20 -hmp_cmds=3D'qemu-io blk "reopen -c none" -info block image -info block file -info block backing -info block backing-file' +qmp_cmds=3D"{ 'execute': 'x-qemu-io', 'arguments': { 'device': 'blk', 'com= mand': 'reopen -c none' } } +$qmp_query" +cache_nodes=3D"image file backing backing-file" =20 check_cache_all_separate =20 @@ -322,12 +368,9 @@ echo echo "--- Basic reopen ---" echo =20 -hmp_cmds=3D'qemu-io none0 "reopen -o backing.cache.direct=3Don" -info block none0 -info block image -info block file -info block backing -info block backing-file' +qmp_cmds=3D"{ 'execute': 'x-qemu-io', 'arguments': { 'device': 'none0', 'c= ommand': 'reopen -o backing.cache.direct=3Don' } } +$qmp_query" +cache_nodes=3D"none0 image file backing backing-file" =20 check_cache_all =20 @@ -341,15 +384,13 @@ echo # TODO Implement node-name support for 'qemu-io' HMP command for -c # Can use only -o to access child node options for now =20 -hmp_cmds=3D"qemu-io none0 \"reopen -o file.cache.direct=3Doff,file.cache.n= o-flush=3Doff\" -qemu-io none0 \"reopen -o backing.file.cache.direct=3Doff,backing.file.cac= he.no-flush=3Don\" -qemu-io none0 \"reopen -c none\" -info block image -info block file -info block backing -info block backing-file" +qmp_cmds=3D"{ 'execute': 'x-qemu-io', 'arguments': { 'device': 'none0', 'c= ommand': 'reopen -o file.cache.direct=3Doff,file.cache.no-flush=3Doff' } } +{ 'execute': 'x-qemu-io', 'arguments': { 'device': 'none0', 'command': 're= open -o backing.file.cache.direct=3Doff,backing.file.cache.no-flush=3Don' }= } +{ 'execute': 'x-qemu-io', 'arguments': { 'device': 'none0', 'command': 're= open -c none' } } +$qmp_query" +cache_nodes=3D"image file backing backing-file" =20 -echo "$hmp_cmds" | run_qemu -drive "$files","$ids" | grep "Cache" +echo "$qmp_cmds" | run_qemu_cache -drive "$files","$ids" =20 echo echo "--- Alignment after changing O_DIRECT ---" diff --git a/tests/qemu-iotests/142.out b/tests/qemu-iotests/142.out index e20cfc8eb812..2769f354e867 100644 --- a/tests/qemu-iotests/142.out +++ b/tests/qemu-iotests/142.out @@ -6,24 +6,34 @@ Formatting 'TEST_DIR/t.IMGFMT', fmt=3DIMGFMT size=3D13421= 7728 backing_file=3DTEST_DIR/ =3D=3D=3D Simple test for all cache modes =3D=3D=3D =20 Testing: -drive file=3DTEST_DIR/t.qcow2,cache=3Dnone -QEMU X.Y.Z monitor - type 'help' for more information -(qemu) quit +QMP_VERSION +{"return": {}} +{"timestamp": {"seconds": TIMESTAMP, "microseconds": TIMESTAMP}, "event"= : "SHUTDOWN", "data": {"guest": false, "reason": "host-qmp-quit"}} +{"return": {}} =20 Testing: -drive file=3DTEST_DIR/t.qcow2,cache=3Ddirectsync -QEMU X.Y.Z monitor - type 'help' for more information -(qemu) quit +QMP_VERSION +{"return": {}} +{"timestamp": {"seconds": TIMESTAMP, "microseconds": TIMESTAMP}, "event"= : "SHUTDOWN", "data": {"guest": false, "reason": "host-qmp-quit"}} +{"return": {}} =20 Testing: -drive file=3DTEST_DIR/t.qcow2,cache=3Dwriteback -QEMU X.Y.Z monitor - type 'help' for more information -(qemu) quit +QMP_VERSION +{"return": {}} +{"timestamp": {"seconds": TIMESTAMP, "microseconds": TIMESTAMP}, "event"= : "SHUTDOWN", "data": {"guest": false, "reason": "host-qmp-quit"}} +{"return": {}} =20 Testing: -drive file=3DTEST_DIR/t.qcow2,cache=3Dwritethrough -QEMU X.Y.Z monitor - type 'help' for more information -(qemu) quit +QMP_VERSION +{"return": {}} +{"timestamp": {"seconds": TIMESTAMP, "microseconds": TIMESTAMP}, "event"= : "SHUTDOWN", "data": {"guest": false, "reason": "host-qmp-quit"}} +{"return": {}} =20 Testing: -drive file=3DTEST_DIR/t.qcow2,cache=3Dunsafe -QEMU X.Y.Z monitor - type 'help' for more information -(qemu) quit +QMP_VERSION +{"return": {}} +{"timestamp": {"seconds": TIMESTAMP, "microseconds": TIMESTAMP}, "event"= : "SHUTDOWN", "data": {"guest": false, "reason": "host-qmp-quit"}} +{"return": {}} =20 Testing: -drive file=3DTEST_DIR/t.qcow2,cache=3Dinvalid_value QEMU_PROG: -drive file=3DTEST_DIR/t.qcow2,cache=3Dinvalid_value: invalid c= ache option --=20 2.56.0.rc0.29.g47ce80527c56 From nobody Sat Sep 26 20:01:40 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=1790108622; cv=none; d=zohomail.com; s=zohoarc; b=iSeLVVEbCmEBoBBPYnGErdDXKmJ3n9316zAtoB+v9/0zrw3Ym8YQh6fUYVF2Xe4wmlvqmzkZaCxS3sY+YDqcSOy+B/6lybaacDnRRIBkaTlH+M+a6yESmA1bsBBPjRmsPOAejudAVS9UnHG0sM37TSzwyx9e/Wkj4/cjsA46arU= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1790108622; 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:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=03QaRt2B3RoI2+iALPUtzvIRPMKnxpX4aGTTmWXZTP0=; b=YbZPidBJhD4sung9Tzx3NCc01SjeYEdEdnU6s8ybJWKcn7f8CPNj7ckeT4YGZaS8JOkKHRYpR+33BrCu19VhUb6l/OYVmrPxiPwUiGCxdRNq9i0FKA2kjtfOYQ9jxxJBQRyc1vOtPGG7G16j0pvzeiMKljGNjmuabHmfMiS1Ohw= 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 1790108622245405.1271833794426; Tue, 22 Sep 2026 13:23:42 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists1p.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1x971G-0004UF-O2; Tue, 22 Sep 2026 16:23:15 -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 1x970X-0002Ro-RZ for qemu-devel@nongnu.org; Tue, 22 Sep 2026 16:22:30 -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 1x970W-0000Gr-JO for qemu-devel@nongnu.org; Tue, 22 Sep 2026 16:22:29 -0400 Received: from mx-prod-mc-08.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-441-fbsgdV4eOjCHyM8TwAHLmw-1; Tue, 22 Sep 2026 16:22:23 -0400 Received: from mx-prod-int-01.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-01.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.4]) (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-08.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id 9B39B183458F; Tue, 22 Sep 2026 20:22:22 +0000 (UTC) Received: from localhost (headnet03.pony-001.prod.iad2.dc.redhat.com [10.2.32.114]) by mx-prod-int-01.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id 99B173000223; Tue, 22 Sep 2026 20:22:21 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1790108546; 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=03QaRt2B3RoI2+iALPUtzvIRPMKnxpX4aGTTmWXZTP0=; b=gUl5lE6QybdF4iQMoNToT8rmhBWzAHQoCQLuKoEm0TE+C+g7GGzfFqSu0piaALlXvwcNTC /5HrSkQkEB4GnNaDgz7GAljx7RPVptoOTuefVDQYb64/uPU1EeOi+z8MHTLROWGH8UfPvO cqSoEpJDJbg5NwsQCKFDnlAuavwrQY8= X-MC-Unique: fbsgdV4eOjCHyM8TwAHLmw-1 X-Mimecast-MFC-AGG-ID: fbsgdV4eOjCHyM8TwAHLmw_1790108542 From: =?utf-8?q?Marc-Andr=C3=A9_Lureau?= Date: Wed, 23 Sep 2026 00:18:01 +0400 Subject: [PATCH 54/88] qemu-iotests/146: migrate away from HMP MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Message-Id: <20260923-nohmp-v1-54-ebc029d4bd80@redhat.com> References: <20260923-nohmp-v1-0-ebc029d4bd80@redhat.com> In-Reply-To: <20260923-nohmp-v1-0-ebc029d4bd80@redhat.com> To: qemu-devel@nongnu.org Cc: Kevin Wolf , =?utf-8?q?Marc-Andr=C3=A9_Lureau?= , Hanna Reitz , qemu-block@nongnu.org X-Developer-Signature: v=1; a=openpgp-sha256; l=603; i=marcandre.lureau@redhat.com; h=from:subject:message-id; bh=gIZ+F2NHVPXgCtxtHRZBC4g4US4YscExD5nvOXJYWYI=; b=owEBbQKS/ZANAwAKAdro4Ql1lpzlAcsmYgBqsuKyP9Nz9uNsO/sLKgyuzs0snW3VDjIOXs7wa 5G/wBY4ih6JAjMEAAEKAB0WIQSHqb2TP4fGBtJ29i3a6OEJdZac5QUCarLisgAKCRDa6OEJdZac 5c73D/4rLUrOBYLa8654it7BRUkX54hISfUzXpfBqIoehYHiDDWpu+LGT+FdQEps1LEkvQKewwP fhZg9Cxl59qAkG3eiWE4W1rLWutQ8t3Zm3xqzXfl2/1L69GN6xm1vH6VcevxFpe/EpcTHLw5tKh THFAGOEnHW09rbLHYpFQzPTvqL3nNtqbyWnB3vI7W9r3EbPONeb2xnoTrQL+MKdKokX81ebWJqc sFR5Re1moxMFmnhfNmca+m3foEizxdFbjj0SAKPJ7FpL4vv4C8oB7THc+2g1+Pc3mSEQI8fjx64 JNa+7ecOb+X0FmFGEb2oOhjEyG76Mp+2uop1C7AoPZJJh9u01IzoC5yYukA7JJdqT1ZOl8GBcKJ +y6smP9NcTN76jVYbJOTibbsN4w54JQjhm6BUKBCp45KxlpXagMx0J6i/vEdmTGKi7WAKT+/C5k nISaLwMr9p3841yvf1DsK8Y866U4Q8SlEiE81bWmqAILdygzbdsP7/u0WvSvZqJH6YJhHxWwOJt x8bwZt+DGSOAW/sL/p/n2TaxpU9iw0MWpMBZM9m3HoO6aJnpdgSrbfnKS9SYHTy38sOhws2m98p zejwWLmJy3X9EkKwJFiNg0exeFaFf949tyUAls+n7LODyg4y99LgD4nEHAg3Tg3dpoNmkWK4WLO fUndn+vn7w2oQ6w== X-Developer-Key: i=marcandre.lureau@redhat.com; a=openpgp; fpr=87A9BD933F87C606D276F62DDAE8E10975969CE5 X-Scanned-By: MIMEDefang 3.4.1 on 10.30.177.4 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: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 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, SPF_HELO_PASS=-0.001, SPF_PASS=-0.001 autolearn=unavailable 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: 1790108622671158500 HMP is actually unused. Signed-off-by: Marc-Andr=C3=A9 Lureau --- tests/qemu-iotests/146 | 5 ----- 1 file changed, 5 deletions(-) diff --git a/tests/qemu-iotests/146 b/tests/qemu-iotests/146 index f63291d0ffba..3cd41e8180a0 100755 --- a/tests/qemu-iotests/146 +++ b/tests/qemu-iotests/146 @@ -42,11 +42,6 @@ trap "_cleanup; exit \$status" 0 1 2 3 15 _supported_fmt vpc _supported_proto file _supported_os Linux -_require_hmp - - -qemu_comm_method=3D"monitor" -silent=3D =20 echo echo =3D=3D=3D Testing VPC Autodetect =3D=3D=3D --=20 2.56.0.rc0.29.g47ce80527c56 From nobody Sat Sep 26 20:01:40 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=1790108947; cv=none; d=zohomail.com; s=zohoarc; b=ec4RHYLJM8wlZnLphTso7BhirhwbUs6+toPhjpgQhnBYtbqwfK5NR98b0rZZKbFX5/kYgHepvoOkz0A4f0OEdgWEyFg62s6hB4SE0NUfYrUgAHtWv6yef3QNiYZX0FT20gZbrfq9UTLyFL+jLYGlujve56HYQRm5/RdJPGrAzEI= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1790108947; 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:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=PeX3kkBwg9WAY+tSUXvhckcEyrx/JVu/CcYU+8EtmK8=; b=grJBN6VahqtqkYDpdzVyWa8evHA6FWEICYB1ikhqOS9AyUfBMKBtIcVvyjo7afS5iOk/3Tb7/L/XvtRnIGuoU6EVbCIHYYpnHeUNrmBepd/fquR1iMWAbNmunfw/KuND7RTvklCHbzQk/Vx5d4QkSS/z6ZskTAQqUUqKA7Uq4Fs= 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 1790108947725508.7112895884404; Tue, 22 Sep 2026 13:29:07 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists1p.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1x971Z-0006RN-1M; Tue, 22 Sep 2026 16:23:33 -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 1x970a-0002Ys-Oo for qemu-devel@nongnu.org; Tue, 22 Sep 2026 16:22:34 -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 1x970Z-0000HP-31 for qemu-devel@nongnu.org; Tue, 22 Sep 2026 16:22:32 -0400 Received: from mx-prod-mc-01.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-83-PPJOlRMMNBGNAYDBhJu9Mw-1; Tue, 22 Sep 2026 16:22:26 -0400 Received: from mx-prod-int-05.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-05.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.17]) (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-01.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id 167AA195D02A; Tue, 22 Sep 2026 20:22:26 +0000 (UTC) Received: from localhost (headnet03.pony-001.prod.iad2.dc.redhat.com [10.2.32.114]) by mx-prod-int-05.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id 42E271956095; Tue, 22 Sep 2026 20:22:24 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1790108550; 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=PeX3kkBwg9WAY+tSUXvhckcEyrx/JVu/CcYU+8EtmK8=; b=JpYnhBxweNpJvpKnHtgXJCKCJCH6IUtfI32HC7bEnsAzlevgsjV+L8YeKlL4Hihb7E4Luy L3ly4i0lAB/iQxELp5A2x2lFJNKQ+rmyuKul50Qvh7CTJfmnO174Nq0o/h7EAQZGY84YyR r9tFQz06qOKVBu3YZ6cVpUTG3yftb9Y= X-MC-Unique: PPJOlRMMNBGNAYDBhJu9Mw-1 X-Mimecast-MFC-AGG-ID: PPJOlRMMNBGNAYDBhJu9Mw_1790108546 From: =?utf-8?q?Marc-Andr=C3=A9_Lureau?= Date: Wed, 23 Sep 2026 00:18:02 +0400 Subject: [PATCH 55/88] qemu-iotests/117: migrate away from HMP MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Message-Id: <20260923-nohmp-v1-55-ebc029d4bd80@redhat.com> References: <20260923-nohmp-v1-0-ebc029d4bd80@redhat.com> In-Reply-To: <20260923-nohmp-v1-0-ebc029d4bd80@redhat.com> To: qemu-devel@nongnu.org Cc: Kevin Wolf , =?utf-8?q?Marc-Andr=C3=A9_Lureau?= , Hanna Reitz , qemu-block@nongnu.org X-Developer-Signature: v=1; a=openpgp-sha256; l=1978; i=marcandre.lureau@redhat.com; h=from:subject:message-id; bh=odxVq0Kgp7ps3FcquMX0FkIHe/fyOXOcYNg4lzb9hA8=; b=owEBbQKS/ZANAwAKAdro4Ql1lpzlAcsmYgBqsuKynsq8CocEMkp1xcKQGetyZKDkC+Gfw7EUZ KGOtUzBxnOJAjMEAAEKAB0WIQSHqb2TP4fGBtJ29i3a6OEJdZac5QUCarLisgAKCRDa6OEJdZac 5RI2D/wN2RidkCmB3lIT4sj8g3Ztlept6iWAXS+x9RWi0yLEed+tYSPMYbE1L6wS5aUXMsKEbPj k0f4lgO9PdpJ2uHGQ64Lzu7gZxI/2fNLfxjpWppkEQLSINC4SJMlJdOZyHv+9Y2VUjap2BQ65kp 6OW1CXB5DEkp/Xst5TRHPAqe2Qcl/pJ2BNCzEXT8PYwF8FuAqeUKwtJ2tteiGsFpcVr00JNgPCS 6yuhpVIFtvMM6z2EHZJwMA0CsKNPH2kEhLgFEFjwB7N1JWQxpwAhBtAfksfK1qrup8FS40PePwu FljpRDWbrXwMCB1AESxU3JBo5cCdgj3PLu+hmLSsUL7vN2pj/pPc3zupQG/dHKNdtiCVEGaWc5a n91LzJhKWXvMI/ha6LuzxQqx3Wol8iB9wxLqPM6+w5MaveojyP3eAQdyfG6sGr+YhIVJh9Lqfr1 REYF+Datn1fymfKhyjPC4dtybhmMMAkvR7C/ixF4fpavmgEb02sQGgw/Bk0qYS3hBJIYNv+rWaL dSPQzl17OqI7YppPKmt1JQrqmO8PIrwSUiSeLpWqT4+9qdYXuEX1lISAujvI86oVt3BoGZFcxD8 H0t6+dhtRoPvvuP7toumXBlJy+7OvFu67fOE5pc+ae/IyQHfylIQcYZ5vTrqPazGRkQjO2sQTrM NxRGF6XHmMNikTw== X-Developer-Key: i=marcandre.lureau@redhat.com; a=openpgp; fpr=87A9BD933F87C606D276F62DDAE8E10975969CE5 X-Scanned-By: MIMEDefang 3.0 on 10.30.177.17 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: 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-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: 1790108948398158500 Signed-off-by: Marc-Andr=C3=A9 Lureau --- tests/qemu-iotests/117 | 5 ++--- tests/qemu-iotests/117.out | 8 +++----- 2 files changed, 5 insertions(+), 8 deletions(-) diff --git a/tests/qemu-iotests/117 b/tests/qemu-iotests/117 index 5cc9433f4a67..69d3a862d5e5 100755 --- a/tests/qemu-iotests/117 +++ b/tests/qemu-iotests/117 @@ -41,7 +41,6 @@ trap "_cleanup; exit \$status" 0 1 2 3 15 =20 _supported_fmt qcow2 _supported_proto file fuse -_require_hmp =20 _make_test_img 64k =20 @@ -66,8 +65,8 @@ _send_qemu_cmd $QEMU_HANDLE \ 'return' =20 _send_qemu_cmd $QEMU_HANDLE \ - "{ 'execute': 'human-monitor-command', - 'arguments': { 'command-line': 'qemu-io format \"write -P 42 0 64k\= "' } }" \ + "{ 'execute': 'x-qemu-io', + 'arguments': { 'device': 'format', 'command': 'write -P 42 0 64k' }= }" \ 'return' =20 _send_qemu_cmd $QEMU_HANDLE \ diff --git a/tests/qemu-iotests/117.out b/tests/qemu-iotests/117.out index 1cea9e021730..af2a30be9e84 100644 --- a/tests/qemu-iotests/117.out +++ b/tests/qemu-iotests/117.out @@ -12,11 +12,9 @@ Formatting 'TEST_DIR/t.IMGFMT', fmt=3DIMGFMT size=3D65536 'driver': 'IMGFMT', 'file': 'protocol' } } {"return": {}} -{ 'execute': 'human-monitor-command', - 'arguments': { 'command-line': 'qemu-io format "write -P 42 0 64k"'= } } -wrote 65536/65536 bytes at offset 0 -64 KiB, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec) -{"return": ""} +{ 'execute': 'x-qemu-io', + 'arguments': { 'device': 'format', 'command': 'write -P 42 0 64k' }= } +{"return": {"human-readable-text": "wrote 65536/65536 bytes at offset 0\n6= 4 KiB, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec)\n"}} { 'execute': 'quit' } {"timestamp": {"seconds": TIMESTAMP, "microseconds": TIMESTAMP}, "event"= : "SHUTDOWN", "data": {"guest": false, "reason": "host-qmp-quit"}} {"return": {}} --=20 2.56.0.rc0.29.g47ce80527c56 From nobody Sat Sep 26 20:01:40 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=1790108970; cv=none; d=zohomail.com; s=zohoarc; b=RRA0tx7yGOa6yo5Phxiew/Ffpms8aw9g0xOVSnBIuWtlDuDU2fwsc+RqZGssIK+PAXC1dqkbRe6wugZ1cI5K/ayLJLnI8S8ytJC4GpKAXtioGPExrzr4KgIee0YKrY3NJk39In6seoo542YFNlbBHM+WQWYhoEmgbvt9iUnVOTU= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1790108970; 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:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=V4LM5aeuXcVbmLarJCZBwKIzCX8/oTrwbPV9HPdl34I=; b=X38r7q3586R9z5Lc+qQLV5I8zQkPsUAMg/W6StpHxFECaaq9IPT/PiRL+GvEE/mSjc+LPW2F5wV8xPXuRrdlqPp9juE6utybaf1DCt4490Z+Bu0/CGlKSfcE7lQd4mF60ZHffXEMZ7D7EGi/fxtAV8tJf4RWnCAOLCvgBf7e31s= 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 1790108970545979.3357528708517; Tue, 22 Sep 2026 13:29:30 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists1p.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1x971Z-0006RL-1O; Tue, 22 Sep 2026 16:23:33 -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 1x970d-0002hu-Pw for qemu-devel@nongnu.org; Tue, 22 Sep 2026 16:22:36 -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 1x970c-0000IC-DM for qemu-devel@nongnu.org; Tue, 22 Sep 2026 16:22:35 -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-139-8dLI9xbVNfuSmBo1dYHF1Q-1; Tue, 22 Sep 2026 16:22:30 -0400 Received: from mx-prod-int-05.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-05.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.17]) (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 7244D180059C; Tue, 22 Sep 2026 20:22:29 +0000 (UTC) Received: from localhost (headnet03.pony-001.prod.iad2.dc.redhat.com [10.2.32.114]) by mx-prod-int-05.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id 809A11956095; Tue, 22 Sep 2026 20:22:28 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1790108553; 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=V4LM5aeuXcVbmLarJCZBwKIzCX8/oTrwbPV9HPdl34I=; b=UNaBj1aZhtaCEhL6gQMdXDq+miDYHZF7Q6whMnKfezylsdx58fXePjD0c61wF+uum4xXkR LwM5d25gOf3wbMIJmgZPo2Se3V8f6chthDhQaiTb7/ynN8k6Bnadxpc6xMjV1Dn9xRTkhY QpzcBRQS03cgG4Nx0h5Ne4UrtuVy3YI= X-MC-Unique: 8dLI9xbVNfuSmBo1dYHF1Q-1 X-Mimecast-MFC-AGG-ID: 8dLI9xbVNfuSmBo1dYHF1Q_1790108549 From: =?utf-8?q?Marc-Andr=C3=A9_Lureau?= Date: Wed, 23 Sep 2026 00:18:03 +0400 Subject: [PATCH 56/88] qemu-iotests/119: migrate away from HMP MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Message-Id: <20260923-nohmp-v1-56-ebc029d4bd80@redhat.com> References: <20260923-nohmp-v1-0-ebc029d4bd80@redhat.com> In-Reply-To: <20260923-nohmp-v1-0-ebc029d4bd80@redhat.com> To: qemu-devel@nongnu.org Cc: Kevin Wolf , =?utf-8?q?Marc-Andr=C3=A9_Lureau?= , Hanna Reitz , qemu-block@nongnu.org X-Developer-Signature: v=1; a=openpgp-sha256; l=1725; i=marcandre.lureau@redhat.com; h=from:subject:message-id; bh=GJxSfMxlvHeuJv+jKQIiEGaB13SWll4bTJtGajT1MwQ=; b=owEBbQKS/ZANAwAKAdro4Ql1lpzlAcsmYgBqsuKyfNiMp2VfkPiZGlcumTQa4UxmcpeLxSQBy eKtp2HbMNqJAjMEAAEKAB0WIQSHqb2TP4fGBtJ29i3a6OEJdZac5QUCarLisgAKCRDa6OEJdZac 5SBmEACqTMBnWgY6RhHLaM8YXHE/n7NsSQl/LoY/6HYfS2Q68JyR5/f/meY+YxiqXQuUSIgl/he 7gbCDU2nNExBxhUrhhv/xP4qdyTfSFnEmu99q06aMlrLGAbYtXWfPd7Hx184cq0TlX12pqzUxEA bkc42GnAFz728DHzWH1EkMZ7EAadpp4SgqMQe3DXhpf4LmDi30wwO1rYAc+pFGcGGTujlBWgcyq 2NUvtPc7iNTaaqCH3O+MhJ3rQLCcszbRUX+1XIjn6zdd4iRU+sZInqs6O/WtElGgH61waJlCguX LK0cQ70JOOvIaw/OVd+SGvLW5ZK4ZS35xKreZGlUqtiEupkI+IJe7obRNJU+Jb/VBRTg6l8jcuk 7MOUA/qeQAbYak7Ckeopz7/fatJtIpCzy+cgZ/0cTIldFbiWqwNa/mHvCcnX4euO1bTqRkCZyeV 5skl/8v5YLhxG51nPSOXwNGJa758Vh5MT6PswtpNtmxOQ4zIqJos1OCBhnkWu91GGI1tL/1VIsF UBXCuGPCVvDocMwV1qdTuNMiab1cii3INA4IFrUY8LlgAVjws67U6zpTT4SxDljgdSWBg5GonV0 lck3R/F7QvZ12XmX27/bja29Ydup0d+FGeiVzTl+0s8qQUZHKOuizOc9ycL0/mXCtiN0XjUP8M2 z/bTgHZ5jiPZpLA== X-Developer-Key: i=marcandre.lureau@redhat.com; a=openpgp; fpr=87A9BD933F87C606D276F62DDAE8E10975969CE5 X-Scanned-By: MIMEDefang 3.0 on 10.30.177.17 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: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 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, SPF_HELO_PASS=-0.001, SPF_PASS=-0.001 autolearn=unavailable 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: 1790108972506158500 Signed-off-by: Marc-Andr=C3=A9 Lureau --- tests/qemu-iotests/119 | 5 ++--- tests/qemu-iotests/119.out | 4 +--- 2 files changed, 3 insertions(+), 6 deletions(-) diff --git a/tests/qemu-iotests/119 b/tests/qemu-iotests/119 index ce1b62521f59..6b95f9224b3e 100755 --- a/tests/qemu-iotests/119 +++ b/tests/qemu-iotests/119 @@ -41,13 +41,12 @@ trap "_cleanup; exit \$status" 0 1 2 3 15 _supported_fmt raw _supported_proto nbd _supported_os Linux -_require_hmp =20 _make_test_img 64M # This should not crash echo "{'execute': 'qmp_capabilities'} - {'execute': 'human-monitor-command', - 'arguments': {'command-line': 'qemu-io drv \"read -P 0 0 64k\"'}} + {'execute': 'x-qemu-io', + 'arguments': {'device': 'drv', 'command': 'read -P 0 0 64k'}} {'execute': 'quit'}" \ | $QEMU -nographic -drive id=3Ddrv,if=3Dnone,file=3D"$TEST_IMG",driver= =3Dnbd \ -qmp stdio -nodefaults \ diff --git a/tests/qemu-iotests/119.out b/tests/qemu-iotests/119.out index 45f82a4faa93..edd555fdd2d7 100644 --- a/tests/qemu-iotests/119.out +++ b/tests/qemu-iotests/119.out @@ -2,9 +2,7 @@ QA output created by 119 Formatting 'TEST_DIR/t.IMGFMT', fmt=3DIMGFMT size=3D67108864 QMP_VERSION {"return": {}} -read 65536/65536 bytes at offset 0 -64 KiB, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec) -{"return": ""} +{"return": {"human-readable-text": "read 65536/65536 bytes at offset 0\n64= KiB, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec)\n"}} {"timestamp": {"seconds": TIMESTAMP, "microseconds": TIMESTAMP}, "event"= : "SHUTDOWN", "data": {"guest": false, "reason": "host-qmp-quit"}} {"return": {}} =20 --=20 2.56.0.rc0.29.g47ce80527c56 From nobody Sat Sep 26 20:01:40 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=1790108921; cv=none; d=zohomail.com; s=zohoarc; b=CfFH0dChsJ9YASqpawuKiMcFG+4eOEqqBrNNOfquIJJzqP6EYV2ZY6+bRKiKh/y10g6ik2htKko/lxykOwbh78xXfWUwUmreZ5K9PmL7jb9c1wqkSld46jytGX3IEcITsnSGiETcuypdETT4qA5X6P5hUBYrUVJ69z4hTCQpJjs= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1790108921; 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:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=TJDmsFu8kUStZLf37ukvoULZtZY1UoVdrTEAldri5oE=; b=IaomDPMJ9XImaLPKeVn8D/CxCJhAnJt9X8onzYAs9Ngb9aYb/xF47QTPpVqfTA8MbVa1F6WEaoYvwtoJ3NnzGYo7jNLgN6t/2QxoLZxgapmcPhoZwgPUJoeptttN+zvjfXwBicuQS/WCtfFNjeSrKRGRqZj7hagGYwhH2hmpV9Q= 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 1790108921337313.4950671733237; Tue, 22 Sep 2026 13:28:41 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists1p.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1x971N-0005Bd-H2; Tue, 22 Sep 2026 16:23:21 -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 1x970h-0002rp-MT for qemu-devel@nongnu.org; Tue, 22 Sep 2026 16:22:52 -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 1x970g-0000Ib-4f for qemu-devel@nongnu.org; Tue, 22 Sep 2026 16:22:39 -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-551-meR3CylKNGefHC9zkzFsZw-1; Tue, 22 Sep 2026 16:22:33 -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 1CA3618005A2; Tue, 22 Sep 2026 20:22:33 +0000 (UTC) Received: from localhost (headnet03.pony-001.prod.iad2.dc.redhat.com [10.2.32.114]) by mx-prod-int-10.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id 4D34F418; Tue, 22 Sep 2026 20:22:31 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1790108557; 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=TJDmsFu8kUStZLf37ukvoULZtZY1UoVdrTEAldri5oE=; b=TWzrOgKOZMilqUAi92iUFrcMQ9FfvjtRV+vHUGczcH5BDmpfllQ+863/Sso8XuqkzpoOBf nSJMSVp5Uwyltxh4VQeirlLFyn1za6n/zN0QORF18uLhDFRo0FVLws2qUT52joZO9Zvrst 7+Z28VsmoizaoSjEdKGCkGMVjtNgd/k= X-MC-Unique: meR3CylKNGefHC9zkzFsZw-1 X-Mimecast-MFC-AGG-ID: meR3CylKNGefHC9zkzFsZw_1790108553 From: =?utf-8?q?Marc-Andr=C3=A9_Lureau?= Date: Wed, 23 Sep 2026 00:18:04 +0400 Subject: [PATCH 57/88] qemu-iotests/060: migrate away from HMP MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Message-Id: <20260923-nohmp-v1-57-ebc029d4bd80@redhat.com> References: <20260923-nohmp-v1-0-ebc029d4bd80@redhat.com> In-Reply-To: <20260923-nohmp-v1-0-ebc029d4bd80@redhat.com> To: qemu-devel@nongnu.org Cc: Kevin Wolf , =?utf-8?q?Marc-Andr=C3=A9_Lureau?= , Hanna Reitz , qemu-block@nongnu.org X-Developer-Signature: v=1; a=openpgp-sha256; l=2757; i=marcandre.lureau@redhat.com; h=from:subject:message-id; bh=tGyM0cVGMQ+xwJ+2qai4Ws7GSoRgwxRYOOvuYnCNttk=; b=owEBbQKS/ZANAwAKAdro4Ql1lpzlAcsmYgBqsuKywp7CjizqGgxtYwzJsu4rUZUR+yaoG2Giu 0B3eELfKVaJAjMEAAEKAB0WIQSHqb2TP4fGBtJ29i3a6OEJdZac5QUCarLisgAKCRDa6OEJdZac 5Va4D/0SSqTghf2V/zhQh8mvAlA9/KNYkaM4GoswU0y2BUjb/UAfti+I0a++IDIkbuVBR+H0+ot ljhx7j5fJUbeykqlvmCttfUq1aU8Fnr+XAzeOLJNvyk/goBY76xbcP1T+QZtjwICWcz5jL34oci qaoPD9Edw7AObBDfp/or644d6FZEqkqBpl9zDgH6p/xhDpNuodwvyBElGaU8Tf8PZf16L2Ss6kU bCBkVUHwn5TEGIYvJP080SDDxR3qf5IQOvF4o3VJ6vj0713aAAwRBR+1MPxk1W8igdFlnFbQJwO KWEsXyc2wRjzU2LWTXNhzWAB4Qxa7ytZE2xsXYSzXE98aNLE/c1bbhdb6M+HrJjfZXTf0IJvcDN mJqkw8oVi2FdicHxad723DYULdTVcgSi3VzqpEqP/dvr040azTqdR1OeeePx6YyhxYgYJ0UJTzS hWJ4P1fkz/Dgs8LSvgFBwPre55Wz5paUZLvQzNHGPWmoKjKRRVxFFm4Nxgx+1+9Z5Ar3mKdtGwM m7ujMRJmRtX2/FcTifIEkpJSS/pO/Ug8PKQr4m3LOEMv6jgLtxi/V58IRCwxfh0FChUsI7XNjoN trLQeuUY5nP5kmCPHWQ7/c5yKFdbeUCfZXVuKJdjXDZqAZr4H+YT6esg8LKYVduRwP/jA3i9w+t +MNckLTrxV7by2g== 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: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 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, SPF_HELO_PASS=-0.001, SPF_PASS=-0.001 autolearn=unavailable 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: 1790108922266158500 Signed-off-by: Marc-Andr=C3=A9 Lureau --- tests/qemu-iotests/060 | 9 ++++----- tests/qemu-iotests/060.out | 2 +- 2 files changed, 5 insertions(+), 6 deletions(-) diff --git a/tests/qemu-iotests/060 b/tests/qemu-iotests/060 index 8d06f84df16b..c2c1cd815f0f 100755 --- a/tests/qemu-iotests/060 +++ b/tests/qemu-iotests/060 @@ -56,7 +56,6 @@ _unsupported_imgopts 'compat=3D0.10' data_file \ =20 # The repair process will create a large file - so check for availability = first _require_large_file 64G -_require_hmp =20 rt_offset=3D65536 # 0x10000 (XXX: just an assumption) rb_offset=3D131072 # 0x20000 (XXX: just an assumption) @@ -450,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 \ @@ -469,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 8870a478231c..833f29c9b031 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 --=20 2.56.0.rc0.29.g47ce80527c56 From nobody Sat Sep 26 20:01:40 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=1790109003; cv=none; d=zohomail.com; s=zohoarc; b=hnbwQcJH1Xp2OOBZJdQ5Y5VFLevpqOVspENRTO7Izb4cEq6bge/Ktm5L38SgtOUhtGEdv22svZX3m+i9OJPPfSKQBDnkOfusm4BKXsanKz2udLR22cub3k8b9x8kYeDrlb+mK3n2kp2yaROvyROpqcCl6VsJ31+2vP6Ik3HE3WM= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1790109003; 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:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=iLmncJkTuaO8OiV1Z6WGTW7ToYzktVHhyIoIa0hQkTY=; b=m9hEkX89EOGHlUBTKf6Roau3iPRLOcOKHFSt3nkcPijMgbMSWDDx+ysiLPGbTQnZulWW0JjbGuGPwFaFnKTWtt6faxWB+xOULWTZXXBU+m9FxZLOreO8ItTgSkf7cnuM8VDio+RIrEfFvEJvVA6L9ddP9h+C6/NhuF6Dw/uxVjk= 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 17901090034051009.3822843586681; Tue, 22 Sep 2026 13:30:03 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists1p.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1x971S-0005nf-GD; Tue, 22 Sep 2026 16:23:26 -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 1x970m-0002uu-0X for qemu-devel@nongnu.org; Tue, 22 Sep 2026 16:22:54 -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 1x970k-0000It-EA for qemu-devel@nongnu.org; Tue, 22 Sep 2026 16:22:43 -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-231-lzsKE4_nNveb8gyYcPELWw-1; Tue, 22 Sep 2026 16:22:38 -0400 Received: from mx-prod-int-05.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-05.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.17]) (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 8F9361828AC5; Tue, 22 Sep 2026 20:22:37 +0000 (UTC) Received: from localhost (headnet03.pony-001.prod.iad2.dc.redhat.com [10.2.32.114]) by mx-prod-int-05.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id E6F881956095; Tue, 22 Sep 2026 20:22:35 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1790108561; 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=iLmncJkTuaO8OiV1Z6WGTW7ToYzktVHhyIoIa0hQkTY=; b=L8k4kBKSQyRf5ySrtqL83Btn3BIfc1gpFOWmke/V07IRtrUARZSzOhdPfkuNJE1DspLvOP KpkwzmWkX8IEXxV14VKapgJYBtoynWlIwYSURcuygoNnaNkT9+NnG4j88cWnSX7cVRQhFP ZJedaL+/XsKV8HO7pj5mkJ6UQZoJR8E= X-MC-Unique: lzsKE4_nNveb8gyYcPELWw-1 X-Mimecast-MFC-AGG-ID: lzsKE4_nNveb8gyYcPELWw_1790108557 From: =?utf-8?q?Marc-Andr=C3=A9_Lureau?= Date: Wed, 23 Sep 2026 00:18:05 +0400 Subject: [PATCH 58/88] qemu-iotests/071: migrate away from HMP MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Message-Id: <20260923-nohmp-v1-58-ebc029d4bd80@redhat.com> References: <20260923-nohmp-v1-0-ebc029d4bd80@redhat.com> In-Reply-To: <20260923-nohmp-v1-0-ebc029d4bd80@redhat.com> To: qemu-devel@nongnu.org Cc: Kevin Wolf , =?utf-8?q?Marc-Andr=C3=A9_Lureau?= , Hanna Reitz , qemu-block@nongnu.org X-Developer-Signature: v=1; a=openpgp-sha256; l=4015; i=marcandre.lureau@redhat.com; h=from:subject:message-id; bh=zMVUUohbio/jDSQJvutRU7usXRmpt1kSpc4NTAIWYds=; b=owEBbQKS/ZANAwAKAdro4Ql1lpzlAcsmYgBqsuKy1mK/r+JHPQ3MkMcIfljgU/Bnu29FZAhCX hqeUZ9ZvaSJAjMEAAEKAB0WIQSHqb2TP4fGBtJ29i3a6OEJdZac5QUCarLisgAKCRDa6OEJdZac 5Y2JEACU3hLrXtintSHAMOp83bYnWuh6ebpJl2tPXT2tBvRnV60prkjzhomUoLGzMnSgf7jQbtN V+BjN+HtnJZpKVe2dQvsVTnkmPHOOraAJLrMfupEXWsLjouKlnGKQayZeCb7v9r2LWDA7rk2Lxf sXkf34KZKZeUKrh3/huU2UovmKnBr6DhE+FGEnbYRXt8F2ZaQqE7QBFxNbrFiAQV/2a0qnNBf7B u/9hZQKMFmMoTBOuwcwE1ZOj+5r131h5QtUdAyrB16+4xGqIZzcsZPA/KwxZ1+lQPs9+oe6MfUc JCh5HGyckWONcyAmu1nQS7jWhEJR8q9nwrSyZxwTnGuKl1kXEY5AZMIJhTg+zYzhbWpnIrZwnz9 rywaqvLLfNuuTJ4Mv0Pw1lF32NkH8oeXLmvE3lToBEGBCQ5mSdTD+bYJ8vWB0IyLJDIaY1H6WxJ Y55mNkQeugiJX9khOeHW6H3gsK1w0MnvRTkkWjknkoVA+chJFZ2adIN9ZBYssgyJ7BoebAIfBG+ C9pciiRyXmBni+V+PimKQ0dOgE6Uwd3GnjB6RRR1lQWEDOw+I4og5r0Qc2gj0IByLzjoOCqr/0N QXhSmPswOQTkQyVdgp3dv+FNFWVQzVGdjQAdwX6q2TMNaNwul26PaR+3Y2eTY7hDD+z+LJxcpXj WbjaD97sV5iCHLg== X-Developer-Key: i=marcandre.lureau@redhat.com; a=openpgp; fpr=87A9BD933F87C606D276F62DDAE8E10975969CE5 X-Scanned-By: MIMEDefang 3.0 on 10.30.177.17 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: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 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, SPF_HELO_PASS=-0.001, SPF_PASS=-0.001 autolearn=unavailable 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: 1790109004808158500 Signed-off-by: Marc-Andr=C3=A9 Lureau --- tests/qemu-iotests/071 | 31 ++++++++++++++++++------------- tests/qemu-iotests/071.out | 12 ++++-------- 2 files changed, 22 insertions(+), 21 deletions(-) diff --git a/tests/qemu-iotests/071 b/tests/qemu-iotests/071 index 83c4ce6314c5..463f5c02349c 100755 --- a/tests/qemu-iotests/071 +++ b/tests/qemu-iotests/071 @@ -43,7 +43,6 @@ _require_drivers blkdebug blkverify # blkdebug can only inject errors on bs->file, not on the data_file, # so this test does not work with external data files _unsupported_imgopts data_file -_require_hmp =20 do_run_qemu() { @@ -140,9 +139,10 @@ run_qemu < (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 1790108878964221.9625983938795; Tue, 22 Sep 2026 13:27:58 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists1p.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1x971Q-0005Xu-MM; Tue, 22 Sep 2026 16:23:24 -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 1x970p-0002v2-Ej for qemu-devel@nongnu.org; Tue, 22 Sep 2026 16:22:54 -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 1x970n-0000JF-WA for qemu-devel@nongnu.org; Tue, 22 Sep 2026 16:22:47 -0400 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-597-__rVABGVO6WD7nrRt_Dd-g-1; Tue, 22 Sep 2026 16:22:42 -0400 Received: from mx-prod-int-05.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-05.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.17]) (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 1A6BC1944AA8; Tue, 22 Sep 2026 20:22:41 +0000 (UTC) Received: from localhost (headnet03.pony-001.prod.iad2.dc.redhat.com [10.2.32.114]) by mx-prod-int-05.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id 36EC61956095; Tue, 22 Sep 2026 20:22:39 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1790108565; 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=WL/NB/LYpRz6GPQ1VlpD2yVcfpnkn7O81T6QScjcaI4=; b=EYcOFl8rF/7lgKf9PaIQv+u9y+4+VZbxEsYd5PCYY7Qr2huBIGBD2KMNDJ18+neeXkQuQW jyflQgapSRtepvWHV9cxqcjCE8B3ashIN7yrngYscvc2lqBdWoCXzZMk7RZVuGTYON7m5q RlSQ3vI3YOWMUuFdnLj9nNHKR0l3w5M= X-MC-Unique: __rVABGVO6WD7nrRt_Dd-g-1 X-Mimecast-MFC-AGG-ID: __rVABGVO6WD7nrRt_Dd-g_1790108561 From: =?utf-8?q?Marc-Andr=C3=A9_Lureau?= Date: Wed, 23 Sep 2026 00:18:06 +0400 Subject: [PATCH 59/88] qemu-iotests/081: migrate away from HMP MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Message-Id: <20260923-nohmp-v1-59-ebc029d4bd80@redhat.com> References: <20260923-nohmp-v1-0-ebc029d4bd80@redhat.com> In-Reply-To: <20260923-nohmp-v1-0-ebc029d4bd80@redhat.com> To: qemu-devel@nongnu.org Cc: Kevin Wolf , =?utf-8?q?Marc-Andr=C3=A9_Lureau?= , Hanna Reitz , qemu-block@nongnu.org X-Developer-Signature: v=1; a=openpgp-sha256; l=2873; i=marcandre.lureau@redhat.com; h=from:subject:message-id; bh=124vNbWIhMcpIZzIFSGGEJj9hzlUtGiHMDdivHQxJX0=; b=owEBbQKS/ZANAwAKAdro4Ql1lpzlAcsmYgBqsuKyfdNsQLY+n2iy0GM0BJ5bGKwBMJRWk2AYB biNOaIVLJGJAjMEAAEKAB0WIQSHqb2TP4fGBtJ29i3a6OEJdZac5QUCarLisgAKCRDa6OEJdZac 5Y3CD/9hDibiKvMKLjcTxH8QRP40Sjc48nh6Y+41XdQk//zGvpWD8Jhytmoquf3RpncxKzPifnz Kbxca86yt6xKUzMy7tiZRCrAY3lLMNtf8aqcErPXy85XD0fd+epMzT9VK/ufJ0czljL4tOgLy7V bONrnmatHDW4QEI0cHWqfy/uj6cjRSe2SAlxwQZtET1jbkoFH9oB5K/fianLfOJe/vqsO/OMOXJ GrnvXPpoV4kNUo3bHsnm+b2UJuljeLdgoU+T6PIlnZgVG8XFUBRS3UYohKVGS6+bsxzMlBeyB4y lIOVu211Ie+0zKzut7jdSBsufX4JqpN6VWnKsGDgFpR8/4pCCr/Ed5N12Ld9+Vh/9/LBsnwDBbr XCF8eieh9msQze0FcjKGhWcsRM+8xJjQGvEtZ61LZxe4z1DdKJOvtVXdrH+W2KAkWNqQOaWZjik iJnN0fB0kGt0pSWEGrZKMjLQ2zihIp7UbB3/yqfGPxRD30TrJ1V/Aam//u6Dd4wdPk4f7UfRZXh G6M6PqVVJgJhhMP0ybbtS8upwCn9I0QvAQOtoZI2B0YPqgR8uaqkR+RoVP9PfsBZPiGapwFuNqV tMPe9VvzQjL9TdqJdJahhBIbdh2Ag0jQXAgv1gdhUz8S5/SgWE9g2Jj/qG3v44mi985GHfePi+Q 808EPXH/OvwJ43g== X-Developer-Key: i=marcandre.lureau@redhat.com; a=openpgp; fpr=87A9BD933F87C606D276F62DDAE8E10975969CE5 X-Scanned-By: MIMEDefang 3.0 on 10.30.177.17 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: 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-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: 1790108880004158500 Signed-off-by: Marc-Andr=C3=A9 Lureau --- tests/qemu-iotests/081 | 11 ++++++----- tests/qemu-iotests/081.out | 8 ++------ 2 files changed, 8 insertions(+), 11 deletions(-) diff --git a/tests/qemu-iotests/081 b/tests/qemu-iotests/081 index d9e729f674c6..f8bf9232bb58 100755 --- a/tests/qemu-iotests/081 +++ b/tests/qemu-iotests/081 @@ -44,7 +44,6 @@ _supported_proto file _supported_os Linux _require_drivers quorum _require_devices virtio-scsi -_require_hmp =20 do_run_qemu() { @@ -138,9 +137,10 @@ run_qemu < (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 1790109004038472.0909477069299; Tue, 22 Sep 2026 13:30:04 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists1p.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1x971d-0006sY-IL; Tue, 22 Sep 2026 16:23:37 -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 1x970r-0002v6-8q for qemu-devel@nongnu.org; Tue, 22 Sep 2026 16:22:54 -0400 Received: from us-smtp-delivery-124.mimecast.com ([170.10.133.124]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1x970p-0000JS-KW for qemu-devel@nongnu.org; Tue, 22 Sep 2026 16:22:48 -0400 Received: from mx-prod-mc-05.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-54-R_fPO-OJM865VgXp7jNyVw-1; Tue, 22 Sep 2026 16:22:45 -0400 Received: from mx-prod-int-01.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-01.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.4]) (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-05.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id 87FE319772EE; Tue, 22 Sep 2026 20:22:44 +0000 (UTC) Received: from localhost (headnet03.pony-001.prod.iad2.dc.redhat.com [10.2.32.114]) by mx-prod-int-01.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id 7E8623000223; Tue, 22 Sep 2026 20:22:43 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1790108567; 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=3bDmFYUs/x08CWZsQUX0w/mf6oNg/SybCHy3tyzihKU=; b=N/D8Y8uCwcZyg9uzNN0VDMPuR0tZ8SBxd/i11c2pxtV+lmQV319T9GVf8Jr4zVjvoCUopG mIXDUAmG20IdtZWIXA+XfLYpNildqmSIqepp65py/tle8+EWzVp+vVEDTW6CmPFw3Mv6eW OAg6w1sCotlz6DjwUX2eJ/yboetsRZc= X-MC-Unique: R_fPO-OJM865VgXp7jNyVw-1 X-Mimecast-MFC-AGG-ID: R_fPO-OJM865VgXp7jNyVw_1790108564 From: =?utf-8?q?Marc-Andr=C3=A9_Lureau?= Date: Wed, 23 Sep 2026 00:18:07 +0400 Subject: [PATCH 60/88] qemu-iotests/102: migrate away from HMP MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Message-Id: <20260923-nohmp-v1-60-ebc029d4bd80@redhat.com> References: <20260923-nohmp-v1-0-ebc029d4bd80@redhat.com> In-Reply-To: <20260923-nohmp-v1-0-ebc029d4bd80@redhat.com> To: qemu-devel@nongnu.org Cc: Kevin Wolf , =?utf-8?q?Marc-Andr=C3=A9_Lureau?= , Hanna Reitz , qemu-block@nongnu.org X-Developer-Signature: v=1; a=openpgp-sha256; l=2706; i=marcandre.lureau@redhat.com; h=from:subject:message-id; bh=3yUAha34BoNWc8nsQWp4lnPh9BerL6wj9EeguM5KeGk=; b=owEBbQKS/ZANAwAKAdro4Ql1lpzlAcsmYgBqsuKyGyG06ta9BHUy0tNGk9XBr/Cg6BC375r5l 4KeC93pvFGJAjMEAAEKAB0WIQSHqb2TP4fGBtJ29i3a6OEJdZac5QUCarLisgAKCRDa6OEJdZac 5YSEEACOxXFNAI9cNwKMhEGwslRF63ONsjL4W8AO7nWCD/0+EqoBJacRb9uyhCmg0lPX6C6kxcB fxaHYTQCIwCzIW+wWjJJY95JYr4qGXtaV7+vuLfoIvtk0HC5d1fiFi3tt+CGFCiScIYVjzjl1bR rsYs4QtjaRO0K1lNxbV7CUOYLigICVim/+TGvvBYi4Zl8kfEqj49DOYMNwoKzdHn52bzy5ni851 q4JJTAKre6Onb5Kw9EiN8ZUN+35oLKfSHzdQ+dX3JDuZWwVhdK3/5l+n2zulLYzv9vwYPHsiZ6s 6kMdF+ZUwBovxsdM2dRZkj60J7cEJ8vj7Aoxtpfr525IubWbsrcbDVAdYo0ipEACxZ1WIzs63UQ cB2xb95R6hhigpVj5YyJ9JtOyMAmjJ1+beINSKWavjUVJFxFeUCpEOR4zHX9ZtccFCy9smjJGuP WEkhHqCGx1kD0cvydXHmYVTXgLXrzagdm6jck4MaSjuDF27DTA9a1PQNi9pKpWMtvxs3uI4EqPj CTiwifmeEBxg6LD/JgnRP4JhSIpS8x8Vl4w3IEBs+TLFUhCkpiV9cNGSDhS5YPbFdHJUhH09J/H r8s4rrVEqlGdanPzuAPmrHRjWlpCfXGFJ8WOsOZzky5cY9nT7V5W7nqAIwu7//xHlINyw8sS+cH zFUpJmUgmBh8Hdg== X-Developer-Key: i=marcandre.lureau@redhat.com; a=openpgp; fpr=87A9BD933F87C606D276F62DDAE8E10975969CE5 X-Scanned-By: MIMEDefang 3.4.1 on 10.30.177.4 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.133.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_H3=0.001, RCVD_IN_MSPIKE_WL=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-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: 1790109004806158500 No need to substitute qemu-io command. Signed-off-by: Marc-Andr=C3=A9 Lureau --- tests/qemu-iotests/102 | 21 ++++++++++++++------- tests/qemu-iotests/102.out | 12 ++++++++---- 2 files changed, 22 insertions(+), 11 deletions(-) diff --git a/tests/qemu-iotests/102 b/tests/qemu-iotests/102 index 5db8180d3bb7..b70053eee302 100755 --- a/tests/qemu-iotests/102 +++ b/tests/qemu-iotests/102 @@ -41,7 +41,6 @@ trap "_cleanup; exit \$status" 0 1 2 3 15 =20 _supported_fmt qcow2 _supported_proto file fuse -_require_hmp =20 IMG_SIZE=3D64K =20 @@ -67,18 +66,26 @@ echo _make_test_img $IMG_SIZE $QEMU_IO -c 'write 0 64k' "$TEST_IMG" | _filter_qemu_io =20 -qemu_comm_method=3Dmonitor _launch_qemu -drive if=3Dnone,file=3D"$TEST_IMG= ",id=3Ddrv0 +_launch_qemu -drive if=3Dnone,file=3D"$TEST_IMG",id=3Ddrv0 =20 -# Wait for a prompt to appear (so we know qemu has opened the image) -_send_qemu_cmd $QEMU_HANDLE '' '(qemu)' +_send_qemu_cmd $QEMU_HANDLE \ + "{ 'execute': 'qmp_capabilities' }" \ + 'return' =20 $QEMU_IMG resize --shrink --image-opts \ "driver=3Draw,file.driver=3Dfile,file.filename=3D$TEST_IMG,file.lockin= g=3Doff" \ $((5 * 64 * 1024)) =20 -_send_qemu_cmd $QEMU_HANDLE 'qemu-io drv0 map' 'allocated' \ - | sed -e 's/^(qemu).*qemu-io drv0 map...$/(qemu) qemu-io drv0 map/' -_send_qemu_cmd $QEMU_HANDLE 'quit' '' +_send_qemu_cmd $QEMU_HANDLE \ + "{ 'execute': 'x-qemu-io', + 'arguments': { 'device': 'drv0', 'command': 'map' } }" \ + 'return' + +_send_qemu_cmd $QEMU_HANDLE \ + "{ 'execute': 'quit' }" \ + 'return' + +wait=3D1 _cleanup_qemu =20 # success, all done echo '*** done' diff --git a/tests/qemu-iotests/102.out b/tests/qemu-iotests/102.out index 320ed5a52ba9..13dee5bdecd6 100644 --- a/tests/qemu-iotests/102.out +++ b/tests/qemu-iotests/102.out @@ -15,9 +15,13 @@ Offset Length File Formatting 'TEST_DIR/t.IMGFMT', fmt=3DIMGFMT size=3D65536 wrote 65536/65536 bytes at offset 0 64 KiB, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec) -QEMU X.Y.Z monitor - type 'help' for more information -(qemu) +{ 'execute': 'qmp_capabilities' } +{"return": {}} Image resized. -(qemu) qemu-io drv0 map -64 KiB (0x10000) bytes allocated at offset 0 bytes (0x0) +{ 'execute': 'x-qemu-io', + 'arguments': { 'device': 'drv0', 'command': 'map' } } +{"return": {"human-readable-text": "64 KiB (0x10000) bytes allocated a= t offset 0 bytes (0x0)\n"}} +{ 'execute': 'quit' } +{"timestamp": {"seconds": TIMESTAMP, "microseconds": TIMESTAMP}, "event"= : "SHUTDOWN", "data": {"guest": false, "reason": "host-qmp-quit"}} +{"return": {}} *** done --=20 2.56.0.rc0.29.g47ce80527c56 From nobody Sat Sep 26 20:01:40 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=1790108943; cv=none; d=zohomail.com; s=zohoarc; b=euoZqPY1R4IrtRlzYZrarik3w1cquLYKYDLzwYx/s2/KpbimBkooZX20l1VE/ZB7rBW4uROZynCa01ZyYnhHYYFfHiTnEPaMc24ZRRZaf96aOHd9tiKs9CQ3tU7R0aDnmbcU0+DlH+rlXdsoDoC8WV9g8pvoDlPzBSxR2fAtkGA= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1790108943; 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:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=mkdniCriR77U7hKX74lx3bmC7dS9jW3MaQ5Y3lghhlw=; b=ZceJMd8HEvo0icDetGOjgBMLGWB6M5HlcThUtBtrNRo8ghnu+iLE0UTTSq/st4mAQbovdym3ZVpMo7zCxJiOV3AvKIY2pBJM3EZvTHfcITiANeQvklqVVmNmhnZJSGSJBjaaZUVOoCXdvwISJWNnCUihYnBDrmDTnBcxJs2DeY8= 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 1790108943686877.049520311858; Tue, 22 Sep 2026 13:29:03 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists1p.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1x971h-0007JY-7I; Tue, 22 Sep 2026 16:23:41 -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 1x970x-0002ve-7d for qemu-devel@nongnu.org; Tue, 22 Sep 2026 16:22:56 -0400 Received: from us-smtp-delivery-124.mimecast.com ([170.10.133.124]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1x970v-0000K9-OY for qemu-devel@nongnu.org; Tue, 22 Sep 2026 16:22:54 -0400 Received: from mx-prod-mc-08.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-194-sjUqAHZ1NnyQ9adafL2sow-1; Tue, 22 Sep 2026 16:22:49 -0400 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-08.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id 66ABE18558A1; Tue, 22 Sep 2026 20:22:48 +0000 (UTC) Received: from localhost (headnet03.pony-001.prod.iad2.dc.redhat.com [10.2.32.114]) by mx-prod-int-08.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id 620671800446; Tue, 22 Sep 2026 20:22:47 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1790108572; 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=mkdniCriR77U7hKX74lx3bmC7dS9jW3MaQ5Y3lghhlw=; b=CFQcQVJAiCBY1RWrxgyaOras1xadtjUV1aKFn8V9j8L6rOGHFBDqI6LGJZmXHOTJshFzVr INQgWSw7WjQgKx6FNSo+I5h68lKhuIpX+mrP0M1cbiq/zJ2NlxX2A/4imRlo0FMxOV2Tlw rLSEmoDScB1k7UIroMa+FLKqDDzw7sc= X-MC-Unique: sjUqAHZ1NnyQ9adafL2sow-1 X-Mimecast-MFC-AGG-ID: sjUqAHZ1NnyQ9adafL2sow_1790108568 From: =?utf-8?q?Marc-Andr=C3=A9_Lureau?= Date: Wed, 23 Sep 2026 00:18:08 +0400 Subject: [PATCH 61/88] qemu-iotests/091: migrate away from HMP MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Message-Id: <20260923-nohmp-v1-61-ebc029d4bd80@redhat.com> References: <20260923-nohmp-v1-0-ebc029d4bd80@redhat.com> In-Reply-To: <20260923-nohmp-v1-0-ebc029d4bd80@redhat.com> To: qemu-devel@nongnu.org Cc: Kevin Wolf , =?utf-8?q?Marc-Andr=C3=A9_Lureau?= , Hanna Reitz , qemu-block@nongnu.org X-Developer-Signature: v=1; a=openpgp-sha256; l=2806; i=marcandre.lureau@redhat.com; h=from:subject:message-id; bh=19WJCvs1BlLgwDnaaKhFfxknvjgxpYumnQuOjA12XsI=; b=owEBbQKS/ZANAwAKAdro4Ql1lpzlAcsmYgBqsuKyAqBrYWDowmfnF4gExPKs5mkF4qdfBoIOa 6eqLaPW5MSJAjMEAAEKAB0WIQSHqb2TP4fGBtJ29i3a6OEJdZac5QUCarLisgAKCRDa6OEJdZac 5WOVD/4wqmg+zf/jJ0EzUVzYzQpMTicm+zB68gAcjNTL1cC+rqFvoZ09aSzc4Y2ho8NJk+FEpeD cxYhieRxGPG0WgC0gICKdazCIOxOBNa1n3ooHQeh51d4khCigdclAIujcdLhQFQLfOxLTm+52ga 7s8dYEdJpNIgOefL65NyUoLoiCJCK6VLk299ELgeIhgDQ+BdKN/WFGJFPcwFVLrCm2ZBQz4TCHJ Mg4x8/8xESOMBh62QWT4EpEoArR7Zh4SP1YMYCsZxNaLW+Cxzaz8CH3WJgg6VYIs98WbokGQA6k hPZT+QFKqwJw2QfLe5GcPxfsRtzOF2s+Cti3RBMzqvBp0T1RQenT9b4u+DIxy8/yuVIo5d9+2yx HLXuiSyrulW8q/UvtxNbQMVuhypKESmG3XsIoxviRa0Jk/xCxJ6isaUDwL6nXY88P8s84ZVki49 MW8a96sHqtRKnOkzna8oqzJtl0HZ9S4aYUAN1kP7Bt/KzKm/pbszTaRVOoq7RbEtDByUeXajqT5 XfRIhUb/7S8kPmduH64W6bvDijAcoYyLqm45ns6H+kev7aJHOJMkHutfu9E5XFC49jeIrqhe2rN 5Pdms0cnVLEZ3g3N5kCPd+R5Cml+H9HpBExTzurjcxHSVtXxyV7MQKv1HuM1Jovrm1dyTiZAXyB E9LMyypW0lVIlag== X-Developer-Key: i=marcandre.lureau@redhat.com; a=openpgp; fpr=87A9BD933F87C606D276F62DDAE8E10975969CE5 X-Scanned-By: MIMEDefang 3.4.1 on 10.30.177.111 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.133.124; envelope-from=marcandre.lureau@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 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_H3=0.001, RCVD_IN_MSPIKE_WL=0.001, SPF_HELO_PASS=-0.001, SPF_PASS=-0.001 autolearn=unavailable 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: 1790108944352158500 Signed-off-by: Marc-Andr=C3=A9 Lureau --- tests/qemu-iotests/091 | 45 +++++++++++++++++++++++++++++++++++---------- 1 file changed, 35 insertions(+), 10 deletions(-) diff --git a/tests/qemu-iotests/091 b/tests/qemu-iotests/091 index 626203d6fc93..d777f94e00e9 100755 --- a/tests/qemu-iotests/091 +++ b/tests/qemu-iotests/091 @@ -48,7 +48,6 @@ _supported_fmt qcow2 _supported_proto file fuse _supported_os Linux _supported_cache_modes writethrough none writeback -_require_hmp _default_cache_mode none writeback =20 size=3D1G @@ -61,7 +60,6 @@ echo echo =3D=3D=3D Starting QEMU VM1 =3D=3D=3D echo =20 -qemu_comm_method=3D"monitor" _launch_qemu -drive file=3D"${TEST_IMG}",cache=3D${CACHEMODE},aio=3D${AIOM= ODE},id=3Ddisk h1=3D$QEMU_HANDLE =20 @@ -77,26 +75,53 @@ echo =3D=3D=3D VM 1: Migrate from VM1 to VM2 =3D=3D=3D echo =20 silent=3Dyes -_send_qemu_cmd $h1 'qemu-io disk "write -P 0x22 0 4M"' "(qemu)" +_send_qemu_cmd $h1 \ + "{ 'execute': 'qmp_capabilities' }" \ + 'return' +_send_qemu_cmd $h2 \ + "{ 'execute': 'qmp_capabilities' }" \ + 'return' + +_send_qemu_cmd $h1 \ + "{ 'execute': 'x-qemu-io', + 'arguments': { 'device': 'disk', 'command': 'write -P 0x22 0 4M' } = }" \ + 'return' echo "vm1: qemu-io disk write complete" -_send_qemu_cmd $h1 "migrate \"exec: cat > '${MIG_FIFO}'\"" "(qemu)" +_send_qemu_cmd $h1 \ + "{ 'execute': 'migrate', + 'arguments': { 'uri': 'exec:cat > ${MIG_FIFO}' } }" \ + 'return' echo "vm1: live migration started" -qemu_cmd_repeat=3D20 _send_qemu_cmd $h1 "info migrate" "completed" +qemu_cmd_repeat=3D20 _send_qemu_cmd $h1 \ + "{ 'execute': 'query-migrate' }" \ + '"status": "completed"' echo "vm1: live migration completed" =20 echo echo =3D=3D=3D VM 2: Post-migration, write to disk, verify running =3D=3D= =3D echo =20 -_send_qemu_cmd $h2 'qemu-io disk "write 4M 1M"' "(qemu)" +_send_qemu_cmd $h2 \ + "{ 'execute': 'x-qemu-io', + 'arguments': { 'device': 'disk', 'command': 'write 4M 1M' } }" \ + 'return' echo "vm2: qemu-io disk write complete" -qemu_cmd_repeat=3D20 _send_qemu_cmd $h2 "info status" "running" +qemu_cmd_repeat=3D20 _send_qemu_cmd $h2 \ + "{ 'execute': 'query-status' }" \ + '"status": "running"' echo "vm2: qemu process running successfully" =20 echo "vm2: flush io, and quit" -_send_qemu_cmd $h2 'qemu-io disk flush' "(qemu)" -_send_qemu_cmd $h2 'quit' "" -_send_qemu_cmd $h1 'quit' "" +_send_qemu_cmd $h2 \ + "{ 'execute': 'x-qemu-io', + 'arguments': { 'device': 'disk', 'command': 'flush' } }" \ + 'return' +_send_qemu_cmd $h2 \ + "{ 'execute': 'quit' }" \ + 'return' +_send_qemu_cmd $h1 \ + "{ 'execute': 'quit' }" \ + 'return' =20 wait=3Dyes _cleanup_qemu >/dev/null =20 --=20 2.56.0.rc0.29.g47ce80527c56 From nobody Sat Sep 26 20:01:40 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=1790108699; cv=none; d=zohomail.com; s=zohoarc; b=KnQKI+LqH4kyxsJpbPn9o/xQ4QsYho8YbaMfFEKSN5eMqijHwgqOIQrOv+2OsVJcoSas4lsVgCBbiEb4Z6DNfFPMpEm3KMeMCBEXnJfyw2RaZXNs+tqw5pOzM3+sEjmq8DGYa+fQrN0WxJxpZJzBThi1ohwAq9leYL74FB5+y8Y= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1790108699; 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:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=ud4bWHBKs7U+iMRE57KMfTHPBw9J9aCTHLnWyZ1ljzQ=; b=Mzy1H/j9sXrukmEZIjJC2VHOnWV8j/7p/evbeMOhlWdM6lDnB4WaNRE2BzDSPri4skQwdy2CF5uTEcIixKKQ6GFpB9Fpo8z5F/oOGzGugVtrk6UaNbg6a9/MOoYffjPMSWI3hjeSHPLo6oVCs8B8Z5grSI1W0WkFujw9I6Mq+1o= 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 1790108699717322.48856420488823; Tue, 22 Sep 2026 13:24:59 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists1p.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1x971M-00059B-TK; Tue, 22 Sep 2026 16:23:21 -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 1x970z-0002xa-VH for qemu-devel@nongnu.org; Tue, 22 Sep 2026 16:22:58 -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 1x970y-0000KV-Jv for qemu-devel@nongnu.org; Tue, 22 Sep 2026 16:22:57 -0400 Received: from mx-prod-mc-01.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-171-hBnLBHOfNNKeIG1egS-U8g-1; Tue, 22 Sep 2026 16:22:52 -0400 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-01.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id B1AC519560AE; Tue, 22 Sep 2026 20:22:51 +0000 (UTC) Received: from localhost (headnet03.pony-001.prod.iad2.dc.redhat.com [10.2.32.114]) by mx-prod-int-08.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id E19471800446; Tue, 22 Sep 2026 20:22:50 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1790108575; 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=ud4bWHBKs7U+iMRE57KMfTHPBw9J9aCTHLnWyZ1ljzQ=; b=WO5ySh0OawqFmk4JVandBPENq0q23tK9oFm68feQUFCQ53gYk/IYFEz8PpijtPz6w8Z+OD IBlxqd6lq0b+0mbqU0GxRYY8A3Ta0LQ0c1POCDAwkQEe8sF/72tM+5Bdjl/2AMlPwF+B+2 JYtAG2HgVNBwFIIbAuhJhubQseL5i1c= X-MC-Unique: hBnLBHOfNNKeIG1egS-U8g-1 X-Mimecast-MFC-AGG-ID: hBnLBHOfNNKeIG1egS-U8g_1790108571 From: =?utf-8?q?Marc-Andr=C3=A9_Lureau?= Date: Wed, 23 Sep 2026 00:18:09 +0400 Subject: [PATCH 62/88] qemu-iotests/120: migrate away from HMP MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Message-Id: <20260923-nohmp-v1-62-ebc029d4bd80@redhat.com> References: <20260923-nohmp-v1-0-ebc029d4bd80@redhat.com> In-Reply-To: <20260923-nohmp-v1-0-ebc029d4bd80@redhat.com> To: qemu-devel@nongnu.org Cc: Kevin Wolf , =?utf-8?q?Marc-Andr=C3=A9_Lureau?= , Hanna Reitz , qemu-block@nongnu.org X-Developer-Signature: v=1; a=openpgp-sha256; l=1753; i=marcandre.lureau@redhat.com; h=from:subject:message-id; bh=JnT2p54tqoC4BrydBFoE4z6q9Ie79AGI9/p9IyjCXec=; b=owEBbQKS/ZANAwAKAdro4Ql1lpzlAcsmYgBqsuKymnwtMrKIS+troVRcR2rysVjhZ1YdGP6Vr c4ZmXxllKGJAjMEAAEKAB0WIQSHqb2TP4fGBtJ29i3a6OEJdZac5QUCarLisgAKCRDa6OEJdZac 5QPdD/9P9zST5ab7OA3jDFo4oKp/WuDlpIc9C+faCz7KK+MlUkZm87D6lkjD5mjvQS4xYw3+o0h Vsa9c2DrlV4Msp4lqiyhCcSf71K8In3A/bXx2dcEJmOJDyURe8VklUlB6FaYWVXpaWSCbcLVF/+ mmwK+asF11WGdPmyASx0QE1P4SQd5yX9cUYJYzeQYFe3FsOKGjDFjdQAmtnjShRJ3Zb3vaqXMSN GPYxwBIXUFPzvCA2DWN/TzQSSCYauIATN4bwqMWDnjfLvO93/wNNeg1+6l5TgTC4l57dK285iQm Fm4xwM3eNbAWiajj1W26r+0c37+BHkts/rOMevGmqbgga5+LUdOggKam3dFlv2C3cXLhTzpfqa7 W8MEA/OD++shUJum2zdgGTaHzJLNHmSPdVSEQtH4nsTMH8ZTq8pC7gtqwcfRB6qYPWCb86ECIUS JtdaVzwwRFRKEAOzrt2Mthgq6B7dnoXUq4hvJZggfmYoruiIbUNKfuXVX8oYAjGVNQ7WN2CBvwN eLb8saRnPb1tpp5YUkS2XhIvo6LFKwnAFfS1t3yCrGLwXc8mHHFV7llmoFg60Wb+amIjUqA5RKx 8yqH6WZqOf0kCDGLxUA0/gqp3uBfX7O4N7pCpfiweBPGedpL1V0VAxfbZUeLEgfz1jb4DF2+WQK cXLm5x6GkNQ1HMw== X-Developer-Key: i=marcandre.lureau@redhat.com; a=openpgp; fpr=87A9BD933F87C606D276F62DDAE8E10975969CE5 X-Scanned-By: MIMEDefang 3.4.1 on 10.30.177.111 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: 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-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: 1790108701129158500 Signed-off-by: Marc-Andr=C3=A9 Lureau --- tests/qemu-iotests/120 | 5 ++--- tests/qemu-iotests/120.out | 4 +--- 2 files changed, 3 insertions(+), 6 deletions(-) diff --git a/tests/qemu-iotests/120 b/tests/qemu-iotests/120 index e4ed87e1a705..fb9ac5a165ef 100755 --- a/tests/qemu-iotests/120 +++ b/tests/qemu-iotests/120 @@ -42,13 +42,12 @@ _supported_fmt generic _supported_proto file fuse _unsupported_fmt luks _require_drivers raw -_require_hmp =20 _make_test_img 64M =20 echo "{'execute': 'qmp_capabilities'} - {'execute': 'human-monitor-command', - 'arguments': {'command-line': 'qemu-io drv \"write -P 42 0 64k\"'}} + {'execute': 'x-qemu-io', + 'arguments': {'device': 'drv', 'command': 'write -P 42 0 64k'}} {'execute': 'quit'}" \ | $QEMU -qmp stdio -nographic -nodefaults \ -drive id=3Ddrv,if=3Dnone,file=3D"$TEST_IMG",driver=3Draw,file= .driver=3D$IMGFMT \ diff --git a/tests/qemu-iotests/120.out b/tests/qemu-iotests/120.out index 35d84a5bc5a8..c32ae81feb05 100644 --- a/tests/qemu-iotests/120.out +++ b/tests/qemu-iotests/120.out @@ -2,9 +2,7 @@ QA output created by 120 Formatting 'TEST_DIR/t.IMGFMT', fmt=3DIMGFMT size=3D67108864 QMP_VERSION {"return": {}} -wrote 65536/65536 bytes at offset 0 -64 KiB, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec) -{"return": ""} +{"return": {"human-readable-text": "wrote 65536/65536 bytes at offset 0\n6= 4 KiB, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec)\n"}} {"timestamp": {"seconds": TIMESTAMP, "microseconds": TIMESTAMP}, "event"= : "SHUTDOWN", "data": {"guest": false, "reason": "host-qmp-quit"}} {"return": {}} read 65536/65536 bytes at offset 0 --=20 2.56.0.rc0.29.g47ce80527c56 From nobody Sat Sep 26 20:01:40 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=1790108791; cv=none; d=zohomail.com; s=zohoarc; b=T1oYXrJQZBrqELGUYYVUqVMhqFwZzH8KxN8o7mSbSH6Ndaz4O87eg/YbvhHQRlpIoGlvL/Rp7cnaIQGJWTQMque4t+6YOz8KIrM9gQTaRgVqopXMsneMU6AGEUp8/Y8eqL0nD3k5AgRvbErB6u+l0j+iYKdoWVjg9uo/ESHSHHw= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1790108791; 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:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=GHge1UqbSGm97cnWevOEtitWDpLtmhAvKSahzYvBaF4=; b=Lf8nN17DoQu4Xd/RjPEhKhldL2qfUekyCNHz6KTnvfT1DUUFAxY4rcUMfgdnUUadz8IL96lv0e+YorS2EgEbRO63/fCcbWN/I1/w8XnESKw1Xlz1rQkf48pnWe8yPtdH1Wqx0W16vCjKWynSQKRmXkBLIleWtQIqrF+2NY0Fzdc= 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 1790108791932492.8560546875158; Tue, 22 Sep 2026 13:26:31 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists1p.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1x971P-0005U7-Fa; Tue, 22 Sep 2026 16:23:24 -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 1x9718-0003Ui-Jm for qemu-devel@nongnu.org; Tue, 22 Sep 2026 16:23:06 -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 1x9716-0000LB-0V for qemu-devel@nongnu.org; Tue, 22 Sep 2026 16:23:06 -0400 Received: from mx-prod-mc-01.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-389-hBx786ruMBCRr9WbEOX7VQ-1; Tue, 22 Sep 2026 16:22:59 -0400 Received: from mx-prod-int-01.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-01.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.4]) (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-01.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id 2E4BB195DE12; Tue, 22 Sep 2026 20:22:55 +0000 (UTC) Received: from localhost (headnet03.pony-001.prod.iad2.dc.redhat.com [10.2.32.114]) by mx-prod-int-01.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id 5E8383000223; Tue, 22 Sep 2026 20:22:54 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1790108583; 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=GHge1UqbSGm97cnWevOEtitWDpLtmhAvKSahzYvBaF4=; b=c4+zfX9VWFdi+SVF+Lf86EkzKAAR18hHUV5ABCw8YWx5MmCUvDd4u0klV64x2gOufWNAfs Mp0B3AB2s2e3ejMr2WH2hb9fHC2GtVcYESlJk811zmnnEaenzp2M0AeQB5CS2kIbU9PuPX aXLN0AWBSS0BDOpe/CTbguMnxILMGhI= X-MC-Unique: hBx786ruMBCRr9WbEOX7VQ-1 X-Mimecast-MFC-AGG-ID: hBx786ruMBCRr9WbEOX7VQ_1790108575 From: =?utf-8?q?Marc-Andr=C3=A9_Lureau?= Date: Wed, 23 Sep 2026 00:18:10 +0400 Subject: [PATCH 63/88] qemu-iotests/161: migrate away from HMP MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Message-Id: <20260923-nohmp-v1-63-ebc029d4bd80@redhat.com> References: <20260923-nohmp-v1-0-ebc029d4bd80@redhat.com> In-Reply-To: <20260923-nohmp-v1-0-ebc029d4bd80@redhat.com> To: qemu-devel@nongnu.org Cc: Kevin Wolf , =?utf-8?q?Marc-Andr=C3=A9_Lureau?= , Hanna Reitz , qemu-block@nongnu.org X-Developer-Signature: v=1; a=openpgp-sha256; l=5927; i=marcandre.lureau@redhat.com; h=from:subject:message-id; bh=rZDeep1FOHy6Ed8MZUb9yqpB7CF7Ks5+iOx3Mw3PFZs=; b=owEBbQKS/ZANAwAKAdro4Ql1lpzlAcsmYgBqsuKy5FocikhtzLWxuAgIbYozpbueUMRdweETT 7+y05LwgACJAjMEAAEKAB0WIQSHqb2TP4fGBtJ29i3a6OEJdZac5QUCarLisgAKCRDa6OEJdZac 5ZudD/0aCNLX/IxlEWnd7+jeXXu1he7EIDEvQwCmu3CfhWH9O0zmd8vicnzZoaS9ZU+8wlFxaTZ XhmN2CcMf1xOnxjr950bzaUosWCrvI6a6W+NxZ8llQ7Xu+LdydDShOC1GOOBmgQFQA4kVpgrsoX bZndVOz4q04ilAeW/Wkel3FmdC42/zaAVpJXV71XXABGsp7WzMqlORnfbpGb35uNfNviuxUNwec LqBxbod6CQges/pPab+bN6FCoUpe19pnOQ0q5IcGUDpMS4ReW08Zi3kk/RUgJ7sd9TTDV7K7wlL 0wPJd+QUa6UHWXGuRunFQH+z0wvctkjGz5MUZsnw4R48B0Gx6JFWMV4o4WuVcqoNjRI4h3nq8hg pE2dctgB63DhQQldmb/aWtcCUC5P5vcCznc5qnLDkQfSj5lNCnl/ZubMPm6z9kTx8Xc5jtn615e xSVKN5W+63tvw2nOEkGhK/c8rOmTbP+HiUkmJDlKYS9OPGA1Zl9JykKetmFI0qAyYOLScZZVnMu 0xR6UkCVCnw5wqX1SbLP3akbFgxBcB9PWT+LgVVEd6Nql2MjAYz2bljpwlYhE0824/4QGhbOEUi T21drLSIXg+a01w2nRw10wQkuYyeuwWWrD6HoQZSO76M/8YkaQvRGsBK4yKsEiIqvBOP4N6VYu/ +6/Tvig79MoIwYQ== X-Developer-Key: i=marcandre.lureau@redhat.com; a=openpgp; fpr=87A9BD933F87C606D276F62DDAE8E10975969CE5 X-Scanned-By: MIMEDefang 3.4.1 on 10.30.177.4 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: 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-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: 1790108793611158500 Signed-off-by: Marc-Andr=C3=A9 Lureau --- tests/qemu-iotests/161 | 19 +++++++++---------- tests/qemu-iotests/161.out | 24 ++++++++++++------------ 2 files changed, 21 insertions(+), 22 deletions(-) diff --git a/tests/qemu-iotests/161 b/tests/qemu-iotests/161 index 8ca139262975..0f4d59b97d24 100755 --- a/tests/qemu-iotests/161 +++ b/tests/qemu-iotests/161 @@ -45,7 +45,6 @@ trap "_cleanup; exit \$status" 0 1 2 3 15 _supported_fmt qcow2 qed _supported_proto file fuse _supported_os Linux -_require_hmp =20 IMG_SIZE=3D1M =20 @@ -65,9 +64,9 @@ _send_qemu_cmd $QEMU_HANDLE \ 'return' =20 _send_qemu_cmd $QEMU_HANDLE \ - "{ 'execute': 'human-monitor-command', - 'arguments': { 'command-line': - 'qemu-io none0 \"reopen -o backing.detect-zeroes=3Do= n\"' } }" \ + "{ 'execute': 'x-qemu-io', + 'arguments': { 'device': 'none0', + 'command': 'reopen -o backing.detect-zeroes=3Don' } = }" \ "return" =20 _cleanup_qemu @@ -93,9 +92,9 @@ _send_qemu_cmd $QEMU_HANDLE \ sleep 0.5 =20 _send_qemu_cmd $QEMU_HANDLE \ - "{ 'execute': 'human-monitor-command', - 'arguments': { 'command-line': - 'qemu-io none0 \"reopen -o backing.detect-zeroes=3Do= n\"' } }" \ + "{ 'execute': 'x-qemu-io', + 'arguments': { 'device': 'none0', + 'command': 'reopen -o backing.detect-zeroes=3Don' } = }" \ "return" =20 _cleanup_qemu @@ -126,9 +125,9 @@ _send_qemu_cmd $QEMU_HANDLE \ sleep 0.5 =20 _send_qemu_cmd $QEMU_HANDLE \ - "{ 'execute': 'human-monitor-command', - 'arguments': { 'command-line': - 'qemu-io none0 \"reopen -o backing.detect-zeroes=3Do= n\"' } }" \ + "{ 'execute': 'x-qemu-io', + 'arguments': { 'device': 'none0', + 'command': 'reopen -o backing.detect-zeroes=3Don' } = }" \ "return" =20 _cleanup_qemu diff --git a/tests/qemu-iotests/161.out b/tests/qemu-iotests/161.out index 6cc285afcfdc..ebadca1c79a2 100644 --- a/tests/qemu-iotests/161.out +++ b/tests/qemu-iotests/161.out @@ -7,10 +7,10 @@ Formatting 'TEST_DIR/t.IMGFMT', fmt=3DIMGFMT size=3D10485= 76 backing_file=3DTEST_DIR/t. =20 { 'execute': 'qmp_capabilities' } {"return": {}} -{ 'execute': 'human-monitor-command', - 'arguments': { 'command-line': - 'qemu-io none0 "reopen -o backing.detect-zeroes=3Don= "' } } -{"return": ""} +{ 'execute': 'x-qemu-io', + 'arguments': { 'device': 'none0', + 'command': 'reopen -o backing.detect-zeroes=3Don' } } +{"return": {"human-readable-text": ""}} =20 *** Stream and then change an option on the backing file =20 @@ -21,15 +21,15 @@ Formatting 'TEST_DIR/t.IMGFMT', fmt=3DIMGFMT size=3D104= 8576 backing_file=3DTEST_DIR/t. {"timestamp": {"seconds": TIMESTAMP, "microseconds": TIMESTAMP}, "event"= : "JOB_STATUS_CHANGE", "data": {"status": "created", "id": "none0"}} {"timestamp": {"seconds": TIMESTAMP, "microseconds": TIMESTAMP}, "event"= : "JOB_STATUS_CHANGE", "data": {"status": "running", "id": "none0"}} {"return": {}} -{ 'execute': 'human-monitor-command', - 'arguments': { 'command-line': - 'qemu-io none0 "reopen -o backing.detect-zeroes=3Don= "' } } +{ 'execute': 'x-qemu-io', + 'arguments': { 'device': 'none0', + 'command': 'reopen -o backing.detect-zeroes=3Don' } } {"timestamp": {"seconds": TIMESTAMP, "microseconds": TIMESTAMP}, "event"= : "JOB_STATUS_CHANGE", "data": {"status": "waiting", "id": "none0"}} {"timestamp": {"seconds": TIMESTAMP, "microseconds": TIMESTAMP}, "event"= : "JOB_STATUS_CHANGE", "data": {"status": "pending", "id": "none0"}} {"timestamp": {"seconds": TIMESTAMP, "microseconds": TIMESTAMP}, "event"= : "BLOCK_JOB_COMPLETED", "data": {"device": "none0", "len": 1048576, "offse= t": 1048576, "speed": 0, "type": "stream"}} {"timestamp": {"seconds": TIMESTAMP, "microseconds": TIMESTAMP}, "event"= : "JOB_STATUS_CHANGE", "data": {"status": "concluded", "id": "none0"}} {"timestamp": {"seconds": TIMESTAMP, "microseconds": TIMESTAMP}, "event"= : "JOB_STATUS_CHANGE", "data": {"status": "null", "id": "none0"}} -{"return": ""} +{"return": {"human-readable-text": ""}} =20 *** Commit and then change an option on the backing file =20 @@ -43,13 +43,13 @@ Formatting 'TEST_DIR/t.IMGFMT', fmt=3DIMGFMT size=3D104= 8576 backing_file=3DTEST_DIR/t. {"timestamp": {"seconds": TIMESTAMP, "microseconds": TIMESTAMP}, "event"= : "JOB_STATUS_CHANGE", "data": {"status": "created", "id": "none0"}} {"timestamp": {"seconds": TIMESTAMP, "microseconds": TIMESTAMP}, "event"= : "JOB_STATUS_CHANGE", "data": {"status": "running", "id": "none0"}} {"return": {}} -{ 'execute': 'human-monitor-command', - 'arguments': { 'command-line': - 'qemu-io none0 "reopen -o backing.detect-zeroes=3Don= "' } } +{ 'execute': 'x-qemu-io', + 'arguments': { 'device': 'none0', + 'command': 'reopen -o backing.detect-zeroes=3Don' } } {"timestamp": {"seconds": TIMESTAMP, "microseconds": TIMESTAMP}, "event"= : "JOB_STATUS_CHANGE", "data": {"status": "waiting", "id": "none0"}} {"timestamp": {"seconds": TIMESTAMP, "microseconds": TIMESTAMP}, "event"= : "JOB_STATUS_CHANGE", "data": {"status": "pending", "id": "none0"}} {"timestamp": {"seconds": TIMESTAMP, "microseconds": TIMESTAMP}, "event"= : "BLOCK_JOB_COMPLETED", "data": {"device": "none0", "len": 1048576, "offse= t": 1048576, "speed": 0, "type": "commit"}} {"timestamp": {"seconds": TIMESTAMP, "microseconds": TIMESTAMP}, "event"= : "JOB_STATUS_CHANGE", "data": {"status": "concluded", "id": "none0"}} {"timestamp": {"seconds": TIMESTAMP, "microseconds": TIMESTAMP}, "event"= : "JOB_STATUS_CHANGE", "data": {"status": "null", "id": "none0"}} -{"return": ""} +{"return": {"human-readable-text": ""}} *** done --=20 2.56.0.rc0.29.g47ce80527c56 From nobody Sat Sep 26 20:01:40 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=1790108657; cv=none; d=zohomail.com; s=zohoarc; b=PmztJhvci1t6eKtfjzDyn1EPFqb4JLle7O0BeCi3I1NwuQQFfkmeEtj7JqreBbPPx2sGzsilnc8XhdshhkJFG1t42Qii0iIyuUUFHa6xKMxztKeLnuAOzgihqUSQp53iyGoblYLalFczpUGmQxgRcU9Fd9T4XjncG/wOr17EMqk= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1790108657; 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:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=rdxscaKfy4+hi+OgbSe7s21g3XydX6kOH6WFjN0huhA=; b=bFy7tasQTwwKTtzdjpu03M/ULHzfs8xZJanFfOxEhslpj15QtH641R5YYTtfIsl1QkAyri4vt0qSIFmUxPGUdUtXMTFHAeRwkPrVPxLMF13nL3/NOrsQH46yd2bZZDE0DmMPFIQPjY+GXxgku6ik1vshyuvA4FeoGwI1WyJn8N8= 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 1790108657466917.9033168977238; Tue, 22 Sep 2026 13:24:17 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists1p.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1x971Y-0006Oh-PF; Tue, 22 Sep 2026 16:23:32 -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 1x9715-0003CM-I9 for qemu-devel@nongnu.org; Tue, 22 Sep 2026 16:23:04 -0400 Received: from us-smtp-delivery-124.mimecast.com ([170.10.133.124]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1x9713-0000L6-PY for qemu-devel@nongnu.org; Tue, 22 Sep 2026 16:23:03 -0400 Received: from mx-prod-mc-05.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-158-e5T04Tl9MJeG4pSZJtbxtw-1; Tue, 22 Sep 2026 16:22:59 -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-05.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id 7B72A1955D76; Tue, 22 Sep 2026 20:22:58 +0000 (UTC) Received: from localhost (headnet03.pony-001.prod.iad2.dc.redhat.com [10.2.32.114]) by mx-prod-int-10.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id AC79041D; Tue, 22 Sep 2026 20:22:57 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1790108581; 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=rdxscaKfy4+hi+OgbSe7s21g3XydX6kOH6WFjN0huhA=; b=OkGsQiNX1CxPFcQAIXKBloI6oAKjlX5G6n5oS8zEqGBJHTevUOOqu2fbMOjyY7O+PX8gPT lCUfhaK3BqUNxp9XgY6C5hgd5g3DYNd5pAAij2mbrpfskPbti9gH5uAkQH649vzUlrckma 0VCIgyn+4JK046DcKU4UKjl8KqUzGNo= X-MC-Unique: e5T04Tl9MJeG4pSZJtbxtw-1 X-Mimecast-MFC-AGG-ID: e5T04Tl9MJeG4pSZJtbxtw_1790108578 From: =?utf-8?q?Marc-Andr=C3=A9_Lureau?= Date: Wed, 23 Sep 2026 00:18:11 +0400 Subject: [PATCH 64/88] qemu-iotests/249: migrate away from HMP MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Message-Id: <20260923-nohmp-v1-64-ebc029d4bd80@redhat.com> References: <20260923-nohmp-v1-0-ebc029d4bd80@redhat.com> In-Reply-To: <20260923-nohmp-v1-0-ebc029d4bd80@redhat.com> To: qemu-devel@nongnu.org Cc: Kevin Wolf , =?utf-8?q?Marc-Andr=C3=A9_Lureau?= , Hanna Reitz , qemu-block@nongnu.org X-Developer-Signature: v=1; a=openpgp-sha256; l=3849; i=marcandre.lureau@redhat.com; h=from:subject:message-id; bh=VLRlMvZ61jdJQkdiAmEeYyQuL77+W9Xqq2buftMSbXE=; b=owEBbQKS/ZANAwAKAdro4Ql1lpzlAcsmYgBqsuKyv+sAhanKEe01XJ28sZU6gi/xRgJGAvy3g G6L7CtzCXqJAjMEAAEKAB0WIQSHqb2TP4fGBtJ29i3a6OEJdZac5QUCarLisgAKCRDa6OEJdZac 5UynEACnbJr4qic6wuKWEH6jt3a9N/Bcliug5FFjRzLdSAUmCqtM8E6XmiHnGljWEEwDRPTtgk9 K6CdY2LeFu9FikbBLz4htPfYQbv0m5268QSDKPllz/gH/TTR+Q5JwVADjJagGJoazISNdcoFuRR +6LP6lXEmowThZUzV4bJTMm20xG/sv0Pk/sk8PM2cpTbtv3vxw5f9zn0NjmMg+Wg5ImAnjHLb3i U8rntBX+B6kiBHQhpoIH70A9Abz6WvBR1TnRtt0eo1lvxsY5op0Q8631D2WVqjjp4EINjTmp6Rb u6vtSll9RY00ZqOxFqQt2NqNutsg6InK035reAwmicPnD7KzsVKgI7WVBU2vsHL7aDDJ3VJfXMI SXZKn/T5JwL77Pw6D7ELog5fmHURFSvuHcRMBj1ay6x7TvSVGSSVXFCLvgqW5q8422qSarbDzZd 75WcXRQyWGXcoB3LWZSi8KLK1vAJx4HLL8KW2NbxEmceoAW67fcM8AwW9usvu36u5XE2VD/nWUV U20q2tDGWyEqNuQGvPYxWpKBQPEAzD8f7hZgaWmNYWzIG9w4LQshdTZLsEsYwfdbmnLeDlr6k5G z8o6gPeQlWeMahBOcjCnukLJcKIxtCFfLPcqXfof3gD5G2d9snyfNX2+ip1xzHdbrGEYDPh6Dlb Zr2f5onUHjmcIvg== 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.133.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_H3=0.001, RCVD_IN_MSPIKE_WL=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-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: 1790108658941158500 Signed-off-by: Marc-Andr=C3=A9 Lureau --- tests/qemu-iotests/249 | 19 +++++++++---------- tests/qemu-iotests/249.out | 18 +++++++++--------- 2 files changed, 18 insertions(+), 19 deletions(-) diff --git a/tests/qemu-iotests/249 b/tests/qemu-iotests/249 index 1254bf942913..fb3a4c480a78 100755 --- a/tests/qemu-iotests/249 +++ b/tests/qemu-iotests/249 @@ -45,7 +45,6 @@ trap "_cleanup; exit \$status" 0 1 2 3 15 _supported_fmt qcow2 qed _supported_proto file fuse _supported_os Linux -_require_hmp =20 IMG_SIZE=3D1M =20 @@ -68,9 +67,9 @@ echo echo '=3D=3D=3D Send a write command to a drive opened in read-only mode (= 1)' echo _send_qemu_cmd $QEMU_HANDLE \ - "{ 'execute': 'human-monitor-command', - 'arguments': {'command-line': 'qemu-io none0 \"aio_write 0 2k\"'}}"= \ - 'return' + "{ 'execute': 'x-qemu-io', + 'arguments': {'device': 'none0', 'command': 'aio_write 0 2k'}}" \ + 'error' =20 echo echo '=3D=3D=3D Run block-commit on base using an invalid filter node name' @@ -85,9 +84,9 @@ echo echo '=3D=3D=3D Send a write command to a drive opened in read-only mode (= 2)' echo _send_qemu_cmd $QEMU_HANDLE \ - "{ 'execute': 'human-monitor-command', - 'arguments': {'command-line': 'qemu-io none0 \"aio_write 0 2k\"'}}"= \ - 'return' + "{ 'execute': 'x-qemu-io', + 'arguments': {'device': 'none0', 'command': 'aio_write 0 2k'}}" \ + 'error' =20 echo echo '=3D=3D=3D Run block-commit on base using the default filter node nam= e' @@ -105,9 +104,9 @@ echo echo '=3D=3D=3D Send a write command to a drive opened in read-only mode (= 3)' echo _send_qemu_cmd $QEMU_HANDLE \ - "{ 'execute': 'human-monitor-command', - 'arguments': {'command-line': 'qemu-io none0 \"aio_write 0 2k\"'}}"= \ - 'return' + "{ 'execute': 'x-qemu-io', + 'arguments': {'device': 'none0', 'command': 'aio_write 0 2k'}}" \ + 'error' =20 _cleanup_qemu =20 diff --git a/tests/qemu-iotests/249.out b/tests/qemu-iotests/249.out index 3d37709a9ef8..79f69cd26513 100644 --- a/tests/qemu-iotests/249.out +++ b/tests/qemu-iotests/249.out @@ -7,9 +7,9 @@ Formatting 'TEST_DIR/t.IMGFMT', fmt=3DIMGFMT size=3D1048576= backing_file=3DTEST_DIR/t. =20 =3D=3D=3D Send a write command to a drive opened in read-only mode (1) =20 -{ 'execute': 'human-monitor-command', - 'arguments': {'command-line': 'qemu-io none0 "aio_write 0 2k"'}} -{"return": "Error: Block node is read-onlyrn"} +{ 'execute': 'x-qemu-io', + 'arguments': {'device': 'none0', 'command': 'aio_write 0 2k'}} +{"error": {"class": "GenericError", "desc": "Block node is read-only"}} =20 =3D=3D=3D Run block-commit on base using an invalid filter node name =20 @@ -22,9 +22,9 @@ Formatting 'TEST_DIR/t.IMGFMT', fmt=3DIMGFMT size=3D10485= 76 backing_file=3DTEST_DIR/t. =20 =3D=3D=3D Send a write command to a drive opened in read-only mode (2) =20 -{ 'execute': 'human-monitor-command', - 'arguments': {'command-line': 'qemu-io none0 "aio_write 0 2k"'}} -{"return": "Error: Block node is read-onlyrn"} +{ 'execute': 'x-qemu-io', + 'arguments': {'device': 'none0', 'command': 'aio_write 0 2k'}} +{"error": {"class": "GenericError", "desc": "Block node is read-only"}} =20 =3D=3D=3D Run block-commit on base using the default filter node name =20 @@ -41,7 +41,7 @@ Formatting 'TEST_DIR/t.IMGFMT', fmt=3DIMGFMT size=3D10485= 76 backing_file=3DTEST_DIR/t. =20 =3D=3D=3D Send a write command to a drive opened in read-only mode (3) =20 -{ 'execute': 'human-monitor-command', - 'arguments': {'command-line': 'qemu-io none0 "aio_write 0 2k"'}} -{"return": "Error: Block node is read-onlyrn"} +{ 'execute': 'x-qemu-io', + 'arguments': {'device': 'none0', 'command': 'aio_write 0 2k'}} +{"error": {"class": "GenericError", "desc": "Block node is read-only"}} *** done --=20 2.56.0.rc0.29.g47ce80527c56 From nobody Sat Sep 26 20:01:40 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=1790109116; cv=none; d=zohomail.com; s=zohoarc; b=D7JXOnzxikAATuyFUkYBkvHtt9C5QqDMGWM2MRyuC7ZJ9occVlgOguYobiyaO9kd2Pio4USDIdhwYl6t5mkrPzu0jETK6O9b+W4FiwGCzdtDQVzDUrMZYGx27EMiUSPNmrwf9v7J8vTUfssv74AIF5qBLQcGE+ua+n05yEClfE8= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1790109116; 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:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=UW23mSHQLZaeviRChpKTXifMRhDBGOq+9e5+n6ZJdrM=; b=KpW9emO+7k+61hm/Y9Ope+QFeNqa9kSNQhP0g8kUOugPNs1g3uPUoYK7XY6WkaMUBFCqeNAMkME8JSEdoclLMtgkwJb+ASN5WqdsLs0toF/WCzXIXXSdjWWdT+YeKZLt3PEicdTnNbP3FhjUxfUHKzogZ9QOfNY8tvDwTFHplm0= 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 1790109116075638.4728234247405; Tue, 22 Sep 2026 13:31:56 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists1p.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1x972A-0000eu-8n; Tue, 22 Sep 2026 16:24:10 -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 1x971B-0003m5-0p for qemu-devel@nongnu.org; Tue, 22 Sep 2026 16:23:09 -0400 Received: from us-smtp-delivery-124.mimecast.com ([170.10.133.124]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1x9718-0000M3-TM for qemu-devel@nongnu.org; Tue, 22 Sep 2026 16:23:08 -0400 Received: from mx-prod-mc-08.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-258-dnsfpMnfOJ-Hsp6Zf0Vkxw-1; Tue, 22 Sep 2026 16:23:03 -0400 Received: from mx-prod-int-05.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-05.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.17]) (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-08.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id 2BB3B1800623; Tue, 22 Sep 2026 20:23:02 +0000 (UTC) Received: from localhost (headnet03.pony-001.prod.iad2.dc.redhat.com [10.2.32.114]) by mx-prod-int-05.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id 3C8371956095; Tue, 22 Sep 2026 20:23:00 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1790108586; 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=UW23mSHQLZaeviRChpKTXifMRhDBGOq+9e5+n6ZJdrM=; b=EpggJz6a9RqrnR9pn3muDq8wXTbrSutYDLiPcWtCWfcn3ktPS9fDvg2Ioq9DTY55UfSDXk 1UKDJoxYGo8Dix7EVp3V+4v7dAVwtY44+nxALDfnilEs5ir7uJ/g02xcMov2wmMk8MUczq P0J/GPCoyfWl2yVdwDfSJ4e0DMP04Z4= X-MC-Unique: dnsfpMnfOJ-Hsp6Zf0Vkxw-1 X-Mimecast-MFC-AGG-ID: dnsfpMnfOJ-Hsp6Zf0Vkxw_1790108582 From: =?utf-8?q?Marc-Andr=C3=A9_Lureau?= Date: Wed, 23 Sep 2026 00:18:12 +0400 Subject: [PATCH 65/88] qemu-iotests/156: migrate away from HMP MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Message-Id: <20260923-nohmp-v1-65-ebc029d4bd80@redhat.com> References: <20260923-nohmp-v1-0-ebc029d4bd80@redhat.com> In-Reply-To: <20260923-nohmp-v1-0-ebc029d4bd80@redhat.com> To: qemu-devel@nongnu.org Cc: Kevin Wolf , =?utf-8?q?Marc-Andr=C3=A9_Lureau?= , Hanna Reitz , qemu-block@nongnu.org X-Developer-Signature: v=1; a=openpgp-sha256; l=8014; i=marcandre.lureau@redhat.com; h=from:subject:message-id; bh=YgO8SeeQJDQXsT41eyxhxVxaJjDtsIQ8/aZsVE2OHLA=; b=owEBbQKS/ZANAwAKAdro4Ql1lpzlAcsmYgBqsuKyE43cuPxgmmRysWyHPH0vENMDooi9K/lId s8893IER8mJAjMEAAEKAB0WIQSHqb2TP4fGBtJ29i3a6OEJdZac5QUCarLisgAKCRDa6OEJdZac 5YbHD/0ejWAokSfPxplxRnxmCGZX1wy9GFqSpoUzGg+H6mioNN+d6l++pw9yRcbh9Brfi3Phbwn tlSqB1CeRRADwIsdSo0nV2OFaDauzYoVDZW3YuOdzL8r7uiEUrYpAB6AvBiNjztlHao4t7q2a9a r+VYwiPOTHYMpj0nhyUfNGgkGPNv5r3ZfULloX8SUwKerlUgP/XYqfPUM8f+frMbQkcYg/gYt/H 2FcZBZnKEzefClpI2Sg6+1TQw7bnSlmd57uYaLDS3bO2nSTPtQ6FjsLpQaBVVLno+POSDFcT/6Q qGNiCkiLY+q6/KAueoR1BPuDzQlCcCfIDf2ZV/Bwv/fft4ZtJuWk8t+krk8ukDNOhH/alohwXRp ZnElu2ACYdevjTbKzMxWIi2W+BKz8SivJB9B/33iURTwYH3eY1pYBEizBaJM98T0RWBiSKK8eAn QtCVKFQL+jClu1NoyM6KJ4oInXBa95lLahpoM1P2h8fUCnUSWPumzFiRbLwx4g4FhhzgLzfsAdw HLPrZRnInA7PQGY+vsj8PDkRUBla3GmvffXQvccdTLj88xbtGoYT/DNMYxuaHpoBLBch9Ovouj7 svE2ny7FDGqaS6XhiOhQ9HR2hnCE9yg7cChmy/P/ECXdC+QYYcoGBD4aeDe+pP1FLu5q/WYfh5m SY+HeBZmQAfyaJA== X-Developer-Key: i=marcandre.lureau@redhat.com; a=openpgp; fpr=87A9BD933F87C606D276F62DDAE8E10975969CE5 X-Scanned-By: MIMEDefang 3.0 on 10.30.177.17 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.133.124; envelope-from=marcandre.lureau@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 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_H3=0.001, RCVD_IN_MSPIKE_WL=0.001, SPF_HELO_PASS=-0.001, SPF_PASS=-0.001 autolearn=unavailable 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: 1790109117789158500 Signed-off-by: Marc-Andr=C3=A9 Lureau --- tests/qemu-iotests/156 | 37 ++++++++++++++-------------- tests/qemu-iotests/156.out | 60 +++++++++++++++++++-----------------------= ---- 2 files changed, 42 insertions(+), 55 deletions(-) diff --git a/tests/qemu-iotests/156 b/tests/qemu-iotests/156 index a0e4d1ffd42a..1b0c955c4222 100755 --- a/tests/qemu-iotests/156 +++ b/tests/qemu-iotests/156 @@ -53,7 +53,6 @@ _supported_fmt qcow2 qed _supported_proto file # Copying files around with cp does not work with external data files _unsupported_imgopts data_file -_require_hmp =20 # Create source disk TEST_IMG=3D"$TEST_IMG.backing" _make_test_img 1M @@ -80,9 +79,9 @@ _send_qemu_cmd $QEMU_HANDLE \ =20 # Write something to the snapshot _send_qemu_cmd $QEMU_HANDLE \ - "{ 'execute': 'human-monitor-command', - 'arguments': { 'command-line': - 'qemu-io source \"write -P 3 128k 128k\"' } }" \ + "{ 'execute': 'x-qemu-io', + 'arguments': { 'device': 'source', + 'command': 'write -P 3 128k 128k' } }" \ 'return' =20 # Create target image @@ -105,9 +104,9 @@ _send_qemu_cmd $QEMU_HANDLE \ =20 # Write some more _send_qemu_cmd $QEMU_HANDLE \ - "{ 'execute': 'human-monitor-command', - 'arguments': { 'command-line': - 'qemu-io source \"write -P 4 192k 64k\"' } }" \ + "{ 'execute': 'x-qemu-io', + 'arguments': { 'device': 'source', + 'command': 'write -P 4 192k 64k' } }" \ 'return' =20 # Copy source backing chain to the target before completing the job @@ -134,27 +133,27 @@ echo =20 # Check online disk contents _send_qemu_cmd $QEMU_HANDLE \ - "{ 'execute': 'human-monitor-command', - 'arguments': { 'command-line': - 'qemu-io source \"read -P 1 0k 64k\"' } }" \ + "{ 'execute': 'x-qemu-io', + 'arguments': { 'device': 'source', + 'command': 'read -P 1 0k 64k' } }" \ 'return' =20 _send_qemu_cmd $QEMU_HANDLE \ - "{ 'execute': 'human-monitor-command', - 'arguments': { 'command-line': - 'qemu-io source \"read -P 2 64k 64k\"' } }" \ + "{ 'execute': 'x-qemu-io', + 'arguments': { 'device': 'source', + 'command': 'read -P 2 64k 64k' } }" \ 'return' =20 _send_qemu_cmd $QEMU_HANDLE \ - "{ 'execute': 'human-monitor-command', - 'arguments': { 'command-line': - 'qemu-io source \"read -P 3 128k 64k\"' } }" \ + "{ 'execute': 'x-qemu-io', + 'arguments': { 'device': 'source', + 'command': 'read -P 3 128k 64k' } }" \ 'return' =20 _send_qemu_cmd $QEMU_HANDLE \ - "{ 'execute': 'human-monitor-command', - 'arguments': { 'command-line': - 'qemu-io source \"read -P 4 192k 64k\"' } }" \ + "{ 'execute': 'x-qemu-io', + 'arguments': { 'device': 'source', + 'command': 'read -P 4 192k 64k' } }" \ 'return' =20 echo diff --git a/tests/qemu-iotests/156.out b/tests/qemu-iotests/156.out index 07e5e83f5d4b..f91ce91d0d60 100644 --- a/tests/qemu-iotests/156.out +++ b/tests/qemu-iotests/156.out @@ -14,12 +14,10 @@ Formatting 'TEST_DIR/t.IMGFMT.overlay', fmt=3DIMGFMT si= ze=3D1048576 backing_file=3DTES 'format': 'IMGFMT', 'mode': 'existing' } } {"return": {}} -{ 'execute': 'human-monitor-command', - 'arguments': { 'command-line': - 'qemu-io source "write -P 3 128k 128k"' } } -wrote 131072/131072 bytes at offset 131072 -128 KiB, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec) -{"return": ""} +{ 'execute': 'x-qemu-io', + 'arguments': { 'device': 'source', + 'command': 'write -P 3 128k 128k' } } +{"return": {"human-readable-text": "wrote 131072/131072 bytes at offset 13= 1072\n128 KiB, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec)\n"}} Formatting 'TEST_DIR/t.IMGFMT.target.overlay', fmt=3DIMGFMT size=3D1048576= backing_file=3DTEST_DIR/t.IMGFMT.target backing_fmt=3DIMGFMT { 'execute': 'drive-mirror', 'arguments': { 'device': 'source', @@ -31,12 +29,10 @@ Formatting 'TEST_DIR/t.IMGFMT.target.overlay', fmt=3DIM= GFMT size=3D1048576 backing_f {"return": {}} {"timestamp": {"seconds": TIMESTAMP, "microseconds": TIMESTAMP}, "event"= : "JOB_STATUS_CHANGE", "data": {"status": "ready", "id": "source"}} {"timestamp": {"seconds": TIMESTAMP, "microseconds": TIMESTAMP}, "event"= : "BLOCK_JOB_READY", "data": {"device": "source", "len": 131072, "offset": = 131072, "speed": 0, "type": "mirror"}} -{ 'execute': 'human-monitor-command', - 'arguments': { 'command-line': - 'qemu-io source "write -P 4 192k 64k"' } } -wrote 65536/65536 bytes at offset 196608 -64 KiB, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec) -{"return": ""} +{ 'execute': 'x-qemu-io', + 'arguments': { 'device': 'source', + 'command': 'write -P 4 192k 64k' } } +{"return": {"human-readable-text": "wrote 65536/65536 bytes at offset 1966= 08\n64 KiB, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec)\n"}} { 'execute': 'block-job-complete', 'arguments': { 'device': 'source' } } {"return": {}} @@ -46,30 +42,22 @@ wrote 65536/65536 bytes at offset 196608 {"timestamp": {"seconds": TIMESTAMP, "microseconds": TIMESTAMP}, "event"= : "JOB_STATUS_CHANGE", "data": {"status": "concluded", "id": "source"}} {"timestamp": {"seconds": TIMESTAMP, "microseconds": TIMESTAMP}, "event"= : "JOB_STATUS_CHANGE", "data": {"status": "null", "id": "source"}} =20 -{ 'execute': 'human-monitor-command', - 'arguments': { 'command-line': - 'qemu-io source "read -P 1 0k 64k"' } } -read 65536/65536 bytes at offset 0 -64 KiB, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec) -{"return": ""} -{ 'execute': 'human-monitor-command', - 'arguments': { 'command-line': - 'qemu-io source "read -P 2 64k 64k"' } } -read 65536/65536 bytes at offset 65536 -64 KiB, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec) -{"return": ""} -{ 'execute': 'human-monitor-command', - 'arguments': { 'command-line': - 'qemu-io source "read -P 3 128k 64k"' } } -read 65536/65536 bytes at offset 131072 -64 KiB, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec) -{"return": ""} -{ 'execute': 'human-monitor-command', - 'arguments': { 'command-line': - 'qemu-io source "read -P 4 192k 64k"' } } -read 65536/65536 bytes at offset 196608 -64 KiB, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec) -{"return": ""} +{ 'execute': 'x-qemu-io', + 'arguments': { 'device': 'source', + 'command': 'read -P 1 0k 64k' } } +{"return": {"human-readable-text": "read 65536/65536 bytes at offset 0\n64= KiB, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec)\n"}} +{ 'execute': 'x-qemu-io', + 'arguments': { 'device': 'source', + 'command': 'read -P 2 64k 64k' } } +{"return": {"human-readable-text": "read 65536/65536 bytes at offset 65536= \n64 KiB, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec)\n"}} +{ 'execute': 'x-qemu-io', + 'arguments': { 'device': 'source', + 'command': 'read -P 3 128k 64k' } } +{"return": {"human-readable-text": "read 65536/65536 bytes at offset 13107= 2\n64 KiB, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec)\n"}} +{ 'execute': 'x-qemu-io', + 'arguments': { 'device': 'source', + 'command': 'read -P 4 192k 64k' } } +{"return": {"human-readable-text": "read 65536/65536 bytes at offset 19660= 8\n64 KiB, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec)\n"}} =20 { 'execute': 'quit' } {"timestamp": {"seconds": TIMESTAMP, "microseconds": TIMESTAMP}, "event"= : "SHUTDOWN", "data": {"guest": false, "reason": "host-qmp-quit"}} --=20 2.56.0.rc0.29.g47ce80527c56 From nobody Sat Sep 26 20:01:40 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=1790108714; cv=none; d=zohomail.com; s=zohoarc; b=YhAPaCMrQ8IGt55Hboxs80wga4Bu7Mp59Tqx/jP34PEL67aEzyZWkdnLJCga/oUKh7/bH7ELzsUWgHKorlXmHCzXGmzSFX8Es0fXIZ36T4U9vho2qL3xTSX5XA9WiHm5gwJDMMW+oHRWqvfrjN7OA9okzU/TkwElTKXiRjEkraA= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1790108714; 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:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=KNFsWAWEhHIJ5jUFvwTQtIHMMPmtQKR6pPx0HRGHhSo=; b=EtanxpsqDKk/pfX+A98sAlbOFoxVaYEQESSCc/B+TcT1TYLSEtWlkU1PECy9W/9EyWRR6ygPm0tCoV79gRvoYOkzJQzmnMkQZ1k51p2RgkEss5Uyr0dM8hH680Stt8LQxxP9YwB8VsEYkbhdcBi1jIPM9suQ7RC5aP13Y/7HQk4= 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 1790108714394753.4339995773886; Tue, 22 Sep 2026 13:25:14 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists1p.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1x971i-0007dR-Sv; Tue, 22 Sep 2026 16:23:43 -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 1x971F-0004NR-CU for qemu-devel@nongnu.org; Tue, 22 Sep 2026 16:23:13 -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 1x971C-0000MZ-Ud for qemu-devel@nongnu.org; Tue, 22 Sep 2026 16:23:12 -0400 Received: from mx-prod-mc-05.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-197-VNSaQvKwOVKLVkRGgEf4LA-1; Tue, 22 Sep 2026 16:23:06 -0400 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-05.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id E103119541A2; Tue, 22 Sep 2026 20:23:05 +0000 (UTC) Received: from localhost (headnet03.pony-001.prod.iad2.dc.redhat.com [10.2.32.114]) by mx-prod-int-08.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id DBE8F1800446; Tue, 22 Sep 2026 20:23:04 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1790108590; 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=KNFsWAWEhHIJ5jUFvwTQtIHMMPmtQKR6pPx0HRGHhSo=; b=OUHLPgkPkOJpS4fC6ixPQCyXHsoFzXoXlkVFctU1jyiEFswhDANEuSK6yguiDwAhyjGa5d W6VwDNhJcKajGvSkh2393Qn2UqrIGAI0D30ETb090F1NsvEz6vtZyu7jBNDBIAzjSC94y+ AVfLnZna9lfoF3TEvmnsnU37mh/MNtY= X-MC-Unique: VNSaQvKwOVKLVkRGgEf4LA-1 X-Mimecast-MFC-AGG-ID: VNSaQvKwOVKLVkRGgEf4LA_1790108586 From: =?utf-8?q?Marc-Andr=C3=A9_Lureau?= Date: Wed, 23 Sep 2026 00:18:13 +0400 Subject: [PATCH 66/88] qemu-iotests/write-zeroes-unmap: migrate away from HMP MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Message-Id: <20260923-nohmp-v1-66-ebc029d4bd80@redhat.com> References: <20260923-nohmp-v1-0-ebc029d4bd80@redhat.com> In-Reply-To: <20260923-nohmp-v1-0-ebc029d4bd80@redhat.com> To: qemu-devel@nongnu.org Cc: Kevin Wolf , =?utf-8?q?Marc-Andr=C3=A9_Lureau?= , Hanna Reitz , qemu-block@nongnu.org X-Developer-Signature: v=1; a=openpgp-sha256; l=10082; i=marcandre.lureau@redhat.com; h=from:subject:message-id; bh=xC1fJrUZ5TXEOinN+weJqJyH+fiyZ3y9gZxOj9L795E=; b=owEBbQKS/ZANAwAKAdro4Ql1lpzlAcsmYgBqsuKyvVLcmV1mrmy2MKsVj0CP5t4MgCLY/we0w aRNn+wnKrmJAjMEAAEKAB0WIQSHqb2TP4fGBtJ29i3a6OEJdZac5QUCarLisgAKCRDa6OEJdZac 5UfPD/9K2GcH62CRV68Pc7mIGC1aXD5SEIzcQhCbjhuwyOu73NWnRutY9AIo0Q79yTmVTZHxM4t tMCuBPwUhT2HjvvY0e3tebMtCB8cKMqck62EVpgxMIWUXPhzwLXgVZRGjwymgZLTr7giO3S3ETo VeC6mcNAazH1erg9gv6sITaiILJuWuXMCPrYeWupJGKYXsiswMbauIAuU+5B1Zbfx4vtsyQX6T3 FNbyiN0rQahM0g7R9CAsQn5I37PLMsWwwb6m0Q3ui1IydmQuZK5/Ua5S0tk1RcQLovB5E7Nocv9 cs39MTD4qvSwAgLOW/Ps/jdRKY/EDMLQojdUZjeCnVNbeX3u2Px90Pp85XSi8SyX+4zTxl8j94v 2FXUvh8NrcW68iy/1Wmex00FNa03hRf414+wuhz3GczUk9JyWzBBdWxCoe20DPyElwM9bIE0Esi PB93gJMJozWdm3MiEu1pAG4Q2uDRpm4mp9OvmjkJNoDAfuFcamJxyeMSxG243g+ndeKidEF4WNp khCENJItHVgdUtRrTUNhHBL6bgEIrtYYT+fuyAASSPFcgBvVFHKdDvnf9YhWsiDdUVZHlnys5Ef CrqwAsSrkz5MRMZg4t1TouNLUjmGqTKxicecqXVSk4G/Gpj7cCEBRdkG9IdO93ZP89PGH6mjjj2 o8dZ/BBj8phKVig== X-Developer-Key: i=marcandre.lureau@redhat.com; a=openpgp; fpr=87A9BD933F87C606D276F62DDAE8E10975969CE5 X-Scanned-By: MIMEDefang 3.4.1 on 10.30.177.111 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: 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-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: 1790108715197158500 Introduce qmp_qemu_io() to help with sending just one x-qemu-io command. Signed-off-by: Marc-Andr=C3=A9 Lureau --- tests/qemu-iotests/tests/write-zeroes-unmap | 42 +++++++------ tests/qemu-iotests/tests/write-zeroes-unmap.out | 80 ++++++++++++---------= ---- 2 files changed, 64 insertions(+), 58 deletions(-) diff --git a/tests/qemu-iotests/tests/write-zeroes-unmap b/tests/qemu-iotes= ts/tests/write-zeroes-unmap index 506ced647bc1..b5c019c85acf 100755 --- a/tests/qemu-iotests/tests/write-zeroes-unmap +++ b/tests/qemu-iotests/tests/write-zeroes-unmap @@ -33,27 +33,33 @@ _supported_fmt raw _supported_proto file _supported_os Linux _require_disk_usage -_require_hmp =20 create_test_image() { _make_test_img -f $IMGFMT 1m } =20 filter_command() { - _filter_testdir | _filter_qemu_io | _filter_qemu | _filter_hmp + _filter_qmp | _filter_testdir | _filter_qemu_io | _filter_qemu } =20 print_disk_usage() { du -sh $TEST_IMG | _filter_testdir } =20 +qmp_qemu_io() { + printf '%s\n' \ + '{"execute":"qmp_capabilities"}' \ + "{\"execute\":\"x-qemu-io\",\"arguments\":{\"device\":\"none0\",\"= command\":\"$1\"}}" \ + '{"execute":"quit"}' +} + echo echo "=3D=3D=3D defaults - write zeros =3D=3D=3D" echo =20 create_test_image -echo -e 'qemu-io none0 "write -z 0 1m"\nquit' \ - | $QEMU -monitor stdio -drive if=3Dnone,file=3D$TEST_IMG,format=3D$IMG= FMT \ +qmp_qemu_io "write -z 0 1m" \ + | $QEMU -qmp stdio -drive if=3Dnone,file=3D$TEST_IMG,format=3D$IMGFMT \ | filter_command print_disk_usage =20 @@ -62,8 +68,8 @@ echo "=3D=3D=3D defaults - write zeros unmap =3D=3D=3D" echo =20 create_test_image -echo -e 'qemu-io none0 "write -zu 0 1m"\nquit' \ - | $QEMU -monitor stdio -drive if=3Dnone,file=3D$TEST_IMG,format=3D$IMG= FMT \ +qmp_qemu_io "write -zu 0 1m" \ + | $QEMU -qmp stdio -drive if=3Dnone,file=3D$TEST_IMG,format=3D$IMGFMT \ | filter_command print_disk_usage =20 @@ -73,8 +79,8 @@ echo "=3D=3D=3D defaults - write actual zeros =3D=3D=3D" echo =20 create_test_image -echo -e 'qemu-io none0 "write -P 0 0 1m"\nquit' \ - | $QEMU -monitor stdio -drive if=3Dnone,file=3D$TEST_IMG,format=3D$IMG= FMT \ +qmp_qemu_io "write -P 0 0 1m" \ + | $QEMU -qmp stdio -drive if=3Dnone,file=3D$TEST_IMG,format=3D$IMGFMT \ | filter_command print_disk_usage =20 @@ -83,8 +89,8 @@ echo "=3D=3D=3D discard=3Doff - write zeroes unmap =3D=3D= =3D" echo =20 create_test_image -echo -e 'qemu-io none0 "write -zu 0 1m"\nquit' \ - | $QEMU -monitor stdio -drive if=3Dnone,file=3D$TEST_IMG,format=3D$IMG= FMT,discard=3Doff \ +qmp_qemu_io "write -zu 0 1m" \ + | $QEMU -qmp stdio -drive if=3Dnone,file=3D$TEST_IMG,format=3D$IMGFMT,= discard=3Doff \ | filter_command print_disk_usage =20 @@ -93,8 +99,8 @@ echo "=3D=3D=3D detect-zeroes=3Don - write actual zeros = =3D=3D=3D" echo =20 create_test_image -echo -e 'qemu-io none0 "write -P 0 0 1m"\nquit' \ - | $QEMU -monitor stdio -drive if=3Dnone,file=3D$TEST_IMG,format=3D$IMG= FMT,detect-zeroes=3Don \ +qmp_qemu_io "write -P 0 0 1m" \ + | $QEMU -qmp stdio -drive if=3Dnone,file=3D$TEST_IMG,format=3D$IMGFMT,= detect-zeroes=3Don \ | filter_command print_disk_usage =20 @@ -103,8 +109,8 @@ echo "=3D=3D=3D detect-zeroes=3Don,discard=3Don - write= actual zeros =3D=3D=3D" echo =20 create_test_image -echo -e 'qemu-io none0 "write -P 0 0 1m"\nquit' \ - | $QEMU -monitor stdio -drive if=3Dnone,file=3D$TEST_IMG,format=3D$IMG= FMT,detect-zeroes=3Don,discard=3Don \ +qmp_qemu_io "write -P 0 0 1m" \ + | $QEMU -qmp stdio -drive if=3Dnone,file=3D$TEST_IMG,format=3D$IMGFMT,= detect-zeroes=3Don,discard=3Don \ | filter_command print_disk_usage =20 @@ -113,8 +119,8 @@ echo "=3D=3D=3D discard=3Don - write zeroes =3D=3D=3D" echo =20 create_test_image -echo -e 'qemu-io none0 "write -z 0 1m"\nquit' \ - | $QEMU -monitor stdio -drive if=3Dnone,file=3D$TEST_IMG,format=3D$IMG= FMT,discard=3Don \ +qmp_qemu_io "write -z 0 1m" \ + | $QEMU -qmp stdio -drive if=3Dnone,file=3D$TEST_IMG,format=3D$IMGFMT,= discard=3Don \ | filter_command print_disk_usage =20 @@ -123,7 +129,7 @@ echo "=3D=3D=3D discard=3Don - write zeroes unmap =3D= =3D=3D" echo =20 create_test_image -echo -e 'qemu-io none0 "write -zu 0 1m"\nquit' \ - | $QEMU -monitor stdio -drive if=3Dnone,file=3D$TEST_IMG,format=3D$IMG= FMT,discard=3Don \ +qmp_qemu_io "write -zu 0 1m" \ + | $QEMU -qmp stdio -drive if=3Dnone,file=3D$TEST_IMG,format=3D$IMGFMT,= discard=3Don \ | filter_command print_disk_usage diff --git a/tests/qemu-iotests/tests/write-zeroes-unmap.out b/tests/qemu-i= otests/tests/write-zeroes-unmap.out index c9319948976f..1ac940a8badc 100644 --- a/tests/qemu-iotests/tests/write-zeroes-unmap.out +++ b/tests/qemu-iotests/tests/write-zeroes-unmap.out @@ -3,79 +3,79 @@ QA output created by write-zeroes-unmap =3D=3D=3D defaults - write zeros =3D=3D=3D =20 Formatting 'TEST_DIR/t.IMGFMT', fmt=3DIMGFMT size=3D1048576 -QEMU X.Y.Z monitor - type 'help' for more information -(qemu) qemu-io none0 "write -z 0 1m" -wrote 1048576/1048576 bytes at offset 0 -1 MiB, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec) -(qemu) quit +QMP_VERSION +{"return": {}} +{"return": {"human-readable-text": "wrote 1048576/1048576 bytes at offset = 0\n1 MiB, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec)\n"}} +{"timestamp": {"seconds": TIMESTAMP, "microseconds": TIMESTAMP}, "event"= : "SHUTDOWN", "data": {"guest": false, "reason": "host-qmp-quit"}} +{"return": {}} 1.0M TEST_DIR/t.raw =20 =3D=3D=3D defaults - write zeros unmap =3D=3D=3D =20 Formatting 'TEST_DIR/t.IMGFMT', fmt=3DIMGFMT size=3D1048576 -QEMU X.Y.Z monitor - type 'help' for more information -(qemu) qemu-io none0 "write -zu 0 1m" -wrote 1048576/1048576 bytes at offset 0 -1 MiB, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec) -(qemu) quit +QMP_VERSION +{"return": {}} +{"return": {"human-readable-text": "wrote 1048576/1048576 bytes at offset = 0\n1 MiB, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec)\n"}} +{"timestamp": {"seconds": TIMESTAMP, "microseconds": TIMESTAMP}, "event"= : "SHUTDOWN", "data": {"guest": false, "reason": "host-qmp-quit"}} +{"return": {}} 1.0M TEST_DIR/t.raw =20 =3D=3D=3D defaults - write actual zeros =3D=3D=3D =20 Formatting 'TEST_DIR/t.IMGFMT', fmt=3DIMGFMT size=3D1048576 -QEMU X.Y.Z monitor - type 'help' for more information -(qemu) qemu-io none0 "write -P 0 0 1m" -wrote 1048576/1048576 bytes at offset 0 -1 MiB, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec) -(qemu) quit +QMP_VERSION +{"return": {}} +{"return": {"human-readable-text": "wrote 1048576/1048576 bytes at offset = 0\n1 MiB, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec)\n"}} +{"timestamp": {"seconds": TIMESTAMP, "microseconds": TIMESTAMP}, "event"= : "SHUTDOWN", "data": {"guest": false, "reason": "host-qmp-quit"}} +{"return": {}} 1.0M TEST_DIR/t.raw =20 =3D=3D=3D discard=3Doff - write zeroes unmap =3D=3D=3D =20 Formatting 'TEST_DIR/t.IMGFMT', fmt=3DIMGFMT size=3D1048576 -QEMU X.Y.Z monitor - type 'help' for more information -(qemu) qemu-io none0 "write -zu 0 1m" -wrote 1048576/1048576 bytes at offset 0 -1 MiB, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec) -(qemu) quit +QMP_VERSION +{"return": {}} +{"return": {"human-readable-text": "wrote 1048576/1048576 bytes at offset = 0\n1 MiB, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec)\n"}} +{"timestamp": {"seconds": TIMESTAMP, "microseconds": TIMESTAMP}, "event"= : "SHUTDOWN", "data": {"guest": false, "reason": "host-qmp-quit"}} +{"return": {}} 1.0M TEST_DIR/t.raw =20 =3D=3D=3D detect-zeroes=3Don - write actual zeros =3D=3D=3D =20 Formatting 'TEST_DIR/t.IMGFMT', fmt=3DIMGFMT size=3D1048576 -QEMU X.Y.Z monitor - type 'help' for more information -(qemu) qemu-io none0 "write -P 0 0 1m" -wrote 1048576/1048576 bytes at offset 0 -1 MiB, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec) -(qemu) quit +QMP_VERSION +{"return": {}} +{"return": {"human-readable-text": "wrote 1048576/1048576 bytes at offset = 0\n1 MiB, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec)\n"}} +{"timestamp": {"seconds": TIMESTAMP, "microseconds": TIMESTAMP}, "event"= : "SHUTDOWN", "data": {"guest": false, "reason": "host-qmp-quit"}} +{"return": {}} 1.0M TEST_DIR/t.raw =20 =3D=3D=3D detect-zeroes=3Don,discard=3Don - write actual zeros =3D=3D=3D =20 Formatting 'TEST_DIR/t.IMGFMT', fmt=3DIMGFMT size=3D1048576 -QEMU X.Y.Z monitor - type 'help' for more information -(qemu) qemu-io none0 "write -P 0 0 1m" -wrote 1048576/1048576 bytes at offset 0 -1 MiB, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec) -(qemu) quit +QMP_VERSION +{"return": {}} +{"return": {"human-readable-text": "wrote 1048576/1048576 bytes at offset = 0\n1 MiB, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec)\n"}} +{"timestamp": {"seconds": TIMESTAMP, "microseconds": TIMESTAMP}, "event"= : "SHUTDOWN", "data": {"guest": false, "reason": "host-qmp-quit"}} +{"return": {}} 1.0M TEST_DIR/t.raw =20 =3D=3D=3D discard=3Don - write zeroes =3D=3D=3D =20 Formatting 'TEST_DIR/t.IMGFMT', fmt=3DIMGFMT size=3D1048576 -QEMU X.Y.Z monitor - type 'help' for more information -(qemu) qemu-io none0 "write -z 0 1m" -wrote 1048576/1048576 bytes at offset 0 -1 MiB, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec) -(qemu) quit +QMP_VERSION +{"return": {}} +{"return": {"human-readable-text": "wrote 1048576/1048576 bytes at offset = 0\n1 MiB, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec)\n"}} +{"timestamp": {"seconds": TIMESTAMP, "microseconds": TIMESTAMP}, "event"= : "SHUTDOWN", "data": {"guest": false, "reason": "host-qmp-quit"}} +{"return": {}} 1.0M TEST_DIR/t.raw =20 =3D=3D=3D discard=3Don - write zeroes unmap =3D=3D=3D =20 Formatting 'TEST_DIR/t.IMGFMT', fmt=3DIMGFMT size=3D1048576 -QEMU X.Y.Z monitor - type 'help' for more information -(qemu) qemu-io none0 "write -zu 0 1m" -wrote 1048576/1048576 bytes at offset 0 -1 MiB, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec) -(qemu) quit +QMP_VERSION +{"return": {}} +{"return": {"human-readable-text": "wrote 1048576/1048576 bytes at offset = 0\n1 MiB, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec)\n"}} +{"timestamp": {"seconds": TIMESTAMP, "microseconds": TIMESTAMP}, "event"= : "SHUTDOWN", "data": {"guest": false, "reason": "host-qmp-quit"}} +{"return": {}} 0 TEST_DIR/t.raw --=20 2.56.0.rc0.29.g47ce80527c56 From nobody Sat Sep 26 20:01:40 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=1790109103; cv=none; d=zohomail.com; s=zohoarc; b=nX+fkCgE2iAGPZjVkhdz0AyuKpQrNYgi0jXsI0go3MvtfxHffgYs7awcN5Ko5cf9zuoOEn/z38RTFQ4bkIuHQu+34HDTKNWhDkX0/xURwGa7SBsS0AInFZXiJtxoUyjdI709E+UtfA+vgjYkQJiY2GSfTABJrn6QBBjRiS3qSMc= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1790109103; 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:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=Uo+DvqGml9/takpc/k7aJ516ia5DpBKk/tqAgtISoeU=; b=WddwXCESt9YX/6Xzwjf4c6BGouyMIoPj2CeV6/sOJTqvf6ZfPOUBQUx4WAz3Nu/YEHunQLmEEWssy7ckJQXWK6bEVEHng5ITSGt7UJjilluREgrldk+VzOQCbdQ1Gb9qU8yUYXXTTispmgpCDmMppcaW/r0HjwjXGyH441R5/gI= 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 1790109103014618.7743658528585; Tue, 22 Sep 2026 13:31:43 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists1p.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1x971n-0007z5-QM; Tue, 22 Sep 2026 16:23:48 -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 1x971I-0004kB-HL for qemu-devel@nongnu.org; Tue, 22 Sep 2026 16:23:16 -0400 Received: from us-smtp-delivery-124.mimecast.com ([170.10.133.124]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1x971G-0000N7-Qz for qemu-devel@nongnu.org; Tue, 22 Sep 2026 16:23:16 -0400 Received: from mx-prod-mc-01.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-350-n81VHSN4P3-CxGR2DgGecA-1; Tue, 22 Sep 2026 16:23:10 -0400 Received: from mx-prod-int-03.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-03.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.12]) (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-01.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id 875461953972; Tue, 22 Sep 2026 20:23:09 +0000 (UTC) Received: from localhost (headnet03.pony-001.prod.iad2.dc.redhat.com [10.2.32.114]) by mx-prod-int-03.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id A99461956086; Tue, 22 Sep 2026 20:23:08 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1790108593; 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=Uo+DvqGml9/takpc/k7aJ516ia5DpBKk/tqAgtISoeU=; b=Eh+DkQbNI/igNciw0+5DlapJcNzowdlf6QCmwZgOVLyp3trbDQNZlhNuKsnqA4KrmUy6Nk /qK+0D9hx2VU1lIrgN6YtyO7IvMmIhEnSCgApVOIxrICj61kZVcyRrk87535knKNiOG9nM q8EIm3KvgUvOFnLyQTDBC3Q1JXZvbc0= X-MC-Unique: n81VHSN4P3-CxGR2DgGecA-1 X-Mimecast-MFC-AGG-ID: n81VHSN4P3-CxGR2DgGecA_1790108589 From: =?utf-8?q?Marc-Andr=C3=A9_Lureau?= Date: Wed, 23 Sep 2026 00:18:14 +0400 Subject: [PATCH 67/88] qemu-iotests/luks-detached-header: migrate away from HMP MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Message-Id: <20260923-nohmp-v1-67-ebc029d4bd80@redhat.com> References: <20260923-nohmp-v1-0-ebc029d4bd80@redhat.com> In-Reply-To: <20260923-nohmp-v1-0-ebc029d4bd80@redhat.com> To: qemu-devel@nongnu.org Cc: Kevin Wolf , =?utf-8?q?Marc-Andr=C3=A9_Lureau?= , Hyman Huang , Hanna Reitz , qemu-block@nongnu.org X-Developer-Signature: v=1; a=openpgp-sha256; l=3080; i=marcandre.lureau@redhat.com; h=from:subject:message-id; bh=MeCIMLJly3FZzybm5mEs0AMwwlJzFXGutdAKehEenOQ=; b=owEBbQKS/ZANAwAKAdro4Ql1lpzlAcsmYgBqsuKzgnWPUwwKDmMkAsICpMAFWZkTjjtcSgq7B KUMWvpNGaqJAjMEAAEKAB0WIQSHqb2TP4fGBtJ29i3a6OEJdZac5QUCarLiswAKCRDa6OEJdZac 5Q54D/9x4uGlW/Fx0PQeQoIkgx0lmpszwh5bMgHKvTN7BHZ4YIfnW59I9W7Fgk75AZbY4MibTWw PFaNedEph/ezK98K23YVE2+/8npQsbeg/XqRS5f9DzNTzB6vjXScU+BE1385CmkIeNlDwcgtKdE yC1ll5jjxsOXbwLYwLdnamHn76iffzDpoXrkhnVSf6KYgfGMwZSzr4EyuxczaVsF4tXZu0wEj4G t5op4iRbu1DfpxENHivNgtamPaf1Nvz9Nzc5t1NqE9yHkN4PPH6It2ynLosX6XFimb15XvxknDN B1yVCERGNnjEM4wco0KiVuWmMd/6t71cfRcT0YGnMAW8815O3YxFle19kmhOoOaAnxBranGsMGz qiCOj8DuSv0EJLw8p/we3svdNyf/JTMRF3Auev3bnuxOUkPGXLM3bUfaB4SJa4/5UDET7Byruzc yQfh99N/MpM8aF9npyrcsHdOoVbAdq4GZSyxz8FI6ComeXy92i2SMvRbaBJpHT1jp+x+WaYGcLf 9HVJL5gNov5s8wzGJ0MbicMXhSxIuFqLUQ0VHh5XyYqXK6tVc4i6Pa2A1rL1bzsz6V+tymS3b95 mREHR5k8LAgS4bgs7C0Zn3934kdBXmGxqGjvOtAZVkb74sV4XBt2OQYX4ze0N7ctchTkRDcB4ip jK/5ezN4+sl1Jsg== X-Developer-Key: i=marcandre.lureau@redhat.com; a=openpgp; fpr=87A9BD933F87C606D276F62DDAE8E10975969CE5 X-Scanned-By: MIMEDefang 3.0 on 10.30.177.12 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.133.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_H3=0.001, RCVD_IN_MSPIKE_WL=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-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: 1790109103483158500 Signed-off-by: Marc-Andr=C3=A9 Lureau Reviewed-by: Hyman Huang --- tests/qemu-iotests/tests/luks-detached-header | 49 +++++++----------------= ---- 1 file changed, 13 insertions(+), 36 deletions(-) diff --git a/tests/qemu-iotests/tests/luks-detached-header b/tests/qemu-iot= ests/tests/luks-detached-header index 58eb3c2cc484..fbf812902832 100755 --- a/tests/qemu-iotests/tests/luks-detached-header +++ b/tests/qemu-iotests/tests/luks-detached-header @@ -266,52 +266,29 @@ class TestDetachedLUKSHeader(QMPTestCase): # (Pattern verification will be checked by tearDown()) =20 # Normal LUKS disk - result =3D self.vm.qmp_log( - "human-monitor-command", - command_line=3D'qemu-io luks-1-format "write -P 40 0 64k"', - ) - self.assert_qmp(result, "return", "") + self.vm.qmp_qemu_io("luks-1-format", "write -P 40 0 64k", + use_log=3DTrue) =20 - result =3D self.vm.qmp_log( - "human-monitor-command", - command_line=3D'qemu-io luks-1-format "read -P 40 0 64k"', - ) - self.assert_qmp(result, "return", "") + self.vm.qmp_qemu_io("luks-1-format", "read -P 40 0 64k", + use_log=3DTrue) =20 # Detached LUKS header with raw payload - cmd =3D 'qemu-io luks-2-payload-raw-format "write -P 41 0 64k"' - result =3D self.vm.qmp( - "human-monitor-command", - command_line=3Dcmd - ) - self.assert_qmp(result, "return", "") + self.vm.qmp_qemu_io("luks-2-payload-raw-format", + "write -P 41 0 64k") =20 - cmd =3D 'qemu-io luks-2-payload-raw-format "read -P 41 0 64k"' - result =3D self.vm.qmp( - "human-monitor-command", - command_line=3Dcmd - ) - self.assert_qmp(result, "return", "") + self.vm.qmp_qemu_io("luks-2-payload-raw-format", + "read -P 41 0 64k") =20 # Detached LUKS header with qcow2 payload - cmd =3D 'qemu-io luks-3-payload-qcow2-format "write -P 42 0 64k"' - result =3D self.vm.qmp( - "human-monitor-command", - command_line=3Dcmd - ) - self.assert_qmp(result, "return", "") + self.vm.qmp_qemu_io("luks-3-payload-qcow2-format", + "write -P 42 0 64k") =20 - cmd =3D 'qemu-io luks-3-payload-qcow2-format "read -P 42 0 64k"' - result =3D self.vm.qmp( - "human-monitor-command", - command_line=3Dcmd - ) - self.assert_qmp(result, "return", "") + self.vm.qmp_qemu_io("luks-3-payload-qcow2-format", + "read -P 42 0 64k") =20 self.vm.shutdown() =20 =20 if __name__ =3D=3D "__main__": # Test image creation and I/O - iotests.main(supported_fmts=3D["luks"], supported_protocols=3D["file"], - require_hmp=3DTrue) + iotests.main(supported_fmts=3D["luks"], supported_protocols=3D["file"]) --=20 2.56.0.rc0.29.g47ce80527c56 From nobody Sat Sep 26 20:01:40 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=1790108960; cv=none; d=zohomail.com; s=zohoarc; b=ZZZq2hbLSjuGteDi65JL6FsEgbHFbF7aANNkL6W4wWVKAZNewrBfReYavngsdQSmwHlphyMBJaMupHb7DAEthbeSQRtHD54XAj29AQWzyNViU+XbDR+tTJeFRRC/CqHwjLlrSppEGJ/wcLUBW0by09AQom34H9z+OZMlIvVVaNM= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1790108960; 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:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=I2Wto5I1yX1IKX5Ovkzu3+N/o/mNbQWnan+kBGT5b14=; b=CMvIX1PaJAUV/xUkPicU1HovP2d5XFMet9Cp1UYgOFoiOZksfj0Gv0MAgFYxlBvmBKX7WNAgt+AX7NWMV5/M5F+HpAdMuK+hEwpcYXKUqAqTPEQGagEWb1fD3zCGmkI1mqUM+N1h1qJX1JGZEabzH2hAXkq/lLRat4eK30PGpI4= 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 1790108960546349.5534521065084; Tue, 22 Sep 2026 13:29:20 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists1p.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1x971h-0007JX-6o; Tue, 22 Sep 2026 16:23:41 -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 1x971N-0005Dg-3z for qemu-devel@nongnu.org; Tue, 22 Sep 2026 16:23:21 -0400 Received: from us-smtp-delivery-124.mimecast.com ([170.10.133.124]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1x971J-0000Nn-UU for qemu-devel@nongnu.org; Tue, 22 Sep 2026 16:23:20 -0400 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-672-Q7jHbFHEPx-v44s0ABcP-Q-1; Tue, 22 Sep 2026 16:23:14 -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-03.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id 2D1F7193E884; Tue, 22 Sep 2026 20:23:13 +0000 (UTC) Received: from localhost (headnet03.pony-001.prod.iad2.dc.redhat.com [10.2.32.114]) by mx-prod-int-10.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id 102D441B; Tue, 22 Sep 2026 20:23:11 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1790108597; 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=I2Wto5I1yX1IKX5Ovkzu3+N/o/mNbQWnan+kBGT5b14=; b=Aq/UpkNwu2LhuUAwRQvzgYEGp4/XniSYUxpJgEtrLMLyGObsvFwobtAXKKhzlregfez0OQ Z3N2EipqVgccsfX92cuXcI9KtvzZz5KnxfwTipXbTZ+Ipgi+PtxQ645b9/VrFiC9/atbSi kIIiPk2zw4yghg3snpy+2c4sz8FDQDs= X-MC-Unique: Q7jHbFHEPx-v44s0ABcP-Q-1 X-Mimecast-MFC-AGG-ID: Q7jHbFHEPx-v44s0ABcP-Q_1790108593 From: =?utf-8?q?Marc-Andr=C3=A9_Lureau?= Date: Wed, 23 Sep 2026 00:18:15 +0400 Subject: [PATCH 68/88] qemu-iotests/qcow2-internal-snapshots: migrate away from HMP MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Message-Id: <20260923-nohmp-v1-68-ebc029d4bd80@redhat.com> References: <20260923-nohmp-v1-0-ebc029d4bd80@redhat.com> In-Reply-To: <20260923-nohmp-v1-0-ebc029d4bd80@redhat.com> To: qemu-devel@nongnu.org Cc: Kevin Wolf , =?utf-8?q?Marc-Andr=C3=A9_Lureau?= , Hanna Reitz , qemu-block@nongnu.org X-Developer-Signature: v=1; a=openpgp-sha256; l=21484; i=marcandre.lureau@redhat.com; h=from:subject:message-id; bh=IYWVaRlfRYajDS8Idms9CE3zZ1Ei8rFCLdCh/+yQ6p0=; b=owEBbQKS/ZANAwAKAdro4Ql1lpzlAcsmYgBqsuKzk0f6v/V13yIwqAGwCPG0A5F88WmCp4XV5 PAwukCotTuJAjMEAAEKAB0WIQSHqb2TP4fGBtJ29i3a6OEJdZac5QUCarLiswAKCRDa6OEJdZac 5WliD/wLYJwNJbnHUR+96n29R0wAoHLkUaYopvI7MU471tqdGbvituli7El90VYhPyZzmncIbRo bJJW7PLbp6oZy6T1MopiwJnmWxOHbbK0NRg58RbEKF02/uNa0MKTy0A0l0Oy0JL9g+J4aq8CTOn /4oJf0pR8MRa4bzQLR/xQf4+Gxe12NsrSlU7E6CWNy6YbuOZLkdM7kSC5OuJRIfq0/hQxnDFvbQ A0DOAE9EN8fkdR6Dy42a1OgeWicuRcXpbTvAVn3eKXyHnUdruOfw1dhhMYKw5Bpjrd51tCkAgPX xNLkUBEcX1DMy28tHQhQAdo9WqemsrR2yrnFLE5Pta+3EnSI+/O1oF21BYMdQJEDcdl+z5SsHte Cq5yjXER9lA3DRBwI+EcNUFRgl7HjMA4w1yuEmagb1cI/+lTnK/BUoIqnBJcUHlj2xxvNHp3ph2 5WHcj7+t6rJ+QUAPY6K/0O/662b8nnMkdjxX6KQY+Z83SJRbD9U3Bma0843pMquJ7DejwnWL5ca pfwFjiUnT4OHmjnXDLG+NWBdLNGZ8FZj9U5sqDdWEBloXSQiQDr8RC5qoL5EjqYo1mDlonoPsXE s5d0wH8nViuCXQCSQiYYgBqnMc+JwLkCSEyZDp4A4dcRuErp6k+SbJL/cjUKnjRA8SPrQ6p6Anm KTbmTzHKwiB+2Ow== 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.133.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_H3=0.001, RCVD_IN_MSPIKE_WL=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-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: 1790108962554158500 Replace the HMP-based test infrastructure with QMP using common.qemu. The old _qemu() function piped HMP commands (savevm, loadvm, delvm, qemu-io) through a monitor stdio pipe. Replace it with interactive QMP control via _launch_qemu / _send_qemu_cmd, using the job-based QMP commands snapshot-save, snapshot-load, and snapshot-delete. These snapshot commands use the JOB_MANUAL_DISMISS flag, so jobs remain in the "concluded" state until explicitly dismissed. The test handles this through two helpers: - _do_snapshot_cmd(): captures noisy QMP events (JOB_STATUS_CHANGE, STOP, RESUME) during the snapshot operation, silently waits for the job to reach "concluded", then dismisses it with job-dismiss. - _do_snapshot_error(): same flow, but before dismissing, queries the concluded job with query-jobs to retrieve the error message. This preserves the error verification that HMP provided natively through its text output. I/O operations use x-qemu-io via _do_qemu_io(). CLI error cases (e.g. conflicting -loadvm with -incoming defer or -preconfig) invoke QEMU directly with stderr redirected, since those errors are emitted before QMP is available. Signed-off-by: Marc-Andr=C3=A9 Lureau --- tests/qemu-iotests/tests/qcow2-internal-snapshots | 226 +++++++++++++++--= ---- .../tests/qcow2-internal-snapshots.out | 175 ++++++++++------ 2 files changed, 284 insertions(+), 117 deletions(-) diff --git a/tests/qemu-iotests/tests/qcow2-internal-snapshots b/tests/qemu= -iotests/tests/qcow2-internal-snapshots index d301f0941b5c..3d6da93e6931 100755 --- a/tests/qemu-iotests/tests/qcow2-internal-snapshots +++ b/tests/qemu-iotests/tests/qcow2-internal-snapshots @@ -29,13 +29,16 @@ status=3D1 # failure is the default! =20 _cleanup() { + _cleanup_qemu _cleanup_test_img } trap "_cleanup; exit \$status" 0 1 2 3 15 =20 # get standard environment, filters and checks -. ../common.rc -. ../common.filter +cd .. +. ./common.rc +. ./common.filter +. ./common.qemu =20 # This tests qcow2-specific low-level functionality _supported_fmt qcow2 @@ -43,20 +46,78 @@ _supported_proto file # Internal snapshots are (currently) impossible with refcount_bits=3D1, # and generally impossible with external data files _unsupported_imgopts 'compat=3D0.10' 'refcount_bits=3D1[^0-9]' data_file -_require_hmp =20 IMG_SIZE=3D64M =20 -_qemu() +QEMU_ARGS=3D"-no-shutdown -nodefaults \ + -blockdev file,filename=3D$TEST_IMG,node-name=3Ddisk0-file \ + -blockdev $IMGFMT,file=3Ddisk0-file,node-name=3Ddisk0 \ + -object iothread,id=3Diothread0 \ + -device virtio-scsi,iothread=3Diothread0 \ + -device scsi-hd,drive=3Ddisk0,share-rw=3Don" + +_do_qemu_io() { - $QEMU -no-shutdown -nographic -monitor stdio -serial none \ - -blockdev file,filename=3D"$TEST_IMG",node-name=3Ddisk0-file \ - -blockdev "$IMGFMT",file=3Ddisk0-file,node-name=3Ddisk0 \ - -object iothread,id=3Diothread0 \ - -device virtio-scsi,iothread=3Diothread0 \ - -device scsi-hd,drive=3Ddisk0,share-rw=3Don \ - "$@" 2>&1 |\ - _filter_qemu | _filter_hmp | _filter_qemu_io + _send_qemu_cmd $QEMU_HANDLE \ + "{ 'execute': 'x-qemu-io', + 'arguments': { 'device': 'disk0', + 'command': '$1' } }" \ + 'return' +} + +_do_snapshot_cmd() +{ + local cmd=3D"$1" job_id=3D"$2" + capture_events=3D"JOB_STATUS_CHANGE STOP RESUME" \ + _send_qemu_cmd $QEMU_HANDLE "$cmd" 'return' + silent=3Dyes _send_qemu_cmd $QEMU_HANDLE '' '"concluded"' + silent=3Dyes capture_events=3D"JOB_STATUS_CHANGE" \ + _send_qemu_cmd $QEMU_HANDLE \ + "{ 'execute': 'job-dismiss', + 'arguments': { 'id': '$job_id' } }" \ + 'return' +} + +_do_snapshot_save() +{ + _do_snapshot_cmd \ + "{ 'execute': 'snapshot-save', + 'arguments': { 'job-id': '$2', 'tag': '$1', + 'vmstate': 'disk0', + 'devices': [\"disk0\"] } }" "$2" +} + +_do_snapshot_load() +{ + _do_snapshot_cmd \ + "{ 'execute': 'snapshot-load', + 'arguments': { 'job-id': '$2', 'tag': '$1', + 'vmstate': 'disk0', + 'devices': [\"disk0\"] } }" "$2" +} + +_do_snapshot_delete() +{ + _do_snapshot_cmd \ + "{ 'execute': 'snapshot-delete', + 'arguments': { 'job-id': '$2', 'tag': '$1', + 'devices': [\"disk0\"] } }" "$2" +} + +_do_snapshot_error() +{ + local cmd=3D"$1" job_id=3D"$2" + capture_events=3D"JOB_STATUS_CHANGE STOP RESUME" \ + _send_qemu_cmd $QEMU_HANDLE "$cmd" 'return' + silent=3Dyes _send_qemu_cmd $QEMU_HANDLE '' '"concluded"' + _send_qemu_cmd $QEMU_HANDLE \ + "{ 'execute': 'query-jobs' }" \ + 'return' + silent=3Dyes capture_events=3D"JOB_STATUS_CHANGE" \ + _send_qemu_cmd $QEMU_HANDLE \ + "{ 'execute': 'job-dismiss', + 'arguments': { 'id': '$job_id' } }" \ + 'return' } =20 _make_test_img $IMG_SIZE @@ -65,14 +126,16 @@ echo echo "=3D=3D=3D Write some data, take a snapshot and overwrite part of it = =3D=3D=3D" echo =20 -{ - echo 'qemu-io disk0 "write -P0x11 0 1M"' - # Give qemu some time to boot before saving the VM state - sleep 0.5 - echo "savevm snap0" - echo 'qemu-io disk0 "write -P0x22 0 512k"' - echo "quit" -} | _qemu +_launch_qemu $QEMU_ARGS +_send_qemu_cmd $QEMU_HANDLE "{ 'execute': 'qmp_capabilities' }" 'return' + +_do_qemu_io "write -P0x11 0 1M" +_do_snapshot_save snap0 save0 +_do_qemu_io "write -P0x22 0 512k" + +capture_events=3D"JOB_STATUS_CHANGE SHUTDOWN" \ +_send_qemu_cmd $QEMU_HANDLE "{ 'execute': 'quit' }" 'return' +wait=3D1 _cleanup_qemu =20 echo $QEMU_IMG snapshot -l "$TEST_IMG" | _filter_date | _filter_vmstate_size @@ -82,26 +145,29 @@ echo echo "=3D=3D=3D Verify that loading the snapshot reverts to the old conten= t =3D=3D=3D" echo =20 -{ - # -loadvm reverted the write from the previous QEMU instance - echo 'qemu-io disk0 "read -P0x11 0 1M"' +# -loadvm reverts the write from the previous QEMU instance +_launch_qemu $QEMU_ARGS -loadvm snap0 +_send_qemu_cmd $QEMU_HANDLE "{ 'execute': 'qmp_capabilities' }" 'return' =20 - # Verify that it works without restarting QEMU, too - echo 'qemu-io disk0 "write -P0x33 512k 512k"' - echo "loadvm snap0" - echo 'qemu-io disk0 "read -P0x11 0 1M"' +_do_qemu_io "read -P0x11 0 1M" =20 - # Verify COW by writing a partial cluster - echo 'qemu-io disk0 "write -P0x33 63k 2k"' - echo 'qemu-io disk0 "read -P0x11 0 63k"' - echo 'qemu-io disk0 "read -P0x33 63k 2k"' - echo 'qemu-io disk0 "read -P0x11 65k 63k"' +# Verify that it works without restarting QEMU, too +_do_qemu_io "write -P0x33 512k 512k" +_do_snapshot_load snap0 load0 +_do_qemu_io "read -P0x11 0 1M" =20 - # Take a second snapshot - echo "savevm snap1" +# Verify COW by writing a partial cluster +_do_qemu_io "write -P0x33 63k 2k" +_do_qemu_io "read -P0x11 0 63k" +_do_qemu_io "read -P0x33 63k 2k" +_do_qemu_io "read -P0x11 65k 63k" =20 - echo "quit" -} | _qemu -loadvm snap0 +# Take a second snapshot +_do_snapshot_save snap1 save1 + +capture_events=3D"JOB_STATUS_CHANGE SHUTDOWN" \ +_send_qemu_cmd $QEMU_HANDLE "{ 'execute': 'quit' }" 'return' +wait=3D1 _cleanup_qemu =20 echo $QEMU_IMG snapshot -l "$TEST_IMG" | _filter_date | _filter_vmstate_size @@ -123,15 +189,19 @@ $QEMU_IO \ echo echo "=3D=3D=3D Deleting snapshots =3D=3D=3D" echo -{ - # The active layer stays unaffected by deleting the snapshot - echo "delvm snap1" - echo 'qemu-io disk0 "read -P0x11 0 63k"' - echo 'qemu-io disk0 "read -P0x33 63k 2k"' - echo 'qemu-io disk0 "read -P0x11 65k 63k"' =20 - echo "quit" -} | _qemu +_launch_qemu $QEMU_ARGS +_send_qemu_cmd $QEMU_HANDLE "{ 'execute': 'qmp_capabilities' }" 'return' + +# The active layer stays unaffected by deleting the snapshot +_do_snapshot_delete snap1 del0 +_do_qemu_io "read -P0x11 0 63k" +_do_qemu_io "read -P0x33 63k 2k" +_do_qemu_io "read -P0x11 65k 63k" + +capture_events=3D"JOB_STATUS_CHANGE SHUTDOWN" \ +_send_qemu_cmd $QEMU_HANDLE "{ 'execute': 'quit' }" 'return' +wait=3D1 _cleanup_qemu =20 =20 echo @@ -143,27 +213,69 @@ echo "=3D=3D=3D Error cases =3D=3D=3D" echo =20 # snap1 should not exist any more -_qemu -loadvm snap1 +$QEMU -no-shutdown -nographic -serial none -nodefaults \ + -blockdev file,filename=3D"$TEST_IMG",node-name=3Ddisk0-file \ + -blockdev "$IMGFMT",file=3Ddisk0-file,node-name=3Ddisk0 \ + -object iothread,id=3Diothread0 \ + -device virtio-scsi,iothread=3Diothread0 \ + -device scsi-hd,drive=3Ddisk0,share-rw=3Don \ + -loadvm snap1 2>&1 | _filter_qemu =20 echo -{ - echo "loadvm snap1" - echo "quit" -} | _qemu +_launch_qemu $QEMU_ARGS +_send_qemu_cmd $QEMU_HANDLE "{ 'execute': 'qmp_capabilities' }" 'return' +_do_snapshot_error \ + "{ 'execute': 'snapshot-load', + 'arguments': { 'job-id': 'load1', 'tag': 'snap1', + 'vmstate': 'disk0', + 'devices': [\"disk0\"] } }" load1 +capture_events=3D"JOB_STATUS_CHANGE SHUTDOWN" \ +_send_qemu_cmd $QEMU_HANDLE "{ 'execute': 'quit' }" 'return' +wait=3D1 _cleanup_qemu =20 # Snapshot operations and inactive images are incompatible echo -_qemu -loadvm snap0 -incoming defer -{ - echo "loadvm snap0" - echo "delvm snap0" - echo "savevm snap1" - echo "quit" -} | _qemu -incoming defer +$QEMU -no-shutdown -nographic -serial none -nodefaults \ + -blockdev file,filename=3D"$TEST_IMG",node-name=3Ddisk0-file \ + -blockdev "$IMGFMT",file=3Ddisk0-file,node-name=3Ddisk0 \ + -object iothread,id=3Diothread0 \ + -device virtio-scsi,iothread=3Diothread0 \ + -device scsi-hd,drive=3Ddisk0,share-rw=3Don \ + -loadvm snap0 -incoming defer 2>&1 | _filter_qemu + +_launch_qemu $QEMU_ARGS -incoming defer +_send_qemu_cmd $QEMU_HANDLE "{ 'execute': 'qmp_capabilities' }" 'return' + +_do_snapshot_error \ + "{ 'execute': 'snapshot-load', + 'arguments': { 'job-id': 'load2', 'tag': 'snap0', + 'vmstate': 'disk0', + 'devices': [\"disk0\"] } }" load2 + +_do_snapshot_error \ + "{ 'execute': 'snapshot-delete', + 'arguments': { 'job-id': 'del2', 'tag': 'snap0', + 'devices': [\"disk0\"] } }" del2 + +_do_snapshot_error \ + "{ 'execute': 'snapshot-save', + 'arguments': { 'job-id': 'save2', 'tag': 'snap1', + 'vmstate': 'disk0', + 'devices': [\"disk0\"] } }" save2 + +capture_events=3D"JOB_STATUS_CHANGE SHUTDOWN" \ +_send_qemu_cmd $QEMU_HANDLE "{ 'execute': 'quit' }" 'return' +wait=3D1 _cleanup_qemu =20 # -loadvm and -preconfig are incompatible echo -_qemu -loadvm snap0 -preconfig +$QEMU -no-shutdown -nographic -serial none -nodefaults \ + -blockdev file,filename=3D"$TEST_IMG",node-name=3Ddisk0-file \ + -blockdev "$IMGFMT",file=3Ddisk0-file,node-name=3Ddisk0 \ + -object iothread,id=3Diothread0 \ + -device virtio-scsi,iothread=3Diothread0 \ + -device scsi-hd,drive=3Ddisk0,share-rw=3Don \ + -loadvm snap0 -preconfig 2>&1 | _filter_qemu =20 # success, all done echo "*** done" diff --git a/tests/qemu-iotests/tests/qcow2-internal-snapshots.out b/tests/= qemu-iotests/tests/qcow2-internal-snapshots.out index fedb09224ea4..fb602505553b 100644 --- a/tests/qemu-iotests/tests/qcow2-internal-snapshots.out +++ b/tests/qemu-iotests/tests/qcow2-internal-snapshots.out @@ -3,15 +3,23 @@ Formatting 'TEST_DIR/t.IMGFMT', fmt=3DIMGFMT size=3D67108= 864 =20 =3D=3D=3D Write some data, take a snapshot and overwrite part of it =3D=3D= =3D =20 -QEMU X.Y.Z monitor - type 'help' for more information -(qemu) qemu-io disk0 "write -P0x11 0 1M" -wrote 1048576/1048576 bytes at offset 0 -1 MiB, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec) -(qemu) savevm snap0 -(qemu) qemu-io disk0 "write -P0x22 0 512k" -wrote 524288/524288 bytes at offset 0 -512 KiB, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec) -(qemu) quit +{ 'execute': 'qmp_capabilities' } +{"return": {}} +{ 'execute': 'x-qemu-io', + 'arguments': { 'device': 'disk0', + 'command': 'write -P0x11 0 1M' } } +{"return": {"human-readable-text": "wrote 1048576/1048576 bytes at offset = 0\n1 MiB, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec)\n"}} +{ 'execute': 'snapshot-save', + 'arguments': { 'job-id': 'save0', 'tag': 'snap0', + 'vmstate': 'disk0', + 'devices': ["disk0"] } } +{"return": {}} +{ 'execute': 'x-qemu-io', + 'arguments': { 'device': 'disk0', + 'command': 'write -P0x22 0 512k' } } +{"return": {"human-readable-text": "wrote 524288/524288 bytes at offset 0\= n512 KiB, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec)\n"}} +{ 'execute': 'quit' } +{"return": {}} =20 Snapshot list: ID TAG VM_SIZE DATE VM_CLOCK = ICOUNT @@ -20,31 +28,48 @@ No errors were found on the image. =20 =3D=3D=3D Verify that loading the snapshot reverts to the old content =3D= =3D=3D =20 -QEMU X.Y.Z monitor - type 'help' for more information -(qemu) qemu-io disk0 "read -P0x11 0 1M" -read 1048576/1048576 bytes at offset 0 -1 MiB, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec) -(qemu) qemu-io disk0 "write -P0x33 512k 512k" -wrote 524288/524288 bytes at offset 524288 -512 KiB, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec) -(qemu) loadvm snap0 -(qemu) qemu-io disk0 "read -P0x11 0 1M" -read 1048576/1048576 bytes at offset 0 -1 MiB, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec) -(qemu) qemu-io disk0 "write -P0x33 63k 2k" -wrote 2048/2048 bytes at offset 64512 -2 KiB, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec) -(qemu) qemu-io disk0 "read -P0x11 0 63k" -read 64512/64512 bytes at offset 0 -63 KiB, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec) -(qemu) qemu-io disk0 "read -P0x33 63k 2k" -read 2048/2048 bytes at offset 64512 -2 KiB, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec) -(qemu) qemu-io disk0 "read -P0x11 65k 63k" -read 64512/64512 bytes at offset 66560 -63 KiB, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec) -(qemu) savevm snap1 -(qemu) quit +{ 'execute': 'qmp_capabilities' } +{"return": {}} +{ 'execute': 'x-qemu-io', + 'arguments': { 'device': 'disk0', + 'command': 'read -P0x11 0 1M' } } +{"return": {"human-readable-text": "read 1048576/1048576 bytes at offset 0= \n1 MiB, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec)\n"}} +{ 'execute': 'x-qemu-io', + 'arguments': { 'device': 'disk0', + 'command': 'write -P0x33 512k 512k' } } +{"return": {"human-readable-text": "wrote 524288/524288 bytes at offset 52= 4288\n512 KiB, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec)\n"}} +{ 'execute': 'snapshot-load', + 'arguments': { 'job-id': 'load0', 'tag': 'snap0', + 'vmstate': 'disk0', + 'devices': ["disk0"] } } +{"return": {}} +{ 'execute': 'x-qemu-io', + 'arguments': { 'device': 'disk0', + 'command': 'read -P0x11 0 1M' } } +{"return": {"human-readable-text": "read 1048576/1048576 bytes at offset 0= \n1 MiB, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec)\n"}} +{ 'execute': 'x-qemu-io', + 'arguments': { 'device': 'disk0', + 'command': 'write -P0x33 63k 2k' } } +{"return": {"human-readable-text": "wrote 2048/2048 bytes at offset 64512\= n2 KiB, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec)\n"}} +{ 'execute': 'x-qemu-io', + 'arguments': { 'device': 'disk0', + 'command': 'read -P0x11 0 63k' } } +{"return": {"human-readable-text": "read 64512/64512 bytes at offset 0\n63= KiB, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec)\n"}} +{ 'execute': 'x-qemu-io', + 'arguments': { 'device': 'disk0', + 'command': 'read -P0x33 63k 2k' } } +{"return": {"human-readable-text": "read 2048/2048 bytes at offset 64512\n= 2 KiB, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec)\n"}} +{ 'execute': 'x-qemu-io', + 'arguments': { 'device': 'disk0', + 'command': 'read -P0x11 65k 63k' } } +{"return": {"human-readable-text": "read 64512/64512 bytes at offset 66560= \n63 KiB, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec)\n"}} +{ 'execute': 'snapshot-save', + 'arguments': { 'job-id': 'save1', 'tag': 'snap1', + 'vmstate': 'disk0', + 'devices': ["disk0"] } } +{"return": {}} +{ 'execute': 'quit' } +{"return": {}} =20 Snapshot list: ID TAG VM_SIZE DATE VM_CLOCK = ICOUNT @@ -65,18 +90,26 @@ read 64512/64512 bytes at offset 66560 =20 =3D=3D=3D Deleting snapshots =3D=3D=3D =20 -QEMU X.Y.Z monitor - type 'help' for more information -(qemu) delvm snap1 -(qemu) qemu-io disk0 "read -P0x11 0 63k" -read 64512/64512 bytes at offset 0 -63 KiB, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec) -(qemu) qemu-io disk0 "read -P0x33 63k 2k" -read 2048/2048 bytes at offset 64512 -2 KiB, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec) -(qemu) qemu-io disk0 "read -P0x11 65k 63k" -read 64512/64512 bytes at offset 66560 -63 KiB, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec) -(qemu) quit +{ 'execute': 'qmp_capabilities' } +{"return": {}} +{ 'execute': 'snapshot-delete', + 'arguments': { 'job-id': 'del0', 'tag': 'snap1', + 'devices': ["disk0"] } } +{"return": {}} +{ 'execute': 'x-qemu-io', + 'arguments': { 'device': 'disk0', + 'command': 'read -P0x11 0 63k' } } +{"return": {"human-readable-text": "read 64512/64512 bytes at offset 0\n63= KiB, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec)\n"}} +{ 'execute': 'x-qemu-io', + 'arguments': { 'device': 'disk0', + 'command': 'read -P0x33 63k 2k' } } +{"return": {"human-readable-text": "read 2048/2048 bytes at offset 64512\n= 2 KiB, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec)\n"}} +{ 'execute': 'x-qemu-io', + 'arguments': { 'device': 'disk0', + 'command': 'read -P0x11 65k 63k' } } +{"return": {"human-readable-text": "read 64512/64512 bytes at offset 66560= \n63 KiB, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec)\n"}} +{ 'execute': 'quit' } +{"return": {}} =20 Snapshot list: ID TAG VM_SIZE DATE VM_CLOCK = ICOUNT @@ -85,23 +118,45 @@ No errors were found on the image. =20 =3D=3D=3D Error cases =3D=3D=3D =20 -QEMU X.Y.Z monitor - type 'help' for more information -(qemu) QEMU_PROG: Snapshot 'snap1' does not exist in one or more devices +QEMU_PROG: Snapshot 'snap1' does not exist in one or more devices =20 -QEMU X.Y.Z monitor - type 'help' for more information -(qemu) loadvm snap1 -Error: Snapshot 'snap1' does not exist in one or more devices -(qemu) quit +{ 'execute': 'qmp_capabilities' } +{"return": {}} +{ 'execute': 'snapshot-load', + 'arguments': { 'job-id': 'load1', 'tag': 'snap1', + 'vmstate': 'disk0', + 'devices': ["disk0"] } } +{"return": {}} +{ 'execute': 'query-jobs' } +{"return": [{"current-progress": 1, "status": "concluded", "total-progress= ": 1, "type": "snapshot-load", "id": "load1", "error": "Snapshot 'snap1' do= es not exist in one or more devices"}]} +{ 'execute': 'quit' } +{"return": {}} =20 QEMU_PROG: 'incoming' and 'loadvm' options are mutually exclusive -QEMU X.Y.Z monitor - type 'help' for more information -(qemu) loadvm snap0 -Error: Device 'disk0' is writable but does not support snapshots -(qemu) delvm snap0 -Error: Device 'disk0' is writable but does not support snapshots -(qemu) savevm snap1 -Error: Device 'disk0' is writable but does not support snapshots -(qemu) quit +{ 'execute': 'qmp_capabilities' } +{"return": {}} +{ 'execute': 'snapshot-load', + 'arguments': { 'job-id': 'load2', 'tag': 'snap0', + 'vmstate': 'disk0', + 'devices': ["disk0"] } } +{"return": {}} +{ 'execute': 'query-jobs' } +{"return": [{"current-progress": 1, "status": "concluded", "total-progress= ": 1, "type": "snapshot-load", "id": "load2", "error": "Device 'disk0' is w= ritable but does not support snapshots"}]} +{ 'execute': 'snapshot-delete', + 'arguments': { 'job-id': 'del2', 'tag': 'snap0', + 'devices': ["disk0"] } } +{"return": {}} +{ 'execute': 'query-jobs' } +{"return": [{"current-progress": 1, "status": "concluded", "total-progress= ": 1, "type": "snapshot-delete", "id": "del2", "error": "Device 'disk0' is = writable but does not support snapshots"}]} +{ 'execute': 'snapshot-save', + 'arguments': { 'job-id': 'save2', 'tag': 'snap1', + 'vmstate': 'disk0', + 'devices': ["disk0"] } } +{"return": {}} +{ 'execute': 'query-jobs' } +{"return": [{"current-progress": 1, "status": "concluded", "total-progress= ": 1, "type": "snapshot-save", "id": "save2", "error": "Device 'disk0' is w= ritable but does not support snapshots"}]} +{ 'execute': 'quit' } +{"return": {}} =20 QEMU_PROG: 'preconfig' and 'loadvm' options are mutually exclusive *** done --=20 2.56.0.rc0.29.g47ce80527c56 From nobody Sat Sep 26 20:01:40 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=1790109002; cv=none; d=zohomail.com; s=zohoarc; b=My2uygMTcy2ndL2h1X9woVe3z6nw7HlP3HmX7mYBoM+8SxoPPrsn84iN1rDVix1U3krB8vdJN+MZ/C1LfYy2v1fUQp4yMZ/b+mHeU3Lnxwr0QnYb9WTOOVAESSYbK/3XAtm+XfcBHlAA7Y32Pzc5ieB4W7Ax9noIgeUZiiCecao= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1790109002; 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:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=qN/aB0TU2Y4wIbghtKuvYsoO89RsxCzfr+5AjzyyZb0=; b=Xyvsx/wyg8zHFkGpaUyzrAe44/lBP/mxhfMemelNo2Lpo8yyIRqxeuwCY6ehiXBPZWetihv8/vwAdt9ouW1WfgHql/cCY4bN1OInAuzuQtOlkC9P3sr7/jxFKz6dVl4HEQmT6T/K1i4UlP3fEkhLRtwYx2+gxOYwQHUKPbjJyGs= 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 1790109002724240.4392287489303; Tue, 22 Sep 2026 13:30:02 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists1p.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1x972R-0001KM-5V; Tue, 22 Sep 2026 16:24:28 -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 1x971Q-0005f7-Rt for qemu-devel@nongnu.org; Tue, 22 Sep 2026 16:23:25 -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 1x971O-0000Ob-Qv for qemu-devel@nongnu.org; Tue, 22 Sep 2026 16:23:24 -0400 Received: from mx-prod-mc-08.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-679-GMxoCDGyNumYsU-IiDmxrA-1; Tue, 22 Sep 2026 16:23:17 -0400 Received: from mx-prod-int-06.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-06.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.93]) (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-08.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id C3BA6185BE98; Tue, 22 Sep 2026 20:23:16 +0000 (UTC) Received: from localhost (headnet03.pony-001.prod.iad2.dc.redhat.com [10.2.32.114]) by mx-prod-int-06.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id C50F0180057E; Tue, 22 Sep 2026 20:23:15 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1790108602; 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=qN/aB0TU2Y4wIbghtKuvYsoO89RsxCzfr+5AjzyyZb0=; b=VqCj60cnneOqZoQQJzNBHlosdtYnu67fb2O4MrJOzX7ul4eKsOptM32drHzfMIaO7TdaB3 FNJZeuxMP6jiKhZfCNepgTBODIZ8BZKWAUYZjzGh8vTTauEnI8NTf/30fy55ztwU2eTdIp c8iZjryQT14ewd21r/vOHI0UM7cq818= X-MC-Unique: GMxoCDGyNumYsU-IiDmxrA-1 X-Mimecast-MFC-AGG-ID: GMxoCDGyNumYsU-IiDmxrA_1790108596 From: =?utf-8?q?Marc-Andr=C3=A9_Lureau?= Date: Wed, 23 Sep 2026 00:18:16 +0400 Subject: [PATCH 69/88] qemu-iotests/185: migrate away from HMP MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Message-Id: <20260923-nohmp-v1-69-ebc029d4bd80@redhat.com> References: <20260923-nohmp-v1-0-ebc029d4bd80@redhat.com> In-Reply-To: <20260923-nohmp-v1-0-ebc029d4bd80@redhat.com> To: qemu-devel@nongnu.org Cc: Kevin Wolf , =?utf-8?q?Marc-Andr=C3=A9_Lureau?= , Hanna Reitz , qemu-block@nongnu.org X-Developer-Signature: v=1; a=openpgp-sha256; l=3039; i=marcandre.lureau@redhat.com; h=from:subject:message-id; bh=7mJorKSl6IzOhE89QpcBPtTlZ5VdE05yu5pSZ8fKPGw=; b=owEBbQKS/ZANAwAKAdro4Ql1lpzlAcsmYgBqsuKzNKeLz6M/uWMDyYsk8LgTiviJRMaBtRJLP XMX9QydvLuJAjMEAAEKAB0WIQSHqb2TP4fGBtJ29i3a6OEJdZac5QUCarLiswAKCRDa6OEJdZac 5VflD/9lpy9qiX1oDOwOITcqiASKiC29XfE14QrdCHk0UEBoBb6/eK3C9B8v4QQwjPShy9Mtsh0 wyQpp2Qg4AbjABbRVbM6skotyFrm//ZIFza7Ju/J1FTrfyAhClVopjeFXFDDkr7bamOS+nr8WBM OGr7nwTdgBSJ3yhNVT3VUZXniCfNvONzNxyShyfuwaVw1Wx3BPsdOQABIG9rWLmVS1V8D9fTRl/ PyasTau69OpWrs+ir8KtW8EMv4TLvtsiC6hu4Fk05598/w7m5KTrJZvj25g89MplqbW+o+MBnFL Dh5Y/vCG/1N5bRnP1uacNMkijWYH9Ru4QyOeXgplMqjk6fJbSlP1IUK8RDr3I09eqSTgsfWRdoa ukHDgAh6Ubjbpj8lSlZme+pDAchyzUauPZDIad1Q7eEGIL0DwGsrAOTQKlqp/GClIUbVoCXnWvh MB0xQLaw9I3CgaCh2a7lVEbLzvixCDWSvi3irbeex/Y8Mn/a5iu0565FxCqvKE0TG9fXAaznuLJ JLLY64/RdfAlorIz2omLdtDH948cilYGzomwEMuA41Ah3XwopoZEE37MPKG347QZrhooRUf3znA 6J8uDAEBv850KWnGkZoxBz2btuBjKUUhw4bH2UbJ5ZUtTE4Rf3QKXJ+RJCzrOYKiWtlgs2ZKLOV DXdce6aDD5J2Hfw== X-Developer-Key: i=marcandre.lureau@redhat.com; a=openpgp; fpr=87A9BD933F87C606D276F62DDAE8E10975969CE5 X-Scanned-By: MIMEDefang 3.4.1 on 10.30.177.93 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: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 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, SPF_HELO_PASS=-0.001, SPF_PASS=-0.001 autolearn=unavailable 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: 1790109004800158500 Signed-off-by: Marc-Andr=C3=A9 Lureau --- tests/qemu-iotests/185 | 15 ++++++--------- tests/qemu-iotests/185.out | 10 ++++------ 2 files changed, 10 insertions(+), 15 deletions(-) diff --git a/tests/qemu-iotests/185 b/tests/qemu-iotests/185 index bb577a9cc999..c43d579676eb 100755 --- a/tests/qemu-iotests/185 +++ b/tests/qemu-iotests/185 @@ -50,7 +50,6 @@ trap "_cleanup; exit \$status" 0 1 2 3 15 _supported_fmt qcow2 _supported_proto file _supported_os Linux -_require_hmp _flaky_test https://gitlab.com/qemu-project/qemu/-/issues/3270 =20 size=3D$((64 * 1048576)) @@ -80,9 +79,9 @@ _send_qemu_cmd $h \ "return" =20 _send_qemu_cmd $h \ - "{ 'execute': 'human-monitor-command', - 'arguments': { 'command-line': - 'qemu-io disk \"write 0 4M\"' } }" \ + "{ 'execute': 'x-qemu-io', + 'arguments': { 'device': 'disk', + 'command': 'write 0 4M' } }" \ "return" =20 _send_qemu_cmd $h \ @@ -307,15 +306,13 @@ wait_for_job_and_quit() { echo '--- Writing data to the virtio-blk device ---' =20 for ofs in $(seq 0 $step $((size - step))); do - qemu_io_cmd=3D"qemu-io -d vblk/virtio-backend " - qemu_io_cmd+=3D"\\\"aio_write $ofs $cluster_size\\\"" - # Do not include these requests in the reference output # (it's just too much) silent=3Dyes _send_qemu_cmd $h \ - "{\"execute\": \"human-monitor-command\", + "{\"execute\": \"x-qemu-io\", \"arguments\": { - \"command-line\": \"$qemu_io_cmd\" + \"qdev\": \"vblk/virtio-backend\", + \"command\": \"aio_write $ofs $cluster_size\" }}" \ 'return' done diff --git a/tests/qemu-iotests/185.out b/tests/qemu-iotests/185.out index 6af0953c4d68..d05f359080b9 100644 --- a/tests/qemu-iotests/185.out +++ b/tests/qemu-iotests/185.out @@ -15,12 +15,10 @@ Formatting 'TEST_DIR/t.IMGFMT.base', fmt=3DIMGFMT size= =3D67108864 'mode': 'absolute-paths' } } Formatting 'TEST_DIR/t.qcow2.mid', fmt=3Dqcow2 cluster_size=3D65536 extend= ed_l2=3Doff compression_type=3Dzlib size=3D67108864 backing_file=3DTEST_DIR= /t.qcow2.base backing_fmt=3Dqcow2 lazy_refcounts=3Doff refcount_bits=3D16 {"return": {}} -{ 'execute': 'human-monitor-command', - 'arguments': { 'command-line': - 'qemu-io disk "write 0 4M"' } } -wrote 4194304/4194304 bytes at offset 0 -4 MiB, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec) -{"return": ""} +{ 'execute': 'x-qemu-io', + 'arguments': { 'device': 'disk', + 'command': 'write 0 4M' } } +{"return": {"human-readable-text": "wrote 4194304/4194304 bytes at offset = 0\n4 MiB, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec)\n"}} { 'execute': 'blockdev-snapshot-sync', 'arguments': { 'device': 'disk', 'snapshot-file': 'TEST_DIR/t.IMGFMT', --=20 2.56.0.rc0.29.g47ce80527c56 From nobody Sat Sep 26 20:01:40 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=1790108717; cv=none; d=zohomail.com; s=zohoarc; b=DJIG80UwK3HCVaa2jQRMKhqXXbNycLw1WTxPL2tndfET++OTXymYLQlLH7nNd/GiTqUF4x3l1fqEFMrjrP3pgQaabB3/LlBQEk4RDt7DNqNRkWbQgOZTycBL55NGvyPjNG1HbZKeIHfpBbRDw1NEovKlhqwK/qWj2uV/qqZ4uKg= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1790108717; 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:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=nqJFO9Zbw4yV2Rp9Ae6R33BSQfpuM1brZMcSKDKzp2w=; b=k0BtQJ/nM4vS3Nt5epMSdUFoL8IMAcBoFvZ0PqYECTuH5LMVS5biNZONCBo8wLc15OHxQI8QwfxDOnoUArBpeRJyCurzIfYMswphca/IwtvuzQTB6G/WbOGM0T5xVT7oQIxLXXVNN1vD/1n+H8GBAnYw9aqBCeRo3Y1QRUfZdmE= 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 1790108717412107.85188041168374; Tue, 22 Sep 2026 13:25:17 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists1p.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1x971m-0007lQ-Rc; Tue, 22 Sep 2026 16:23:47 -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 1x971R-0005jC-AB for qemu-devel@nongnu.org; Tue, 22 Sep 2026 16:23:25 -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 1x971P-0000Og-6S for qemu-devel@nongnu.org; Tue, 22 Sep 2026 16:23:24 -0400 Received: from mx-prod-mc-01.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-311-NNgnS_SCPJ64wSPMEpruvw-1; Tue, 22 Sep 2026 16:23:21 -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-01.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id 21BB3195D013; Tue, 22 Sep 2026 20:23:20 +0000 (UTC) Received: from localhost (headnet03.pony-001.prod.iad2.dc.redhat.com [10.2.32.114]) by mx-prod-int-10.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id 4E1F8418; Tue, 22 Sep 2026 20:23:18 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1790108602; 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=nqJFO9Zbw4yV2Rp9Ae6R33BSQfpuM1brZMcSKDKzp2w=; b=JoKr6rfNbdwduiShnfwziP2H7vVCPpBgwgFQQUVIaVrazN1AysFtKKwcI5KDZDpDb9F0N0 9/mg0wXUrh2U8E0ReuUXUNM2Kds0poZaIg6dV+cPvHEHgEKwm9Evi5iDAomEJR/pMgWBIi 3AIKBocX16zlMJBOQ10gf+naMtC3xqE= X-MC-Unique: NNgnS_SCPJ64wSPMEpruvw-1 X-Mimecast-MFC-AGG-ID: NNgnS_SCPJ64wSPMEpruvw_1790108600 From: =?utf-8?q?Marc-Andr=C3=A9_Lureau?= Date: Wed, 23 Sep 2026 00:18:17 +0400 Subject: [PATCH 70/88] qemu-iotests/246: migrate away from HMP MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Message-Id: <20260923-nohmp-v1-70-ebc029d4bd80@redhat.com> References: <20260923-nohmp-v1-0-ebc029d4bd80@redhat.com> In-Reply-To: <20260923-nohmp-v1-0-ebc029d4bd80@redhat.com> To: qemu-devel@nongnu.org Cc: Kevin Wolf , =?utf-8?q?Marc-Andr=C3=A9_Lureau?= , Hanna Reitz , qemu-block@nongnu.org X-Developer-Signature: v=1; a=openpgp-sha256; l=3039; i=marcandre.lureau@redhat.com; h=from:subject:message-id; bh=WPaT+n066L0xfnS5yDo40W78Cd4DPrfdTywG4clNEF4=; b=owEBbQKS/ZANAwAKAdro4Ql1lpzlAcsmYgBqsuKzOdvKOAimtpeCUFpM+gMjEP+oRu5djGZYp 127hoeTdqSJAjMEAAEKAB0WIQSHqb2TP4fGBtJ29i3a6OEJdZac5QUCarLiswAKCRDa6OEJdZac 5Yr2EACctB6mlGMuqeiS2TzKVVxRLDpDld6CwC0PYXXfAUULhW/gB7YmJhROoo9BnZ2urk7viCO Kb7Er/PRlGfkgx5UhhO8lfN7Dnd3JQyW2J2yo4tln4Wn8yWf16G9sf1wdaMRhx6WTZRVO7MKx0p sH8LAU/344tebgqR5xaSuudD47qJjEJfSEk6Gohzlcsl//6fdLFjNJr/N/+NUdv27DHsGv2djl8 uwr+bIk5i8KgoB7xsvfTj3diI35thvKz/Ocasrgv886ivn+rK8ihVBeRSC/ramwCCdAehK7Mnq/ g6MXqgbIAS68S1P0Vv0ATTuDKh1zOTzCqR/ZgAuAVayh9QORemM2jTwae8lb2C92fUb3rmdeGrj F7BMAlam/kUxRvj6rQeg4sYdbxDJQXQ3Sf5rmH6rPdH5XoxOLeXv4AYfLJGzGhbVtlD2v96RWTJ EHjgq/j3VWxWedc4yQLNpW4p3aHjTCkRHx9l32gwKbddVgfKWb2megEN6iyktpRvN9iyDWvTADp 6yF6mxsRssTqJNMU2nWYu1BTTbpCtsNVQQS1YRyTO1wmEAfTYBtzDumghm0+xgeSlGbbx23gM7P 1JcngePbgdA+6AZ3zyAymgrxB7hGdxFDfW2k1h1Ft9r35EfyJOS77OlbtZkCQMX/gR363S3j7mP wtjNRtPhP9Y/PMA== 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: 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-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: 1790108719235158500 Signed-off-by: Marc-Andr=C3=A9 Lureau --- tests/qemu-iotests/246 | 11 +++++------ tests/qemu-iotests/246.out | 8 ++++---- 2 files changed, 9 insertions(+), 10 deletions(-) diff --git a/tests/qemu-iotests/246 b/tests/qemu-iotests/246 index cee5131c3ce4..a821e2cab8ea 100755 --- a/tests/qemu-iotests/246 +++ b/tests/qemu-iotests/246 @@ -24,8 +24,7 @@ import iotests from iotests import log =20 iotests.script_initialize(supported_fmts=3D['qcow2'], - unsupported_imgopts=3D['compat'], - require_hmp=3DTrue) + unsupported_imgopts=3D['compat']) size =3D 64 * 1024 * 1024 * 1024 gran_small =3D 32 * 1024 gran_large =3D 128 * 1024 @@ -69,8 +68,8 @@ with iotests.FilePath('img') as img_path, \ log('--- Adding new bitmap, growing image, and adding 2nd new bitmap -= --') vm.qmp_log("block-dirty-bitmap-add", node=3D"drive0", name=3D"New", persistent=3DTrue) - vm.qmp_log("human-monitor-command", - command_line=3D"block_resize drive0 70G") + vm.qmp_log("block_resize", device=3D"drive0", + size=3D70 * 1024 * 1024 * 1024) vm.qmp_log("block-dirty-bitmap-add", node=3D"drive0", name=3D"Newtwo", persistent=3DTrue) log(query_bitmaps(vm), indent=3D2) @@ -90,8 +89,8 @@ with iotests.FilePath('img') as img_path, \ name=3D"New") =20 log('--- Truncating image ---\n') - vm.qmp_log("human-monitor-command", - command_line=3D"block_resize drive0 50G") + vm.qmp_log("block_resize", device=3D"drive0", + size=3D50 * 1024 * 1024 * 1024) =20 log('--- Adding "NewC" bitmap, removing "NewTwo" bitmap ---') vm.qmp_log("block-dirty-bitmap-add", node=3D"drive0", diff --git a/tests/qemu-iotests/246.out b/tests/qemu-iotests/246.out index eeb98ab37c93..dde5bfb6d42c 100644 --- a/tests/qemu-iotests/246.out +++ b/tests/qemu-iotests/246.out @@ -88,8 +88,8 @@ --- Adding new bitmap, growing image, and adding 2nd new bitmap --- {"execute": "block-dirty-bitmap-add", "arguments": {"name": "New", "node":= "drive0", "persistent": true}} {"return": {}} -{"execute": "human-monitor-command", "arguments": {"command-line": "block_= resize drive0 70G"}} -{"return": ""} +{"execute": "block_resize", "arguments": {"device": "drive0", "size": 7516= 1927680}} +{"return": {}} {"execute": "block-dirty-bitmap-add", "arguments": {"name": "Newtwo", "nod= e": "drive0", "persistent": true}} {"return": {}} { @@ -195,8 +195,8 @@ {"return": {}} --- Truncating image --- =20 -{"execute": "human-monitor-command", "arguments": {"command-line": "block_= resize drive0 50G"}} -{"return": ""} +{"execute": "block_resize", "arguments": {"device": "drive0", "size": 5368= 7091200}} +{"return": {}} --- Adding "NewC" bitmap, removing "NewTwo" bitmap --- {"execute": "block-dirty-bitmap-add", "arguments": {"name": "NewC", "node"= : "drive0", "persistent": true}} {"return": {}} --=20 2.56.0.rc0.29.g47ce80527c56 From nobody Sat Sep 26 20:01:40 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=1790108843; cv=none; d=zohomail.com; s=zohoarc; b=e/p9I0vDJAOEzT2HQwykgFMAiDeXB3ONjEJ+r9g3iRHV2Du0ButAJWmL+GEOV2ZbaTrh8DbvI/HUm96fNA1wlqDLPb85a7TYyyKJkS6CVEQd/5AUlJsmsOXdAd229nluR5iZmAKfV3TDOve1jXQDcsk2dEWIxZ3fEHbLVWi2QaE= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1790108843; 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:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=mfbMgMV4azljAgltI1vhifC9l9nHWI+d3UI2pmdhqXs=; b=SXvSui10jL6peSdBbhy0vhbxGi3o93KKmtHFe7vYLu4o67w9RH0OrawBKkiVoQW/SgqpqYOAD7OYXoNloOXYin/4VFuCIYBQi6sI+Ik4iOhJUEFcQXOkfBBa6TO1KCFGdPBxSd4Mvr7qvum1jp15EqKSGucV4cqqdyaEDUN96Q8= 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 1790108843424464.7624891994923; Tue, 22 Sep 2026 13:27:23 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists1p.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1x972T-0001Nn-Eg; Tue, 22 Sep 2026 16:24:29 -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 1x971V-00062c-3e for qemu-devel@nongnu.org; Tue, 22 Sep 2026 16:23:29 -0400 Received: from us-smtp-delivery-124.mimecast.com ([170.10.133.124]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1x971T-0000PK-21 for qemu-devel@nongnu.org; Tue, 22 Sep 2026 16:23:28 -0400 Received: from mx-prod-mc-01.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-468-nr1abh7ON_KpI4rRfXCtMw-1; Tue, 22 Sep 2026 16:23:24 -0400 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-01.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id 032BF195FCF9; Tue, 22 Sep 2026 20:23:24 +0000 (UTC) Received: from localhost (headnet03.pony-001.prod.iad2.dc.redhat.com [10.2.32.114]) by mx-prod-int-08.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id F39C01800446; Tue, 22 Sep 2026 20:23:22 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1790108606; 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=mfbMgMV4azljAgltI1vhifC9l9nHWI+d3UI2pmdhqXs=; b=TcQv6RifeRafdwQN3IV5jDhNLHvIP0N2GinGDYDwaAR3/Au4RCFtSbSU13mYyvUVqcpimV B1o0vP7R3BTBPqxcsin+8M8TQJGXWqjdayIiaFhVyN4Kt2Oqf8KRZqpAepWPJ5geWA1GKJ qiPEaKUsYtahEipuxJEcL50eek/2tU0= X-MC-Unique: nr1abh7ON_KpI4rRfXCtMw-1 X-Mimecast-MFC-AGG-ID: nr1abh7ON_KpI4rRfXCtMw_1790108604 From: =?utf-8?q?Marc-Andr=C3=A9_Lureau?= Date: Wed, 23 Sep 2026 00:18:18 +0400 Subject: [PATCH 71/88] qemu-iotests/274: migrate away from HMP MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Message-Id: <20260923-nohmp-v1-71-ebc029d4bd80@redhat.com> References: <20260923-nohmp-v1-0-ebc029d4bd80@redhat.com> In-Reply-To: <20260923-nohmp-v1-0-ebc029d4bd80@redhat.com> To: qemu-devel@nongnu.org Cc: Kevin Wolf , =?utf-8?q?Marc-Andr=C3=A9_Lureau?= , Hanna Reitz , qemu-block@nongnu.org X-Developer-Signature: v=1; a=openpgp-sha256; l=2900; i=marcandre.lureau@redhat.com; h=from:subject:message-id; bh=rzHiNLUbPaKLIpJuXfTIUWXUNuL24MxzcF3PDJ25jUE=; b=owEBbQKS/ZANAwAKAdro4Ql1lpzlAcsmYgBqsuKz0xasVDBeY9NXMkYBMTV8InNeR3pMQeejG UWTXKrCCe6JAjMEAAEKAB0WIQSHqb2TP4fGBtJ29i3a6OEJdZac5QUCarLiswAKCRDa6OEJdZac 5QZPD/9wMJsMSCQ4t0JZKMb+3WxVDcvBsG0NjZAfBKdzEYzbTprIxtoTNvSBFYi+/Y9/mu4Ukqc MQNfn9J5Xh4QKGCwVqxyOOj0BpnS6t+QKx49pK5haJWQ8dWoHj9qGiHkYQoymlgj+QoLQPjODrL A2cPpaZxVD+x7yald+y2ckhg7dpx/1YTE/upOCQR1sjUj4UCUvAvR6AEXihZrMGXnqOjlwy6L10 kkLVlMrszBEoWxykeAYOhjnXX1PxETqLzCwfiekuOEChRDWV4Z8o6ZErU9W3945X6ZB68U6RrR6 DQugavRpquTpZdzRCg4F1eR+m1uw2bmDeBEnuta+FMHWzPN87vm+sQ7MfEOsq8LvJZN2wEO/sZE K2ZRuIIFCputexPfiMjIGKJrx76tK90sk3zizPDgnD0ggI87AZcxBScgvp4nxl/pHe3OYTOgCVe iY9AZ8gQyuuw2RD/AY5hTdZ5kEtQpVzkKC7+CkiozAySOxij4PD5zdTxgB1rccHHu9+sVmBFICh 4lp1C1fnWF0JKtiUEiwl1P2kRG1f9MjAsNL569kXhMDmlFLQLI0XXMMwFS2egxOd33BDyDY1D6K +NTa5v8YpaPLThGgN2oKY1J1gBjcl22bvIhbbTNYi221M6UWm9vJQkUhvsEr19zz6GgtW9eBmjx 8BOhcSXeNx31QGw== X-Developer-Key: i=marcandre.lureau@redhat.com; a=openpgp; fpr=87A9BD933F87C606D276F62DDAE8E10975969CE5 X-Scanned-By: MIMEDefang 3.4.1 on 10.30.177.111 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.133.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_H3=0.001, RCVD_IN_MSPIKE_WL=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-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: 1790108843825158500 Drop the quite redundant HMP code path. Signed-off-by: Marc-Andr=C3=A9 Lureau --- tests/qemu-iotests/274 | 14 +------------- tests/qemu-iotests/274.out | 26 -------------------------- 2 files changed, 1 insertion(+), 39 deletions(-) diff --git a/tests/qemu-iotests/274 b/tests/qemu-iotests/274 index d91c11c70d2e..917982ec63bf 100755 --- a/tests/qemu-iotests/274 +++ b/tests/qemu-iotests/274 @@ -24,8 +24,7 @@ import iotests =20 iotests.script_initialize(supported_fmts=3D['qcow2'], supported_platforms=3D['linux'], - unsupported_imgopts=3D['refcount_bits', 'compat'= ], - require_hmp=3DTrue) + unsupported_imgopts=3D['refcount_bits', 'compat'= ]) =20 size_short =3D 1 * 1024 * 1024 size_long =3D 2 * 1024 * 1024 @@ -93,17 +92,6 @@ with iotests.FilePath('base') as base, \ iotests.qemu_io_log('-c', 'read -P 1 0 %d' % size_short, mid) iotests.qemu_io_log('-c', 'read -P 0 %d %d' % (size_short, size_diff),= mid) =20 - iotests.log('=3D=3D=3D Testing HMP commit (top -> mid) =3D=3D=3D') - - create_chain() - with create_vm() as vm: - vm.launch() - vm.qmp_log('human-monitor-command', command_line=3D'commit drive0') - - iotests.img_info_log(mid) - iotests.qemu_io_log('-c', 'read -P 1 0 %d' % size_short, mid) - iotests.qemu_io_log('-c', 'read -P 0 %d %d' % (size_short, size_diff),= mid) - iotests.log('=3D=3D=3D Testing QMP active commit (top -> mid) =3D=3D= =3D') =20 create_chain() diff --git a/tests/qemu-iotests/274.out b/tests/qemu-iotests/274.out index c2967335ca09..ef1d2d993c9f 100644 --- a/tests/qemu-iotests/274.out +++ b/tests/qemu-iotests/274.out @@ -59,32 +59,6 @@ read 1048576/1048576 bytes at offset 0 read 1048576/1048576 bytes at offset 1048576 1 MiB, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec) =20 -=3D=3D=3D Testing HMP commit (top -> mid) =3D=3D=3D -wrote 2097152/2097152 bytes at offset 0 -2 MiB, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec) - -{"execute": "human-monitor-command", "arguments": {"command-line": "commit= drive0"}} -{"return": ""} -image: TEST_IMG -file format: IMGFMT -virtual size: 2 MiB (2097152 bytes) -cluster_size: 65536 -backing file: TEST_DIR/PID-base -backing file format: IMGFMT -Format specific information: - compat: 1.1 - compression type: COMPRESSION_TYPE - lazy refcounts: false - refcount bits: 16 - corrupt: false - extended l2: false - -read 1048576/1048576 bytes at offset 0 -1 MiB, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec) - -read 1048576/1048576 bytes at offset 1048576 -1 MiB, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec) - =3D=3D=3D Testing QMP active commit (top -> mid) =3D=3D=3D wrote 2097152/2097152 bytes at offset 0 2 MiB, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec) --=20 2.56.0.rc0.29.g47ce80527c56 From nobody Sat Sep 26 20:01:40 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=1790108800; cv=none; d=zohomail.com; s=zohoarc; b=ccJYrsgmvtppwz20BVBUPtdGttVhBfJ0t4uwn53hxV6lZlG81RkycOeSwXA9WcCc00GMzOIqdRwpXsAwDxr6QZT+T6+ILyoC84WPVeIvvaTkzjA0sqN5WekNE33ryhg6tNwL+8+Ibrhq7nVZUHfRoejWglAbIjgHHjOJDmSUHRI= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1790108800; 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:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=t9NActlqZrsqXIi6E6W/1zrSkYpuOjkw9/ZCmANmogk=; b=F9YsKTQh0wFU8DmWA6k419s7mGvOnrvXrJaQ7DM/TQamYBNkxsJHq92gAgO3WeG97lBChAIGHLBMDKoPOdz6ZumRms/SPCinDzcuUhMCVzhUr2NotXqj3/uQQ6UjjPJxDjvpNGB5KnJaherDYAdnTTo8R/aFOnXXMSS+g6OEcsE= 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 17901087999981002.7725292188754; Tue, 22 Sep 2026 13:26:39 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists1p.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1x972D-0000rM-4q; Tue, 22 Sep 2026 16:24:14 -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 1x971Y-0006Lw-1a for qemu-devel@nongnu.org; Tue, 22 Sep 2026 16:23:32 -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 1x971W-0000Pk-G9 for qemu-devel@nongnu.org; Tue, 22 Sep 2026 16:23:31 -0400 Received: from mx-prod-mc-01.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-495-jD-GX_d_MRimFiq_DWNGgA-1; Tue, 22 Sep 2026 16:23:28 -0400 Received: from mx-prod-int-01.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-01.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.4]) (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-01.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id 6C3D11955F28; Tue, 22 Sep 2026 20:23:27 +0000 (UTC) Received: from localhost (headnet03.pony-001.prod.iad2.dc.redhat.com [10.2.32.114]) by mx-prod-int-01.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id 6AA613000223; Tue, 22 Sep 2026 20:23:26 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1790108609; 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=t9NActlqZrsqXIi6E6W/1zrSkYpuOjkw9/ZCmANmogk=; b=OUDApCIHBatwl9CUgaHcWzKmsMRWRgOOIjyVo/QcEUkhtLOVsslA12ZtO+YkGjh509qAsq FXbKMpbDLnTffut/G657R65aru4zZgcdq0IDaA/s0gzI/mxwG6m7DYyHwHsKOEgcKVEo/Q vSNEfqFZHGC8FnssoNknExDfZSyOmmY= X-MC-Unique: jD-GX_d_MRimFiq_DWNGgA-1 X-Mimecast-MFC-AGG-ID: jD-GX_d_MRimFiq_DWNGgA_1790108607 From: =?utf-8?q?Marc-Andr=C3=A9_Lureau?= Date: Wed, 23 Sep 2026 00:18:19 +0400 Subject: [PATCH 72/88] qemu-iotests/145: migrate away from HMP MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Message-Id: <20260923-nohmp-v1-72-ebc029d4bd80@redhat.com> References: <20260923-nohmp-v1-0-ebc029d4bd80@redhat.com> In-Reply-To: <20260923-nohmp-v1-0-ebc029d4bd80@redhat.com> To: qemu-devel@nongnu.org Cc: Kevin Wolf , =?utf-8?q?Marc-Andr=C3=A9_Lureau?= , Hanna Reitz , qemu-block@nongnu.org X-Developer-Signature: v=1; a=openpgp-sha256; l=1667; i=marcandre.lureau@redhat.com; h=from:subject:message-id; bh=AjZGx6vuolVU8p5Fw4suRr0BtpDzQNyU9vyTBsiRh+g=; b=owEBbQKS/ZANAwAKAdro4Ql1lpzlAcsmYgBqsuKzOAsXcmj9cUGwpUSOCoVAQkkPwHpdHn6kg DqOpol6zC6JAjMEAAEKAB0WIQSHqb2TP4fGBtJ29i3a6OEJdZac5QUCarLiswAKCRDa6OEJdZac 5aN1EACdHOXz8oOAPicUqFza7+yoftWISGBmHqvrVwTfb8EWOJSkb3eKKAtlqJXoXRJBfRbUaD0 oNsZ6hpmONxaro/qk7PzUehElQuUP7la4rwdvaiEBE2z0s4wFOhNbdzAMy7B3vvP/hHi1qNDQ21 i/D25uQ78s6rjiMDVMfVuiPCThyuUDMUk/eOFaWu/644gL0DQb24v7ZM2AVB5ll5LJQcqoOGpDf C6ug20NxAX/tZTCGRnhQtjHQxmKRCdrzYQ68ooPqCuRYQfLFMA+MJi7Rj0acqK78Tq8qMS1MQAv MViLPQtnTCsQEJX3FBGAtbkd2z96a7BL7dkjEFgAlSUxamTDs77U7jsvGV/f07PI/uuP2DbqcGK 0y8tOWi3QcAha5UB9/tE2cTGbRUTCxVhr57lW/Fjgepc8VVsBXcFXr9nUCR96VZuowEX3ERtHzD KZRP02IjNXhlefaSdQbQb+Greqpxbx570RsgxF9KIY57qu6vsenb/PYFO1qqrPIwK3XCcBZXU7X zL/XQ5WOWgD4pJ4Ab2JrczfESqX84KqZ8HOkupoTUL6ySj3p8xkMuVhs32vgIHiYMik4PfvSVR/ 2qBa5gPUR3eRsDx6fQxN+baeoCReiQy9cZCJx/As8Na2p7sUqc70xG3FTKO9qwyr1rjTKR67932 GhBDk8QBgajRTkQ== X-Developer-Key: i=marcandre.lureau@redhat.com; a=openpgp; fpr=87A9BD933F87C606D276F62DDAE8E10975969CE5 X-Scanned-By: MIMEDefang 3.4.1 on 10.30.177.4 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: 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-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: 1790108801752158500 Signed-off-by: Marc-Andr=C3=A9 Lureau --- tests/qemu-iotests/145 | 8 ++++---- tests/qemu-iotests/145.out | 6 ++++-- 2 files changed, 8 insertions(+), 6 deletions(-) diff --git a/tests/qemu-iotests/145 b/tests/qemu-iotests/145 index f61a50f63951..d763ea14417a 100755 --- a/tests/qemu-iotests/145 +++ b/tests/qemu-iotests/145 @@ -40,7 +40,6 @@ trap "_cleanup; exit \$status" 0 1 2 3 15 =20 _supported_fmt generic _supported_proto generic -_require_hmp =20 _make_test_img 1M =20 @@ -57,9 +56,10 @@ else SYSEMU_EXTRA_ARGS=3D"" fi =20 -echo quit | $QEMU -nographic $SYSEMU_EXTRA_ARGS -drive $SYSEMU_DRIVE_ARG \ - -incoming 'exec:true' -snapshot -serial none -monitor st= dio \ - | _filter_qemu | _filter_hmp +printf '%s\n' '{"execute":"qmp_capabilities"}' '{"execute":"quit"}' \ + | $QEMU -nographic $SYSEMU_EXTRA_ARGS -drive $SYSEMU_DRIVE_ARG \ + -incoming 'exec:true' -snapshot -serial none -qmp stdio \ + | _filter_qmp | _filter_qemu =20 # success, all done echo "*** done" diff --git a/tests/qemu-iotests/145.out b/tests/qemu-iotests/145.out index 9a90009e44e3..d7ab88904278 100644 --- a/tests/qemu-iotests/145.out +++ b/tests/qemu-iotests/145.out @@ -1,5 +1,7 @@ QA output created by 145 Formatting 'TEST_DIR/t.IMGFMT', fmt=3DIMGFMT size=3D1048576 -QEMU X.Y.Z monitor - type 'help' for more information -(qemu) quit +QMP_VERSION +{"return": {}} +{"timestamp": {"seconds": TIMESTAMP, "microseconds": TIMESTAMP}, "event"= : "SHUTDOWN", "data": {"guest": false, "reason": "host-qmp-quit"}} +{"return": {}} *** done --=20 2.56.0.rc0.29.g47ce80527c56 From nobody Sat Sep 26 20:01:40 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=1790108877; cv=none; d=zohomail.com; s=zohoarc; b=kDpznzD4M5XVMK99ywP3Eab4HdrdGCpPNcHgVhuL2RvZeKldlIoQm2wLQQ8vCuFw72vd7grD1Tup6YYb+761knx4KRLuEwVnJADkJsJ3t6DJ1AIgPq00Ai15n5vRHwLDY25rgPDU8GE2I5H4nVgA9OEfN2U8Pln+DnIcCFGjI5s= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1790108877; 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:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=Oy+CIlG/adbBU7+GU1hko0NnzX2P2hlt0YDFKgcMYe4=; b=RNc9CxESJXWYOyaf5BIOWJ5xHWYYwxPTOygPgKFFFVyb5TSvTu904NLcwN7d9nE8Bb/CIhrjQSdkNJyirzBkX3d9wrPkrgvnAdodqXat4O91MmUcS88pSAeeVptYOyLgc0JfUx3vIkocrePCmLjPBMb+HFVK4wPwxV9pYHkw0Io= 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 1790108877037921.5798375514717; Tue, 22 Sep 2026 13:27:57 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists1p.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1x9730-0002yl-L2; Tue, 22 Sep 2026 16:25:03 -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 1x971b-0006pQ-SB for qemu-devel@nongnu.org; Tue, 22 Sep 2026 16:23:36 -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 1x971Z-0000QB-Rq for qemu-devel@nongnu.org; Tue, 22 Sep 2026 16:23:35 -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-505-Qs_C4FsXNyqLUiM4dIIx-w-1; Tue, 22 Sep 2026 16:23:31 -0400 Received: from mx-prod-int-05.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-05.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.17]) (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 D9A7F180059C; Tue, 22 Sep 2026 20:23:30 +0000 (UTC) Received: from localhost (headnet03.pony-001.prod.iad2.dc.redhat.com [10.2.32.114]) by mx-prod-int-05.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id 136E01953941; Tue, 22 Sep 2026 20:23:29 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1790108613; 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=Oy+CIlG/adbBU7+GU1hko0NnzX2P2hlt0YDFKgcMYe4=; b=YP9Bkis0oVdfPT6tYjBAGZ6VaqJxXWBZOi03FKt2YYiJfUerr7G44HIXT2csngbn0AUa1J 3CUvXaMjaz6oIt0GIJknL+tjSHzpz4d02qRsVJpzYIDC/Y2jIznOuudIZ5Sfez5ibxrlzZ QO/1HC6k5lJbdZ2pVzr+DuSBGPS5TUc= X-MC-Unique: Qs_C4FsXNyqLUiM4dIIx-w-1 X-Mimecast-MFC-AGG-ID: Qs_C4FsXNyqLUiM4dIIx-w_1790108611 From: =?utf-8?q?Marc-Andr=C3=A9_Lureau?= Date: Wed, 23 Sep 2026 00:18:20 +0400 Subject: [PATCH 73/88] qemu-iotests/068: migrate away from HMP MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Message-Id: <20260923-nohmp-v1-73-ebc029d4bd80@redhat.com> References: <20260923-nohmp-v1-0-ebc029d4bd80@redhat.com> In-Reply-To: <20260923-nohmp-v1-0-ebc029d4bd80@redhat.com> To: qemu-devel@nongnu.org Cc: Kevin Wolf , =?utf-8?q?Marc-Andr=C3=A9_Lureau?= , Hanna Reitz , qemu-block@nongnu.org X-Developer-Signature: v=1; a=openpgp-sha256; l=5585; i=marcandre.lureau@redhat.com; h=from:subject:message-id; bh=7kjpW7gWnWMHvsIKI0iwQ6zfC9EZSudtcb7aHFR23Xs=; b=owEBbQKS/ZANAwAKAdro4Ql1lpzlAcsmYgBqsuKz4clK5zGPVPlBPEIAxJOz83f5CUaDDQcVA Nwjk5ldB7mJAjMEAAEKAB0WIQSHqb2TP4fGBtJ29i3a6OEJdZac5QUCarLiswAKCRDa6OEJdZac 5XgWEACPiVpjNTUL4yNGr6x+8H73x427jI9UqvxgmcDvzqU3mGKS5R60j7NhAei0LN6fwwZQqPy xiKHMyfTudfLztNtr+3HyJ7UwAZJ/VO49efc77O6SOZ9KZcXeUc6DcvhBEXtbB/YCBWDMeVcZVu +G5He2X5uQw//LkxTyPEAz1eF5HUTsmyf2ON0RiQVo5FlFMRjtElzIbYGRre1kChGqcFhLLTeXA fQ7lCJqOBjvMOwizqDHVumgSuz2ilWDbhctpBxsnSJLWbEpyo7cFORYvpzs1iEwXToTWPuFXgh/ BpHm4oGBgy5HRV9StrvdgzgRtmUV8dxAFOaUkqs7cxDBTO4AWpZaaEzoijPWpD8bTJNv5y5GqrB vcwvQI7aHlxhzF25fXiwLD7fjHLhILUiG0jLpJAOTYrrj0gXx6DBMIQTl6t0TFbg6qE7iH+SjGY V77TwaFP6YROMSEl+Vmx37kvjzeoj5JvfSSrsT8JMBzRMJN85idZwnitNSFIjUNOtjlOaARk5bn 9Egwv4MwC9INMhy2GKSPdBVa+9lXnbz27IDZ0l7BRvPFDPqHFwuYyYhwMq+PV+I/hSPm3LaTTuH S9eWEoWnQwzByvYmrDKiK7Qk31H9c3mt/t45W6cs739KYoz4KmH9rnVjKcMLYZO2TdzvmrJfne7 RSPbS1GD7MMytQg== X-Developer-Key: i=marcandre.lureau@redhat.com; a=openpgp; fpr=87A9BD933F87C606D276F62DDAE8E10975969CE5 X-Scanned-By: MIMEDefang 3.0 on 10.30.177.17 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: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 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, 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: 1790108878086158500 Replace HMP savevm/loadvm with QMP snapshot-save/snapshot-load job-based API. Use _run_qmp_job() helper to factor the common send/wait/dismiss pattern. The sleep before sending commands is no longer needed: the QMP qmp_capabilities handshake is synchronous, so QEMU is guaranteed to be ready. Signed-off-by: Marc-Andr=C3=A9 Lureau --- tests/qemu-iotests/068 | 56 ++++++++++++++++++++++++++++++++++--------= ---- tests/qemu-iotests/068.out | 26 ++++++++++----------- 2 files changed, 54 insertions(+), 28 deletions(-) diff --git a/tests/qemu-iotests/068 b/tests/qemu-iotests/068 index 11b660a8b7c4..0b756862c1c3 100755 --- a/tests/qemu-iotests/068 +++ b/tests/qemu-iotests/068 @@ -29,6 +29,7 @@ status=3D1 # failure is the default! =20 _cleanup() { + _cleanup_qemu _cleanup_test_img } trap "_cleanup; exit \$status" 0 1 2 3 15 @@ -36,6 +37,7 @@ trap "_cleanup; exit \$status" 0 1 2 3 15 # get standard environment, filters and checks . ./common.rc . ./common.filter +. ./common.qemu =20 # This tests qcow2-specific low-level functionality _supported_fmt qcow2 @@ -43,7 +45,6 @@ _supported_proto generic # Internal snapshots are (currently) impossible with refcount_bits=3D1, # and generally impossible with external data files _unsupported_imgopts 'compat=3D0.10' 'refcount_bits=3D1[^0-9]' data_file -_require_hmp =20 IMG_SIZE=3D128K =20 @@ -56,16 +57,6 @@ case "$QEMU_DEFAULT_MACHINE" in ;; esac =20 -_qemu() -{ - $QEMU $platform_parm -nographic -monitor stdio -serial none \ - -drive if=3Dnone,id=3Ddrive0,file=3D"$TEST_IMG",format=3D"$IMGFM= T" \ - -device virtio-scsi,id=3Dhba0 \ - -device scsi-hd,drive=3Ddrive0 \ - "$@" |\ - _filter_qemu | _filter_hmp -} - for extra_args in \ "" \ "-object iothread,id=3Diothread0 -set device.hba0.iothread=3Diothread0= "; do @@ -75,10 +66,47 @@ for extra_args in \ =20 _make_test_img $IMG_SIZE =20 - # Give qemu some time to boot before saving the VM state - { sleep 1; printf "savevm 0\nquit\n"; } | _qemu $extra_args + # Save VM state + _launch_qemu $platform_parm \ + -drive if=3Dnone,id=3Ddrive0,node-name=3Ddisk0,file=3D"$TEST_IMG= ",format=3D"$IMGFMT" \ + -device virtio-scsi,id=3Dhba0 \ + -device scsi-hd,drive=3Ddrive0 \ + $extra_args + silent=3Dyes _send_qemu_cmd $QEMU_HANDLE \ + "{ 'execute': 'qmp_capabilities' }" \ + 'return' + silent=3Dyes _run_qmp_job $QEMU_HANDLE 'save0' \ + "{ 'execute': 'snapshot-save', + 'arguments': { 'job-id': 'save0', + 'tag': '0', + 'vmstate': 'disk0', + 'devices': ['disk0'] } }" + _send_qemu_cmd $QEMU_HANDLE \ + "{ 'execute': 'quit' }" \ + 'return' + wait=3D1 _cleanup_qemu + # Now try to continue from that VM state (this should just work) - { sleep 1; printf "loadvm 0\nloadvm 0\nquit\n"; } | _qemu $extra_args = -S + _launch_qemu $platform_parm \ + -drive if=3Dnone,id=3Ddrive0,node-name=3Ddisk0,file=3D"$TEST_IMG= ",format=3D"$IMGFMT" \ + -device virtio-scsi,id=3Dhba0 \ + -device scsi-hd,drive=3Ddrive0 \ + -S $extra_args + silent=3Dyes _send_qemu_cmd $QEMU_HANDLE \ + "{ 'execute': 'qmp_capabilities' }" \ + 'return' + for i in 1 2; do + silent=3Dyes _run_qmp_job $QEMU_HANDLE "load$i" \ + "{ 'execute': 'snapshot-load', + 'arguments': { 'job-id': 'load$i', + 'tag': '0', + 'vmstate': 'disk0', + 'devices': ['disk0'] } }" + done + _send_qemu_cmd $QEMU_HANDLE \ + "{ 'execute': 'quit' }" \ + 'return' + wait=3D1 _cleanup_qemu done =20 # success, all done diff --git a/tests/qemu-iotests/068.out b/tests/qemu-iotests/068.out index f07a938a3838..3bc0b5a771db 100644 --- a/tests/qemu-iotests/068.out +++ b/tests/qemu-iotests/068.out @@ -3,22 +3,20 @@ QA output created by 068 =3D=3D=3D Saving and reloading a VM state to/from a qcow2 image () =3D=3D= =3D =20 Formatting 'TEST_DIR/t.IMGFMT', fmt=3DIMGFMT size=3D131072 -QEMU X.Y.Z monitor - type 'help' for more information -(qemu) savevm 0 -(qemu) quit -QEMU X.Y.Z monitor - type 'help' for more information -(qemu) loadvm 0 -(qemu) loadvm 0 -(qemu) quit +{ 'execute': 'quit' } +{"timestamp": {"seconds": TIMESTAMP, "microseconds": TIMESTAMP}, "event"= : "SHUTDOWN", "data": {"guest": false, "reason": "host-qmp-quit"}} +{"return": {}} +{ 'execute': 'quit' } +{"timestamp": {"seconds": TIMESTAMP, "microseconds": TIMESTAMP}, "event"= : "SHUTDOWN", "data": {"guest": false, "reason": "host-qmp-quit"}} +{"return": {}} =20 =3D=3D=3D Saving and reloading a VM state to/from a qcow2 image (-object i= othread,id=3Diothread0 -set device.hba0.iothread=3Diothread0) =3D=3D=3D =20 Formatting 'TEST_DIR/t.IMGFMT', fmt=3DIMGFMT size=3D131072 -QEMU X.Y.Z monitor - type 'help' for more information -(qemu) savevm 0 -(qemu) quit -QEMU X.Y.Z monitor - type 'help' for more information -(qemu) loadvm 0 -(qemu) loadvm 0 -(qemu) quit +{ 'execute': 'quit' } +{"timestamp": {"seconds": TIMESTAMP, "microseconds": TIMESTAMP}, "event"= : "SHUTDOWN", "data": {"guest": false, "reason": "host-qmp-quit"}} +{"return": {}} +{ 'execute': 'quit' } +{"timestamp": {"seconds": TIMESTAMP, "microseconds": TIMESTAMP}, "event"= : "SHUTDOWN", "data": {"guest": false, "reason": "host-qmp-quit"}} +{"return": {}} *** done --=20 2.56.0.rc0.29.g47ce80527c56 From nobody Sat Sep 26 20:01:40 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=1790108918; cv=none; d=zohomail.com; s=zohoarc; b=LfV9hQCFuACBvq14movnI3DkJ3vr0NcM3nt7X0CQPied3/0+wfGMmRj1Ka2rSE74gQH8f5pYP87XpWiABcjfwpx8RQYaMN58NKRCn9arwpHz/QVaPYCT8mM5iL5W7g7VNVE7jEJo2YetVF7Pjt+8lejd1oQt5ajt/IowdSNeSME= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1790108918; 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:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=ArTgqVawGv6a/NtFiXaEVr9WEUB3GZtXsMYexCrpmms=; b=Dl1NG1qvz/Z4VLsoT7owPTE7dWugFLaspRCOsngvDSfmZCAeXUZdpOV4NFvcwGhnl7WUg0qDe+zrpXD0KDOO/e2kjrnngWMpvfKVN6ST/VL5K8mrUqGpXrvhT3VspVruCe2+qfkVDPrY/YMBuPwI7+d0mMr/mts/h1XSNJbFGVQ= 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 1790108918731447.43918263440617; Tue, 22 Sep 2026 13:28:38 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists1p.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1x972W-0001bC-TZ; Tue, 22 Sep 2026 16:24:32 -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 1x971f-0007Av-9r for qemu-devel@nongnu.org; Tue, 22 Sep 2026 16:23:39 -0400 Received: from us-smtp-delivery-124.mimecast.com ([170.10.133.124]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1x971d-0000Qs-Gp for qemu-devel@nongnu.org; Tue, 22 Sep 2026 16:23:38 -0400 Received: from mx-prod-mc-01.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-98-X-8EnChCOae4PLtEvgolXw-1; Tue, 22 Sep 2026 16:23:35 -0400 Received: from mx-prod-int-06.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-06.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.93]) (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-01.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id 6A44A195FD11; Tue, 22 Sep 2026 20:23:34 +0000 (UTC) Received: from localhost (headnet03.pony-001.prod.iad2.dc.redhat.com [10.2.32.114]) by mx-prod-int-06.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id 610D31800370; Tue, 22 Sep 2026 20:23:33 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1790108616; 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=ArTgqVawGv6a/NtFiXaEVr9WEUB3GZtXsMYexCrpmms=; b=D5cJr8rS9i11txcTUoJvZi5RccoJaoo52+WfDC2HII2guBMa0sFz7ie0P0P9/31wSEqEnY iWs9l/B/xus3HhvmVvU+gJr/W+/pI2Vu3KQOHtqGI93GCqCPcinP1U7nHWGN067tLpDbkY mHGZpuFPdJkyuZknUQIeN3L2p0DCeZE= X-MC-Unique: X-8EnChCOae4PLtEvgolXw-1 X-Mimecast-MFC-AGG-ID: X-8EnChCOae4PLtEvgolXw_1790108614 From: =?utf-8?q?Marc-Andr=C3=A9_Lureau?= Date: Wed, 23 Sep 2026 00:18:21 +0400 Subject: [PATCH 74/88] qemu-iotests/130: migrate away from HMP MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Message-Id: <20260923-nohmp-v1-74-ebc029d4bd80@redhat.com> References: <20260923-nohmp-v1-0-ebc029d4bd80@redhat.com> In-Reply-To: <20260923-nohmp-v1-0-ebc029d4bd80@redhat.com> To: qemu-devel@nongnu.org Cc: Kevin Wolf , =?utf-8?q?Marc-Andr=C3=A9_Lureau?= , Hanna Reitz , qemu-block@nongnu.org X-Developer-Signature: v=1; a=openpgp-sha256; l=4274; i=marcandre.lureau@redhat.com; h=from:subject:message-id; bh=yRmZMtPGaLTkXb3jb5qSGcgOzjcAJVdxJQ3/weBLRPA=; b=owEBbQKS/ZANAwAKAdro4Ql1lpzlAcsmYgBqsuKzkv6qabSwo9SoMGJN6/o57+s223/ZsgKuL 9zzA/ad8gaJAjMEAAEKAB0WIQSHqb2TP4fGBtJ29i3a6OEJdZac5QUCarLiswAKCRDa6OEJdZac 5RqcD/42ehoesuVktPZuPVLo+E8NbugEcRcjYRoTRlgJVqv4bqfmfSThxrfCq0Egcchp7K01Gz0 dGnJcz+G3KVUPn+GkFeWLNk0wEqkwP8xlSKGR8HH5nuYXZZgR++yufx08yb6JvGn7HyIqU3Mrcd kWEcxQ+DaeOEsIsBz4jwyvm7mKWjocTQXPClCQmgAGVzlQl7e2xQNI6WkHmDmnTMtyOqen6OEzx gaLOav9IzwPrqrPJNEkJH9WUVOzkdufxlFP9Kx4pzmlpqMNEv25z0CFntTn1b5Otb5puVym4/2H /OmbPxNKGNTRWmgjPXuQHobAZZFqNv3Uaxtp3ZsFkrBw2dL9bLnByj3t+LjtCJHWDNGBr5UnuDq YFG4djqNeI4dIaOWRiSa+Zr+V+1eCY0zUyrBAMVbgTiBvbyctLGmqjE2mnETcEHMDSrRWomZBxa LdiodZXWX2mXjXss8gwPxmpGXtckoUC7KdyRtwHlZcJyPyQKNQh9aEjiepdylx3dC8dl1CP3MJQ cfoYbpuPNtqWhYbEiS+TzBtuIXR2VHPqvhIEkKcslxLwHnHcjDyCg4/svcELVoZjcVu3oB9pISJ V0S7o6PpWgshdclKtArc8wwxQxHrrRiRud95/hqnHd4UPt5gSt3EEY4w1v8cJkBHaSkKed2iVFS CyzMltlescoAXgA== X-Developer-Key: i=marcandre.lureau@redhat.com; a=openpgp; fpr=87A9BD933F87C606D276F62DDAE8E10975969CE5 X-Scanned-By: MIMEDefang 3.4.1 on 10.30.177.93 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.133.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_H3=0.001, RCVD_IN_MSPIKE_WL=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-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: 1790108920268158500 Replace HMP commit with QMP block-commit job-based API, using _run_qmp_job() helper for the complete/dismiss sequence. Silence all QMP output since the test validates backing file path preservation via _img_info, not the commit protocol itself. Signed-off-by: Marc-Andr=C3=A9 Lureau --- tests/qemu-iotests/130 | 53 +++++++++++++++++++++++++++++++++++++-----= ---- tests/qemu-iotests/130.out | 8 +------ 2 files changed, 44 insertions(+), 17 deletions(-) diff --git a/tests/qemu-iotests/130 b/tests/qemu-iotests/130 index 3d10aba2594e..beb5ef24c0f1 100755 --- a/tests/qemu-iotests/130 +++ b/tests/qemu-iotests/130 @@ -46,9 +46,6 @@ _supported_proto file _supported_os Linux # We are going to use lazy-refcounts _unsupported_imgopts 'compat=3D0.10' -_require_hmp - -qemu_comm_method=3D"monitor" =20 =20 TEST_IMG=3D"$TEST_IMG.orig" _make_test_img 64M @@ -57,24 +54,60 @@ _make_test_img 64M _img_info | _filter_img_info =20 echo -echo "=3D=3D=3D HMP commit =3D=3D=3D" +echo "=3D=3D=3D commit =3D=3D=3D" echo # bdrv_make_empty() involves a header update for qcow2 =20 # Test that a backing file isn't written _launch_qemu -drive id=3Dtestdisk,file=3D"$TEST_IMG",backing.file.filename= =3D"$TEST_IMG.base" -_send_qemu_cmd $QEMU_HANDLE "commit testdisk" "(qemu)" -_send_qemu_cmd $QEMU_HANDLE '' '(qemu)' -_cleanup_qemu +silent=3Dyes _send_qemu_cmd $QEMU_HANDLE \ + "{ 'execute': 'qmp_capabilities' }" \ + 'return' +silent=3Dyes _send_qemu_cmd $QEMU_HANDLE \ + "{ 'execute': 'block-commit', + 'arguments': { 'device': 'testdisk', + 'job-id': 'job0', + 'auto-dismiss': false } }" \ + 'BLOCK_JOB_READY' +silent=3Dyes _send_qemu_cmd $QEMU_HANDLE \ + "{ 'execute': 'block-job-complete', + 'arguments': { 'device': 'job0' } }" \ + 'return' +silent=3Dyes _send_qemu_cmd $QEMU_HANDLE '' '"concluded"' +silent=3Dyes _send_qemu_cmd $QEMU_HANDLE \ + "{ 'execute': 'job-dismiss', + 'arguments': { 'id': 'job0' } }" 'return' +silent=3Dyes _send_qemu_cmd $QEMU_HANDLE \ + "{ 'execute': 'quit' }" \ + 'return' +wait=3D1 _cleanup_qemu _img_info | _filter_img_info =20 # Make sure that if there was a backing file that was just overridden on t= he # command line, that backing file is retained, with the right format _make_test_img -F raw -b "$TEST_IMG.orig" 64M _launch_qemu -drive id=3Dtestdisk,file=3D"$TEST_IMG",backing.file.filename= =3D"$TEST_IMG.base",backing.driver=3D$IMGFMT -_send_qemu_cmd $QEMU_HANDLE "commit testdisk" "(qemu)" -_send_qemu_cmd $QEMU_HANDLE '' '(qemu)' -_cleanup_qemu +silent=3Dyes _send_qemu_cmd $QEMU_HANDLE \ + "{ 'execute': 'qmp_capabilities' }" \ + 'return' +silent=3Dyes _send_qemu_cmd $QEMU_HANDLE \ + "{ 'execute': 'block-commit', + 'arguments': { 'device': 'testdisk', + 'job-id': 'job0', + 'auto-dismiss': false } }" \ + 'BLOCK_JOB_READY' +silent=3Dyes _send_qemu_cmd $QEMU_HANDLE \ + "{ 'execute': 'block-job-complete', + 'arguments': { 'device': 'job0' } }" \ + 'return' +silent=3Dyes _send_qemu_cmd $QEMU_HANDLE '' '"concluded"' +silent=3Dyes _send_qemu_cmd $QEMU_HANDLE \ + "{ 'execute': 'job-dismiss', + 'arguments': { 'id': 'job0' } }" 'return' +silent=3Dyes _send_qemu_cmd $QEMU_HANDLE \ + "{ 'execute': 'quit' }" \ + 'return' +wait=3D1 _cleanup_qemu _img_info | _filter_img_info =20 echo diff --git a/tests/qemu-iotests/130.out b/tests/qemu-iotests/130.out index e45285ccc311..f9109d6ed9db 100644 --- a/tests/qemu-iotests/130.out +++ b/tests/qemu-iotests/130.out @@ -6,18 +6,12 @@ image: TEST_DIR/t.IMGFMT file format: IMGFMT virtual size: 64 MiB (67108864 bytes) =20 -=3D=3D=3D HMP commit =3D=3D=3D +=3D=3D=3D commit =3D=3D=3D =20 -QEMU X.Y.Z monitor - type 'help' for more information -(qemu) commit testdisk -(qemu)=20 image: TEST_DIR/t.IMGFMT file format: IMGFMT virtual size: 64 MiB (67108864 bytes) Formatting 'TEST_DIR/t.IMGFMT', fmt=3DIMGFMT size=3D67108864 backing_file= =3DTEST_DIR/t.IMGFMT.orig backing_fmt=3Draw -QEMU X.Y.Z monitor - type 'help' for more information -(qemu) commit testdisk -(qemu)=20 image: TEST_DIR/t.IMGFMT file format: IMGFMT virtual size: 64 MiB (67108864 bytes) --=20 2.56.0.rc0.29.g47ce80527c56 From nobody Sat Sep 26 20:01:40 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=1790109026; cv=none; d=zohomail.com; s=zohoarc; b=mb5gt9kzvwCAKB895GyWoihtSaz6WD/EX+1VMfP73ZGPLNs+/R20OOmxgoJtCPg+wL9Gcx6aTDLm8DYuuQfiCrl9BM5hJ55U4DamQv3pln9Ev7waxfjYsmo3mB5RC4ylM8AYK9qAW3Ftw6gmJErp7p2avOfRMrQeKpnx6jpr3iE= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1790109026; 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:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=+rKjJMz+aMh1Qy1H8vCbMANpylIxy65AnQsfSBm0aNs=; b=PUa17EN21+kVaGXDgxOkMWp+lPp1u0JdG9oieijOdvtqTW2nadktnH2I6JHmSYCcabodS9L6EOnMfefg82QBux0Y7lBpFSZRwNwVal7DW144QrryHT1mBpAJD9OSWNwZiKeugwAiAac5Fml6a72DwQvNiri1AMGEv0ublr9nSVQ= 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 1790109026005188.77766965651176; Tue, 22 Sep 2026 13:30:26 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists1p.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1x972t-0002ID-RA; Tue, 22 Sep 2026 16:24:56 -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 1x971j-0007gk-50 for qemu-devel@nongnu.org; Tue, 22 Sep 2026 16:23:43 -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 1x971h-0000RZ-5K for qemu-devel@nongnu.org; Tue, 22 Sep 2026 16:23:42 -0400 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-475-gu1_pmF2N_yfjC_urmPDKA-1; Tue, 22 Sep 2026 16:23:39 -0400 Received: from mx-prod-int-06.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-06.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.93]) (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 5246B1977587; Tue, 22 Sep 2026 20:23:38 +0000 (UTC) Received: from localhost (headnet03.pony-001.prod.iad2.dc.redhat.com [10.2.32.114]) by mx-prod-int-06.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id 82CCF1800370; Tue, 22 Sep 2026 20:23:37 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1790108620; 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=+rKjJMz+aMh1Qy1H8vCbMANpylIxy65AnQsfSBm0aNs=; b=YNBYMtuG5JSVUSTv7LT+XWNlmgvU9sCIrWcrs5wvRqnAvKp92FmF0+/S+wZlJEQo7/JcGb MbjG5jOue2yRpFWz1p15gwte6fZIw/8gejzool2y1vtrtGgTau1eD7i9s2SgUo7uZpSt0D wt+IZT81nK4zXh2gkJHZYHGeub4zpsQ= X-MC-Unique: gu1_pmF2N_yfjC_urmPDKA-1 X-Mimecast-MFC-AGG-ID: gu1_pmF2N_yfjC_urmPDKA_1790108618 From: =?utf-8?q?Marc-Andr=C3=A9_Lureau?= Date: Wed, 23 Sep 2026 00:18:22 +0400 Subject: [PATCH 75/88] qemu-iotests/153: migrate away from HMP MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Message-Id: <20260923-nohmp-v1-75-ebc029d4bd80@redhat.com> References: <20260923-nohmp-v1-0-ebc029d4bd80@redhat.com> In-Reply-To: <20260923-nohmp-v1-0-ebc029d4bd80@redhat.com> To: qemu-devel@nongnu.org Cc: Kevin Wolf , =?utf-8?q?Marc-Andr=C3=A9_Lureau?= , Hanna Reitz , qemu-block@nongnu.org X-Developer-Signature: v=1; a=openpgp-sha256; l=7089; i=marcandre.lureau@redhat.com; h=from:subject:message-id; bh=wksABVwCBrRcsBjPGyVPTBIdEaRVbsmnl+BCoF7sNvs=; b=owEBbQKS/ZANAwAKAdro4Ql1lpzlAcsmYgBqsuKzCsCZft3907lmRUJuZ2tNS8ZTR14Z7E8vq Vkc7URcKVaJAjMEAAEKAB0WIQSHqb2TP4fGBtJ29i3a6OEJdZac5QUCarLiswAKCRDa6OEJdZac 5b9XD/9GDjkFobqwI/yaoD5WMCxAICr7Z2aeR3TxzIDccXiM1VVZJyErFA7Uak9hWEckQNA2p8c Oa3FyYNU7Pxf6FbfHtRZq8f6gm/C2MzyNI1HEaGXmGDoPoMp9KBo4j/OTCU93WK35k8osa3GQhp RyonyGX/1BB1efj+6DKd/TdN+nmFN1gA/BpWx68sUFsdCArNIY9cS+DFnWG0A6Figt7mVx0uYUl K3INJTsxIqP1njA1B2Y7cacd4kG2UNbeceKKSvft9hb5bFKqMYZE/6jsvTq1cGH3w92HqEAQYr/ D1KAuLqjLt7ENEYynHt9Fiyt78ptG3IMnV8+1NMP5JJEWDs7m7T/l7vAbf/TDDrWkHi6WpH+Cj/ 3zX8l46btM84tmcEZbbbklrTbKk3cTB5JaDSbz5UNn19chFywEDxrXKzkBg649DlYCyZf081JvC sT1wUXlp+ZznYRa6svUWWag3ib0LqyzQX6ax3xs6gWi6h/QA4SqA3oWtQaaCZBY1j1tevhlwDZx pNXJo/G+g+GN/qotA3K7GY0xelHljcUDbMtjj2KxSQS0ia4CsGxU9eehtJJiUwWu4yuk7lKAhNB U0zFWPTo40TrRwjkVGOxSV4eqbzt+3Bz7yl0bnd1LP4zxNv+J+P14N6kdgN6j01MsIJPQoykesq PJxcK/W5Y5U4lxw== X-Developer-Key: i=marcandre.lureau@redhat.com; a=openpgp; fpr=87A9BD933F87C606D276F62DDAE8E10975969CE5 X-Scanned-By: MIMEDefang 3.4.1 on 10.30.177.93 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: 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-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: 1790109026988158500 Replace HMP drive_add/drive_del with QMP blockdev-add/blockdev-del. Convert pipe-based monitor to QMP. Signed-off-by: Marc-Andr=C3=A9 Lureau --- tests/qemu-iotests/153 | 37 +++++++++++++++++++++---------------- tests/qemu-iotests/153.out | 44 ++++++++++++++++++++++++++----------------= -- 2 files changed, 47 insertions(+), 34 deletions(-) diff --git a/tests/qemu-iotests/153 b/tests/qemu-iotests/153 index def01d6f3ea4..12807c2cb5c1 100755 --- a/tests/qemu-iotests/153 +++ b/tests/qemu-iotests/153 @@ -59,7 +59,6 @@ _check_ofd || _notrun "OFD lock not available" =20 _supported_fmt qcow2 _supported_proto file -_require_hmp =20 _run_cmd() { @@ -70,13 +69,14 @@ _run_cmd() _do_run_qemu() { ( + echo '{"execute":"qmp_capabilities"}' if ! test -t 0; then while read cmd; do - echo $cmd + echo "$cmd" done fi - echo quit - ) | $QEMU -nographic -monitor stdio -serial none "$@" 1>/dev/null + echo '{"execute":"quit"}' + ) | $QEMU -nographic -qmp stdio -serial none "$@" 1>/dev/null } =20 _run_qemu_with_images() @@ -106,8 +106,8 @@ for opts1 in "" "read-only=3Don" "read-only=3Don,force-= share=3Don"; do for opts2 in "" "read-only=3Don" "read-only=3Don,force-share=3Don"; do echo echo "=3D=3D Launching another QEMU, opts: '$opts2' =3D=3D" - echo "quit" | \ - $QEMU -nographic -monitor stdio \ + printf '%s\n' '{"execute":"qmp_capabilities"}' '{"execute":"quit"}= ' | \ + $QEMU -nographic -qmp stdio \ -drive file=3D"${TEST_IMG}",if=3Dnone,$opts2 2>&1 1>/dev/null = | \ _filter_testdir | _filter_qemu done @@ -213,8 +213,10 @@ _send_qemu_cmd $QEMU_HANDLE \ =20 echo "Adding drive" _send_qemu_cmd $QEMU_HANDLE \ - "{ 'execute': 'human-monitor-command', - 'arguments': { 'command-line': 'drive_add 0 if=3Dnone,id=3Dd0,file= =3D${TEST_IMG}' } }" \ + "{ 'execute': 'blockdev-add', + 'arguments': { 'driver': '$IMGFMT', 'node-name': 'd0', + 'file': { 'driver': 'file', + 'filename': '${TEST_IMG}' } } }" \ 'return' =20 _run_cmd $QEMU_IO "${TEST_IMG}" -c 'write 0 512' @@ -224,8 +226,8 @@ _run_cmd $QEMU_IMG create -f $IMGFMT -b "${TEST_IMG}" -= F $IMGFMT "${TEST_IMG}.ov =20 echo "=3D=3D Closing an image should unlock it =3D=3D" _send_qemu_cmd $QEMU_HANDLE \ - "{ 'execute': 'human-monitor-command', - 'arguments': { 'command-line': 'drive_del d0' } }" \ + "{ 'execute': 'blockdev-del', + 'arguments': { 'node-name': 'd0' } }" \ 'return' =20 _run_cmd $QEMU_IO "${TEST_IMG}" -c 'write 0 512' @@ -233,24 +235,27 @@ _run_cmd $QEMU_IO "${TEST_IMG}" -c 'write 0 512' echo "Adding two and closing one" for d in d0 d1; do _send_qemu_cmd $QEMU_HANDLE \ - "{ 'execute': 'human-monitor-command', - 'arguments': { 'command-line': 'drive_add 0 if=3Dnone,id=3D$d,f= ile=3D${TEST_IMG},readonly=3Don' } }" \ + "{ 'execute': 'blockdev-add', + 'arguments': { 'driver': '$IMGFMT', 'node-name': '$d', + 'read-only': true, + 'file': { 'driver': 'file', + 'filename': '${TEST_IMG}' } } }" \ 'return' done =20 _run_cmd $QEMU_IMG info "${TEST_IMG}" =20 _send_qemu_cmd $QEMU_HANDLE \ - "{ 'execute': 'human-monitor-command', - 'arguments': { 'command-line': 'drive_del d0' } }" \ + "{ 'execute': 'blockdev-del', + 'arguments': { 'node-name': 'd0' } }" \ 'return' =20 _run_cmd $QEMU_IO "${TEST_IMG}" -c 'write 0 512' =20 echo "Closing the other" _send_qemu_cmd $QEMU_HANDLE \ - "{ 'execute': 'human-monitor-command', - 'arguments': { 'command-line': 'drive_del d1' } }" \ + "{ 'execute': 'blockdev-del', + 'arguments': { 'node-name': 'd1' } }" \ 'return' =20 _run_cmd $QEMU_IO "${TEST_IMG}" -c 'write 0 512' diff --git a/tests/qemu-iotests/153.out b/tests/qemu-iotests/153.out index 1607a79b36b7..90d0ac660a1f 100644 --- a/tests/qemu-iotests/153.out +++ b/tests/qemu-iotests/153.out @@ -425,9 +425,11 @@ _qemu_img_wrapper commit -b TEST_DIR/t.qcow2.b TEST_DI= R/t.qcow2.c { 'execute': 'qmp_capabilities' } {"return": {}} Adding drive -{ 'execute': 'human-monitor-command', - 'arguments': { 'command-line': 'drive_add 0 if=3Dnone,id=3Dd0,file= =3DTEST_DIR/t.IMGFMT' } } -{"return": "OKrn"} +{ 'execute': 'blockdev-add', + 'arguments': { 'driver': 'IMGFMT', 'node-name': 'd0', + 'file': { 'driver': 'file', + 'filename': 'TEST_DIR/t.IMGFMT' } } } +{"return": {}} =20 _qemu_io_wrapper TEST_DIR/t.qcow2 -c write 0 512 can't open device TEST_DIR/t.qcow2: Failed to get "write" lock @@ -436,31 +438,37 @@ Creating overlay with qemu-img when the guest is runn= ing should be allowed =20 _qemu_img_wrapper create -f qcow2 -b TEST_DIR/t.qcow2 -F qcow2 TEST_DIR/t.= qcow2.overlay =3D=3D Closing an image should unlock it =3D=3D -{ 'execute': 'human-monitor-command', - 'arguments': { 'command-line': 'drive_del d0' } } -{"return": ""} +{ 'execute': 'blockdev-del', + 'arguments': { 'node-name': 'd0' } } +{"return": {}} =20 _qemu_io_wrapper TEST_DIR/t.qcow2 -c write 0 512 Adding two and closing one -{ 'execute': 'human-monitor-command', - 'arguments': { 'command-line': 'drive_add 0 if=3Dnone,id=3Dd0,f= ile=3DTEST_DIR/t.IMGFMT,readonly=3Don' } } -{"return": "OKrn"} -{ 'execute': 'human-monitor-command', - 'arguments': { 'command-line': 'drive_add 0 if=3Dnone,id=3Dd1,f= ile=3DTEST_DIR/t.IMGFMT,readonly=3Don' } } -{"return": "OKrn"} +{ 'execute': 'blockdev-add', + 'arguments': { 'driver': 'IMGFMT', 'node-name': 'd0', + 'read-only': true, + 'file': { 'driver': 'file', + 'filename': 'TEST_DIR/t.IMGFMT' } } } +{"return": {}} +{ 'execute': 'blockdev-add', + 'arguments': { 'driver': 'IMGFMT', 'node-name': 'd1', + 'read-only': true, + 'file': { 'driver': 'file', + 'filename': 'TEST_DIR/t.IMGFMT' } } } +{"return": {}} =20 _qemu_img_wrapper info TEST_DIR/t.qcow2 -{ 'execute': 'human-monitor-command', - 'arguments': { 'command-line': 'drive_del d0' } } -{"return": ""} +{ 'execute': 'blockdev-del', + 'arguments': { 'node-name': 'd0' } } +{"return": {}} =20 _qemu_io_wrapper TEST_DIR/t.qcow2 -c write 0 512 can't open device TEST_DIR/t.qcow2: Failed to get "write" lock Is another process using the image [TEST_DIR/t.qcow2]? Closing the other -{ 'execute': 'human-monitor-command', - 'arguments': { 'command-line': 'drive_del d1' } } -{"return": ""} +{ 'execute': 'blockdev-del', + 'arguments': { 'node-name': 'd1' } } +{"return": {}} =20 _qemu_io_wrapper TEST_DIR/t.qcow2 -c write 0 512 =20 --=20 2.56.0.rc0.29.g47ce80527c56 From nobody Sat Sep 26 20:01:40 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=1790108868; cv=none; d=zohomail.com; s=zohoarc; b=LZeCepN68xvcW0ykhRENeaIvChAdL4AT7FE0vx8+M9RL8+PRC+BYF88dRr1LLLZQgRfPppn+MCmJMTyx02XCK/jkjKgDi9HlrbnIQpsTUTTa8ER7Ft1edhCJwE3/SybRjrXoDoktZmncmOxH94Sjbqs3KPeXbybUcKYBpgCMChw= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1790108868; 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:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=HHJc+T4KepJJr+in79W/PnOBVuFLMUlWcdlj1QiE4ak=; b=bmWqr/+w9Ya4/eh9PPkM+Eh3bkyEoDCo+ZYPn5YFWU4/U5TEiAbY4Poe/1JCHR9uhAuDFyM8XvG5FHR3OIp/30CMcr6luF4kvfJb3FmKW9QCUVpB9RLehQ6BB9YFOuPvo1/xaMabgAMOuArOIw5YJpdvRBgpnV4ThsH6XZvJ7MM= 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 1790108868539985.333064837996; Tue, 22 Sep 2026 13:27:48 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists1p.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1x9731-00032h-1x; Tue, 22 Sep 2026 16:25:04 -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 1x971o-0008BJ-Rd for qemu-devel@nongnu.org; Tue, 22 Sep 2026 16:23:49 -0400 Received: from us-smtp-delivery-124.mimecast.com ([170.10.133.124]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1x971m-0000Sb-Lm for qemu-devel@nongnu.org; Tue, 22 Sep 2026 16:23:48 -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-542-yYEeK8SJOxav7vPcPwsbDg-1; Tue, 22 Sep 2026 16:23:42 -0400 Received: from mx-prod-int-06.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-06.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.93]) (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 B8FA618009C4; Tue, 22 Sep 2026 20:23:41 +0000 (UTC) Received: from localhost (headnet03.pony-001.prod.iad2.dc.redhat.com [10.2.32.114]) by mx-prod-int-06.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id EB3FC1800370; Tue, 22 Sep 2026 20:23:40 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1790108625; 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=HHJc+T4KepJJr+in79W/PnOBVuFLMUlWcdlj1QiE4ak=; b=B4y6iQ9W0jKdhAIRd2wWMBiXKD8GVnlEywDKiXoht3DtbaSAtT9tetRJWpPziFKuMdBvh8 BjLQP+qVc+XeZed2gqZykbUuY8vItbez1mOVyngYptNCABYHLjkrAYWA+SuaUKz+I5hz4h h+xorglLF3aSpSezV7Bmw68eFOYdLCs= X-MC-Unique: yYEeK8SJOxav7vPcPwsbDg-1 X-Mimecast-MFC-AGG-ID: yYEeK8SJOxav7vPcPwsbDg_1790108621 From: =?utf-8?q?Marc-Andr=C3=A9_Lureau?= Date: Wed, 23 Sep 2026 00:18:23 +0400 Subject: [PATCH 76/88] qemu-iotests/157: migrate away from HMP MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Message-Id: <20260923-nohmp-v1-76-ebc029d4bd80@redhat.com> References: <20260923-nohmp-v1-0-ebc029d4bd80@redhat.com> In-Reply-To: <20260923-nohmp-v1-0-ebc029d4bd80@redhat.com> To: qemu-devel@nongnu.org Cc: Kevin Wolf , =?utf-8?q?Marc-Andr=C3=A9_Lureau?= , Hanna Reitz , qemu-block@nongnu.org X-Developer-Signature: v=1; a=openpgp-sha256; l=2854; i=marcandre.lureau@redhat.com; h=from:subject:message-id; bh=TNLf3j3z/aF2QnIRb7Q32lRIcrKEmsdosTMxFMBLNsY=; b=owEBbQKS/ZANAwAKAdro4Ql1lpzlAcsmYgBqsuKzGN+9HLRJSVYQ7f2Jv5RinrK6VSibcCutu gZRW+bKsXGJAjMEAAEKAB0WIQSHqb2TP4fGBtJ29i3a6OEJdZac5QUCarLiswAKCRDa6OEJdZac 5ZZXD/9VzfjY3kpKDwePwWFVdW2qB9X5wLS82fdPlnkdSIxbLtN1vf5CtixZRY/cqpZQPKh2jp9 4NzBvCaUGF6SFBfRal67yTxVx5ppBaRknHt4dbmSZZNojcfGsBVkyX8K+Omev+C69sz1sAiYVLk oqCmjtie1SkY1ovWngJa+X0G7XNyeKIQPKuzsL3ywXe4GMTK6rsfvnssmZvx+aaMqubHZQUdXjV gSbi0zZ1BfgngFzmWlLVDaCh9zUIgT73ppi+8W9etW8WsMnUHPau3i05T/JXVFSTcriRW7DnXCU pwBXK75vmyxGnlx2a5pjYNIjKCQBSR9z7SO1qfgkWAxSllGNissO6kBNdN2IPMJQjVEtLZ8sI/3 bpZwHLPuPyfu+CZqmaOmkpiS97wRuYTR/TAxzLOi055boNoCcbVtupzPqgkOiCf5uSkgsN2Yg5U JEGY+EG2eBjMi2h8Zj/IAZDQ5xt/QQdFsKFwNQYKgve2MF+ye5UegqFkuxNZUdF292cLZPmuFts MKzcfhdwu3H69mB7iqIMOIJgRJrY3FyQ+tf+N4sLj2LzOq/4h9rrWwF7xdJq4hCY2I4KdcSr966 AdC9Sk6n/W4rKzwJk5YvOXssGlGxLDs3+4VXYuOcQ6OAXdZoOUUYHlDvu9zg0Ei7/9TlSHBj6oD Uv3IX30gY4CrPwQ== X-Developer-Key: i=marcandre.lureau@redhat.com; a=openpgp; fpr=87A9BD933F87C606D276F62DDAE8E10975969CE5 X-Scanned-By: MIMEDefang 3.4.1 on 10.30.177.93 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.133.124; envelope-from=marcandre.lureau@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 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_H3=0.001, RCVD_IN_MSPIKE_WL=0.001, SPF_HELO_PASS=-0.001, SPF_PASS=-0.001 autolearn=unavailable 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: 1790108870005158500 Replace HMP "info block" with QMP "query-block". The expected output changes from HMP "Cache mode: writeback/writethrough" to QMP "writeback": true/false. Signed-off-by: Marc-Andr=C3=A9 Lureau --- tests/qemu-iotests/157 | 10 +++++----- tests/qemu-iotests/157.out | 16 ++++++++-------- 2 files changed, 13 insertions(+), 13 deletions(-) diff --git a/tests/qemu-iotests/157 b/tests/qemu-iotests/157 index 531dbd3122b1..2f9d73155a10 100755 --- a/tests/qemu-iotests/157 +++ b/tests/qemu-iotests/157 @@ -41,18 +41,18 @@ _supported_fmt generic _supported_proto file =20 _require_devices virtio-blk -_require_hmp =20 do_run_qemu() { ( + printf '%s\n' '{"execute":"qmp_capabilities"}' if ! test -t 0; then while read cmd; do echo $cmd done fi - echo quit - ) | $QEMU -nodefaults -nographic -monitor stdio -serial none "$@" + printf '%s\n' '{"execute":"quit"}' + ) | $QEMU -nodefaults -nographic -qmp stdio -serial none "$@" echo } =20 @@ -89,10 +89,10 @@ echo for cache in "writeback" "writethrough"; do for wce in "" ",write-cache=3Dauto" ",write-cache=3Don" ",write-cache= =3Doff"; do echo "Testing: cache=3D'$cache' wce=3D'$wce'" - echo "info block" \ + echo '{"execute":"query-block"}' \ | run_qemu $SYSEMU_EXTRA_ARGS -drive "$SYSEMU_DRIVE_ARG,cache= =3D$cache" \ -device "virtio-blk,drive=3Dnone0$wce" \ - | grep -e "Testing" -e "Cache mode" + | grep -o '"writeback": *[a-z]*' done done =20 diff --git a/tests/qemu-iotests/157.out b/tests/qemu-iotests/157.out index fdc807f541f3..f6c345f143cc 100644 --- a/tests/qemu-iotests/157.out +++ b/tests/qemu-iotests/157.out @@ -4,19 +4,19 @@ Formatting 'TEST_DIR/t.IMGFMT', fmt=3DIMGFMT size=3D13421= 7728 =3D=3D=3D Setting WCE with qdev and with manually created BB =3D=3D=3D =20 Testing: cache=3D'writeback' wce=3D'' - Cache mode: writeback +"writeback": true Testing: cache=3D'writeback' wce=3D',write-cache=3Dauto' - Cache mode: writeback +"writeback": true Testing: cache=3D'writeback' wce=3D',write-cache=3Don' - Cache mode: writeback +"writeback": true Testing: cache=3D'writeback' wce=3D',write-cache=3Doff' - Cache mode: writethrough +"writeback": false Testing: cache=3D'writethrough' wce=3D'' - Cache mode: writethrough +"writeback": false Testing: cache=3D'writethrough' wce=3D',write-cache=3Dauto' - Cache mode: writethrough +"writeback": false Testing: cache=3D'writethrough' wce=3D',write-cache=3Don' - Cache mode: writeback +"writeback": true Testing: cache=3D'writethrough' wce=3D',write-cache=3Doff' - Cache mode: writethrough +"writeback": false *** done --=20 2.56.0.rc0.29.g47ce80527c56 From nobody Sat Sep 26 20:01:40 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=1790108910; cv=none; d=zohomail.com; s=zohoarc; b=JIjWTkKxUPGuCxKExNOpjvoEoFxkkFoyXQZuHh0OhUAvUr1oD8pPswVdlbcwY+uETar060uiMo6O01n3ivEUeArEQfhT9zWJdJaMd1C9SPl8fbW+dazrsQs3ewlDjJLNsEJ6Ktov5YjlfRUxme4+Sl59HMCh6ATwIIiSG0oZTuQ= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1790108910; 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:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=7s1YoYdM1i9DUeQaJXKr4O1KGACtaLK3E1rwLt0mq9Q=; b=UMsKtyFQ++r21KbyBs5yq4+J/LfC9JlIp66KIFQtnpNIHIp2O/VHYqMbJbaqmusuKtLaqIuMBp7sjFF9b8AiUycL4sesyOTY/w9gMnSutrnIp7zqFiuQUXULnTpKN9hu3cI14Bga5ORc9be5ygdQ7Wqw/NawopEzl13fTeQBCcU= 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 1790108909998601.1568364689122; Tue, 22 Sep 2026 13:28:29 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists1p.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1x9725-0000VQ-GT; Tue, 22 Sep 2026 16:24:08 -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 1x971s-00005x-IQ for qemu-devel@nongnu.org; Tue, 22 Sep 2026 16:23:52 -0400 Received: from us-smtp-delivery-124.mimecast.com ([170.10.133.124]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1x971q-0000TK-5u for qemu-devel@nongnu.org; Tue, 22 Sep 2026 16:23:52 -0400 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-558-4n0YV8XyOp6wbdzh3dp8eg-1; Tue, 22 Sep 2026 16:23:46 -0400 Received: from mx-prod-int-06.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-06.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.93]) (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 3C11F1955E86; Tue, 22 Sep 2026 20:23:45 +0000 (UTC) Received: from localhost (headnet03.pony-001.prod.iad2.dc.redhat.com [10.2.32.114]) by mx-prod-int-06.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id 6B08D1800370; Tue, 22 Sep 2026 20:23:44 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1790108629; 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=7s1YoYdM1i9DUeQaJXKr4O1KGACtaLK3E1rwLt0mq9Q=; b=M1VyUHovnctJ1sYK9/iivB0V0yyXGuvV9sfHLUh0d448RgMpdpTKbsB/QDx41joCXZYROC WU7l000VHUMESEW1739+mKdnuZJJjwXzEankTWxKhXA/eUjk328r5UtVPFo1BWUP0nmC22 FjblledJWdAYFgXQxh8noMptt9hS+sY= X-MC-Unique: 4n0YV8XyOp6wbdzh3dp8eg-1 X-Mimecast-MFC-AGG-ID: 4n0YV8XyOp6wbdzh3dp8eg_1790108625 From: =?utf-8?q?Marc-Andr=C3=A9_Lureau?= Date: Wed, 23 Sep 2026 00:18:24 +0400 Subject: [PATCH 77/88] qemu-iotests/181: migrate away from HMP MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Message-Id: <20260923-nohmp-v1-77-ebc029d4bd80@redhat.com> References: <20260923-nohmp-v1-0-ebc029d4bd80@redhat.com> In-Reply-To: <20260923-nohmp-v1-0-ebc029d4bd80@redhat.com> To: qemu-devel@nongnu.org Cc: Kevin Wolf , =?utf-8?q?Marc-Andr=C3=A9_Lureau?= , Hanna Reitz , qemu-block@nongnu.org X-Developer-Signature: v=1; a=openpgp-sha256; l=7500; i=marcandre.lureau@redhat.com; h=from:subject:message-id; bh=rqJ4WMDQ6kwxskRAsn1ltEAO5ZsJQAzxuAKDK46OEhQ=; b=owEBbQKS/ZANAwAKAdro4Ql1lpzlAcsmYgBqsuKzF61b5xIhjC0VAhfu5GW6O5yB6JegYeTol 0LHyekrRGmJAjMEAAEKAB0WIQSHqb2TP4fGBtJ29i3a6OEJdZac5QUCarLiswAKCRDa6OEJdZac 5WoAD/9UtjdG1xl208WxMEd9MNVhto1cssMIv1oTTEXubDscrStZk6k9mKrETvUiDfrM6uFyvE3 ETIcFPOuP9wUWAaUytPSK1LpPFiAAxaW2xA2wt2PA75ROX4z7KD3K6vWgNFpVSfy2s8myv5qX3G WX51CgrcvQ1qSkOw19AWoa1scvW9/3pSCB3MGrl/1r8ys+ACmvINqlYHRgXszX3UmYEgoTlnKVe HZlhT8ur6dWtsJtAnds1zGoRStADd4sKFKeseZM8zV/RLOAgtz1KQtSnHUN92ws/jcyiY+fK1uh SFLD76e83AcDeVZ8jdSo1qQi9BxmsQxpkBk5WrMfoT4SB8UtI5jxCI0pOwrk24gr5TmPG1tGN34 upggGZY7DjK5Qyzug+/FxHZ1PLAQkuYfjBnyWJHLTT60X1yJX+LeLPiB3tPVlvKH/ULEs/dDeVQ X/wDIZ6sICsUwoMGQfLDu1zr+Rf3dEvEgB/+FkYelE75e8FcALy0RxrE1AY/f+e++3tV2fh+ycP BaIJjwJR6ig+wNIeFb3KAG6fiYMujicYgV8bkMe3JAG9ILdbxnQD84EJiekUfbp5h2QDr3KnQbA diEYWcxA8jNlJpCHUy9S3uUePhu70MRtZf/fWiJArqjyYEiqD+ARm6X0+cFYZigyc9HvapUZ+QV 7ifdgKwiyeo2gMw== X-Developer-Key: i=marcandre.lureau@redhat.com; a=openpgp; fpr=87A9BD933F87C606D276F62DDAE8E10975969CE5 X-Scanned-By: MIMEDefang 3.4.1 on 10.30.177.93 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.133.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_H3=0.001, RCVD_IN_MSPIKE_WL=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-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: 1790108910258158500 Replace HMP migration and savevm/loadvm commands with QMP equivalents. Signed-off-by: Marc-Andr=C3=A9 Lureau --- tests/qemu-iotests/181 | 86 ++++++++++++++++++++++++++++++++----------= ---- tests/qemu-iotests/181.out | 36 +++++++++---------- 2 files changed, 78 insertions(+), 44 deletions(-) diff --git a/tests/qemu-iotests/181 b/tests/qemu-iotests/181 index 458cb737f1cb..d814a1b8226e 100755 --- a/tests/qemu-iotests/181 +++ b/tests/qemu-iotests/181 @@ -47,7 +47,6 @@ _supported_fmt generic _unsupported_fmt qcow vdi vhdx vmdk vpc vvfat parallels _supported_proto generic _supported_os Linux -_require_hmp =20 _flaky_test https://gitlab.com/qemu-project/qemu/-/work_items/3515 =20 @@ -58,8 +57,6 @@ echo echo =3D=3D=3D Starting VMs =3D=3D=3D echo =20 -qemu_comm_method=3D"monitor" - if [ "$IMGOPTSSYNTAX" =3D "true" ]; then _launch_qemu \ -drive "${TEST_IMG}",cache=3D${CACHEMODE},aio=3D$AIOMODE,id=3Ddisk @@ -80,15 +77,27 @@ else fi dest=3D$QEMU_HANDLE =20 +silent=3Dyes +_send_qemu_cmd $src \ + "{ 'execute': 'qmp_capabilities' }" \ + 'return' +_send_qemu_cmd $dest \ + "{ 'execute': 'qmp_capabilities' }" \ + 'return' + echo echo =3D=3D=3D Write something on the source =3D=3D=3D echo =20 silent=3D -_send_qemu_cmd $src 'qemu-io disk "write -P 0x55 0 64k"' "(qemu)" -_send_qemu_cmd $src "" "ops/sec" -_send_qemu_cmd $src 'qemu-io disk "read -P 0x55 0 64k"' "(qemu)" -_send_qemu_cmd $src "" "ops/sec" +_send_qemu_cmd $src \ + "{ 'execute': 'x-qemu-io', + 'arguments': { 'device': 'disk', 'command': 'write -P 0x55 0 64k' }= }" \ + 'return' +_send_qemu_cmd $src \ + "{ 'execute': 'x-qemu-io', + 'arguments': { 'device': 'disk', 'command': 'read -P 0x55 0 64k' } = }" \ + 'return' =20 echo echo =3D=3D=3D Do postcopy migration to destination =3D=3D=3D @@ -98,28 +107,45 @@ echo # switch to postcopy # Enable postcopy-ram capability both on source and destination silent=3Dyes -_send_qemu_cmd $dest 'migrate_set_capability postcopy-ram on' "(qemu)" - qemu_error_no_exit=3Dyes success_or_failure=3Dyes \ - _send_qemu_cmd $dest '' "(qemu)" "Postcopy is not supported" + _send_qemu_cmd $dest \ + "{ 'execute': 'migrate-set-capabilities', + 'arguments': { 'capabilities': [ + { 'capability': 'postcopy-ram', 'state': true } ] } }" \ + 'return' 'error' if [ ${QEMU_STATUS[$dest]} -lt 0 ]; then - _send_qemu_cmd $dest '' "(qemu)" - - _send_qemu_cmd $src 'quit' "" - _send_qemu_cmd $dest 'quit' "" + _send_qemu_cmd $src \ + "{ 'execute': 'quit' }" \ + 'return' + _send_qemu_cmd $dest \ + "{ 'execute': 'quit' }" \ + 'return' wait=3D1 _cleanup_qemu =20 _notrun 'Postcopy is not supported' fi =20 -_send_qemu_cmd $src 'migrate_set_parameter max-bandwidth 4k' "(qemu)" -_send_qemu_cmd $src 'migrate_set_capability postcopy-ram on' "(qemu)" -_send_qemu_cmd $src "migrate -d unix:${MIG_SOCKET}" "(qemu)" -_send_qemu_cmd $src 'migrate_start_postcopy' "(qemu)" +_send_qemu_cmd $src \ + "{ 'execute': 'migrate-set-parameters', + 'arguments': { 'max-bandwidth': 4096 } }" \ + 'return' +_send_qemu_cmd $src \ + "{ 'execute': 'migrate-set-capabilities', + 'arguments': { 'capabilities': [ + { 'capability': 'postcopy-ram', 'state': true } ] } }" \ + 'return' +_send_qemu_cmd $src \ + "{ 'execute': 'migrate', + 'arguments': { 'uri': 'unix:${MIG_SOCKET}' } }" \ + 'return' +_send_qemu_cmd $src \ + "{ 'execute': 'migrate-start-postcopy' }" \ + 'return' =20 QEMU_COMM_TIMEOUT=3D1 qemu_cmd_repeat=3D10 silent=3Dyes \ - _send_qemu_cmd $src "info migrate" "completed\|failed" -silent=3Dyes _send_qemu_cmd $src "" "(qemu)" + _send_qemu_cmd $src \ + "{ 'execute': 'query-migrate' }" \ + '"status": "completed"\|"status": "failed"' =20 echo echo =3D=3D=3D Do some I/O on the destination =3D=3D=3D @@ -129,17 +155,25 @@ echo # of the node name, which would create a new BlockBackend and not test whe= ther # the guest has the necessary permissions to access the image now silent=3D -_send_qemu_cmd $dest 'qemu-io disk "read -P 0x55 0 64k"' "(qemu)" -_send_qemu_cmd $dest "" "ops/sec" -_send_qemu_cmd $dest 'qemu-io disk "write -P 0x66 1M 64k"' "(qemu)" -_send_qemu_cmd $dest "" "ops/sec" +_send_qemu_cmd $dest \ + "{ 'execute': 'x-qemu-io', + 'arguments': { 'device': 'disk', 'command': 'read -P 0x55 0 64k' } = }" \ + 'return' +_send_qemu_cmd $dest \ + "{ 'execute': 'x-qemu-io', + 'arguments': { 'device': 'disk', 'command': 'write -P 0x66 1M 64k' = } }" \ + 'return' =20 echo echo =3D=3D=3D Shut down and check image =3D=3D=3D echo =20 -_send_qemu_cmd $src 'quit' "" -_send_qemu_cmd $dest 'quit' "" +_send_qemu_cmd $src \ + "{ 'execute': 'quit' }" \ + 'return' +_send_qemu_cmd $dest \ + "{ 'execute': 'quit' }" \ + 'return' wait=3D1 _cleanup_qemu =20 _check_test_img diff --git a/tests/qemu-iotests/181.out b/tests/qemu-iotests/181.out index d58c6a9dabb0..43dc83bc9cae 100644 --- a/tests/qemu-iotests/181.out +++ b/tests/qemu-iotests/181.out @@ -6,32 +6,32 @@ Formatting 'TEST_DIR/t.IMGFMT', fmt=3DIMGFMT size=3D67108= 864 =20 =3D=3D=3D Write something on the source =3D=3D=3D =20 -QEMU X.Y.Z monitor - type 'help' for more information -(qemu) qemu-io disk "write -P 0x55 0 64k" -wrote 65536/65536 bytes at offset 0 -64 KiB, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec) -(qemu)=20 -(qemu) qemu-io disk "read -P 0x55 0 64k" -read 65536/65536 bytes at offset 0 -64 KiB, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec) +{ 'execute': 'x-qemu-io', + 'arguments': { 'device': 'disk', 'command': 'write -P 0x55 0 64k' }= } +{"return": {"human-readable-text": "wrote 65536/65536 bytes at offset 0n64= KiB, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec)n"}} +{ 'execute': 'x-qemu-io', + 'arguments': { 'device': 'disk', 'command': 'read -P 0x55 0 64k' } } +{"return": {"human-readable-text": "read 65536/65536 bytes at offset 0n64 = KiB, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec)n"}} =20 =3D=3D=3D Do postcopy migration to destination =3D=3D=3D =20 =20 =3D=3D=3D Do some I/O on the destination =3D=3D=3D =20 -(qemu) qemu-io disk "read -P 0x55 0 64k" -read 65536/65536 bytes at offset 0 -64 KiB, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec) -(qemu)=20 -(qemu) qemu-io disk "write -P 0x66 1M 64k" -wrote 65536/65536 bytes at offset 1048576 -64 KiB, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec) +{ 'execute': 'x-qemu-io', + 'arguments': { 'device': 'disk', 'command': 'read -P 0x55 0 64k' } } +{"return": {"human-readable-text": "read 65536/65536 bytes at offset 0n64 = KiB, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec)n"}} +{ 'execute': 'x-qemu-io', + 'arguments': { 'device': 'disk', 'command': 'write -P 0x66 1M 64k' = } } +{"return": {"human-readable-text": "wrote 65536/65536 bytes at offset 1048= 576n64 KiB, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec)n"}} =20 =3D=3D=3D Shut down and check image =3D=3D=3D =20 -(qemu) quit -(qemu)=20 -(qemu) quit +{ 'execute': 'quit' } +{"timestamp": {"seconds": TIMESTAMP, "microseconds": TIMESTAMP}, "event"= : "SHUTDOWN", "data": {"guest": false, "reason": "host-qmp-quit"}} +{"return": {}} +{ 'execute': 'quit' } +{"timestamp": {"seconds": TIMESTAMP, "microseconds": TIMESTAMP}, "event"= : "SHUTDOWN", "data": {"guest": false, "reason": "host-qmp-quit"}} +{"return": {}} No errors were found on the image. *** done --=20 2.56.0.rc0.29.g47ce80527c56 From nobody Sat Sep 26 20:01:40 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=1790108895; cv=none; d=zohomail.com; s=zohoarc; b=ei8fpfji7vfaE2LnQTWxKtu0JH4//0P2nOMU48Vte5qTTjLbRyP4O0WSONfKNmw93gIIStPvqz75jHwnW2BVX9lqQj1RKcY0DbdDlo8redyVW0iobBpDxSQVTqmJipDMS+7iddc0fHMSd1YptR39126NLUkf4pr74eHHJFssSMI= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1790108895; 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:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=GrpBqUXeC/DgTI1ceWzLEG29wOaAQIV2yhaVFaojsLc=; b=MNzKj4kVFipaUFeVqjG46JFJnq7tgAPFzbEd9H3zpsQ3YvryLQ6XgwykeJ2sa26FR6zka0lg3xhZ5LAQQDZDAZMYoq9yrDuDoWG3PxphkrIvla0/eFwXonQofDxPsfmdqFibSeIFrBXJ/dVjIikm5wKfTRKlj2WdhPpgAhSdCII= 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 1790108895205526.3011277161348; Tue, 22 Sep 2026 13:28:15 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists1p.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1x972T-0001Py-Kj; Tue, 22 Sep 2026 16:24:29 -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 1x971v-0000RJ-1J for qemu-devel@nongnu.org; Tue, 22 Sep 2026 16:23:56 -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 1x971t-0000Ut-EA for qemu-devel@nongnu.org; Tue, 22 Sep 2026 16:23:54 -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-657-9gVVur3QNxuaPyN9YoeB4w-1; Tue, 22 Sep 2026 16:23:49 -0400 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-06.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id 966671800596; Tue, 22 Sep 2026 20:23:48 +0000 (UTC) Received: from localhost (headnet03.pony-001.prod.iad2.dc.redhat.com [10.2.32.114]) by mx-prod-int-08.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id 89FBC180034C; Tue, 22 Sep 2026 20:23:47 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1790108632; 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=GrpBqUXeC/DgTI1ceWzLEG29wOaAQIV2yhaVFaojsLc=; b=JxuUdnckUv8ZTW9Aau5EkkWaroKzajdRKf4whp3E/B6z3jr41uxAqwPPtmvhVfHiMg7Xvs nIpKwPd/wsovPmelfWlYMaAID942WOABIhZC4vtkHIsft6fbUbcUznK4f9MGK7VVkO3lqJ f1kQ4WjXBcN9A39HXB8cyJkPa1T2VmE= X-MC-Unique: 9gVVur3QNxuaPyN9YoeB4w-1 X-Mimecast-MFC-AGG-ID: 9gVVur3QNxuaPyN9YoeB4w_1790108628 From: =?utf-8?q?Marc-Andr=C3=A9_Lureau?= Date: Wed, 23 Sep 2026 00:18:25 +0400 Subject: [PATCH 78/88] qemu-iotests/182: migrate away from HMP MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Message-Id: <20260923-nohmp-v1-78-ebc029d4bd80@redhat.com> References: <20260923-nohmp-v1-0-ebc029d4bd80@redhat.com> In-Reply-To: <20260923-nohmp-v1-0-ebc029d4bd80@redhat.com> To: qemu-devel@nongnu.org Cc: Kevin Wolf , =?utf-8?q?Marc-Andr=C3=A9_Lureau?= , Hanna Reitz , qemu-block@nongnu.org X-Developer-Signature: v=1; a=openpgp-sha256; l=1051; i=marcandre.lureau@redhat.com; h=from:subject:message-id; bh=VgNH8Xn8plg4jtJaaQTpiN6uMmsqW9QWi+JUc5TV58Y=; b=owEBbQKS/ZANAwAKAdro4Ql1lpzlAcsmYgBqsuKzZf/IizyUAZFSKADTEoV4XGK/IEJP7zUOa HBN0VB4qSuJAjMEAAEKAB0WIQSHqb2TP4fGBtJ29i3a6OEJdZac5QUCarLiswAKCRDa6OEJdZac 5cppD/9KfFhs+T1NTvDKtTtGblrIYE4H+l6gT38kjmppnK/e8iW/wt3LAYcCaXTwChQewBZxcbe rGnY0gdk/UEytNwXsWOJ3xPUYapBGXd1E8Tn5KIEvf5lMhAT/IQY+cuVACiQs2iXcs9ekqsa1B6 kBqPezzKooixJ1f37RCoDlHyiEat/R+43EJsomMet/iVAz7qitIF4F8KfLsLKUQR/2syMmcKRE8 17wblACVmXU4jVNzlUBEgBUdm8LrWcWMOk1dvlkvIJ0nvEL7KKFKpY4w6d+aHSBu01dzS2hBHLd HxPGZ88mZilslOtAqn3W2zgnw0gq1ZQocMgME6/zN1C9CckY1Sh3vSdpGC7nUR2/wQBgBBHvogr XCS1Kp1Ydcl5HcxHV9v08GzoaxYxjXJwY3VLtOuT8bNlDKxNsbhM+ctNCau20ufSK3iT9okc+Vb WuJD7ofiqJVppvKJEr/iGglf05CLz/NGEZF3LpdKvSvS4odgZjM2wC+TJl9NC2OtIdkuNYw+URf eQokRINJ+f/85t4CXAYz3a7Qg/XM2D0AhbNbLLPhE9PFT1PRUmB6xb0QhaUxjNg9SfoU3K6b+KG dEs6iBKF/Zcom/yDJmCJ7XevHuUtuEqIVLjQX3fzlgvKgFVUJekzpL0TL1d/zcrh0hzbJs/bvt1 iqNaHrdrd57V0WA== X-Developer-Key: i=marcandre.lureau@redhat.com; a=openpgp; fpr=87A9BD933F87C606D276F62DDAE8E10975969CE5 X-Scanned-By: MIMEDefang 3.4.1 on 10.30.177.111 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: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 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, SPF_HELO_PASS=-0.001, SPF_PASS=-0.001 autolearn=unavailable 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: 1790108896140158500 Replace -monitor stdio with -qmp stdio for the second QEMU instance that tests file locking. Signed-off-by: Marc-Andr=C3=A9 Lureau --- tests/qemu-iotests/182 | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/tests/qemu-iotests/182 b/tests/qemu-iotests/182 index af5eeb599c18..f0b8bd1ad2b2 100755 --- a/tests/qemu-iotests/182 +++ b/tests/qemu-iotests/182 @@ -55,10 +55,11 @@ _launch_qemu -drive file=3D$TEST_IMG,if=3Dnone,id=3Ddri= ve0,file.locking=3Don \ =20 echo echo "Starting a second QEMU using the same image should fail" -echo 'quit' | $QEMU -nographic -monitor stdio \ +echo '{"execute":"qmp_capabilities"} +{"execute":"quit"}' | $QEMU -nographic -qmp stdio \ -drive file=3D$TEST_IMG,if=3Dnone,id=3Ddrive0,file.locking=3Don \ -device virtio-blk,drive=3Ddrive0 2>&1 | _filter_testdir 2>&1 | - _filter_qemu | + _filter_qemu | grep -v '^{' | sed -e '/falling back to POSIX file/d' \ -e '/locks can be lost unexpectedly/d' =20 --=20 2.56.0.rc0.29.g47ce80527c56 From nobody Sat Sep 26 20:01:40 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=1790109128; cv=none; d=zohomail.com; s=zohoarc; b=NMtduc6xKNjIu21OY7TP7CU9OtGWLPK0AMMbJrKGcpetIVFrD4xYLhWO5Co8YBCPkQwprFlK+uIbDPC0zUP3Wk77FzC+DqjjY/7X/pg7vlDSLnQp8Yu612svSdAHJud88ZoMYNW5TA5vBw3LIwPTBYl7gRfMnzYgataiu3ECxLE= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1790109128; 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:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=8/OVYXkQe1QMnI4wvHKulOQBAOcvaoS2FA+7oii3348=; b=krR90UR86yBSwsJAJTK8Dt+uHxuUBcyy7yx9qY8eqBjJe7ijdVIXLJZ4e9LQ1Vrv07QoLuQYy5QNQLBMIkJArX6KMJIU53a0YBmlGXXiknWtpOwr7WYtfDwnDkt7xm4bWLMT2URHIlTpaBfr+UlM72Rp4vgxRXl0VYliXVFyhx4= 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 1790109128005822.7388111309381; Tue, 22 Sep 2026 13:32:08 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists1p.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1x972X-0001dr-Cp; Tue, 22 Sep 2026 16:24:35 -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 1x9721-0000bM-94 for qemu-devel@nongnu.org; Tue, 22 Sep 2026 16:24:04 -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 1x971w-0000WS-37 for qemu-devel@nongnu.org; Tue, 22 Sep 2026 16:24:00 -0400 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-639-1Don_5-LNv2NTBYGQY8dHw-1; Tue, 22 Sep 2026 16:23:53 -0400 Received: from mx-prod-int-06.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-06.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.93]) (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 A73821955DDF; Tue, 22 Sep 2026 20:23:52 +0000 (UTC) Received: from localhost (headnet03.pony-001.prod.iad2.dc.redhat.com [10.2.32.114]) by mx-prod-int-06.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id 46D63180056E; Tue, 22 Sep 2026 20:23:50 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1790108635; 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=8/OVYXkQe1QMnI4wvHKulOQBAOcvaoS2FA+7oii3348=; b=UlHq0A8RMAdadx7vGPc2emlMqwVeiiazr0Cbr8mHNd0ci5Lp3qU5YZrTW52F6/sBqyj+xj S7xkDOaCDgRCZQpHN1ZNrMBFOtWImisp2A2ggSlCdyHUaT7Esu4WI6t2+sLl0Bu95KsQgk zR/DZbI+u2ToajShBsjqnF8bdG8b3c8= X-MC-Unique: 1Don_5-LNv2NTBYGQY8dHw-1 X-Mimecast-MFC-AGG-ID: 1Don_5-LNv2NTBYGQY8dHw_1790108632 From: =?utf-8?q?Marc-Andr=C3=A9_Lureau?= Date: Wed, 23 Sep 2026 00:18:26 +0400 Subject: [PATCH 79/88] qemu-iotests/186: migrate away from HMP MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Message-Id: <20260923-nohmp-v1-79-ebc029d4bd80@redhat.com> References: <20260923-nohmp-v1-0-ebc029d4bd80@redhat.com> In-Reply-To: <20260923-nohmp-v1-0-ebc029d4bd80@redhat.com> To: qemu-devel@nongnu.org Cc: Kevin Wolf , =?utf-8?q?Marc-Andr=C3=A9_Lureau?= , Hanna Reitz , qemu-block@nongnu.org X-Developer-Signature: v=1; a=openpgp-sha256; l=63836; i=marcandre.lureau@redhat.com; h=from:subject:message-id; bh=XvI4A+02rb5Agfheb8KROpz6AMCJEFW1mMefHosceEY=; b=owEBbQKS/ZANAwAKAdro4Ql1lpzlAcsmYgBqsuKzkR7na3H0UZSqXg2cEqctPmySPq1D1h8yY elkASj4fmyJAjMEAAEKAB0WIQSHqb2TP4fGBtJ29i3a6OEJdZac5QUCarLiswAKCRDa6OEJdZac 5dntD/9wTMbFVO47zQhlWYACSFol84NVZsIV2MyleD03MJ1jieF4HOtuyhkETAkyh/RofWhMW0t J08aepodKVySYmjjkWOH6jTYQxjRrWJvB55V7zRvO+ekyFCrOdLGxFiB+14w0ZOXLka8fyIu6RB xL7LOIR7C8fNIWKVvFr3UqoCfbKCcFhXnA3aSLXJtEU9XWslr2ZKA/5IF2J3zeNHsZtY7af0Fga qJOyVfGdvZ/lc3Bug6sdZMv80kltsKaiwGnuXrELpjXH9nWX0PluJ0eTt5wvfWBZqLE+VZouRNB IIdsAoynTCXKpxutJ/IycsmhJfe0YHSnwJin6Zf71Z2FP0WmQhDLkKR4b5P9D6pwBIZ7tuk/EPC +0dbsZPexkBI0/gylSj4M45aF25FvgKi7CbZUeMf6cpfRNRtLQbqgjuBxD/+zIAA4dcXZANG7Mb uLtR5UrUa/a9r6UeaFKkEtJbs1+h4ahmY/vKACobtfZ5lFpqmUF+aUCXGsp3zP/cvioLgwIGdW1 Jdv0f3uI3ippgjZzt7WwUvzqpB3Y80oooOhgZybyTVXyWYIeoeebMXRp6ZhOS1DF/lscql3vj8z 1h+W1RzyrcxNdZxeRkKj9/YB6/RSacL7ocFEQv4dm2PDJAK0lYLSEQDEky/UBOUPoTN1CLUxz+8 sYoJOUs/+NR5+QA== X-Developer-Key: i=marcandre.lureau@redhat.com; a=openpgp; fpr=87A9BD933F87C606D276F62DDAE8E10975969CE5 X-Scanned-By: MIMEDefang 3.4.1 on 10.30.177.93 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: 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-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: 1790109129619158500 Replace pipe-based HMP info block with QMP query-block. Signed-off-by: Marc-Andr=C3=A9 Lureau --- tests/qemu-iotests/186 | 12 +- tests/qemu-iotests/186.out | 590 +++++++++++++++++++----------------------= ---- 2 files changed, 256 insertions(+), 346 deletions(-) diff --git a/tests/qemu-iotests/186 b/tests/qemu-iotests/186 index 9a4215d28e92..56952356b24f 100755 --- a/tests/qemu-iotests/186 +++ b/tests/qemu-iotests/186 @@ -41,7 +41,6 @@ _supported_fmt qcow2 _supported_proto file fuse _require_drivers null-co _require_devices virtio-scsi-pci -_require_hmp =20 if [ "$QEMU_DEFAULT_MACHINE" !=3D "pc" ]; then _notrun "Requires a PC machine" @@ -52,20 +51,21 @@ do_run_qemu() echo Testing: "$@" =20 ( + echo '{ "execute": "qmp_capabilities" }' if ! test -t 0; then while read cmd; do - echo $cmd + echo "$cmd" done fi - echo quit - ) | $QEMU -S -display none -device virtio-scsi-pci -monitor stdio "$@"= 2>&1 + echo '{ "execute": "quit" }' + ) | $QEMU -S -display none -device virtio-scsi-pci -qmp stdio "$@" 2>&1 echo } =20 check_info_block() { - echo "info block" | - do_run_qemu "$@" | _filter_win32 | _filter_hmp | _filter_qemu | + echo '{ "execute": "query-block" }' | + do_run_qemu "$@" | _filter_win32 | _filter_qmp | _filter_qemu | _filter_generated_node_ids | _filter_qom_path } =20 diff --git a/tests/qemu-iotests/186.out b/tests/qemu-iotests/186.out index 01530040e5f4..4f966a70219e 100644 --- a/tests/qemu-iotests/186.out +++ b/tests/qemu-iotests/186.out @@ -4,458 +4,368 @@ Formatting 'TEST_DIR/t.IMGFMT', fmt=3DIMGFMT size=3D671= 08864 =3D=3D=3D Empty drives =3D=3D=3D =20 Testing: -device floppy -QEMU X.Y.Z monitor - type 'help' for more information -(qemu) info block -/machine/peripheral-anon/device[1]: [not inserted] - Attached to: /machine/peripheral-anon/device[N] - Removable device: not locked, tray closed -(qemu) quit +QMP_VERSION +{"return": {}} +{"return": [{"device": "", "locked": false, "removable": true, "qdev": "/m= achine/peripheral-anon/device[1]", "type": "unknown"}]} +{"timestamp": {"seconds": TIMESTAMP, "microseconds": TIMESTAMP}, "event"= : "SHUTDOWN", "data": {"guest": false, "reason": "host-qmp-quit"}} +{"return": {}} =20 Testing: -device floppy,id=3Dqdev_id -QEMU X.Y.Z monitor - type 'help' for more information -(qemu) info block -qdev_id: [not inserted] - Attached to: qdev_id - Removable device: not locked, tray closed -(qemu) quit +QMP_VERSION +{"return": {}} +{"return": [{"device": "", "locked": false, "removable": true, "qdev": "qd= ev_id", "type": "unknown"}]} +{"timestamp": {"seconds": TIMESTAMP, "microseconds": TIMESTAMP}, "event"= : "SHUTDOWN", "data": {"guest": false, "reason": "host-qmp-quit"}} +{"return": {}} =20 Testing: -device ide-cd -QEMU X.Y.Z monitor - type 'help' for more information -(qemu) info block -/machine/peripheral-anon/device[1]: [not inserted] - Attached to: /machine/peripheral-anon/device[N] - Removable device: not locked, tray closed -(qemu) quit +QMP_VERSION +{"return": {}} +{"return": [{"io-status": "ok", "device": "", "locked": false, "removable"= : true, "qdev": "/machine/peripheral-anon/device[1]", "tray_open": false, "= type": "unknown"}]} +{"timestamp": {"seconds": TIMESTAMP, "microseconds": TIMESTAMP}, "event"= : "SHUTDOWN", "data": {"guest": false, "reason": "host-qmp-quit"}} +{"return": {}} =20 Testing: -device ide-cd,id=3Dqdev_id -QEMU X.Y.Z monitor - type 'help' for more information -(qemu) info block -qdev_id: [not inserted] - Attached to: qdev_id - Removable device: not locked, tray closed -(qemu) quit +QMP_VERSION +{"return": {}} +{"return": [{"io-status": "ok", "device": "", "locked": false, "removable"= : true, "qdev": "qdev_id", "tray_open": false, "type": "unknown"}]} +{"timestamp": {"seconds": TIMESTAMP, "microseconds": TIMESTAMP}, "event"= : "SHUTDOWN", "data": {"guest": false, "reason": "host-qmp-quit"}} +{"return": {}} =20 Testing: -device scsi-cd -QEMU X.Y.Z monitor - type 'help' for more information -(qemu) info block -/machine/peripheral-anon/device[1]: [not inserted] - Attached to: /machine/peripheral-anon/device[N] - Removable device: not locked, tray closed -(qemu) quit +QMP_VERSION +{"return": {}} +{"return": [{"io-status": "ok", "device": "", "locked": false, "removable"= : true, "qdev": "/machine/peripheral-anon/device[1]", "tray_open": false, "= type": "unknown"}]} +{"timestamp": {"seconds": TIMESTAMP, "microseconds": TIMESTAMP}, "event"= : "SHUTDOWN", "data": {"guest": false, "reason": "host-qmp-quit"}} +{"return": {}} =20 Testing: -device scsi-cd,id=3Dqdev_id -QEMU X.Y.Z monitor - type 'help' for more information -(qemu) info block -qdev_id: [not inserted] - Attached to: qdev_id - Removable device: not locked, tray closed -(qemu) quit +QMP_VERSION +{"return": {}} +{"return": [{"io-status": "ok", "device": "", "locked": false, "removable"= : true, "qdev": "qdev_id", "tray_open": false, "type": "unknown"}]} +{"timestamp": {"seconds": TIMESTAMP, "microseconds": TIMESTAMP}, "event"= : "SHUTDOWN", "data": {"guest": false, "reason": "host-qmp-quit"}} +{"return": {}} =20 =20 =3D=3D=3D -blockdev/-device=3D =3D=3D=3D =20 Testing: -blockdev driver=3Dnull-co,read-zeroes=3Don,node-name=3Dnull -dev= ice ide-hd,drive=3Dnull -QEMU X.Y.Z monitor - type 'help' for more information -(qemu) info block -null: json:{"read-zeroes": true, "driver": "null-co"} (null-co) - Attached to: /machine/peripheral-anon/device[N] - Cache mode: writeback -(qemu) quit +QMP_VERSION +{"return": {}} +{"return": [{"io-status": "ok", "device": "", "locked": false, "removable"= : false, "inserted": {"iops_rd": 0, "detect_zeroes": "off", "active": true,= "image": {"limits": {"request-alignment": 1, "min-mem-alignment": 512, "op= t-mem-alignment": 4096, "max-iov": 1024}, "virtual-size": 1073741824, "file= name": "json:{\"read-zeroes\": true, \"driver\": \"null-co\"}", "format": "= null-co", "actual-size": 0}, "iops_wr": 0, "ro": false, "children": [], "no= de-name": "null", "backing_file_depth": 0, "drv": "null-co", "iops": 0, "bp= s_wr": 0, "write_threshold": 0, "encrypted": false, "bps": 0, "bps_rd": 0, = "cache": {"no-flush": false, "direct": false, "writeback": true}, "file": "= json:{\"read-zeroes\": true, \"driver\": \"null-co\"}"}, "qdev": "/machine/= peripheral-anon/device[1]", "type": "unknown"}]} +{"timestamp": {"seconds": TIMESTAMP, "microseconds": TIMESTAMP}, "event"= : "SHUTDOWN", "data": {"guest": false, "reason": "host-qmp-quit"}} +{"return": {}} =20 Testing: -blockdev driver=3Dnull-co,read-zeroes=3Don,node-name=3Dnull -dev= ice ide-hd,drive=3Dnull,id=3Dqdev_id -QEMU X.Y.Z monitor - type 'help' for more information -(qemu) info block -null: json:{"read-zeroes": true, "driver": "null-co"} (null-co) - Attached to: qdev_id - Cache mode: writeback -(qemu) quit +QMP_VERSION +{"return": {}} +{"return": [{"io-status": "ok", "device": "", "locked": false, "removable"= : false, "inserted": {"iops_rd": 0, "detect_zeroes": "off", "active": true,= "image": {"limits": {"request-alignment": 1, "min-mem-alignment": 512, "op= t-mem-alignment": 4096, "max-iov": 1024}, "virtual-size": 1073741824, "file= name": "json:{\"read-zeroes\": true, \"driver\": \"null-co\"}", "format": "= null-co", "actual-size": 0}, "iops_wr": 0, "ro": false, "children": [], "no= de-name": "null", "backing_file_depth": 0, "drv": "null-co", "iops": 0, "bp= s_wr": 0, "write_threshold": 0, "encrypted": false, "bps": 0, "bps_rd": 0, = "cache": {"no-flush": false, "direct": false, "writeback": true}, "file": "= json:{\"read-zeroes\": true, \"driver\": \"null-co\"}"}, "qdev": "qdev_id",= "type": "unknown"}]} +{"timestamp": {"seconds": TIMESTAMP, "microseconds": TIMESTAMP}, "event"= : "SHUTDOWN", "data": {"guest": false, "reason": "host-qmp-quit"}} +{"return": {}} =20 Testing: -blockdev driver=3Dnull-co,read-zeroes=3Don,node-name=3Dnull -dev= ice scsi-hd,drive=3Dnull -QEMU X.Y.Z monitor - type 'help' for more information -(qemu) info block -null: json:{"read-zeroes": true, "driver": "null-co"} (null-co) - Attached to: /machine/peripheral-anon/device[N] - Cache mode: writeback -(qemu) quit +QMP_VERSION +{"return": {}} +{"return": [{"io-status": "ok", "device": "", "locked": false, "removable"= : false, "inserted": {"iops_rd": 0, "detect_zeroes": "off", "active": true,= "image": {"limits": {"request-alignment": 1, "min-mem-alignment": 512, "op= t-mem-alignment": 4096, "max-iov": 1024}, "virtual-size": 1073741824, "file= name": "json:{\"read-zeroes\": true, \"driver\": \"null-co\"}", "format": "= null-co", "actual-size": 0}, "iops_wr": 0, "ro": false, "children": [], "no= de-name": "null", "backing_file_depth": 0, "drv": "null-co", "iops": 0, "bp= s_wr": 0, "write_threshold": 0, "encrypted": false, "bps": 0, "bps_rd": 0, = "cache": {"no-flush": false, "direct": false, "writeback": true}, "file": "= json:{\"read-zeroes\": true, \"driver\": \"null-co\"}"}, "qdev": "/machine/= peripheral-anon/device[1]", "type": "unknown"}]} +{"timestamp": {"seconds": TIMESTAMP, "microseconds": TIMESTAMP}, "event"= : "SHUTDOWN", "data": {"guest": false, "reason": "host-qmp-quit"}} +{"return": {}} =20 Testing: -blockdev driver=3Dnull-co,read-zeroes=3Don,node-name=3Dnull -dev= ice scsi-hd,drive=3Dnull,id=3Dqdev_id -QEMU X.Y.Z monitor - type 'help' for more information -(qemu) info block -null: json:{"read-zeroes": true, "driver": "null-co"} (null-co) - Attached to: qdev_id - Cache mode: writeback -(qemu) quit +QMP_VERSION +{"return": {}} +{"return": [{"io-status": "ok", "device": "", "locked": false, "removable"= : false, "inserted": {"iops_rd": 0, "detect_zeroes": "off", "active": true,= "image": {"limits": {"request-alignment": 1, "min-mem-alignment": 512, "op= t-mem-alignment": 4096, "max-iov": 1024}, "virtual-size": 1073741824, "file= name": "json:{\"read-zeroes\": true, \"driver\": \"null-co\"}", "format": "= null-co", "actual-size": 0}, "iops_wr": 0, "ro": false, "children": [], "no= de-name": "null", "backing_file_depth": 0, "drv": "null-co", "iops": 0, "bp= s_wr": 0, "write_threshold": 0, "encrypted": false, "bps": 0, "bps_rd": 0, = "cache": {"no-flush": false, "direct": false, "writeback": true}, "file": "= json:{\"read-zeroes\": true, \"driver\": \"null-co\"}"}, "qdev": "qdev_id",= "type": "unknown"}]} +{"timestamp": {"seconds": TIMESTAMP, "microseconds": TIMESTAMP}, "event"= : "SHUTDOWN", "data": {"guest": false, "reason": "host-qmp-quit"}} +{"return": {}} =20 Testing: -blockdev driver=3Dnull-co,read-zeroes=3Don,node-name=3Dnull -dev= ice virtio-blk-pci,drive=3Dnull -QEMU X.Y.Z monitor - type 'help' for more information -(qemu) info block -null: json:{"read-zeroes": true, "driver": "null-co"} (null-co) - Attached to: /machine/peripheral-anon/device[N]/virtio-backend - Cache mode: writeback -(qemu) quit +QMP_VERSION +{"return": {}} +{"return": [{"io-status": "ok", "device": "", "locked": false, "removable"= : false, "inserted": {"iops_rd": 0, "detect_zeroes": "off", "active": true,= "image": {"limits": {"request-alignment": 1, "min-mem-alignment": 512, "op= t-mem-alignment": 4096, "max-iov": 1024}, "virtual-size": 1073741824, "file= name": "json:{\"read-zeroes\": true, \"driver\": \"null-co\"}", "format": "= null-co", "actual-size": 0}, "iops_wr": 0, "ro": false, "children": [], "no= de-name": "null", "backing_file_depth": 0, "drv": "null-co", "iops": 0, "bp= s_wr": 0, "write_threshold": 0, "encrypted": false, "bps": 0, "bps_rd": 0, = "cache": {"no-flush": false, "direct": false, "writeback": true}, "file": "= json:{\"read-zeroes\": true, \"driver\": \"null-co\"}"}, "qdev": "/machine/= peripheral-anon/device[1]/virtio-backend", "type": "unknown"}]} +{"timestamp": {"seconds": TIMESTAMP, "microseconds": TIMESTAMP}, "event"= : "SHUTDOWN", "data": {"guest": false, "reason": "host-qmp-quit"}} +{"return": {}} =20 Testing: -blockdev driver=3Dnull-co,read-zeroes=3Don,node-name=3Dnull -dev= ice virtio-blk-pci,drive=3Dnull,id=3Dqdev_id -QEMU X.Y.Z monitor - type 'help' for more information -(qemu) info block -null: json:{"read-zeroes": true, "driver": "null-co"} (null-co) - Attached to: /machine/peripheral/qdev_id/virtio-backend - Cache mode: writeback -(qemu) quit +QMP_VERSION +{"return": {}} +{"return": [{"io-status": "ok", "device": "", "locked": false, "removable"= : false, "inserted": {"iops_rd": 0, "detect_zeroes": "off", "active": true,= "image": {"limits": {"request-alignment": 1, "min-mem-alignment": 512, "op= t-mem-alignment": 4096, "max-iov": 1024}, "virtual-size": 1073741824, "file= name": "json:{\"read-zeroes\": true, \"driver\": \"null-co\"}", "format": "= null-co", "actual-size": 0}, "iops_wr": 0, "ro": false, "children": [], "no= de-name": "null", "backing_file_depth": 0, "drv": "null-co", "iops": 0, "bp= s_wr": 0, "write_threshold": 0, "encrypted": false, "bps": 0, "bps_rd": 0, = "cache": {"no-flush": false, "direct": false, "writeback": true}, "file": "= json:{\"read-zeroes\": true, \"driver\": \"null-co\"}"}, "qdev": "/machine/= peripheral/qdev_id/virtio-backend", "type": "unknown"}]} +{"timestamp": {"seconds": TIMESTAMP, "microseconds": TIMESTAMP}, "event"= : "SHUTDOWN", "data": {"guest": false, "reason": "host-qmp-quit"}} +{"return": {}} =20 Testing: -blockdev driver=3Dnull-co,read-zeroes=3Don,node-name=3Dnull -dev= ice floppy,drive=3Dnull -QEMU X.Y.Z monitor - type 'help' for more information -(qemu) info block -null: json:{"read-zeroes": true, "driver": "null-co"} (null-co) - Attached to: /machine/peripheral-anon/device[N] - Removable device: not locked, tray closed - Cache mode: writeback -(qemu) quit +QMP_VERSION +{"return": {}} +{"return": [{"device": "", "locked": false, "removable": true, "inserted":= {"iops_rd": 0, "detect_zeroes": "off", "active": true, "image": {"limits":= {"request-alignment": 1, "min-mem-alignment": 512, "opt-mem-alignment": 40= 96, "max-iov": 1024}, "virtual-size": 1073741824, "filename": "json:{\"read= -zeroes\": true, \"driver\": \"null-co\"}", "format": "null-co", "actual-si= ze": 0}, "iops_wr": 0, "ro": false, "children": [], "node-name": "null", "b= acking_file_depth": 0, "drv": "null-co", "iops": 0, "bps_wr": 0, "write_thr= eshold": 0, "encrypted": false, "bps": 0, "bps_rd": 0, "cache": {"no-flush"= : false, "direct": false, "writeback": true}, "file": "json:{\"read-zeroes\= ": true, \"driver\": \"null-co\"}"}, "qdev": "/machine/peripheral-anon/devi= ce[1]", "type": "unknown"}]} +{"timestamp": {"seconds": TIMESTAMP, "microseconds": TIMESTAMP}, "event"= : "SHUTDOWN", "data": {"guest": false, "reason": "host-qmp-quit"}} +{"return": {}} =20 Testing: -blockdev driver=3Dnull-co,read-zeroes=3Don,node-name=3Dnull -dev= ice floppy,drive=3Dnull,id=3Dqdev_id -QEMU X.Y.Z monitor - type 'help' for more information -(qemu) info block -null: json:{"read-zeroes": true, "driver": "null-co"} (null-co) - Attached to: qdev_id - Removable device: not locked, tray closed - Cache mode: writeback -(qemu) quit +QMP_VERSION +{"return": {}} +{"return": [{"device": "", "locked": false, "removable": true, "inserted":= {"iops_rd": 0, "detect_zeroes": "off", "active": true, "image": {"limits":= {"request-alignment": 1, "min-mem-alignment": 512, "opt-mem-alignment": 40= 96, "max-iov": 1024}, "virtual-size": 1073741824, "filename": "json:{\"read= -zeroes\": true, \"driver\": \"null-co\"}", "format": "null-co", "actual-si= ze": 0}, "iops_wr": 0, "ro": false, "children": [], "node-name": "null", "b= acking_file_depth": 0, "drv": "null-co", "iops": 0, "bps_wr": 0, "write_thr= eshold": 0, "encrypted": false, "bps": 0, "bps_rd": 0, "cache": {"no-flush"= : false, "direct": false, "writeback": true}, "file": "json:{\"read-zeroes\= ": true, \"driver\": \"null-co\"}"}, "qdev": "qdev_id", "type": "unknown"}]} +{"timestamp": {"seconds": TIMESTAMP, "microseconds": TIMESTAMP}, "event"= : "SHUTDOWN", "data": {"guest": false, "reason": "host-qmp-quit"}} +{"return": {}} =20 Testing: -blockdev driver=3Dnull-co,read-zeroes=3Don,node-name=3Dnull -dev= ice ide-cd,drive=3Dnull -QEMU X.Y.Z monitor - type 'help' for more information -(qemu) info block -null: json:{"read-zeroes": true, "driver": "null-co"} (null-co) - Attached to: /machine/peripheral-anon/device[N] - Removable device: not locked, tray closed - Cache mode: writeback -(qemu) quit +QMP_VERSION +{"return": {}} +{"return": [{"io-status": "ok", "device": "", "locked": false, "removable"= : true, "inserted": {"iops_rd": 0, "detect_zeroes": "off", "active": true, = "image": {"limits": {"request-alignment": 1, "min-mem-alignment": 512, "opt= -mem-alignment": 4096, "max-iov": 1024}, "virtual-size": 1073741824, "filen= ame": "json:{\"read-zeroes\": true, \"driver\": \"null-co\"}", "format": "n= ull-co", "actual-size": 0}, "iops_wr": 0, "ro": false, "children": [], "nod= e-name": "null", "backing_file_depth": 0, "drv": "null-co", "iops": 0, "bps= _wr": 0, "write_threshold": 0, "encrypted": false, "bps": 0, "bps_rd": 0, "= cache": {"no-flush": false, "direct": false, "writeback": true}, "file": "j= son:{\"read-zeroes\": true, \"driver\": \"null-co\"}"}, "qdev": "/machine/p= eripheral-anon/device[1]", "tray_open": false, "type": "unknown"}]} +{"timestamp": {"seconds": TIMESTAMP, "microseconds": TIMESTAMP}, "event"= : "SHUTDOWN", "data": {"guest": false, "reason": "host-qmp-quit"}} +{"return": {}} =20 Testing: -blockdev driver=3Dnull-co,read-zeroes=3Don,node-name=3Dnull -dev= ice ide-cd,drive=3Dnull,id=3Dqdev_id -QEMU X.Y.Z monitor - type 'help' for more information -(qemu) info block -null: json:{"read-zeroes": true, "driver": "null-co"} (null-co) - Attached to: qdev_id - Removable device: not locked, tray closed - Cache mode: writeback -(qemu) quit +QMP_VERSION +{"return": {}} +{"return": [{"io-status": "ok", "device": "", "locked": false, "removable"= : true, "inserted": {"iops_rd": 0, "detect_zeroes": "off", "active": true, = "image": {"limits": {"request-alignment": 1, "min-mem-alignment": 512, "opt= -mem-alignment": 4096, "max-iov": 1024}, "virtual-size": 1073741824, "filen= ame": "json:{\"read-zeroes\": true, \"driver\": \"null-co\"}", "format": "n= ull-co", "actual-size": 0}, "iops_wr": 0, "ro": false, "children": [], "nod= e-name": "null", "backing_file_depth": 0, "drv": "null-co", "iops": 0, "bps= _wr": 0, "write_threshold": 0, "encrypted": false, "bps": 0, "bps_rd": 0, "= cache": {"no-flush": false, "direct": false, "writeback": true}, "file": "j= son:{\"read-zeroes\": true, \"driver\": \"null-co\"}"}, "qdev": "qdev_id", = "tray_open": false, "type": "unknown"}]} +{"timestamp": {"seconds": TIMESTAMP, "microseconds": TIMESTAMP}, "event"= : "SHUTDOWN", "data": {"guest": false, "reason": "host-qmp-quit"}} +{"return": {}} =20 Testing: -blockdev driver=3Dnull-co,read-zeroes=3Don,node-name=3Dnull -dev= ice scsi-cd,drive=3Dnull -QEMU X.Y.Z monitor - type 'help' for more information -(qemu) info block -null: json:{"read-zeroes": true, "driver": "null-co"} (null-co) - Attached to: /machine/peripheral-anon/device[N] - Removable device: not locked, tray closed - Cache mode: writeback -(qemu) quit +QMP_VERSION +{"return": {}} +{"return": [{"io-status": "ok", "device": "", "locked": false, "removable"= : true, "inserted": {"iops_rd": 0, "detect_zeroes": "off", "active": true, = "image": {"limits": {"request-alignment": 1, "min-mem-alignment": 512, "opt= -mem-alignment": 4096, "max-iov": 1024}, "virtual-size": 1073741824, "filen= ame": "json:{\"read-zeroes\": true, \"driver\": \"null-co\"}", "format": "n= ull-co", "actual-size": 0}, "iops_wr": 0, "ro": false, "children": [], "nod= e-name": "null", "backing_file_depth": 0, "drv": "null-co", "iops": 0, "bps= _wr": 0, "write_threshold": 0, "encrypted": false, "bps": 0, "bps_rd": 0, "= cache": {"no-flush": false, "direct": false, "writeback": true}, "file": "j= son:{\"read-zeroes\": true, \"driver\": \"null-co\"}"}, "qdev": "/machine/p= eripheral-anon/device[1]", "tray_open": false, "type": "unknown"}]} +{"timestamp": {"seconds": TIMESTAMP, "microseconds": TIMESTAMP}, "event"= : "SHUTDOWN", "data": {"guest": false, "reason": "host-qmp-quit"}} +{"return": {}} =20 Testing: -blockdev driver=3Dnull-co,read-zeroes=3Don,node-name=3Dnull -dev= ice scsi-cd,drive=3Dnull,id=3Dqdev_id -QEMU X.Y.Z monitor - type 'help' for more information -(qemu) info block -null: json:{"read-zeroes": true, "driver": "null-co"} (null-co) - Attached to: qdev_id - Removable device: not locked, tray closed - Cache mode: writeback -(qemu) quit +QMP_VERSION +{"return": {}} +{"return": [{"io-status": "ok", "device": "", "locked": false, "removable"= : true, "inserted": {"iops_rd": 0, "detect_zeroes": "off", "active": true, = "image": {"limits": {"request-alignment": 1, "min-mem-alignment": 512, "opt= -mem-alignment": 4096, "max-iov": 1024}, "virtual-size": 1073741824, "filen= ame": "json:{\"read-zeroes\": true, \"driver\": \"null-co\"}", "format": "n= ull-co", "actual-size": 0}, "iops_wr": 0, "ro": false, "children": [], "nod= e-name": "null", "backing_file_depth": 0, "drv": "null-co", "iops": 0, "bps= _wr": 0, "write_threshold": 0, "encrypted": false, "bps": 0, "bps_rd": 0, "= cache": {"no-flush": false, "direct": false, "writeback": true}, "file": "j= son:{\"read-zeroes\": true, \"driver\": \"null-co\"}"}, "qdev": "qdev_id", = "tray_open": false, "type": "unknown"}]} +{"timestamp": {"seconds": TIMESTAMP, "microseconds": TIMESTAMP}, "event"= : "SHUTDOWN", "data": {"guest": false, "reason": "host-qmp-quit"}} +{"return": {}} =20 =20 =3D=3D=3D -drive if=3Dnone/-device=3D =3D=3D=3D =20 Testing: -drive if=3Dnone,driver=3Dnull-co,read-zeroes=3Don,node-name=3Dnu= ll -device ide-hd,drive=3Dnull,id=3Dqdev_id -QEMU X.Y.Z monitor - type 'help' for more information -(qemu) info block -none0 (null): json:{"read-zeroes": "on", "driver": "null-co"} (null-co) - Removable device: not locked, tray closed - Cache mode: writeback - -null: json:{"read-zeroes": "on", "driver": "null-co"} (null-co) - Attached to: qdev_id - Cache mode: writeback -(qemu) quit +QMP_VERSION +{"return": {}} +{"return": [{"device": "none0", "locked": false, "removable": true, "inser= ted": {"iops_rd": 0, "detect_zeroes": "off", "active": true, "image": {"lim= its": {"request-alignment": 1, "min-mem-alignment": 512, "opt-mem-alignment= ": 4096, "max-iov": 1024}, "virtual-size": 1073741824, "filename": "json:{\= "read-zeroes\": \"on\", \"driver\": \"null-co\"}", "format": "null-co", "ac= tual-size": 0}, "iops_wr": 0, "ro": false, "children": [], "node-name": "nu= ll", "backing_file_depth": 0, "drv": "null-co", "iops": 0, "bps_wr": 0, "wr= ite_threshold": 0, "encrypted": false, "bps": 0, "bps_rd": 0, "cache": {"no= -flush": false, "direct": false, "writeback": true}, "file": "json:{\"read-= zeroes\": \"on\", \"driver\": \"null-co\"}"}, "type": "unknown"}, {"io-stat= us": "ok", "device": "", "locked": false, "removable": false, "inserted": {= "iops_rd": 0, "detect_zeroes": "off", "active": true, "image": {"limits": {= "request-alignment": 1, "min-mem-alignment": 512, "opt-mem-alignment": 4096= , "max-iov": 1024}, "vi rtual-size": 1073741824, "filename": "json:{\"read-zeroes\": \"on\", \"dri= ver\": \"null-co\"}", "format": "null-co", "actual-size": 0}, "iops_wr": 0,= "ro": false, "children": [], "node-name": "null", "backing_file_depth": 0,= "drv": "null-co", "iops": 0, "bps_wr": 0, "write_threshold": 0, "encrypted= ": false, "bps": 0, "bps_rd": 0, "cache": {"no-flush": false, "direct": fal= se, "writeback": true}, "file": "json:{\"read-zeroes\": \"on\", \"driver\":= \"null-co\"}"}, "qdev": "qdev_id", "type": "unknown"}]} +{"timestamp": {"seconds": TIMESTAMP, "microseconds": TIMESTAMP}, "event"= : "SHUTDOWN", "data": {"guest": false, "reason": "host-qmp-quit"}} +{"return": {}} =20 Testing: -drive if=3Dnone,driver=3Dnull-co,read-zeroes=3Don,node-name=3Dnu= ll -device scsi-hd,drive=3Dnull,id=3Dqdev_id -QEMU X.Y.Z monitor - type 'help' for more information -(qemu) info block -none0 (null): json:{"read-zeroes": "on", "driver": "null-co"} (null-co) - Removable device: not locked, tray closed - Cache mode: writeback - -null: json:{"read-zeroes": "on", "driver": "null-co"} (null-co) - Attached to: qdev_id - Cache mode: writeback -(qemu) quit +QMP_VERSION +{"return": {}} +{"return": [{"device": "none0", "locked": false, "removable": true, "inser= ted": {"iops_rd": 0, "detect_zeroes": "off", "active": true, "image": {"lim= its": {"request-alignment": 1, "min-mem-alignment": 512, "opt-mem-alignment= ": 4096, "max-iov": 1024}, "virtual-size": 1073741824, "filename": "json:{\= "read-zeroes\": \"on\", \"driver\": \"null-co\"}", "format": "null-co", "ac= tual-size": 0}, "iops_wr": 0, "ro": false, "children": [], "node-name": "nu= ll", "backing_file_depth": 0, "drv": "null-co", "iops": 0, "bps_wr": 0, "wr= ite_threshold": 0, "encrypted": false, "bps": 0, "bps_rd": 0, "cache": {"no= -flush": false, "direct": false, "writeback": true}, "file": "json:{\"read-= zeroes\": \"on\", \"driver\": \"null-co\"}"}, "type": "unknown"}, {"io-stat= us": "ok", "device": "", "locked": false, "removable": false, "inserted": {= "iops_rd": 0, "detect_zeroes": "off", "active": true, "image": {"limits": {= "request-alignment": 1, "min-mem-alignment": 512, "opt-mem-alignment": 4096= , "max-iov": 1024}, "vi rtual-size": 1073741824, "filename": "json:{\"read-zeroes\": \"on\", \"dri= ver\": \"null-co\"}", "format": "null-co", "actual-size": 0}, "iops_wr": 0,= "ro": false, "children": [], "node-name": "null", "backing_file_depth": 0,= "drv": "null-co", "iops": 0, "bps_wr": 0, "write_threshold": 0, "encrypted= ": false, "bps": 0, "bps_rd": 0, "cache": {"no-flush": false, "direct": fal= se, "writeback": true}, "file": "json:{\"read-zeroes\": \"on\", \"driver\":= \"null-co\"}"}, "qdev": "qdev_id", "type": "unknown"}]} +{"timestamp": {"seconds": TIMESTAMP, "microseconds": TIMESTAMP}, "event"= : "SHUTDOWN", "data": {"guest": false, "reason": "host-qmp-quit"}} +{"return": {}} =20 Testing: -drive if=3Dnone,driver=3Dnull-co,read-zeroes=3Don,node-name=3Dnu= ll -device virtio-blk-pci,drive=3Dnull,id=3Dqdev_id -QEMU X.Y.Z monitor - type 'help' for more information -(qemu) info block -none0 (null): json:{"read-zeroes": "on", "driver": "null-co"} (null-co) - Removable device: not locked, tray closed - Cache mode: writeback - -null: json:{"read-zeroes": "on", "driver": "null-co"} (null-co) - Attached to: /machine/peripheral/qdev_id/virtio-backend - Cache mode: writeback -(qemu) quit +QMP_VERSION +{"return": {}} +{"return": [{"device": "none0", "locked": false, "removable": true, "inser= ted": {"iops_rd": 0, "detect_zeroes": "off", "active": true, "image": {"lim= its": {"request-alignment": 1, "min-mem-alignment": 512, "opt-mem-alignment= ": 4096, "max-iov": 1024}, "virtual-size": 1073741824, "filename": "json:{\= "read-zeroes\": \"on\", \"driver\": \"null-co\"}", "format": "null-co", "ac= tual-size": 0}, "iops_wr": 0, "ro": false, "children": [], "node-name": "nu= ll", "backing_file_depth": 0, "drv": "null-co", "iops": 0, "bps_wr": 0, "wr= ite_threshold": 0, "encrypted": false, "bps": 0, "bps_rd": 0, "cache": {"no= -flush": false, "direct": false, "writeback": true}, "file": "json:{\"read-= zeroes\": \"on\", \"driver\": \"null-co\"}"}, "type": "unknown"}, {"io-stat= us": "ok", "device": "", "locked": false, "removable": false, "inserted": {= "iops_rd": 0, "detect_zeroes": "off", "active": true, "image": {"limits": {= "request-alignment": 1, "min-mem-alignment": 512, "opt-mem-alignment": 4096= , "max-iov": 1024}, "vi rtual-size": 1073741824, "filename": "json:{\"read-zeroes\": \"on\", \"dri= ver\": \"null-co\"}", "format": "null-co", "actual-size": 0}, "iops_wr": 0,= "ro": false, "children": [], "node-name": "null", "backing_file_depth": 0,= "drv": "null-co", "iops": 0, "bps_wr": 0, "write_threshold": 0, "encrypted= ": false, "bps": 0, "bps_rd": 0, "cache": {"no-flush": false, "direct": fal= se, "writeback": true}, "file": "json:{\"read-zeroes\": \"on\", \"driver\":= \"null-co\"}"}, "qdev": "/machine/peripheral/qdev_id/virtio-backend", "typ= e": "unknown"}]} +{"timestamp": {"seconds": TIMESTAMP, "microseconds": TIMESTAMP}, "event"= : "SHUTDOWN", "data": {"guest": false, "reason": "host-qmp-quit"}} +{"return": {}} =20 Testing: -drive if=3Dnone,driver=3Dnull-co,read-zeroes=3Don,node-name=3Dnu= ll -device floppy,drive=3Dnull,id=3Dqdev_id -QEMU X.Y.Z monitor - type 'help' for more information -(qemu) info block -none0 (null): json:{"read-zeroes": "on", "driver": "null-co"} (null-co) - Removable device: not locked, tray closed - Cache mode: writeback - -null: json:{"read-zeroes": "on", "driver": "null-co"} (null-co) - Attached to: qdev_id - Removable device: not locked, tray closed - Cache mode: writeback -(qemu) quit +QMP_VERSION +{"return": {}} +{"return": [{"device": "none0", "locked": false, "removable": true, "inser= ted": {"iops_rd": 0, "detect_zeroes": "off", "active": true, "image": {"lim= its": {"request-alignment": 1, "min-mem-alignment": 512, "opt-mem-alignment= ": 4096, "max-iov": 1024}, "virtual-size": 1073741824, "filename": "json:{\= "read-zeroes\": \"on\", \"driver\": \"null-co\"}", "format": "null-co", "ac= tual-size": 0}, "iops_wr": 0, "ro": false, "children": [], "node-name": "nu= ll", "backing_file_depth": 0, "drv": "null-co", "iops": 0, "bps_wr": 0, "wr= ite_threshold": 0, "encrypted": false, "bps": 0, "bps_rd": 0, "cache": {"no= -flush": false, "direct": false, "writeback": true}, "file": "json:{\"read-= zeroes\": \"on\", \"driver\": \"null-co\"}"}, "type": "unknown"}, {"device"= : "", "locked": false, "removable": true, "inserted": {"iops_rd": 0, "detec= t_zeroes": "off", "active": true, "image": {"limits": {"request-alignment":= 1, "min-mem-alignment": 512, "opt-mem-alignment": 4096, "max-iov": 1024}, = "virtual-size": 1073741 824, "filename": "json:{\"read-zeroes\": \"on\", \"driver\": \"null-co\"}"= , "format": "null-co", "actual-size": 0}, "iops_wr": 0, "ro": false, "child= ren": [], "node-name": "null", "backing_file_depth": 0, "drv": "null-co", "= iops": 0, "bps_wr": 0, "write_threshold": 0, "encrypted": false, "bps": 0, = "bps_rd": 0, "cache": {"no-flush": false, "direct": false, "writeback": tru= e}, "file": "json:{\"read-zeroes\": \"on\", \"driver\": \"null-co\"}"}, "qd= ev": "qdev_id", "type": "unknown"}]} +{"timestamp": {"seconds": TIMESTAMP, "microseconds": TIMESTAMP}, "event"= : "SHUTDOWN", "data": {"guest": false, "reason": "host-qmp-quit"}} +{"return": {}} =20 Testing: -drive if=3Dnone,driver=3Dnull-co,read-zeroes=3Don,node-name=3Dnu= ll -device ide-cd,drive=3Dnull,id=3Dqdev_id -QEMU X.Y.Z monitor - type 'help' for more information -(qemu) info block -none0 (null): json:{"read-zeroes": "on", "driver": "null-co"} (null-co) - Removable device: not locked, tray closed - Cache mode: writeback - -null: json:{"read-zeroes": "on", "driver": "null-co"} (null-co) - Attached to: qdev_id - Removable device: not locked, tray closed - Cache mode: writeback -(qemu) quit +QMP_VERSION +{"return": {}} +{"return": [{"device": "none0", "locked": false, "removable": true, "inser= ted": {"iops_rd": 0, "detect_zeroes": "off", "active": true, "image": {"lim= its": {"request-alignment": 1, "min-mem-alignment": 512, "opt-mem-alignment= ": 4096, "max-iov": 1024}, "virtual-size": 1073741824, "filename": "json:{\= "read-zeroes\": \"on\", \"driver\": \"null-co\"}", "format": "null-co", "ac= tual-size": 0}, "iops_wr": 0, "ro": false, "children": [], "node-name": "nu= ll", "backing_file_depth": 0, "drv": "null-co", "iops": 0, "bps_wr": 0, "wr= ite_threshold": 0, "encrypted": false, "bps": 0, "bps_rd": 0, "cache": {"no= -flush": false, "direct": false, "writeback": true}, "file": "json:{\"read-= zeroes\": \"on\", \"driver\": \"null-co\"}"}, "type": "unknown"}, {"io-stat= us": "ok", "device": "", "locked": false, "removable": true, "inserted": {"= iops_rd": 0, "detect_zeroes": "off", "active": true, "image": {"limits": {"= request-alignment": 1, "min-mem-alignment": 512, "opt-mem-alignment": 4096,= "max-iov": 1024}, "vir tual-size": 1073741824, "filename": "json:{\"read-zeroes\": \"on\", \"driv= er\": \"null-co\"}", "format": "null-co", "actual-size": 0}, "iops_wr": 0, = "ro": false, "children": [], "node-name": "null", "backing_file_depth": 0, = "drv": "null-co", "iops": 0, "bps_wr": 0, "write_threshold": 0, "encrypted"= : false, "bps": 0, "bps_rd": 0, "cache": {"no-flush": false, "direct": fals= e, "writeback": true}, "file": "json:{\"read-zeroes\": \"on\", \"driver\": = \"null-co\"}"}, "qdev": "qdev_id", "tray_open": false, "type": "unknown"}]} +{"timestamp": {"seconds": TIMESTAMP, "microseconds": TIMESTAMP}, "event"= : "SHUTDOWN", "data": {"guest": false, "reason": "host-qmp-quit"}} +{"return": {}} =20 Testing: -drive if=3Dnone,driver=3Dnull-co,read-zeroes=3Don,node-name=3Dnu= ll -device scsi-cd,drive=3Dnull,id=3Dqdev_id -QEMU X.Y.Z monitor - type 'help' for more information -(qemu) info block -none0 (null): json:{"read-zeroes": "on", "driver": "null-co"} (null-co) - Removable device: not locked, tray closed - Cache mode: writeback - -null: json:{"read-zeroes": "on", "driver": "null-co"} (null-co) - Attached to: qdev_id - Removable device: not locked, tray closed - Cache mode: writeback -(qemu) quit +QMP_VERSION +{"return": {}} +{"return": [{"device": "none0", "locked": false, "removable": true, "inser= ted": {"iops_rd": 0, "detect_zeroes": "off", "active": true, "image": {"lim= its": {"request-alignment": 1, "min-mem-alignment": 512, "opt-mem-alignment= ": 4096, "max-iov": 1024}, "virtual-size": 1073741824, "filename": "json:{\= "read-zeroes\": \"on\", \"driver\": \"null-co\"}", "format": "null-co", "ac= tual-size": 0}, "iops_wr": 0, "ro": false, "children": [], "node-name": "nu= ll", "backing_file_depth": 0, "drv": "null-co", "iops": 0, "bps_wr": 0, "wr= ite_threshold": 0, "encrypted": false, "bps": 0, "bps_rd": 0, "cache": {"no= -flush": false, "direct": false, "writeback": true}, "file": "json:{\"read-= zeroes\": \"on\", \"driver\": \"null-co\"}"}, "type": "unknown"}, {"io-stat= us": "ok", "device": "", "locked": false, "removable": true, "inserted": {"= iops_rd": 0, "detect_zeroes": "off", "active": true, "image": {"limits": {"= request-alignment": 1, "min-mem-alignment": 512, "opt-mem-alignment": 4096,= "max-iov": 1024}, "vir tual-size": 1073741824, "filename": "json:{\"read-zeroes\": \"on\", \"driv= er\": \"null-co\"}", "format": "null-co", "actual-size": 0}, "iops_wr": 0, = "ro": false, "children": [], "node-name": "null", "backing_file_depth": 0, = "drv": "null-co", "iops": 0, "bps_wr": 0, "write_threshold": 0, "encrypted"= : false, "bps": 0, "bps_rd": 0, "cache": {"no-flush": false, "direct": fals= e, "writeback": true}, "file": "json:{\"read-zeroes\": \"on\", \"driver\": = \"null-co\"}"}, "qdev": "qdev_id", "tray_open": false, "type": "unknown"}]} +{"timestamp": {"seconds": TIMESTAMP, "microseconds": TIMESTAMP}, "event"= : "SHUTDOWN", "data": {"guest": false, "reason": "host-qmp-quit"}} +{"return": {}} =20 =20 =3D=3D=3D -drive if=3Dnone/-device=3D (with medium) =3D=3D=3D =20 Testing: -drive if=3Dnone,driver=3Dnull-co,read-zeroes=3Don,node-name=3Dnu= ll -device ide-hd,drive=3Dnone0 -QEMU X.Y.Z monitor - type 'help' for more information -(qemu) info block -none0 (null): json:{"read-zeroes": "on", "driver": "null-co"} (null-co) - Attached to: /machine/peripheral-anon/device[N] - Cache mode: writeback -(qemu) quit +QMP_VERSION +{"return": {}} +{"return": [{"io-status": "ok", "device": "none0", "locked": false, "remov= able": false, "inserted": {"iops_rd": 0, "detect_zeroes": "off", "active": = true, "image": {"limits": {"request-alignment": 1, "min-mem-alignment": 512= , "opt-mem-alignment": 4096, "max-iov": 1024}, "virtual-size": 1073741824, = "filename": "json:{\"read-zeroes\": \"on\", \"driver\": \"null-co\"}", "for= mat": "null-co", "actual-size": 0}, "iops_wr": 0, "ro": false, "children": = [], "node-name": "null", "backing_file_depth": 0, "drv": "null-co", "iops":= 0, "bps_wr": 0, "write_threshold": 0, "encrypted": false, "bps": 0, "bps_r= d": 0, "cache": {"no-flush": false, "direct": false, "writeback": true}, "f= ile": "json:{\"read-zeroes\": \"on\", \"driver\": \"null-co\"}"}, "qdev": "= /machine/peripheral-anon/device[1]", "type": "unknown"}]} +{"timestamp": {"seconds": TIMESTAMP, "microseconds": TIMESTAMP}, "event"= : "SHUTDOWN", "data": {"guest": false, "reason": "host-qmp-quit"}} +{"return": {}} =20 Testing: -drive if=3Dnone,driver=3Dnull-co,read-zeroes=3Don,node-name=3Dnu= ll -device ide-hd,drive=3Dnone0,id=3Dqdev_id -QEMU X.Y.Z monitor - type 'help' for more information -(qemu) info block -none0 (null): json:{"read-zeroes": "on", "driver": "null-co"} (null-co) - Attached to: qdev_id - Cache mode: writeback -(qemu) quit +QMP_VERSION +{"return": {}} +{"return": [{"io-status": "ok", "device": "none0", "locked": false, "remov= able": false, "inserted": {"iops_rd": 0, "detect_zeroes": "off", "active": = true, "image": {"limits": {"request-alignment": 1, "min-mem-alignment": 512= , "opt-mem-alignment": 4096, "max-iov": 1024}, "virtual-size": 1073741824, = "filename": "json:{\"read-zeroes\": \"on\", \"driver\": \"null-co\"}", "for= mat": "null-co", "actual-size": 0}, "iops_wr": 0, "ro": false, "children": = [], "node-name": "null", "backing_file_depth": 0, "drv": "null-co", "iops":= 0, "bps_wr": 0, "write_threshold": 0, "encrypted": false, "bps": 0, "bps_r= d": 0, "cache": {"no-flush": false, "direct": false, "writeback": true}, "f= ile": "json:{\"read-zeroes\": \"on\", \"driver\": \"null-co\"}"}, "qdev": "= qdev_id", "type": "unknown"}]} +{"timestamp": {"seconds": TIMESTAMP, "microseconds": TIMESTAMP}, "event"= : "SHUTDOWN", "data": {"guest": false, "reason": "host-qmp-quit"}} +{"return": {}} =20 Testing: -drive if=3Dnone,driver=3Dnull-co,read-zeroes=3Don,node-name=3Dnu= ll -device scsi-hd,drive=3Dnone0 -QEMU X.Y.Z monitor - type 'help' for more information -(qemu) info block -none0 (null): json:{"read-zeroes": "on", "driver": "null-co"} (null-co) - Attached to: /machine/peripheral-anon/device[N] - Cache mode: writeback -(qemu) quit +QMP_VERSION +{"return": {}} +{"return": [{"io-status": "ok", "device": "none0", "locked": false, "remov= able": false, "inserted": {"iops_rd": 0, "detect_zeroes": "off", "active": = true, "image": {"limits": {"request-alignment": 1, "min-mem-alignment": 512= , "opt-mem-alignment": 4096, "max-iov": 1024}, "virtual-size": 1073741824, = "filename": "json:{\"read-zeroes\": \"on\", \"driver\": \"null-co\"}", "for= mat": "null-co", "actual-size": 0}, "iops_wr": 0, "ro": false, "children": = [], "node-name": "null", "backing_file_depth": 0, "drv": "null-co", "iops":= 0, "bps_wr": 0, "write_threshold": 0, "encrypted": false, "bps": 0, "bps_r= d": 0, "cache": {"no-flush": false, "direct": false, "writeback": true}, "f= ile": "json:{\"read-zeroes\": \"on\", \"driver\": \"null-co\"}"}, "qdev": "= /machine/peripheral-anon/device[1]", "type": "unknown"}]} +{"timestamp": {"seconds": TIMESTAMP, "microseconds": TIMESTAMP}, "event"= : "SHUTDOWN", "data": {"guest": false, "reason": "host-qmp-quit"}} +{"return": {}} =20 Testing: -drive if=3Dnone,driver=3Dnull-co,read-zeroes=3Don,node-name=3Dnu= ll -device scsi-hd,drive=3Dnone0,id=3Dqdev_id -QEMU X.Y.Z monitor - type 'help' for more information -(qemu) info block -none0 (null): json:{"read-zeroes": "on", "driver": "null-co"} (null-co) - Attached to: qdev_id - Cache mode: writeback -(qemu) quit +QMP_VERSION +{"return": {}} +{"return": [{"io-status": "ok", "device": "none0", "locked": false, "remov= able": false, "inserted": {"iops_rd": 0, "detect_zeroes": "off", "active": = true, "image": {"limits": {"request-alignment": 1, "min-mem-alignment": 512= , "opt-mem-alignment": 4096, "max-iov": 1024}, "virtual-size": 1073741824, = "filename": "json:{\"read-zeroes\": \"on\", \"driver\": \"null-co\"}", "for= mat": "null-co", "actual-size": 0}, "iops_wr": 0, "ro": false, "children": = [], "node-name": "null", "backing_file_depth": 0, "drv": "null-co", "iops":= 0, "bps_wr": 0, "write_threshold": 0, "encrypted": false, "bps": 0, "bps_r= d": 0, "cache": {"no-flush": false, "direct": false, "writeback": true}, "f= ile": "json:{\"read-zeroes\": \"on\", \"driver\": \"null-co\"}"}, "qdev": "= qdev_id", "type": "unknown"}]} +{"timestamp": {"seconds": TIMESTAMP, "microseconds": TIMESTAMP}, "event"= : "SHUTDOWN", "data": {"guest": false, "reason": "host-qmp-quit"}} +{"return": {}} =20 Testing: -drive if=3Dnone,driver=3Dnull-co,read-zeroes=3Don,node-name=3Dnu= ll -device virtio-blk-pci,drive=3Dnone0 -QEMU X.Y.Z monitor - type 'help' for more information -(qemu) info block -none0 (null): json:{"read-zeroes": "on", "driver": "null-co"} (null-co) - Attached to: /machine/peripheral-anon/device[N]/virtio-backend - Cache mode: writeback -(qemu) quit +QMP_VERSION +{"return": {}} +{"return": [{"io-status": "ok", "device": "none0", "locked": false, "remov= able": false, "inserted": {"iops_rd": 0, "detect_zeroes": "off", "active": = true, "image": {"limits": {"request-alignment": 1, "min-mem-alignment": 512= , "opt-mem-alignment": 4096, "max-iov": 1024}, "virtual-size": 1073741824, = "filename": "json:{\"read-zeroes\": \"on\", \"driver\": \"null-co\"}", "for= mat": "null-co", "actual-size": 0}, "iops_wr": 0, "ro": false, "children": = [], "node-name": "null", "backing_file_depth": 0, "drv": "null-co", "iops":= 0, "bps_wr": 0, "write_threshold": 0, "encrypted": false, "bps": 0, "bps_r= d": 0, "cache": {"no-flush": false, "direct": false, "writeback": true}, "f= ile": "json:{\"read-zeroes\": \"on\", \"driver\": \"null-co\"}"}, "qdev": "= /machine/peripheral-anon/device[1]/virtio-backend", "type": "unknown"}]} +{"timestamp": {"seconds": TIMESTAMP, "microseconds": TIMESTAMP}, "event"= : "SHUTDOWN", "data": {"guest": false, "reason": "host-qmp-quit"}} +{"return": {}} =20 Testing: -drive if=3Dnone,driver=3Dnull-co,read-zeroes=3Don,node-name=3Dnu= ll -device virtio-blk-pci,drive=3Dnone0,id=3Dqdev_id -QEMU X.Y.Z monitor - type 'help' for more information -(qemu) info block -none0 (null): json:{"read-zeroes": "on", "driver": "null-co"} (null-co) - Attached to: /machine/peripheral/qdev_id/virtio-backend - Cache mode: writeback -(qemu) quit +QMP_VERSION +{"return": {}} +{"return": [{"io-status": "ok", "device": "none0", "locked": false, "remov= able": false, "inserted": {"iops_rd": 0, "detect_zeroes": "off", "active": = true, "image": {"limits": {"request-alignment": 1, "min-mem-alignment": 512= , "opt-mem-alignment": 4096, "max-iov": 1024}, "virtual-size": 1073741824, = "filename": "json:{\"read-zeroes\": \"on\", \"driver\": \"null-co\"}", "for= mat": "null-co", "actual-size": 0}, "iops_wr": 0, "ro": false, "children": = [], "node-name": "null", "backing_file_depth": 0, "drv": "null-co", "iops":= 0, "bps_wr": 0, "write_threshold": 0, "encrypted": false, "bps": 0, "bps_r= d": 0, "cache": {"no-flush": false, "direct": false, "writeback": true}, "f= ile": "json:{\"read-zeroes\": \"on\", \"driver\": \"null-co\"}"}, "qdev": "= /machine/peripheral/qdev_id/virtio-backend", "type": "unknown"}]} +{"timestamp": {"seconds": TIMESTAMP, "microseconds": TIMESTAMP}, "event"= : "SHUTDOWN", "data": {"guest": false, "reason": "host-qmp-quit"}} +{"return": {}} =20 Testing: -drive if=3Dnone,driver=3Dnull-co,read-zeroes=3Don,node-name=3Dnu= ll -device floppy,drive=3Dnone0 -QEMU X.Y.Z monitor - type 'help' for more information -(qemu) info block -none0 (null): json:{"read-zeroes": "on", "driver": "null-co"} (null-co) - Attached to: /machine/peripheral-anon/device[N] - Removable device: not locked, tray closed - Cache mode: writeback -(qemu) quit +QMP_VERSION +{"return": {}} +{"return": [{"device": "none0", "locked": false, "removable": true, "inser= ted": {"iops_rd": 0, "detect_zeroes": "off", "active": true, "image": {"lim= its": {"request-alignment": 1, "min-mem-alignment": 512, "opt-mem-alignment= ": 4096, "max-iov": 1024}, "virtual-size": 1073741824, "filename": "json:{\= "read-zeroes\": \"on\", \"driver\": \"null-co\"}", "format": "null-co", "ac= tual-size": 0}, "iops_wr": 0, "ro": false, "children": [], "node-name": "nu= ll", "backing_file_depth": 0, "drv": "null-co", "iops": 0, "bps_wr": 0, "wr= ite_threshold": 0, "encrypted": false, "bps": 0, "bps_rd": 0, "cache": {"no= -flush": false, "direct": false, "writeback": true}, "file": "json:{\"read-= zeroes\": \"on\", \"driver\": \"null-co\"}"}, "qdev": "/machine/peripheral-= anon/device[1]", "type": "unknown"}]} +{"timestamp": {"seconds": TIMESTAMP, "microseconds": TIMESTAMP}, "event"= : "SHUTDOWN", "data": {"guest": false, "reason": "host-qmp-quit"}} +{"return": {}} =20 Testing: -drive if=3Dnone,driver=3Dnull-co,read-zeroes=3Don,node-name=3Dnu= ll -device floppy,drive=3Dnone0,id=3Dqdev_id -QEMU X.Y.Z monitor - type 'help' for more information -(qemu) info block -none0 (null): json:{"read-zeroes": "on", "driver": "null-co"} (null-co) - Attached to: qdev_id - Removable device: not locked, tray closed - Cache mode: writeback -(qemu) quit +QMP_VERSION +{"return": {}} +{"return": [{"device": "none0", "locked": false, "removable": true, "inser= ted": {"iops_rd": 0, "detect_zeroes": "off", "active": true, "image": {"lim= its": {"request-alignment": 1, "min-mem-alignment": 512, "opt-mem-alignment= ": 4096, "max-iov": 1024}, "virtual-size": 1073741824, "filename": "json:{\= "read-zeroes\": \"on\", \"driver\": \"null-co\"}", "format": "null-co", "ac= tual-size": 0}, "iops_wr": 0, "ro": false, "children": [], "node-name": "nu= ll", "backing_file_depth": 0, "drv": "null-co", "iops": 0, "bps_wr": 0, "wr= ite_threshold": 0, "encrypted": false, "bps": 0, "bps_rd": 0, "cache": {"no= -flush": false, "direct": false, "writeback": true}, "file": "json:{\"read-= zeroes\": \"on\", \"driver\": \"null-co\"}"}, "qdev": "qdev_id", "type": "u= nknown"}]} +{"timestamp": {"seconds": TIMESTAMP, "microseconds": TIMESTAMP}, "event"= : "SHUTDOWN", "data": {"guest": false, "reason": "host-qmp-quit"}} +{"return": {}} =20 Testing: -drive if=3Dnone,driver=3Dnull-co,read-zeroes=3Don,node-name=3Dnu= ll -device ide-cd,drive=3Dnone0 -QEMU X.Y.Z monitor - type 'help' for more information -(qemu) info block -none0 (null): json:{"read-zeroes": "on", "driver": "null-co"} (null-co) - Attached to: /machine/peripheral-anon/device[N] - Removable device: not locked, tray closed - Cache mode: writeback -(qemu) quit +QMP_VERSION +{"return": {}} +{"return": [{"io-status": "ok", "device": "none0", "locked": false, "remov= able": true, "inserted": {"iops_rd": 0, "detect_zeroes": "off", "active": t= rue, "image": {"limits": {"request-alignment": 1, "min-mem-alignment": 512,= "opt-mem-alignment": 4096, "max-iov": 1024}, "virtual-size": 1073741824, "= filename": "json:{\"read-zeroes\": \"on\", \"driver\": \"null-co\"}", "form= at": "null-co", "actual-size": 0}, "iops_wr": 0, "ro": false, "children": [= ], "node-name": "null", "backing_file_depth": 0, "drv": "null-co", "iops": = 0, "bps_wr": 0, "write_threshold": 0, "encrypted": false, "bps": 0, "bps_rd= ": 0, "cache": {"no-flush": false, "direct": false, "writeback": true}, "fi= le": "json:{\"read-zeroes\": \"on\", \"driver\": \"null-co\"}"}, "qdev": "/= machine/peripheral-anon/device[1]", "tray_open": false, "type": "unknown"}]} +{"timestamp": {"seconds": TIMESTAMP, "microseconds": TIMESTAMP}, "event"= : "SHUTDOWN", "data": {"guest": false, "reason": "host-qmp-quit"}} +{"return": {}} =20 Testing: -drive if=3Dnone,driver=3Dnull-co,read-zeroes=3Don,node-name=3Dnu= ll -device ide-cd,drive=3Dnone0,id=3Dqdev_id -QEMU X.Y.Z monitor - type 'help' for more information -(qemu) info block -none0 (null): json:{"read-zeroes": "on", "driver": "null-co"} (null-co) - Attached to: qdev_id - Removable device: not locked, tray closed - Cache mode: writeback -(qemu) quit +QMP_VERSION +{"return": {}} +{"return": [{"io-status": "ok", "device": "none0", "locked": false, "remov= able": true, "inserted": {"iops_rd": 0, "detect_zeroes": "off", "active": t= rue, "image": {"limits": {"request-alignment": 1, "min-mem-alignment": 512,= "opt-mem-alignment": 4096, "max-iov": 1024}, "virtual-size": 1073741824, "= filename": "json:{\"read-zeroes\": \"on\", \"driver\": \"null-co\"}", "form= at": "null-co", "actual-size": 0}, "iops_wr": 0, "ro": false, "children": [= ], "node-name": "null", "backing_file_depth": 0, "drv": "null-co", "iops": = 0, "bps_wr": 0, "write_threshold": 0, "encrypted": false, "bps": 0, "bps_rd= ": 0, "cache": {"no-flush": false, "direct": false, "writeback": true}, "fi= le": "json:{\"read-zeroes\": \"on\", \"driver\": \"null-co\"}"}, "qdev": "q= dev_id", "tray_open": false, "type": "unknown"}]} +{"timestamp": {"seconds": TIMESTAMP, "microseconds": TIMESTAMP}, "event"= : "SHUTDOWN", "data": {"guest": false, "reason": "host-qmp-quit"}} +{"return": {}} =20 Testing: -drive if=3Dnone,driver=3Dnull-co,read-zeroes=3Don,node-name=3Dnu= ll -device scsi-cd,drive=3Dnone0 -QEMU X.Y.Z monitor - type 'help' for more information -(qemu) info block -none0 (null): json:{"read-zeroes": "on", "driver": "null-co"} (null-co) - Attached to: /machine/peripheral-anon/device[N] - Removable device: not locked, tray closed - Cache mode: writeback -(qemu) quit +QMP_VERSION +{"return": {}} +{"return": [{"io-status": "ok", "device": "none0", "locked": false, "remov= able": true, "inserted": {"iops_rd": 0, "detect_zeroes": "off", "active": t= rue, "image": {"limits": {"request-alignment": 1, "min-mem-alignment": 512,= "opt-mem-alignment": 4096, "max-iov": 1024}, "virtual-size": 1073741824, "= filename": "json:{\"read-zeroes\": \"on\", \"driver\": \"null-co\"}", "form= at": "null-co", "actual-size": 0}, "iops_wr": 0, "ro": false, "children": [= ], "node-name": "null", "backing_file_depth": 0, "drv": "null-co", "iops": = 0, "bps_wr": 0, "write_threshold": 0, "encrypted": false, "bps": 0, "bps_rd= ": 0, "cache": {"no-flush": false, "direct": false, "writeback": true}, "fi= le": "json:{\"read-zeroes\": \"on\", \"driver\": \"null-co\"}"}, "qdev": "/= machine/peripheral-anon/device[1]", "tray_open": false, "type": "unknown"}]} +{"timestamp": {"seconds": TIMESTAMP, "microseconds": TIMESTAMP}, "event"= : "SHUTDOWN", "data": {"guest": false, "reason": "host-qmp-quit"}} +{"return": {}} =20 Testing: -drive if=3Dnone,driver=3Dnull-co,read-zeroes=3Don,node-name=3Dnu= ll -device scsi-cd,drive=3Dnone0,id=3Dqdev_id -QEMU X.Y.Z monitor - type 'help' for more information -(qemu) info block -none0 (null): json:{"read-zeroes": "on", "driver": "null-co"} (null-co) - Attached to: qdev_id - Removable device: not locked, tray closed - Cache mode: writeback -(qemu) quit +QMP_VERSION +{"return": {}} +{"return": [{"io-status": "ok", "device": "none0", "locked": false, "remov= able": true, "inserted": {"iops_rd": 0, "detect_zeroes": "off", "active": t= rue, "image": {"limits": {"request-alignment": 1, "min-mem-alignment": 512,= "opt-mem-alignment": 4096, "max-iov": 1024}, "virtual-size": 1073741824, "= filename": "json:{\"read-zeroes\": \"on\", \"driver\": \"null-co\"}", "form= at": "null-co", "actual-size": 0}, "iops_wr": 0, "ro": false, "children": [= ], "node-name": "null", "backing_file_depth": 0, "drv": "null-co", "iops": = 0, "bps_wr": 0, "write_threshold": 0, "encrypted": false, "bps": 0, "bps_rd= ": 0, "cache": {"no-flush": false, "direct": false, "writeback": true}, "fi= le": "json:{\"read-zeroes\": \"on\", \"driver\": \"null-co\"}"}, "qdev": "q= dev_id", "tray_open": false, "type": "unknown"}]} +{"timestamp": {"seconds": TIMESTAMP, "microseconds": TIMESTAMP}, "event"= : "SHUTDOWN", "data": {"guest": false, "reason": "host-qmp-quit"}} +{"return": {}} =20 =20 =3D=3D=3D -drive if=3Dnone/-device=3D (without medium) =3D=3D=3D =20 Testing: -drive if=3Dnone -QEMU X.Y.Z monitor - type 'help' for more information -(qemu) info block -none0: [not inserted] - Removable device: not locked, tray closed -(qemu) quit +QMP_VERSION +{"return": {}} +{"return": [{"device": "none0", "locked": false, "removable": true, "type"= : "unknown"}]} +{"timestamp": {"seconds": TIMESTAMP, "microseconds": TIMESTAMP}, "event"= : "SHUTDOWN", "data": {"guest": false, "reason": "host-qmp-quit"}} +{"return": {}} =20 Testing: -drive if=3Dnone -device floppy,drive=3Dnone0 -QEMU X.Y.Z monitor - type 'help' for more information -(qemu) info block -none0: [not inserted] - Attached to: /machine/peripheral-anon/device[N] - Removable device: not locked, tray closed -(qemu) quit +QMP_VERSION +{"return": {}} +{"return": [{"device": "none0", "locked": false, "removable": true, "qdev"= : "/machine/peripheral-anon/device[1]", "type": "unknown"}]} +{"timestamp": {"seconds": TIMESTAMP, "microseconds": TIMESTAMP}, "event"= : "SHUTDOWN", "data": {"guest": false, "reason": "host-qmp-quit"}} +{"return": {}} =20 Testing: -drive if=3Dnone -device floppy,drive=3Dnone0,id=3Dqdev_id -QEMU X.Y.Z monitor - type 'help' for more information -(qemu) info block -none0: [not inserted] - Attached to: qdev_id - Removable device: not locked, tray closed -(qemu) quit +QMP_VERSION +{"return": {}} +{"return": [{"device": "none0", "locked": false, "removable": true, "qdev"= : "qdev_id", "type": "unknown"}]} +{"timestamp": {"seconds": TIMESTAMP, "microseconds": TIMESTAMP}, "event"= : "SHUTDOWN", "data": {"guest": false, "reason": "host-qmp-quit"}} +{"return": {}} =20 Testing: -drive if=3Dnone -device ide-cd,drive=3Dnone0 -QEMU X.Y.Z monitor - type 'help' for more information -(qemu) info block -none0: [not inserted] - Attached to: /machine/peripheral-anon/device[N] - Removable device: not locked, tray closed -(qemu) quit +QMP_VERSION +{"return": {}} +{"return": [{"io-status": "ok", "device": "none0", "locked": false, "remov= able": true, "qdev": "/machine/peripheral-anon/device[1]", "tray_open": fal= se, "type": "unknown"}]} +{"timestamp": {"seconds": TIMESTAMP, "microseconds": TIMESTAMP}, "event"= : "SHUTDOWN", "data": {"guest": false, "reason": "host-qmp-quit"}} +{"return": {}} =20 Testing: -drive if=3Dnone -device ide-cd,drive=3Dnone0,id=3Dqdev_id -QEMU X.Y.Z monitor - type 'help' for more information -(qemu) info block -none0: [not inserted] - Attached to: qdev_id - Removable device: not locked, tray closed -(qemu) quit +QMP_VERSION +{"return": {}} +{"return": [{"io-status": "ok", "device": "none0", "locked": false, "remov= able": true, "qdev": "qdev_id", "tray_open": false, "type": "unknown"}]} +{"timestamp": {"seconds": TIMESTAMP, "microseconds": TIMESTAMP}, "event"= : "SHUTDOWN", "data": {"guest": false, "reason": "host-qmp-quit"}} +{"return": {}} =20 Testing: -drive if=3Dnone -device scsi-cd,drive=3Dnone0 -QEMU X.Y.Z monitor - type 'help' for more information -(qemu) info block -none0: [not inserted] - Attached to: /machine/peripheral-anon/device[N] - Removable device: not locked, tray closed -(qemu) quit +QMP_VERSION +{"return": {}} +{"return": [{"io-status": "ok", "device": "none0", "locked": false, "remov= able": true, "qdev": "/machine/peripheral-anon/device[1]", "tray_open": fal= se, "type": "unknown"}]} +{"timestamp": {"seconds": TIMESTAMP, "microseconds": TIMESTAMP}, "event"= : "SHUTDOWN", "data": {"guest": false, "reason": "host-qmp-quit"}} +{"return": {}} =20 Testing: -drive if=3Dnone -device scsi-cd,drive=3Dnone0,id=3Dqdev_id -QEMU X.Y.Z monitor - type 'help' for more information -(qemu) info block -none0: [not inserted] - Attached to: qdev_id - Removable device: not locked, tray closed -(qemu) quit +QMP_VERSION +{"return": {}} +{"return": [{"io-status": "ok", "device": "none0", "locked": false, "remov= able": true, "qdev": "qdev_id", "tray_open": false, "type": "unknown"}]} +{"timestamp": {"seconds": TIMESTAMP, "microseconds": TIMESTAMP}, "event"= : "SHUTDOWN", "data": {"guest": false, "reason": "host-qmp-quit"}} +{"return": {}} =20 =20 =3D=3D=3D -drive if=3D... =3D=3D=3D =20 Testing: -drive if=3Dfloppy -QEMU X.Y.Z monitor - type 'help' for more information -(qemu) info block -floppy0: [not inserted] - Attached to: /machine/unattached/device[N] - Removable device: not locked, tray closed -(qemu) quit +QMP_VERSION +{"return": {}} +{"return": [{"device": "floppy0", "locked": false, "removable": true, "qde= v": "/machine/unattached/device[10]", "type": "unknown"}]} +{"timestamp": {"seconds": TIMESTAMP, "microseconds": TIMESTAMP}, "event"= : "SHUTDOWN", "data": {"guest": false, "reason": "host-qmp-quit"}} +{"return": {}} =20 Testing: -drive if=3Dfloppy,driver=3Dnull-co,read-zeroes=3Don -QEMU X.Y.Z monitor - type 'help' for more information -(qemu) info block -floppy0 (NODE_NAME): json:{"read-zeroes": "on", "driver": "null-co"} (null= -co) - Attached to: /machine/unattached/device[N] - Removable device: not locked, tray closed - Cache mode: writeback -(qemu) quit +QMP_VERSION +{"return": {}} +{"return": [{"device": "floppy0", "locked": false, "removable": true, "ins= erted": {"iops_rd": 0, "detect_zeroes": "off", "active": true, "image": {"l= imits": {"request-alignment": 1, "min-mem-alignment": 512, "opt-mem-alignme= nt": 4096, "max-iov": 1024}, "virtual-size": 1073741824, "filename": "json:= {\"read-zeroes\": \"on\", \"driver\": \"null-co\"}", "format": "null-co", "= actual-size": 0}, "iops_wr": 0, "ro": false, "children": [], "node-name": "= NODE_NAME", "backing_file_depth": 0, "drv": "null-co", "iops": 0, "bps_wr":= 0, "write_threshold": 0, "encrypted": false, "bps": 0, "bps_rd": 0, "cache= ": {"no-flush": false, "direct": false, "writeback": true}, "file": "json:{= \"read-zeroes\": \"on\", \"driver\": \"null-co\"}"}, "qdev": "/machine/unat= tached/device[10]", "type": "unknown"}]} +{"timestamp": {"seconds": TIMESTAMP, "microseconds": TIMESTAMP}, "event"= : "SHUTDOWN", "data": {"guest": false, "reason": "host-qmp-quit"}} +{"return": {}} =20 Testing: -drive if=3Dide,driver=3Dnull-co,read-zeroes=3Don -QEMU X.Y.Z monitor - type 'help' for more information -(qemu) info block -ide0-hd0 (NODE_NAME): json:{"read-zeroes": "on", "driver": "null-co"} (nul= l-co) - Attached to: /machine/unattached/device[N] - Cache mode: writeback -(qemu) quit +QMP_VERSION +{"return": {}} +{"return": [{"io-status": "ok", "device": "ide0-hd0", "locked": false, "re= movable": false, "inserted": {"iops_rd": 0, "detect_zeroes": "off", "active= ": true, "image": {"limits": {"request-alignment": 1, "min-mem-alignment": = 512, "opt-mem-alignment": 4096, "max-iov": 1024}, "virtual-size": 107374182= 4, "filename": "json:{\"read-zeroes\": \"on\", \"driver\": \"null-co\"}", "= format": "null-co", "actual-size": 0}, "iops_wr": 0, "ro": false, "children= ": [], "node-name": "NODE_NAME", "backing_file_depth": 0, "drv": "null-co",= "iops": 0, "bps_wr": 0, "write_threshold": 0, "encrypted": false, "bps": 0= , "bps_rd": 0, "cache": {"no-flush": false, "direct": false, "writeback": t= rue}, "file": "json:{\"read-zeroes\": \"on\", \"driver\": \"null-co\"}"}, "= qdev": "/machine/unattached/device[4]", "type": "unknown"}]} +{"timestamp": {"seconds": TIMESTAMP, "microseconds": TIMESTAMP}, "event"= : "SHUTDOWN", "data": {"guest": false, "reason": "host-qmp-quit"}} +{"return": {}} =20 Testing: -drive if=3Dide,media=3Dcdrom -QEMU X.Y.Z monitor - type 'help' for more information -(qemu) info block -ide0-cd0: [not inserted] - Attached to: /machine/unattached/device[N] - Removable device: not locked, tray closed -(qemu) quit +QMP_VERSION +{"return": {}} +{"return": [{"io-status": "ok", "device": "ide0-cd0", "locked": false, "re= movable": true, "qdev": "/machine/unattached/device[4]", "tray_open": false= , "type": "unknown"}]} +{"timestamp": {"seconds": TIMESTAMP, "microseconds": TIMESTAMP}, "event"= : "SHUTDOWN", "data": {"guest": false, "reason": "host-qmp-quit"}} +{"return": {}} =20 Testing: -drive if=3Dide,driver=3Dnull-co,read-zeroes=3Don,media=3Dcdrom -QEMU X.Y.Z monitor - type 'help' for more information -(qemu) info block -ide0-cd0 (NODE_NAME): json:{"read-zeroes": "on", "driver": "null-co"} (nul= l-co, read-only) - Attached to: /machine/unattached/device[N] - Removable device: not locked, tray closed - Cache mode: writeback -(qemu) quit +QMP_VERSION +{"return": {}} +{"return": [{"io-status": "ok", "device": "ide0-cd0", "locked": false, "re= movable": true, "inserted": {"iops_rd": 0, "detect_zeroes": "off", "active"= : true, "image": {"limits": {"request-alignment": 1, "min-mem-alignment": 5= 12, "opt-mem-alignment": 4096, "max-iov": 1024}, "virtual-size": 1073741824= , "filename": "json:{\"read-zeroes\": \"on\", \"driver\": \"null-co\"}", "f= ormat": "null-co", "actual-size": 0}, "iops_wr": 0, "ro": true, "children":= [], "node-name": "NODE_NAME", "backing_file_depth": 0, "drv": "null-co", "= iops": 0, "bps_wr": 0, "write_threshold": 0, "encrypted": false, "bps": 0, = "bps_rd": 0, "cache": {"no-flush": false, "direct": false, "writeback": tru= e}, "file": "json:{\"read-zeroes\": \"on\", \"driver\": \"null-co\"}"}, "qd= ev": "/machine/unattached/device[4]", "tray_open": false, "type": "unknown"= }]} +{"timestamp": {"seconds": TIMESTAMP, "microseconds": TIMESTAMP}, "event"= : "SHUTDOWN", "data": {"guest": false, "reason": "host-qmp-quit"}} +{"return": {}} =20 Testing: -drive if=3Dvirtio,driver=3Dnull-co,read-zeroes=3Don -QEMU X.Y.Z monitor - type 'help' for more information -(qemu) info block -virtio0 (NODE_NAME): json:{"read-zeroes": "on", "driver": "null-co"} (null= -co) - Attached to: /machine/peripheral-anon/device[N]/virtio-backend - Cache mode: writeback -(qemu) quit +QMP_VERSION +{"return": {}} +{"return": [{"io-status": "ok", "device": "virtio0", "locked": false, "rem= ovable": false, "inserted": {"iops_rd": 0, "detect_zeroes": "off", "active"= : true, "image": {"limits": {"request-alignment": 1, "min-mem-alignment": 5= 12, "opt-mem-alignment": 4096, "max-iov": 1024}, "virtual-size": 1073741824= , "filename": "json:{\"read-zeroes\": \"on\", \"driver\": \"null-co\"}", "f= ormat": "null-co", "actual-size": 0}, "iops_wr": 0, "ro": false, "children"= : [], "node-name": "NODE_NAME", "backing_file_depth": 0, "drv": "null-co", = "iops": 0, "bps_wr": 0, "write_threshold": 0, "encrypted": false, "bps": 0,= "bps_rd": 0, "cache": {"no-flush": false, "direct": false, "writeback": tr= ue}, "file": "json:{\"read-zeroes\": \"on\", \"driver\": \"null-co\"}"}, "q= dev": "/machine/peripheral-anon/device[1]/virtio-backend", "type": "unknown= "}]} +{"timestamp": {"seconds": TIMESTAMP, "microseconds": TIMESTAMP}, "event"= : "SHUTDOWN", "data": {"guest": false, "reason": "host-qmp-quit"}} +{"return": {}} =20 Testing: -drive if=3Dpflash,driver=3Dnull-co,read-zeroes=3Don,size=3D1M -QEMU X.Y.Z monitor - type 'help' for more information -(qemu) info block -pflash0 (NODE_NAME): json:{"read-zeroes": "on", "driver": "null-co", "size= ": "1M"} (null-co) - Attached to: /machine/system.flash0 - Cache mode: writeback -(qemu) quit +QMP_VERSION +{"return": {}} +{"return": [{"device": "pflash0", "locked": false, "removable": false, "in= serted": {"iops_rd": 0, "detect_zeroes": "off", "active": true, "image": {"= limits": {"request-alignment": 1, "min-mem-alignment": 512, "opt-mem-alignm= ent": 4096, "max-iov": 1024}, "virtual-size": 1048576, "filename": "json:{\= "read-zeroes\": \"on\", \"driver\": \"null-co\", \"size\": \"1M\"}", "forma= t": "null-co", "actual-size": 0}, "iops_wr": 0, "ro": false, "children": []= , "node-name": "NODE_NAME", "backing_file_depth": 0, "drv": "null-co", "iop= s": 0, "bps_wr": 0, "write_threshold": 0, "encrypted": false, "bps": 0, "bp= s_rd": 0, "cache": {"no-flush": false, "direct": false, "writeback": true},= "file": "json:{\"read-zeroes\": \"on\", \"driver\": \"null-co\", \"size\":= \"1M\"}"}, "qdev": "/machine/system.flash0", "type": "unknown"}]} +{"timestamp": {"seconds": TIMESTAMP, "microseconds": TIMESTAMP}, "event"= : "SHUTDOWN", "data": {"guest": false, "reason": "host-qmp-quit"}} +{"return": {}} =20 *** done --=20 2.56.0.rc0.29.g47ce80527c56 From nobody Sat Sep 26 20:01:40 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=1790109101; cv=none; d=zohomail.com; s=zohoarc; b=SvYacE6LrZid9lsn5g8Osb3nJhWHFuvt78mTYCyS6oz5EvqC+Pnv1BC2LvEiPuVMVT8egUC4drfiZGnPcw3mAS0wpwZdooj9dRodWAErMFeiAPLyUx4d2XL6MBvHrkbbto6vmjOWaieI4Kw89MpIv1NlGnDUDNkeB72mxBRwff4= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1790109101; 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:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=tqog62RpVQHtXn7Z53NynEn45ORAoRbqVTbtVT6ia1s=; b=gzTjf7kAuJZ4MPANtU48FIvLmAZOTlQ4dTR7PfzkvqGmxxuRZqbkNInTg2/7DEutAJCFDflV3RXPU2Ex1djAl239sF7b4NYFPgn3s5/v0wV3SlPcguUK06xQIeEpxeo7ekRxQGhQt+SXXp0wb9lAHCLTFul0LxKYAI3IVSV9Xc0= 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 1790109101864299.1190787859856; Tue, 22 Sep 2026 13:31:41 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists1p.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1x973k-0003la-Ms; Tue, 22 Sep 2026 16:25:52 -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 1x9727-0000g1-Qo for qemu-devel@nongnu.org; Tue, 22 Sep 2026 16:24:10 -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 1x9720-0000Wx-SP for qemu-devel@nongnu.org; Tue, 22 Sep 2026 16:24:02 -0400 Received: from mx-prod-mc-08.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-15-3wpmqzxUOgyvCpVV4UINdQ-1; Tue, 22 Sep 2026 16:23:56 -0400 Received: from mx-prod-int-03.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-03.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.12]) (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-08.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id E23E0180AA59; Tue, 22 Sep 2026 20:23:55 +0000 (UTC) Received: from localhost (headnet03.pony-001.prod.iad2.dc.redhat.com [10.2.32.114]) by mx-prod-int-03.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id F390A1956086; Tue, 22 Sep 2026 20:23:54 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1790108640; 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=tqog62RpVQHtXn7Z53NynEn45ORAoRbqVTbtVT6ia1s=; b=YkvY9wMZp2fVHKau8+h1Zh/1FFlDjFMROSRYQowYdG3w0nT5i7/blmgEvKu9ZxasmXhzV5 IlLeqtRDlzAHFOIP3glA2wMwTY4Vf+n7hEcCKSUdGKNv/3ymRiivcbEbYehOkZKX0HvXLD NEVczj0fLNbPKJu/sfrz46pKLJjXTR4= X-MC-Unique: 3wpmqzxUOgyvCpVV4UINdQ-1 X-Mimecast-MFC-AGG-ID: 3wpmqzxUOgyvCpVV4UINdQ_1790108636 From: =?utf-8?q?Marc-Andr=C3=A9_Lureau?= Date: Wed, 23 Sep 2026 00:18:27 +0400 Subject: [PATCH 80/88] qemu-iotests/192: migrate away from HMP MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Message-Id: <20260923-nohmp-v1-80-ebc029d4bd80@redhat.com> References: <20260923-nohmp-v1-0-ebc029d4bd80@redhat.com> In-Reply-To: <20260923-nohmp-v1-0-ebc029d4bd80@redhat.com> To: qemu-devel@nongnu.org Cc: Kevin Wolf , =?utf-8?q?Marc-Andr=C3=A9_Lureau?= , Hanna Reitz , qemu-block@nongnu.org X-Developer-Signature: v=1; a=openpgp-sha256; l=2860; i=marcandre.lureau@redhat.com; h=from:subject:message-id; bh=STnE9fKOhDDMVPXAxHVL1ePns70Xw7kAsVCiZzRqt0k=; b=owEBbQKS/ZANAwAKAdro4Ql1lpzlAcsmYgBqsuK0dLYHYqOzBzLqy7q8cATus4s4KAUukj/Xx 3DmctWXcE6JAjMEAAEKAB0WIQSHqb2TP4fGBtJ29i3a6OEJdZac5QUCarLitAAKCRDa6OEJdZac 5dcTEACHeXXy8ZSHFJiFrAeWZYKaSFAf3/4EijIJ2EN+i8k9rPxAOKRNm8qyeGcnG0KLNh3m1pW UCgMa4tOMjn14L8/UuU04mhHigcPp9McbNpE19NwazcwFoXOEqr92/LTT5hzMv0ZFxOtHnqcstB XQRqBHFN9sd5Hli2gJEpt/dSgEGnzyEX3XtmP7YpaE+/OH/KJ4zy4mspaQSGLKSpUjh/xVmVJDo 3INYhvQ/jV3LrkTe2X0fC25iD9GtkclG6zfgYTS+6+kHCrWDSNJP6DZUFO0rgi2VU61bhjGx0jv BcjYxL6Bhqij/t2WYh0AYOjehf60Qp7krg1zXB2vkeQFQOGsoy8HiM5zs2v6bzd6TjExVy7t3Gz OuWcT5XsEBOg0xtDEnOA+h/30pd5DhhAOamIfKuySTMKhVLRb/VE1+McpQECv4ZeTRyr+cneF4g cl4sr2SXD0jSZ36iZ1bJ25wqT0GmWt8v71Sd9xqOrGNfaZ+qYCrjCTXHtrqyaEx3KvNUA0UCqzW hp6i8+sr3BsEqVYqRUX8ZFgk/grq1WFC1XqjUY7OGbYpBLljs4XHRVVONyHgPtl+gadk6ET2KIC bXh1rwomCTtFHJFSM8cleKdK4uSV2T4CDf3s3VnFI0v7xrnWQKUhwuiTJ7W8aVvRkoJQeOR2qVU cC5QjdqVgnxWaiQ== X-Developer-Key: i=marcandre.lureau@redhat.com; a=openpgp; fpr=87A9BD933F87C606D276F62DDAE8E10975969CE5 X-Scanned-By: MIMEDefang 3.0 on 10.30.177.12 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: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 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, SPF_HELO_PASS=-0.001, SPF_PASS=-0.001 autolearn=unavailable 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: 1790109103345158500 Replace HMP nbd_server_start/nbd_server_add with QMP nbd-server-start/nbd-server-add. Signed-off-by: Marc-Andr=C3=A9 Lureau --- tests/qemu-iotests/192 | 25 ++++++++++++++++++++----- tests/qemu-iotests/192.out | 17 +++++++++++++---- 2 files changed, 33 insertions(+), 9 deletions(-) diff --git a/tests/qemu-iotests/192 b/tests/qemu-iotests/192 index 6869bd171537..080aff368815 100755 --- a/tests/qemu-iotests/192 +++ b/tests/qemu-iotests/192 @@ -43,7 +43,6 @@ trap "_cleanup; exit \$status" 0 1 2 3 15 =20 _supported_fmt generic _supported_proto file -_require_hmp =20 if [ "$QEMU_DEFAULT_MACHINE" !=3D "pc" ]; then _notrun "Requires a PC machine" @@ -59,7 +58,6 @@ else DRIVE_ARG=3Dif=3Dide,id=3Ddrive0,format=3D$IMGFMT,file=3D$TEST_IMG fi =20 -qemu_comm_method=3D"monitor" _launch_qemu -drive $DRIVE_ARG -incoming defer h=3D$QEMU_HANDLE if [ "${VALGRIND_QEMU}" =3D=3D "y" ]; then @@ -68,9 +66,26 @@ else QEMU_COMM_TIMEOUT=3D1 fi =20 -_send_qemu_cmd $h "nbd_server_start unix:$SOCK_DIR/nbd" "(qemu)" -_send_qemu_cmd $h "nbd_server_add -w drive0" "(qemu)" -_send_qemu_cmd $h "q" "(qemu)" +_send_qemu_cmd $h \ + "{ 'execute': 'qmp_capabilities' }" \ + 'return' + +_send_qemu_cmd $h \ + "{ 'execute': 'nbd-server-start', + 'arguments': { 'addr': { 'type': 'unix', + 'data': { 'path': '$SOCK_DIR/nbd' } } } }"= \ + 'return' + +_send_qemu_cmd $h \ + "{ 'execute': 'nbd-server-add', + 'arguments': { 'device': 'drive0', 'writable': true } }" \ + 'return' + +_send_qemu_cmd $h \ + "{ 'execute': 'quit' }" \ + 'return' + +wait=3D1 _cleanup_qemu =20 # success, all done echo "*** done" diff --git a/tests/qemu-iotests/192.out b/tests/qemu-iotests/192.out index b9429dbe3679..88185a2e8ff4 100644 --- a/tests/qemu-iotests/192.out +++ b/tests/qemu-iotests/192.out @@ -1,7 +1,16 @@ QA output created by 192 Formatting 'TEST_DIR/t.IMGFMT', fmt=3DIMGFMT size=3D67108864 -QEMU X.Y.Z monitor - type 'help' for more information -(qemu) nbd_server_start unix:SOCK_DIR/nbd -(qemu) nbd_server_add -w drive0 -(qemu) q +{ 'execute': 'qmp_capabilities' } +{"return": {}} +{ 'execute': 'nbd-server-start', + 'arguments': { 'addr': { 'type': 'unix', + 'data': { 'path': 'SOCK_DIR/nbd' } } } } +{"return": {}} +{ 'execute': 'nbd-server-add', + 'arguments': { 'device': 'drive0', 'writable': true } } +{"return": {}} +{ 'execute': 'quit' } +{"timestamp": {"seconds": TIMESTAMP, "microseconds": TIMESTAMP}, "event"= : "SHUTDOWN", "data": {"guest": false, "reason": "host-qmp-quit"}} +{"timestamp": {"seconds": TIMESTAMP, "microseconds": TIMESTAMP}, "event"= : "BLOCK_EXPORT_DELETED", "data": {"id": "drive0"}} +{"return": {}} *** done --=20 2.56.0.rc0.29.g47ce80527c56 From nobody Sat Sep 26 20:01:40 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=1790108938; cv=none; d=zohomail.com; s=zohoarc; b=FTNsRqJoFoxEuVID2xMf3GVhw96YkLJeOGMuGI/j5CsEZbm23GJuAHJlFv/faEN0jdgeyc2jD1ZLctTqES6A/9V0wYWT2dYxVva8osC37QF9KpWzgVjamKdFsufPiko8eT3NvC5lKV6rGNk9R1A0RFvbYeQy767SLbpmg5H3qMI= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1790108938; 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:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=LP8XCX5ASRsqA4OG+3UZ8Qu3Ks/FKYKqG2r9J83gIoE=; b=WayOLZiX7cUitvCFdqtqVTmVxwEAcNxDUVkg0acfRfHch5GJHVDK9HHR5xC5u2x1Id96iCI9UYySYUjCTyBRDua9gDlPQXU8RDkJClo5DGsI+Sh82TbjtqmAJKKL53SJdsjn9zAJLaITOR6fcsAoEEcvD4HrmAgXUjZdVfrPvuM= 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 179010893875571.1054470573855; Tue, 22 Sep 2026 13:28:58 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists1p.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1x9749-0004MA-Kk; Tue, 22 Sep 2026 16:26:19 -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 1x972B-0000oi-7M for qemu-devel@nongnu.org; Tue, 22 Sep 2026 16:24:11 -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 1x9727-0000Ye-Jy for qemu-devel@nongnu.org; Tue, 22 Sep 2026 16:24:10 -0400 Received: from mx-prod-mc-01.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-373-qb8V35DNO_OewSgP-VGA4w-1; Tue, 22 Sep 2026 16:24:00 -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-01.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id C81E819541A5; Tue, 22 Sep 2026 20:23:59 +0000 (UTC) Received: from localhost (headnet03.pony-001.prod.iad2.dc.redhat.com [10.2.32.114]) by mx-prod-int-10.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id 9740041D; Tue, 22 Sep 2026 20:23:58 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1790108642; 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=LP8XCX5ASRsqA4OG+3UZ8Qu3Ks/FKYKqG2r9J83gIoE=; b=HsfWi69uHr7BbdGmisuETop1FtkFhhqNUvFwy/1rwCeqcB1presxPZMMs9kvkETMbVWpDK RfrXlZpr4NURQuGpHpJfrOElnRMsjuK5YH73+kbM4BTEE7TEvIMiEThmpkdVY6hrhvW6Pl 2l5H5LQiQjjayTIXXy9oRyeuQsM6Vvw= X-MC-Unique: qb8V35DNO_OewSgP-VGA4w-1 X-Mimecast-MFC-AGG-ID: qb8V35DNO_OewSgP-VGA4w_1790108639 From: =?utf-8?q?Marc-Andr=C3=A9_Lureau?= Date: Wed, 23 Sep 2026 00:18:28 +0400 Subject: [PATCH 81/88] qemu-iotests/201: migrate away from HMP MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Message-Id: <20260923-nohmp-v1-81-ebc029d4bd80@redhat.com> References: <20260923-nohmp-v1-0-ebc029d4bd80@redhat.com> In-Reply-To: <20260923-nohmp-v1-0-ebc029d4bd80@redhat.com> To: qemu-devel@nongnu.org Cc: Kevin Wolf , =?utf-8?q?Marc-Andr=C3=A9_Lureau?= , Hanna Reitz , qemu-block@nongnu.org X-Developer-Signature: v=1; a=openpgp-sha256; l=5955; i=marcandre.lureau@redhat.com; h=from:subject:message-id; bh=0bp6tqAl3jxpTfegHU87ohdT+lbG4Pc2Re4usS/nCyY=; b=owEBbQKS/ZANAwAKAdro4Ql1lpzlAcsmYgBqsuK01KY3ClsYVbvD0Xgn2+cVI9tPoNRmyTtm2 MqWO+FHASuJAjMEAAEKAB0WIQSHqb2TP4fGBtJ29i3a6OEJdZac5QUCarLitAAKCRDa6OEJdZac 5aL0D/kBx641MWl4VyVSemh0tPuPXAv0cvYIX+bnHlY8/mx2RODGU+Cew7SoAawhlNMgLsVntXR AYSXu+qxFapCCJ3T5deh9BCGRDVcxYWpMZDL+wXsiKc/7NlVRUuwvfU+cyVqRCLxVOAqMGovOVr 8xoz1cNsPsMovAB+nn1qz2HW41oGH2owV4xhoqFXKNZxfYH0Qz9eazAqOgTMHrLc6cGnu0nA1X1 tdTsOUE2To9nlskxZsckhAHLtB0TT0oQmA651fwsNEca3s3UsiX5TzVKJFnP7OtqaMmq5tuPeGT QfAsDJx4vCGiyy3njbqqzVmkrgcLop7FF7w2spklRT6/cOIf8m8XRpGUQYpFZo+qBDsGTGNmwNv icS5qKzTTOggRVbso9rbihDWu8jQq64GN+sqbRNAs7Gzo1Dg602hoFCgHZKweBZzR+pLnClG4RX re84Yw7gNBf3Af+OuD4CD4piuyhzIH2YqgAk6y/gVG+6AlGs1MWkpm84l+Wp3aF1/U9E3bo8ik5 YlT8m4V7z7fkYRRGkyQ33TcuMlbSsmtguq0zUibN69nEOz5XQ6RV2UJ+oTqf8H5U+rCG99u5wn9 2egDSLWXndStbw1gW6qtap93utumCab3vOplQsZM4fP0zyVTH4N3jVKRInWGjCKClfi6s97pzbV Q6vcC/c+ZRO0ktQ== 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: 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-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: 1790108940343158500 Replace HMP migration and savevm/loadvm commands with QMP equivalents. Signed-off-by: Marc-Andr=C3=A9 Lureau --- tests/qemu-iotests/201 | 75 +++++++++++++++++++++++++++++-------------= ---- tests/qemu-iotests/201.out | 10 ++++--- 2 files changed, 53 insertions(+), 32 deletions(-) diff --git a/tests/qemu-iotests/201 b/tests/qemu-iotests/201 index a5c750c38a83..302ad983d83d 100755 --- a/tests/qemu-iotests/201 +++ b/tests/qemu-iotests/201 @@ -47,7 +47,6 @@ _supported_os Linux # Internal snapshots are (currently) impossible with refcount_bits=3D1, # and generally impossible with external data files _unsupported_imgopts 'refcount_bits=3D1[^0-9]' data_file -_require_hmp =20 size=3D64M _make_test_img $size @@ -56,76 +55,96 @@ echo echo =3D=3D=3D Starting VMs =3D=3D=3D echo =20 -qemu_comm_method=3D"monitor" - if [ "$IMGOPTSSYNTAX" =3D "true" ]; then _launch_qemu \ - -drive "${TEST_IMG}",cache=3D${CACHEMODE},aio=3D$AIOMODE,id=3Ddisk + -drive "${TEST_IMG}",cache=3D${CACHEMODE},aio=3D$AIOMODE,id=3Ddisk= ,node-name=3Ddisk0 else _launch_qemu \ - -drive file=3D"${TEST_IMG}",cache=3D${CACHEMODE},aio=3D$AIOMODE,dr= iver=3D$IMGFMT,id=3Ddisk + -drive file=3D"${TEST_IMG}",cache=3D${CACHEMODE},aio=3D$AIOMODE,dr= iver=3D$IMGFMT,id=3Ddisk,node-name=3Ddisk0 fi src=3D$QEMU_HANDLE +silent=3Dyes _send_qemu_cmd $src "{ 'execute': 'qmp_capabilities' }" 'retu= rn' =20 if [ "$IMGOPTSSYNTAX" =3D "true" ]; then _launch_qemu \ - -drive "${TEST_IMG}",cache=3D${CACHEMODE},aio=3D$AIOMODE,id=3Ddisk= \ + -drive "${TEST_IMG}",cache=3D${CACHEMODE},aio=3D$AIOMODE,id=3Ddisk= ,node-name=3Ddisk0 \ -incoming "unix:${MIG_SOCKET}" else _launch_qemu \ - -drive file=3D"${TEST_IMG}",cache=3D${CACHEMODE},aio=3D$AIOMODE,dr= iver=3D$IMGFMT,id=3Ddisk \ + -drive file=3D"${TEST_IMG}",cache=3D${CACHEMODE},aio=3D$AIOMODE,dr= iver=3D$IMGFMT,id=3Ddisk,node-name=3Ddisk0 \ -incoming "unix:${MIG_SOCKET}" fi dest=3D$QEMU_HANDLE +silent=3Dyes _send_qemu_cmd $dest "{ 'execute': 'qmp_capabilities' }" 'ret= urn' =20 echo echo =3D=3D=3D Set \'migrate_set_capability postcopy-ram on\' and migrate = =3D=3D=3D echo =20 -silent=3Dyes -_send_qemu_cmd $dest 'migrate_set_capability postcopy-ram on' "(qemu)" - -qemu_error_no_exit=3Dyes success_or_failure=3Dyes \ - _send_qemu_cmd $dest '' "(qemu)" "Postcopy is not supported" +silent=3Dyes qemu_error_no_exit=3Dyes success_or_failure=3Dyes \ + _send_qemu_cmd $dest \ + "{ 'execute': 'migrate-set-capabilities', + 'arguments': { 'capabilities': [ + { 'capability': 'postcopy-ram', 'state': true } + ] } }" \ + 'return' "Postcopy is not supported" if [ ${QEMU_STATUS[$dest]} -lt 0 ]; then - _send_qemu_cmd $dest '' "(qemu)" - - _send_qemu_cmd $src 'quit' "" - _send_qemu_cmd $dest 'quit' "" + _send_qemu_cmd $src "{ 'execute': 'quit' }" 'return' + _send_qemu_cmd $dest "{ 'execute': 'quit' }" 'return' wait=3D1 _cleanup_qemu - _notrun 'Postcopy is not supported' fi =20 -_send_qemu_cmd $src 'migrate_set_capability postcopy-ram on' "(qemu)" -_send_qemu_cmd $src "migrate -d unix:${MIG_SOCKET}" "(qemu)" +silent=3Dyes _send_qemu_cmd $src \ + "{ 'execute': 'migrate-set-capabilities', + 'arguments': { 'capabilities': [ + { 'capability': 'postcopy-ram', 'state': true } + ] } }" \ + 'return' + +silent=3Dyes _send_qemu_cmd $src \ + "{ 'execute': 'migrate', + 'arguments': { 'uri': 'unix:${MIG_SOCKET}' } }" \ + 'return' =20 QEMU_COMM_TIMEOUT=3D1 qemu_cmd_repeat=3D10 silent=3Dyes \ - _send_qemu_cmd $src "info migrate" "completed\|failed" -silent=3Dyes _send_qemu_cmd $src "" "(qemu)" + _send_qemu_cmd $src \ + "{ 'execute': 'query-migrate' }" \ + '"completed"\|"failed"' =20 echo echo =3D=3D=3D Check if migration was successful =3D=3D=3D echo =20 QEMU_COMM_TIMEOUT=3D1 silent=3Dyes \ - _send_qemu_cmd $src "info migrate" "completed" -silent=3Dyes _send_qemu_cmd $src "" "(qemu)" + _send_qemu_cmd $src \ + "{ 'execute': 'query-migrate' }" \ + '"completed"' =20 echo echo =3D=3D=3D On destination, execute savevm and loadvm =3D=3D=3D echo =20 -silent=3D -_send_qemu_cmd $dest 'savevm state1' "(qemu)" -_send_qemu_cmd $dest 'loadvm state1' "(qemu)" +silent=3Dyes _run_qmp_job $dest 'save0' \ + "{ 'execute': 'snapshot-save', + 'arguments': { 'job-id': 'save0', + 'tag': 'state1', + 'vmstate': 'disk0', + 'devices': ['disk0'] } }" + +silent=3Dyes _run_qmp_job $dest 'load0' \ + "{ 'execute': 'snapshot-load', + 'arguments': { 'job-id': 'load0', + 'tag': 'state1', + 'vmstate': 'disk0', + 'devices': ['disk0'] } }" =20 echo echo =3D=3D=3D Shut down and check image =3D=3D=3D echo =20 -_send_qemu_cmd $src 'quit' "" -_send_qemu_cmd $dest 'quit' "" +_send_qemu_cmd $src "{ 'execute': 'quit' }" 'return' +_send_qemu_cmd $dest "{ 'execute': 'quit' }" 'return' wait=3D1 _cleanup_qemu =20 _check_test_img diff --git a/tests/qemu-iotests/201.out b/tests/qemu-iotests/201.out index 9faf06f996a0..8c75a3441255 100644 --- a/tests/qemu-iotests/201.out +++ b/tests/qemu-iotests/201.out @@ -12,12 +12,14 @@ Formatting 'TEST_DIR/t.IMGFMT', fmt=3DIMGFMT size=3D671= 08864 =20 =3D=3D=3D On destination, execute savevm and loadvm =3D=3D=3D =20 -(qemu) savevm state1 -(qemu) loadvm state1 =20 =3D=3D=3D Shut down and check image =3D=3D=3D =20 -(qemu) quit -(qemu) quit +{ 'execute': 'quit' } +{"timestamp": {"seconds": TIMESTAMP, "microseconds": TIMESTAMP}, "event"= : "SHUTDOWN", "data": {"guest": false, "reason": "host-qmp-quit"}} +{"return": {}} +{ 'execute': 'quit' } +{"timestamp": {"seconds": TIMESTAMP, "microseconds": TIMESTAMP}, "event"= : "SHUTDOWN", "data": {"guest": false, "reason": "host-qmp-quit"}} +{"return": {}} No errors were found on the image. *** done --=20 2.56.0.rc0.29.g47ce80527c56 From nobody Sat Sep 26 20:01:40 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=1790109167; cv=none; d=zohomail.com; s=zohoarc; b=g5IDQoX6oZFZVHsYCduEXhfS4DqelVvANCkwrtDFkbHvCR40N6TtwCbFEvitFVT4oi0k4HWHNSkfSrPNZfmU4Xfl0Wm9nWaYxCLKR/nBQFeABXyFrdiYSfSPJ2abv3cvqb1GaZuKfBjzOCKtKU2sYPQy4LTd2QoLW+qipn9JE9g= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1790109167; 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:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=zOMxDRs4e6kbwdqK+UcD+rHmrn1BkQESsCiR2mUNx1w=; b=JRuqQGnmoREtMVP0K8jfZDUfUCuZG/aehMiyC+iO8mMOIRT6Q3Q8FztiszQcOVaPb23ykz+RJ97KdwYqJYAuGxEJYBCj9fqtFjFUapJI6mo3YaREJsq+8UHWEkhnmb2/8oJ1PZwphEOAtvfDQ1NK+E97/yzDwlkMSFVJrMfFNE4= 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 1790109167829888.5255060342363; Tue, 22 Sep 2026 13:32:47 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists1p.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1x972u-0002LP-7F; Tue, 22 Sep 2026 16:24:56 -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 1x972C-0000tN-RB for qemu-devel@nongnu.org; Tue, 22 Sep 2026 16:24:14 -0400 Received: from us-smtp-delivery-124.mimecast.com ([170.10.133.124]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1x9728-0000Zf-0h for qemu-devel@nongnu.org; Tue, 22 Sep 2026 16:24:12 -0400 Received: from mx-prod-mc-05.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-50-DwKapS4-PN6kA5s465ClEQ-1; Tue, 22 Sep 2026 16:24:03 -0400 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-05.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id 0F81F195C244; Tue, 22 Sep 2026 20:24:03 +0000 (UTC) Received: from localhost (headnet03.pony-001.prod.iad2.dc.redhat.com [10.2.32.114]) by mx-prod-int-08.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id 3B9D61800446; Tue, 22 Sep 2026 20:24:01 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1790108647; 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=zOMxDRs4e6kbwdqK+UcD+rHmrn1BkQESsCiR2mUNx1w=; b=EbFYfI98Edfr91zf3Y3GKioDXg4qpGJDe8boEWxBitqJAWeuHfEflcdDK+4HxSdq+D0boP srXaaSLYbnEklwHfAs9ftUO2+Idu5keDwmYB9+R5O/9HazrPZXC1xGLpwXk1aD3kTDwGSs L5Ju/4PmyiJb/ikcgifXNfHctc3fmQw= X-MC-Unique: DwKapS4-PN6kA5s465ClEQ-1 X-Mimecast-MFC-AGG-ID: DwKapS4-PN6kA5s465ClEQ_1790108643 From: =?utf-8?q?Marc-Andr=C3=A9_Lureau?= Date: Wed, 23 Sep 2026 00:18:29 +0400 Subject: [PATCH 82/88] qemu-iotests/232: migrate away from HMP MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Message-Id: <20260923-nohmp-v1-82-ebc029d4bd80@redhat.com> References: <20260923-nohmp-v1-0-ebc029d4bd80@redhat.com> In-Reply-To: <20260923-nohmp-v1-0-ebc029d4bd80@redhat.com> To: qemu-devel@nongnu.org Cc: Kevin Wolf , =?utf-8?q?Marc-Andr=C3=A9_Lureau?= , Hanna Reitz , qemu-block@nongnu.org X-Developer-Signature: v=1; a=openpgp-sha256; l=29499; i=marcandre.lureau@redhat.com; h=from:subject:message-id; bh=vUlKTxQY8qRfH+BvWfnVX+8fPYcmZls7c+OQK7ViFgA=; b=owEBbQKS/ZANAwAKAdro4Ql1lpzlAcsmYgBqsuK0cUc/i4rDpDb1PNFk8RMC+8XLBWzyGITqI /UEU7ptcpKJAjMEAAEKAB0WIQSHqb2TP4fGBtJ29i3a6OEJdZac5QUCarLitAAKCRDa6OEJdZac 5WdSD/4pWtLpfgVAHYcc7zwu1zsI81Ml1KOJWSdRaqo+UXwmihI27iHclgzn0u5AKAMDcbfXzto n5q7gAlJwozuTK0IjfmAXgRh3XcxrpXwxe2NUeL6GoaRfx56QfkGZPiT0Sl+NrZ3VjlkwRtkyFO IM92vJgMUbJ+sepFwBGOLFsiDZ5H8zdkellLwcEeFQMZ/bBkqdBFT1iLComuJP0ZBoW6D2v8Z/s Hw6siXF5EqtsJTX329iWgysXb2mp+eyg5yTRtGgmJet7lbUMc92kjx7Blaqc7oo4z3U92LhNBa8 cfxqLtcOh4RX9CsonrQ3Cbw0V4le/wTsMAOcuRB121sbBFxTvHuvUdyhyq7H/egrgMvI2fJBMeN b8VB0mM6rS1gjAx+cwM4Kw5L5DwEEweiZmv3pWD7UxIv74viMzb9zxCVDAnRT0NRGsm0aWwDBgv HwakgoJ8IW94IRWTw9vxco/JwWchxYcbx2FGT/lkFSsOPG6CjwTFsAMUEg2DvPof9T9ZdsiQlts vxiuGBVn633SObPdT17MoVMuo2XxmycB6Baf6jbHHRdeuo9xPrKKSEgHZgpUs6C7PzS+y9MyuT/ Io8esjQ7KibGb1BVswt1S4bWhvysqQSE7YPndnjhaobI66PS/XQvSulCT5s/S9TLd2clF9QB5EO ojWqSYk+9L4DQNw== X-Developer-Key: i=marcandre.lureau@redhat.com; a=openpgp; fpr=87A9BD933F87C606D276F62DDAE8E10975969CE5 X-Scanned-By: MIMEDefang 3.4.1 on 10.30.177.111 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.133.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_H3=0.001, RCVD_IN_MSPIKE_WL=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-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: 1790109169869158500 Replace pipe-based HMP info block -n with QMP query-named-block-nodes. Signed-off-by: Marc-Andr=C3=A9 Lureau --- tests/qemu-iotests/232 | 32 +++---- tests/qemu-iotests/232.out | 216 ++++++++++++++++++++++++++++++++++++++---= ---- 2 files changed, 196 insertions(+), 52 deletions(-) diff --git a/tests/qemu-iotests/232 b/tests/qemu-iotests/232 index 1ee0aae481d4..05eb4688772b 100755 --- a/tests/qemu-iotests/232 +++ b/tests/qemu-iotests/232 @@ -43,31 +43,19 @@ trap "_cleanup; exit \$status" 0 1 2 3 15 _supported_fmt generic _supported_proto file _supported_os Linux -_require_hmp - -do_run_qemu() -{ - echo Testing: "$@" - ( - if ! test -t 0; then - while read cmd; do - echo $cmd - done - fi - echo quit - ) | $QEMU -nographic -monitor stdio -nodefaults "$@" - echo -} - -run_qemu() -{ - do_run_qemu "$@" 2>&1 | _filter_testdir | _filter_qemu | _filter_hmp | - _filter_generated_node_ids | _filter_imgfmt -} =20 run_qemu_info_block() { - echo "info block -n" | run_qemu "$@" | grep -e "(file" -e "QEMU_PROG" + ( + printf '%s\n' '{"execute":"qmp_capabilities"}' \ + '{"execute":"query-named-block-nodes"}' \ + '{"execute":"quit"}' + ) | $QEMU -nographic -qmp stdio -nodefaults "$@" 2>&1 | + _filter_testdir | _filter_qemu | _filter_qmp | + _filter_generated_node_ids | _filter_imgfmt | + _filter_actual_image_size | + gsed -e 's/\("virtual-size":\s*\)[0-9]\+/\1VSIZE/g' + echo } =20 size=3D128M diff --git a/tests/qemu-iotests/232.out b/tests/qemu-iotests/232.out index 3bd1a920afc9..3c7716914e84 100644 --- a/tests/qemu-iotests/232.out +++ b/tests/qemu-iotests/232.out @@ -3,57 +3,213 @@ Formatting 'TEST_DIR/t.IMGFMT', fmt=3DIMGFMT size=3D1342= 17728 =20 =3D=3D=3D -drive with read-write image: read-only/auto-read-only combinati= ons =3D=3D=3D =20 -NODE_NAME: TEST_DIR/t.IMGFMT (file, read-only) -NODE_NAME: TEST_DIR/t.IMGFMT (file, read-only) -NODE_NAME: TEST_DIR/t.IMGFMT (file, read-only) +QMP_VERSION +{"return": {}} +{"return": [{"iops_rd": 0, "detect_zeroes": "off", "active": true, "image"= : {"limits": {"request-alignment": 1, "min-mem-alignment": 1, "opt-mem-alig= nment": 4096, "max-iov": 1024}, "virtual-size": VSIZE, "filename": "TEST_DI= R/t.IMGFMT", "format": "file", "actual-size": SIZE, "format-specific": {"ty= pe": "file", "data": {}}, "dirty-flag": false}, "iops_wr": 0, "ro": true, "= children": [], "node-name": "NODE_NAME", "backing_file_depth": 0, "drv": "f= ile", "iops": 0, "bps_wr": 0, "write_threshold": 0, "encrypted": false, "bp= s": 0, "bps_rd": 0, "cache": {"no-flush": false, "direct": false, "writebac= k": true}, "file": "TEST_DIR/t.IMGFMT"}]} +{"timestamp": {"seconds": TIMESTAMP, "microseconds": TIMESTAMP}, "event"= : "SHUTDOWN", "data": {"guest": false, "reason": "host-qmp-quit"}} +{"return": {}} =20 -NODE_NAME: TEST_DIR/t.IMGFMT (file) -NODE_NAME: TEST_DIR/t.IMGFMT (file) -NODE_NAME: TEST_DIR/t.IMGFMT (file) +QMP_VERSION +{"return": {}} +{"return": [{"iops_rd": 0, "detect_zeroes": "off", "active": true, "image"= : {"limits": {"request-alignment": 1, "min-mem-alignment": 1, "opt-mem-alig= nment": 4096, "max-iov": 1024}, "virtual-size": VSIZE, "filename": "TEST_DI= R/t.IMGFMT", "format": "file", "actual-size": SIZE, "format-specific": {"ty= pe": "file", "data": {}}, "dirty-flag": false}, "iops_wr": 0, "ro": true, "= children": [], "node-name": "NODE_NAME", "backing_file_depth": 0, "drv": "f= ile", "iops": 0, "bps_wr": 0, "write_threshold": 0, "encrypted": false, "bp= s": 0, "bps_rd": 0, "cache": {"no-flush": false, "direct": false, "writebac= k": true}, "file": "TEST_DIR/t.IMGFMT"}]} +{"timestamp": {"seconds": TIMESTAMP, "microseconds": TIMESTAMP}, "event"= : "SHUTDOWN", "data": {"guest": false, "reason": "host-qmp-quit"}} +{"return": {}} + +QMP_VERSION +{"return": {}} +{"return": [{"iops_rd": 0, "detect_zeroes": "off", "active": true, "image"= : {"limits": {"request-alignment": 1, "min-mem-alignment": 1, "opt-mem-alig= nment": 4096, "max-iov": 1024}, "virtual-size": VSIZE, "filename": "TEST_DI= R/t.IMGFMT", "format": "file", "actual-size": SIZE, "format-specific": {"ty= pe": "file", "data": {}}, "dirty-flag": false}, "iops_wr": 0, "ro": true, "= children": [], "node-name": "NODE_NAME", "backing_file_depth": 0, "drv": "f= ile", "iops": 0, "bps_wr": 0, "write_threshold": 0, "encrypted": false, "bp= s": 0, "bps_rd": 0, "cache": {"no-flush": false, "direct": false, "writebac= k": true}, "file": "TEST_DIR/t.IMGFMT"}]} +{"timestamp": {"seconds": TIMESTAMP, "microseconds": TIMESTAMP}, "event"= : "SHUTDOWN", "data": {"guest": false, "reason": "host-qmp-quit"}} +{"return": {}} + + +QMP_VERSION +{"return": {}} +{"return": [{"iops_rd": 0, "detect_zeroes": "off", "active": true, "image"= : {"limits": {"request-alignment": 1, "min-mem-alignment": 1, "opt-mem-alig= nment": 4096, "max-iov": 1024}, "virtual-size": VSIZE, "filename": "TEST_DI= R/t.IMGFMT", "format": "file", "actual-size": SIZE, "format-specific": {"ty= pe": "file", "data": {}}, "dirty-flag": false}, "iops_wr": 0, "ro": false, = "children": [], "node-name": "NODE_NAME", "backing_file_depth": 0, "drv": "= file", "iops": 0, "bps_wr": 0, "write_threshold": 0, "encrypted": false, "b= ps": 0, "bps_rd": 0, "cache": {"no-flush": false, "direct": false, "writeba= ck": true}, "file": "TEST_DIR/t.IMGFMT"}]} +{"timestamp": {"seconds": TIMESTAMP, "microseconds": TIMESTAMP}, "event"= : "SHUTDOWN", "data": {"guest": false, "reason": "host-qmp-quit"}} +{"return": {}} + +QMP_VERSION +{"return": {}} +{"return": [{"iops_rd": 0, "detect_zeroes": "off", "active": true, "image"= : {"limits": {"request-alignment": 1, "min-mem-alignment": 1, "opt-mem-alig= nment": 4096, "max-iov": 1024}, "virtual-size": VSIZE, "filename": "TEST_DI= R/t.IMGFMT", "format": "file", "actual-size": SIZE, "format-specific": {"ty= pe": "file", "data": {}}, "dirty-flag": false}, "iops_wr": 0, "ro": false, = "children": [], "node-name": "NODE_NAME", "backing_file_depth": 0, "drv": "= file", "iops": 0, "bps_wr": 0, "write_threshold": 0, "encrypted": false, "b= ps": 0, "bps_rd": 0, "cache": {"no-flush": false, "direct": false, "writeba= ck": true}, "file": "TEST_DIR/t.IMGFMT"}]} +{"timestamp": {"seconds": TIMESTAMP, "microseconds": TIMESTAMP}, "event"= : "SHUTDOWN", "data": {"guest": false, "reason": "host-qmp-quit"}} +{"return": {}} + +QMP_VERSION +{"return": {}} +{"return": [{"iops_rd": 0, "detect_zeroes": "off", "active": true, "image"= : {"limits": {"request-alignment": 1, "min-mem-alignment": 1, "opt-mem-alig= nment": 4096, "max-iov": 1024}, "virtual-size": VSIZE, "filename": "TEST_DI= R/t.IMGFMT", "format": "file", "actual-size": SIZE, "format-specific": {"ty= pe": "file", "data": {}}, "dirty-flag": false}, "iops_wr": 0, "ro": false, = "children": [], "node-name": "NODE_NAME", "backing_file_depth": 0, "drv": "= file", "iops": 0, "bps_wr": 0, "write_threshold": 0, "encrypted": false, "b= ps": 0, "bps_rd": 0, "cache": {"no-flush": false, "direct": false, "writeba= ck": true}, "file": "TEST_DIR/t.IMGFMT"}]} +{"timestamp": {"seconds": TIMESTAMP, "microseconds": TIMESTAMP}, "event"= : "SHUTDOWN", "data": {"guest": false, "reason": "host-qmp-quit"}} +{"return": {}} + + +QMP_VERSION +{"return": {}} +{"return": [{"iops_rd": 0, "detect_zeroes": "off", "active": true, "image"= : {"limits": {"request-alignment": 1, "min-mem-alignment": 1, "opt-mem-alig= nment": 4096, "max-iov": 1024}, "virtual-size": VSIZE, "filename": "TEST_DI= R/t.IMGFMT", "format": "file", "actual-size": SIZE, "format-specific": {"ty= pe": "file", "data": {}}, "dirty-flag": false}, "iops_wr": 0, "ro": false, = "children": [], "node-name": "NODE_NAME", "backing_file_depth": 0, "drv": "= file", "iops": 0, "bps_wr": 0, "write_threshold": 0, "encrypted": false, "b= ps": 0, "bps_rd": 0, "cache": {"no-flush": false, "direct": false, "writeba= ck": true}, "file": "TEST_DIR/t.IMGFMT"}]} +{"timestamp": {"seconds": TIMESTAMP, "microseconds": TIMESTAMP}, "event"= : "SHUTDOWN", "data": {"guest": false, "reason": "host-qmp-quit"}} +{"return": {}} + +QMP_VERSION +{"return": {}} +{"return": [{"iops_rd": 0, "detect_zeroes": "off", "active": true, "image"= : {"limits": {"request-alignment": 1, "min-mem-alignment": 1, "opt-mem-alig= nment": 4096, "max-iov": 1024}, "virtual-size": VSIZE, "filename": "TEST_DI= R/t.IMGFMT", "format": "file", "actual-size": SIZE, "format-specific": {"ty= pe": "file", "data": {}}, "dirty-flag": false}, "iops_wr": 0, "ro": false, = "children": [], "node-name": "NODE_NAME", "backing_file_depth": 0, "drv": "= file", "iops": 0, "bps_wr": 0, "write_threshold": 0, "encrypted": false, "b= ps": 0, "bps_rd": 0, "cache": {"no-flush": false, "direct": false, "writeba= ck": true}, "file": "TEST_DIR/t.IMGFMT"}]} +{"timestamp": {"seconds": TIMESTAMP, "microseconds": TIMESTAMP}, "event"= : "SHUTDOWN", "data": {"guest": false, "reason": "host-qmp-quit"}} +{"return": {}} + +QMP_VERSION +{"return": {}} +{"return": [{"iops_rd": 0, "detect_zeroes": "off", "active": true, "image"= : {"limits": {"request-alignment": 1, "min-mem-alignment": 1, "opt-mem-alig= nment": 4096, "max-iov": 1024}, "virtual-size": VSIZE, "filename": "TEST_DI= R/t.IMGFMT", "format": "file", "actual-size": SIZE, "format-specific": {"ty= pe": "file", "data": {}}, "dirty-flag": false}, "iops_wr": 0, "ro": false, = "children": [], "node-name": "NODE_NAME", "backing_file_depth": 0, "drv": "= file", "iops": 0, "bps_wr": 0, "write_threshold": 0, "encrypted": false, "b= ps": 0, "bps_rd": 0, "cache": {"no-flush": false, "direct": false, "writeba= ck": true}, "file": "TEST_DIR/t.IMGFMT"}]} +{"timestamp": {"seconds": TIMESTAMP, "microseconds": TIMESTAMP}, "event"= : "SHUTDOWN", "data": {"guest": false, "reason": "host-qmp-quit"}} +{"return": {}} =20 -NODE_NAME: TEST_DIR/t.IMGFMT (file) -NODE_NAME: TEST_DIR/t.IMGFMT (file) -NODE_NAME: TEST_DIR/t.IMGFMT (file) =20 =3D=3D=3D -drive with read-only image: read-only/auto-read-only combinatio= ns =3D=3D=3D =20 -NODE_NAME: TEST_DIR/t.IMGFMT (file, read-only) -NODE_NAME: TEST_DIR/t.IMGFMT (file, read-only) -NODE_NAME: TEST_DIR/t.IMGFMT (file, read-only) +QMP_VERSION +{"return": {}} +{"return": [{"iops_rd": 0, "detect_zeroes": "off", "active": true, "image"= : {"limits": {"request-alignment": 1, "min-mem-alignment": 1, "opt-mem-alig= nment": 4096, "max-iov": 1024}, "virtual-size": VSIZE, "filename": "TEST_DI= R/t.IMGFMT", "format": "file", "actual-size": SIZE, "format-specific": {"ty= pe": "file", "data": {}}, "dirty-flag": false}, "iops_wr": 0, "ro": true, "= children": [], "node-name": "NODE_NAME", "backing_file_depth": 0, "drv": "f= ile", "iops": 0, "bps_wr": 0, "write_threshold": 0, "encrypted": false, "bp= s": 0, "bps_rd": 0, "cache": {"no-flush": false, "direct": false, "writebac= k": true}, "file": "TEST_DIR/t.IMGFMT"}]} +{"timestamp": {"seconds": TIMESTAMP, "microseconds": TIMESTAMP}, "event"= : "SHUTDOWN", "data": {"guest": false, "reason": "host-qmp-quit"}} +{"return": {}} + +QMP_VERSION +{"return": {}} +{"return": [{"iops_rd": 0, "detect_zeroes": "off", "active": true, "image"= : {"limits": {"request-alignment": 1, "min-mem-alignment": 1, "opt-mem-alig= nment": 4096, "max-iov": 1024}, "virtual-size": VSIZE, "filename": "TEST_DI= R/t.IMGFMT", "format": "file", "actual-size": SIZE, "format-specific": {"ty= pe": "file", "data": {}}, "dirty-flag": false}, "iops_wr": 0, "ro": true, "= children": [], "node-name": "NODE_NAME", "backing_file_depth": 0, "drv": "f= ile", "iops": 0, "bps_wr": 0, "write_threshold": 0, "encrypted": false, "bp= s": 0, "bps_rd": 0, "cache": {"no-flush": false, "direct": false, "writebac= k": true}, "file": "TEST_DIR/t.IMGFMT"}]} +{"timestamp": {"seconds": TIMESTAMP, "microseconds": TIMESTAMP}, "event"= : "SHUTDOWN", "data": {"guest": false, "reason": "host-qmp-quit"}} +{"return": {}} + +QMP_VERSION +{"return": {}} +{"return": [{"iops_rd": 0, "detect_zeroes": "off", "active": true, "image"= : {"limits": {"request-alignment": 1, "min-mem-alignment": 1, "opt-mem-alig= nment": 4096, "max-iov": 1024}, "virtual-size": VSIZE, "filename": "TEST_DI= R/t.IMGFMT", "format": "file", "actual-size": SIZE, "format-specific": {"ty= pe": "file", "data": {}}, "dirty-flag": false}, "iops_wr": 0, "ro": true, "= children": [], "node-name": "NODE_NAME", "backing_file_depth": 0, "drv": "f= ile", "iops": 0, "bps_wr": 0, "write_threshold": 0, "encrypted": false, "bp= s": 0, "bps_rd": 0, "cache": {"no-flush": false, "direct": false, "writebac= k": true}, "file": "TEST_DIR/t.IMGFMT"}]} +{"timestamp": {"seconds": TIMESTAMP, "microseconds": TIMESTAMP}, "event"= : "SHUTDOWN", "data": {"guest": false, "reason": "host-qmp-quit"}} +{"return": {}} + =20 QEMU_PROG: -drive driver=3Dfile,file=3DTEST_DIR/t.IMGFMT,if=3Dnone,read-on= ly=3Doff,auto-read-only=3Doff: Could not open 'TEST_DIR/t.IMGFMT': Permissi= on denied -NODE_NAME: TEST_DIR/t.IMGFMT (file) -NODE_NAME: TEST_DIR/t.IMGFMT (file) + +QMP_VERSION +{"return": {}} +{"return": [{"iops_rd": 0, "detect_zeroes": "off", "active": true, "image"= : {"limits": {"request-alignment": 1, "min-mem-alignment": 1, "opt-mem-alig= nment": 4096, "max-iov": 1024}, "virtual-size": VSIZE, "filename": "TEST_DI= R/t.IMGFMT", "format": "file", "actual-size": SIZE, "format-specific": {"ty= pe": "file", "data": {}}, "dirty-flag": false}, "iops_wr": 0, "ro": false, = "children": [], "node-name": "NODE_NAME", "backing_file_depth": 0, "drv": "= file", "iops": 0, "bps_wr": 0, "write_threshold": 0, "encrypted": false, "b= ps": 0, "bps_rd": 0, "cache": {"no-flush": false, "direct": false, "writeba= ck": true}, "file": "TEST_DIR/t.IMGFMT"}]} +{"timestamp": {"seconds": TIMESTAMP, "microseconds": TIMESTAMP}, "event"= : "SHUTDOWN", "data": {"guest": false, "reason": "host-qmp-quit"}} +{"return": {}} + +QMP_VERSION +{"return": {}} +{"return": [{"iops_rd": 0, "detect_zeroes": "off", "active": true, "image"= : {"limits": {"request-alignment": 1, "min-mem-alignment": 1, "opt-mem-alig= nment": 4096, "max-iov": 1024}, "virtual-size": VSIZE, "filename": "TEST_DI= R/t.IMGFMT", "format": "file", "actual-size": SIZE, "format-specific": {"ty= pe": "file", "data": {}}, "dirty-flag": false}, "iops_wr": 0, "ro": false, = "children": [], "node-name": "NODE_NAME", "backing_file_depth": 0, "drv": "= file", "iops": 0, "bps_wr": 0, "write_threshold": 0, "encrypted": false, "b= ps": 0, "bps_rd": 0, "cache": {"no-flush": false, "direct": false, "writeba= ck": true}, "file": "TEST_DIR/t.IMGFMT"}]} +{"timestamp": {"seconds": TIMESTAMP, "microseconds": TIMESTAMP}, "event"= : "SHUTDOWN", "data": {"guest": false, "reason": "host-qmp-quit"}} +{"return": {}} + =20 QEMU_PROG: -drive driver=3Dfile,file=3DTEST_DIR/t.IMGFMT,if=3Dnone,auto-re= ad-only=3Doff: Could not open 'TEST_DIR/t.IMGFMT': Permission denied -NODE_NAME: TEST_DIR/t.IMGFMT (file) -NODE_NAME: TEST_DIR/t.IMGFMT (file) + +QMP_VERSION +{"return": {}} +{"return": [{"iops_rd": 0, "detect_zeroes": "off", "active": true, "image"= : {"limits": {"request-alignment": 1, "min-mem-alignment": 1, "opt-mem-alig= nment": 4096, "max-iov": 1024}, "virtual-size": VSIZE, "filename": "TEST_DI= R/t.IMGFMT", "format": "file", "actual-size": SIZE, "format-specific": {"ty= pe": "file", "data": {}}, "dirty-flag": false}, "iops_wr": 0, "ro": false, = "children": [], "node-name": "NODE_NAME", "backing_file_depth": 0, "drv": "= file", "iops": 0, "bps_wr": 0, "write_threshold": 0, "encrypted": false, "b= ps": 0, "bps_rd": 0, "cache": {"no-flush": false, "direct": false, "writeba= ck": true}, "file": "TEST_DIR/t.IMGFMT"}]} +{"timestamp": {"seconds": TIMESTAMP, "microseconds": TIMESTAMP}, "event"= : "SHUTDOWN", "data": {"guest": false, "reason": "host-qmp-quit"}} +{"return": {}} + +QMP_VERSION +{"return": {}} +{"return": [{"iops_rd": 0, "detect_zeroes": "off", "active": true, "image"= : {"limits": {"request-alignment": 1, "min-mem-alignment": 1, "opt-mem-alig= nment": 4096, "max-iov": 1024}, "virtual-size": VSIZE, "filename": "TEST_DI= R/t.IMGFMT", "format": "file", "actual-size": SIZE, "format-specific": {"ty= pe": "file", "data": {}}, "dirty-flag": false}, "iops_wr": 0, "ro": false, = "children": [], "node-name": "NODE_NAME", "backing_file_depth": 0, "drv": "= file", "iops": 0, "bps_wr": 0, "write_threshold": 0, "encrypted": false, "b= ps": 0, "bps_rd": 0, "cache": {"no-flush": false, "direct": false, "writeba= ck": true}, "file": "TEST_DIR/t.IMGFMT"}]} +{"timestamp": {"seconds": TIMESTAMP, "microseconds": TIMESTAMP}, "event"= : "SHUTDOWN", "data": {"guest": false, "reason": "host-qmp-quit"}} +{"return": {}} + =20 =3D=3D=3D -blockdev with read-write image: read-only/auto-read-only combin= ations =3D=3D=3D =20 -node0: TEST_DIR/t.IMGFMT (file, read-only) -node0: TEST_DIR/t.IMGFMT (file, read-only) -node0: TEST_DIR/t.IMGFMT (file, read-only) +QMP_VERSION +{"return": {}} +{"return": [{"iops_rd": 0, "detect_zeroes": "off", "active": true, "image"= : {"limits": {"request-alignment": 1, "min-mem-alignment": 1, "opt-mem-alig= nment": 4096, "max-iov": 1024}, "virtual-size": VSIZE, "filename": "TEST_DI= R/t.IMGFMT", "format": "file", "actual-size": SIZE, "format-specific": {"ty= pe": "file", "data": {}}, "dirty-flag": false}, "iops_wr": 0, "ro": true, "= children": [], "node-name": "node0", "backing_file_depth": 0, "drv": "file"= , "iops": 0, "bps_wr": 0, "write_threshold": 0, "encrypted": false, "bps": = 0, "bps_rd": 0, "cache": {"no-flush": false, "direct": false, "writeback": = true}, "file": "TEST_DIR/t.IMGFMT"}]} +{"timestamp": {"seconds": TIMESTAMP, "microseconds": TIMESTAMP}, "event"= : "SHUTDOWN", "data": {"guest": false, "reason": "host-qmp-quit"}} +{"return": {}} =20 -node0: TEST_DIR/t.IMGFMT (file) -node0: TEST_DIR/t.IMGFMT (file) -node0: TEST_DIR/t.IMGFMT (file) +QMP_VERSION +{"return": {}} +{"return": [{"iops_rd": 0, "detect_zeroes": "off", "active": true, "image"= : {"limits": {"request-alignment": 1, "min-mem-alignment": 1, "opt-mem-alig= nment": 4096, "max-iov": 1024}, "virtual-size": VSIZE, "filename": "TEST_DI= R/t.IMGFMT", "format": "file", "actual-size": SIZE, "format-specific": {"ty= pe": "file", "data": {}}, "dirty-flag": false}, "iops_wr": 0, "ro": true, "= children": [], "node-name": "node0", "backing_file_depth": 0, "drv": "file"= , "iops": 0, "bps_wr": 0, "write_threshold": 0, "encrypted": false, "bps": = 0, "bps_rd": 0, "cache": {"no-flush": false, "direct": false, "writeback": = true}, "file": "TEST_DIR/t.IMGFMT"}]} +{"timestamp": {"seconds": TIMESTAMP, "microseconds": TIMESTAMP}, "event"= : "SHUTDOWN", "data": {"guest": false, "reason": "host-qmp-quit"}} +{"return": {}} + +QMP_VERSION +{"return": {}} +{"return": [{"iops_rd": 0, "detect_zeroes": "off", "active": true, "image"= : {"limits": {"request-alignment": 1, "min-mem-alignment": 1, "opt-mem-alig= nment": 4096, "max-iov": 1024}, "virtual-size": VSIZE, "filename": "TEST_DI= R/t.IMGFMT", "format": "file", "actual-size": SIZE, "format-specific": {"ty= pe": "file", "data": {}}, "dirty-flag": false}, "iops_wr": 0, "ro": true, "= children": [], "node-name": "node0", "backing_file_depth": 0, "drv": "file"= , "iops": 0, "bps_wr": 0, "write_threshold": 0, "encrypted": false, "bps": = 0, "bps_rd": 0, "cache": {"no-flush": false, "direct": false, "writeback": = true}, "file": "TEST_DIR/t.IMGFMT"}]} +{"timestamp": {"seconds": TIMESTAMP, "microseconds": TIMESTAMP}, "event"= : "SHUTDOWN", "data": {"guest": false, "reason": "host-qmp-quit"}} +{"return": {}} + + +QMP_VERSION +{"return": {}} +{"return": [{"iops_rd": 0, "detect_zeroes": "off", "active": true, "image"= : {"limits": {"request-alignment": 1, "min-mem-alignment": 1, "opt-mem-alig= nment": 4096, "max-iov": 1024}, "virtual-size": VSIZE, "filename": "TEST_DI= R/t.IMGFMT", "format": "file", "actual-size": SIZE, "format-specific": {"ty= pe": "file", "data": {}}, "dirty-flag": false}, "iops_wr": 0, "ro": false, = "children": [], "node-name": "node0", "backing_file_depth": 0, "drv": "file= ", "iops": 0, "bps_wr": 0, "write_threshold": 0, "encrypted": false, "bps":= 0, "bps_rd": 0, "cache": {"no-flush": false, "direct": false, "writeback":= true}, "file": "TEST_DIR/t.IMGFMT"}]} +{"timestamp": {"seconds": TIMESTAMP, "microseconds": TIMESTAMP}, "event"= : "SHUTDOWN", "data": {"guest": false, "reason": "host-qmp-quit"}} +{"return": {}} + +QMP_VERSION +{"return": {}} +{"return": [{"iops_rd": 0, "detect_zeroes": "off", "active": true, "image"= : {"limits": {"request-alignment": 1, "min-mem-alignment": 1, "opt-mem-alig= nment": 4096, "max-iov": 1024}, "virtual-size": VSIZE, "filename": "TEST_DI= R/t.IMGFMT", "format": "file", "actual-size": SIZE, "format-specific": {"ty= pe": "file", "data": {}}, "dirty-flag": false}, "iops_wr": 0, "ro": false, = "children": [], "node-name": "node0", "backing_file_depth": 0, "drv": "file= ", "iops": 0, "bps_wr": 0, "write_threshold": 0, "encrypted": false, "bps":= 0, "bps_rd": 0, "cache": {"no-flush": false, "direct": false, "writeback":= true}, "file": "TEST_DIR/t.IMGFMT"}]} +{"timestamp": {"seconds": TIMESTAMP, "microseconds": TIMESTAMP}, "event"= : "SHUTDOWN", "data": {"guest": false, "reason": "host-qmp-quit"}} +{"return": {}} + +QMP_VERSION +{"return": {}} +{"return": [{"iops_rd": 0, "detect_zeroes": "off", "active": true, "image"= : {"limits": {"request-alignment": 1, "min-mem-alignment": 1, "opt-mem-alig= nment": 4096, "max-iov": 1024}, "virtual-size": VSIZE, "filename": "TEST_DI= R/t.IMGFMT", "format": "file", "actual-size": SIZE, "format-specific": {"ty= pe": "file", "data": {}}, "dirty-flag": false}, "iops_wr": 0, "ro": false, = "children": [], "node-name": "node0", "backing_file_depth": 0, "drv": "file= ", "iops": 0, "bps_wr": 0, "write_threshold": 0, "encrypted": false, "bps":= 0, "bps_rd": 0, "cache": {"no-flush": false, "direct": false, "writeback":= true}, "file": "TEST_DIR/t.IMGFMT"}]} +{"timestamp": {"seconds": TIMESTAMP, "microseconds": TIMESTAMP}, "event"= : "SHUTDOWN", "data": {"guest": false, "reason": "host-qmp-quit"}} +{"return": {}} + + +QMP_VERSION +{"return": {}} +{"return": [{"iops_rd": 0, "detect_zeroes": "off", "active": true, "image"= : {"limits": {"request-alignment": 1, "min-mem-alignment": 1, "opt-mem-alig= nment": 4096, "max-iov": 1024}, "virtual-size": VSIZE, "filename": "TEST_DI= R/t.IMGFMT", "format": "file", "actual-size": SIZE, "format-specific": {"ty= pe": "file", "data": {}}, "dirty-flag": false}, "iops_wr": 0, "ro": false, = "children": [], "node-name": "node0", "backing_file_depth": 0, "drv": "file= ", "iops": 0, "bps_wr": 0, "write_threshold": 0, "encrypted": false, "bps":= 0, "bps_rd": 0, "cache": {"no-flush": false, "direct": false, "writeback":= true}, "file": "TEST_DIR/t.IMGFMT"}]} +{"timestamp": {"seconds": TIMESTAMP, "microseconds": TIMESTAMP}, "event"= : "SHUTDOWN", "data": {"guest": false, "reason": "host-qmp-quit"}} +{"return": {}} + +QMP_VERSION +{"return": {}} +{"return": [{"iops_rd": 0, "detect_zeroes": "off", "active": true, "image"= : {"limits": {"request-alignment": 1, "min-mem-alignment": 1, "opt-mem-alig= nment": 4096, "max-iov": 1024}, "virtual-size": VSIZE, "filename": "TEST_DI= R/t.IMGFMT", "format": "file", "actual-size": SIZE, "format-specific": {"ty= pe": "file", "data": {}}, "dirty-flag": false}, "iops_wr": 0, "ro": false, = "children": [], "node-name": "node0", "backing_file_depth": 0, "drv": "file= ", "iops": 0, "bps_wr": 0, "write_threshold": 0, "encrypted": false, "bps":= 0, "bps_rd": 0, "cache": {"no-flush": false, "direct": false, "writeback":= true}, "file": "TEST_DIR/t.IMGFMT"}]} +{"timestamp": {"seconds": TIMESTAMP, "microseconds": TIMESTAMP}, "event"= : "SHUTDOWN", "data": {"guest": false, "reason": "host-qmp-quit"}} +{"return": {}} + +QMP_VERSION +{"return": {}} +{"return": [{"iops_rd": 0, "detect_zeroes": "off", "active": true, "image"= : {"limits": {"request-alignment": 1, "min-mem-alignment": 1, "opt-mem-alig= nment": 4096, "max-iov": 1024}, "virtual-size": VSIZE, "filename": "TEST_DI= R/t.IMGFMT", "format": "file", "actual-size": SIZE, "format-specific": {"ty= pe": "file", "data": {}}, "dirty-flag": false}, "iops_wr": 0, "ro": false, = "children": [], "node-name": "node0", "backing_file_depth": 0, "drv": "file= ", "iops": 0, "bps_wr": 0, "write_threshold": 0, "encrypted": false, "bps":= 0, "bps_rd": 0, "cache": {"no-flush": false, "direct": false, "writeback":= true}, "file": "TEST_DIR/t.IMGFMT"}]} +{"timestamp": {"seconds": TIMESTAMP, "microseconds": TIMESTAMP}, "event"= : "SHUTDOWN", "data": {"guest": false, "reason": "host-qmp-quit"}} +{"return": {}} =20 -node0: TEST_DIR/t.IMGFMT (file) -node0: TEST_DIR/t.IMGFMT (file) -node0: TEST_DIR/t.IMGFMT (file) =20 =3D=3D=3D -blockdev with read-only image: read-only/auto-read-only combina= tions =3D=3D=3D =20 -node0: TEST_DIR/t.IMGFMT (file, read-only) -node0: TEST_DIR/t.IMGFMT (file, read-only) -node0: TEST_DIR/t.IMGFMT (file, read-only) +QMP_VERSION +{"return": {}} +{"return": [{"iops_rd": 0, "detect_zeroes": "off", "active": true, "image"= : {"limits": {"request-alignment": 1, "min-mem-alignment": 1, "opt-mem-alig= nment": 4096, "max-iov": 1024}, "virtual-size": VSIZE, "filename": "TEST_DI= R/t.IMGFMT", "format": "file", "actual-size": SIZE, "format-specific": {"ty= pe": "file", "data": {}}, "dirty-flag": false}, "iops_wr": 0, "ro": true, "= children": [], "node-name": "node0", "backing_file_depth": 0, "drv": "file"= , "iops": 0, "bps_wr": 0, "write_threshold": 0, "encrypted": false, "bps": = 0, "bps_rd": 0, "cache": {"no-flush": false, "direct": false, "writeback": = true}, "file": "TEST_DIR/t.IMGFMT"}]} +{"timestamp": {"seconds": TIMESTAMP, "microseconds": TIMESTAMP}, "event"= : "SHUTDOWN", "data": {"guest": false, "reason": "host-qmp-quit"}} +{"return": {}} + +QMP_VERSION +{"return": {}} +{"return": [{"iops_rd": 0, "detect_zeroes": "off", "active": true, "image"= : {"limits": {"request-alignment": 1, "min-mem-alignment": 1, "opt-mem-alig= nment": 4096, "max-iov": 1024}, "virtual-size": VSIZE, "filename": "TEST_DI= R/t.IMGFMT", "format": "file", "actual-size": SIZE, "format-specific": {"ty= pe": "file", "data": {}}, "dirty-flag": false}, "iops_wr": 0, "ro": true, "= children": [], "node-name": "node0", "backing_file_depth": 0, "drv": "file"= , "iops": 0, "bps_wr": 0, "write_threshold": 0, "encrypted": false, "bps": = 0, "bps_rd": 0, "cache": {"no-flush": false, "direct": false, "writeback": = true}, "file": "TEST_DIR/t.IMGFMT"}]} +{"timestamp": {"seconds": TIMESTAMP, "microseconds": TIMESTAMP}, "event"= : "SHUTDOWN", "data": {"guest": false, "reason": "host-qmp-quit"}} +{"return": {}} + +QMP_VERSION +{"return": {}} +{"return": [{"iops_rd": 0, "detect_zeroes": "off", "active": true, "image"= : {"limits": {"request-alignment": 1, "min-mem-alignment": 1, "opt-mem-alig= nment": 4096, "max-iov": 1024}, "virtual-size": VSIZE, "filename": "TEST_DI= R/t.IMGFMT", "format": "file", "actual-size": SIZE, "format-specific": {"ty= pe": "file", "data": {}}, "dirty-flag": false}, "iops_wr": 0, "ro": true, "= children": [], "node-name": "node0", "backing_file_depth": 0, "drv": "file"= , "iops": 0, "bps_wr": 0, "write_threshold": 0, "encrypted": false, "bps": = 0, "bps_rd": 0, "cache": {"no-flush": false, "direct": false, "writeback": = true}, "file": "TEST_DIR/t.IMGFMT"}]} +{"timestamp": {"seconds": TIMESTAMP, "microseconds": TIMESTAMP}, "event"= : "SHUTDOWN", "data": {"guest": false, "reason": "host-qmp-quit"}} +{"return": {}} + =20 QEMU_PROG: -blockdev driver=3Dfile,filename=3DTEST_DIR/t.IMGFMT,node-name= =3Dnode0,read-only=3Doff,auto-read-only=3Doff: Could not open 'TEST_DIR/t.I= MGFMT': Permission denied -node0: TEST_DIR/t.IMGFMT (file) + +QMP_VERSION +{"return": {}} +{"return": [{"iops_rd": 0, "detect_zeroes": "off", "active": true, "image"= : {"limits": {"request-alignment": 1, "min-mem-alignment": 1, "opt-mem-alig= nment": 4096, "max-iov": 1024}, "virtual-size": VSIZE, "filename": "TEST_DI= R/t.IMGFMT", "format": "file", "actual-size": SIZE, "format-specific": {"ty= pe": "file", "data": {}}, "dirty-flag": false}, "iops_wr": 0, "ro": false, = "children": [], "node-name": "node0", "backing_file_depth": 0, "drv": "file= ", "iops": 0, "bps_wr": 0, "write_threshold": 0, "encrypted": false, "bps":= 0, "bps_rd": 0, "cache": {"no-flush": false, "direct": false, "writeback":= true}, "file": "TEST_DIR/t.IMGFMT"}]} +{"timestamp": {"seconds": TIMESTAMP, "microseconds": TIMESTAMP}, "event"= : "SHUTDOWN", "data": {"guest": false, "reason": "host-qmp-quit"}} +{"return": {}} + QEMU_PROG: -blockdev driver=3Dfile,filename=3DTEST_DIR/t.IMGFMT,node-name= =3Dnode0,read-only=3Doff: Could not open 'TEST_DIR/t.IMGFMT': Permission de= nied =20 + QEMU_PROG: -blockdev driver=3Dfile,filename=3DTEST_DIR/t.IMGFMT,node-name= =3Dnode0,auto-read-only=3Doff: Could not open 'TEST_DIR/t.IMGFMT': Permissi= on denied -node0: TEST_DIR/t.IMGFMT (file) + +QMP_VERSION +{"return": {}} +{"return": [{"iops_rd": 0, "detect_zeroes": "off", "active": true, "image"= : {"limits": {"request-alignment": 1, "min-mem-alignment": 1, "opt-mem-alig= nment": 4096, "max-iov": 1024}, "virtual-size": VSIZE, "filename": "TEST_DI= R/t.IMGFMT", "format": "file", "actual-size": SIZE, "format-specific": {"ty= pe": "file", "data": {}}, "dirty-flag": false}, "iops_wr": 0, "ro": false, = "children": [], "node-name": "node0", "backing_file_depth": 0, "drv": "file= ", "iops": 0, "bps_wr": 0, "write_threshold": 0, "encrypted": false, "bps":= 0, "bps_rd": 0, "cache": {"no-flush": false, "direct": false, "writeback":= true}, "file": "TEST_DIR/t.IMGFMT"}]} +{"timestamp": {"seconds": TIMESTAMP, "microseconds": TIMESTAMP}, "event"= : "SHUTDOWN", "data": {"guest": false, "reason": "host-qmp-quit"}} +{"return": {}} + QEMU_PROG: -blockdev driver=3Dfile,filename=3DTEST_DIR/t.IMGFMT,node-name= =3Dnode0: Could not open 'TEST_DIR/t.IMGFMT': Permission denied + *** done --=20 2.56.0.rc0.29.g47ce80527c56 From nobody Sat Sep 26 20:01:40 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=1790108957; cv=none; d=zohomail.com; s=zohoarc; b=F9zjeBgKDAvqMlXYdCQNE9Wnmee73JkxDJnKJIk3opt5BvVU8iUt41Wq8nNTiNJW6Ax28cBwQoGwPBIuYPPHtUQapcn+o7qraqCXzh4FUSuQuLoaTTm+17rczxjIiU02dzOpl8rq0u53ARGRv2X5Bf2mCQS8QQK5ShhlnMwtYJ4= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1790108957; 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:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=vcsFqAShCWyBQOCRfo3cy+/x60my1BS7qUt9F/KDa+c=; b=UHd/3FJIXQ2oLRAaXWBdp/BH+iIfsuR/EC/LaL+tGTNqxicDDXq2N8po1CxojWl+VyZ9c5mLAEs2UOS+eCCCpPPW+aiQEVvdj4TKgRmZSzaydDHoieRSDPkThdMrz2gHCYBbUfvNGw08KQ6EaNFGiQ4QBeqLU8cRN19x2bGWaYo= 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 1790108957786256.1564681842309; Tue, 22 Sep 2026 13:29:17 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists1p.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1x974d-0004zD-N5; Tue, 22 Sep 2026 16:26:47 -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 1x972F-00018i-CX for qemu-devel@nongnu.org; Tue, 22 Sep 2026 16:24:16 -0400 Received: from us-smtp-delivery-124.mimecast.com ([170.10.133.124]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1x972A-0000a1-Ch for qemu-devel@nongnu.org; Tue, 22 Sep 2026 16:24:14 -0400 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-292-fwKfVv1bNRGwaFtXacmONA-1; Tue, 22 Sep 2026 16:24:08 -0400 Received: from mx-prod-int-01.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-01.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.4]) (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 4C4941955E86; Tue, 22 Sep 2026 20:24:07 +0000 (UTC) Received: from localhost (headnet03.pony-001.prod.iad2.dc.redhat.com [10.2.32.114]) by mx-prod-int-01.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id DFA043000223; Tue, 22 Sep 2026 20:24:05 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1790108649; 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=vcsFqAShCWyBQOCRfo3cy+/x60my1BS7qUt9F/KDa+c=; b=i3p9ddvEEktfksnt+xj8yF8d8FpGX8DIykqvzgry21mZYJiTnn32QMfEG8J0kCEVlXT63y fhz8ONZrlSz/eI5GnJ9MkPT7HYmTp2+uwWxZohQCDvrYHdexwsCFOZTEcc4TBOP0J3PIgn 095KU5wuRytXNWfyYfGoFJYk8sQq5n8= X-MC-Unique: fwKfVv1bNRGwaFtXacmONA-1 X-Mimecast-MFC-AGG-ID: fwKfVv1bNRGwaFtXacmONA_1790108647 From: =?utf-8?q?Marc-Andr=C3=A9_Lureau?= Date: Wed, 23 Sep 2026 00:18:30 +0400 Subject: [PATCH 83/88] qemu-iotests/267: migrate away from HMP MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Message-Id: <20260923-nohmp-v1-83-ebc029d4bd80@redhat.com> References: <20260923-nohmp-v1-0-ebc029d4bd80@redhat.com> In-Reply-To: <20260923-nohmp-v1-0-ebc029d4bd80@redhat.com> To: qemu-devel@nongnu.org Cc: Kevin Wolf , =?utf-8?q?Marc-Andr=C3=A9_Lureau?= , Hanna Reitz , qemu-block@nongnu.org X-Developer-Signature: v=1; a=openpgp-sha256; l=41267; i=marcandre.lureau@redhat.com; h=from:subject:message-id; bh=ML7PxDngHFqharBEJ3m9Lfq//oAnaCOUk1Soj4x9UdM=; b=owEBbQKS/ZANAwAKAdro4Ql1lpzlAcsmYgBqsuK0q32W2jIVZAtGs5/bejiQJWgxVSJnVxj+n 8Cz/2arxSCJAjMEAAEKAB0WIQSHqb2TP4fGBtJ29i3a6OEJdZac5QUCarLitAAKCRDa6OEJdZac 5f32D/9BuqwoTNFrUozh+jCW1ztWwwBi5OiQrQQ36eTvZ+tw42yPlfDtwTgC1Gj61fDlmdQ6meZ SBMXReJgosmUXjEAzFxchIE/VK4LHIih/hWS/oVOC/l9Iesyq/uMHiiTdcW9EDj+mbXaZN72sa4 0WLEm57Sp8b6n6e4UUX/gK5vZyAyIpQrBJ+jLqx0UwXt4MaJVYv+/x5VERR1zgoT9SiBqBKrico BStDQAdzFZetLVCrE7IcHyznchj0owWZ0nuPwoZcFB6MLfU9E1eYAnVOph8rQMFP5jAxKU2ejFg Fq/LArPn8BqFW/gKocbjhdpu2K+y//BWG1+l+xusWdwFepn7ZgAm/td81k+mOjWoN17BfUEzWsI dvolQ0RvnIOIhyDEoVLReXl5RccR1N4bBqcBs4X6+5f07VC62T/qMp/U5BTpHgeaNdpd2quP3lc Bl6DjCr2Dm6nRNsz4Uc04Voih07CwePXEmbHry7thIF0Ji6AbJS6teFAWwx0U3DVbHXbZ4thWRe W93Hd05vSvwFoo90YjxZqNBr2lURMccYpf/Xfk3AO/3px7O7dkj5qOf0DTZ6IQCBdGGAc5r4LTm oPUuHVJGxJySm7Q05C1jcAQmXT7WIyMA+IyxizmpNGsUFZmZCzgJxQXFtIABJ5pdF9ZzJYVcOhE oWBB8/jxGByqg1A== X-Developer-Key: i=marcandre.lureau@redhat.com; a=openpgp; fpr=87A9BD933F87C606D276F62DDAE8E10975969CE5 X-Scanned-By: MIMEDefang 3.4.1 on 10.30.177.4 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.133.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_H3=0.001, RCVD_IN_MSPIKE_WL=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-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: 1790108958601158500 Replace pipe-based HMP savevm/loadvm, nbd_server_start/add, and info snapshots with QMP equivalents. Signed-off-by: Marc-Andr=C3=A9 Lureau --- tests/qemu-iotests/267 | 139 +++++++++----- tests/qemu-iotests/267.out | 447 ++++++++++++++++++++++++++++++++++-------= ---- 2 files changed, 435 insertions(+), 151 deletions(-) diff --git a/tests/qemu-iotests/267 b/tests/qemu-iotests/267 index e14aeb1f18d0..68c2f2cbebb1 100755 --- a/tests/qemu-iotests/267 +++ b/tests/qemu-iotests/267 @@ -29,6 +29,7 @@ status=3D1 # failure is the default! =20 _cleanup() { + _cleanup_qemu _cleanup_test_img rm -f "$SOCK_DIR/nbd" } @@ -37,6 +38,7 @@ trap "_cleanup; exit \$status" 0 1 2 3 15 # get standard environment, filters and checks . ./common.rc . ./common.filter +. ./common.qemu =20 _supported_fmt qcow2 _supported_proto file @@ -48,38 +50,53 @@ _require_drivers copy-on-read _unsupported_imgopts 'refcount_bits=3D1[^0-9]' data_file =20 _require_devices virtio-blk -_require_hmp - -do_run_qemu() -{ - echo Testing: "$@" - ( - if ! test -t 0; then - while read cmd; do - echo $cmd - done - fi - echo quit - ) | $QEMU -nographic -monitor stdio -nodefaults "$@" - echo -} - -run_qemu() -{ - do_run_qemu "$@" 2>&1 | _filter_testdir | _filter_qemu | _filter_hmp | - _filter_generated_node_ids | _filter_imgfmt | _filter_vmstate_size -} =20 size=3D128M =20 +# snapshot-save/snapshot-load are job-based QMP commands; wait for +# "concluded" (auto-dismiss to "null" only fires on the next command). run_test() { + local snapshot_node=3D"$1" + shift + if [ -n "$BACKING_FILE" ]; then _make_test_img -b "$BACKING_FILE" -F $IMGFMT $size else _make_test_img $size fi - printf "savevm snap0\ninfo snapshots\nloadvm snap0\n" | run_qemu "$@" = | _filter_date + + echo Testing: "$@" | _filter_testdir | _filter_imgfmt + _launch_qemu -nodefaults "$@" + _send_qemu_cmd $QEMU_HANDLE \ + "{ 'execute': 'qmp_capabilities' }" \ + 'return' + + # snapshot-save + _send_qemu_cmd $QEMU_HANDLE \ + "{ 'execute': 'snapshot-save', + 'arguments': { 'job-id': 'save0', 'tag': 'snap0', + 'vmstate': '$snapshot_node', + 'devices': [\"$snapshot_node\"] } }" \ + 'return' + silent=3Dyes _send_qemu_cmd $QEMU_HANDLE '' '"concluded"' + + # snapshot-load + _send_qemu_cmd $QEMU_HANDLE \ + "{ 'execute': 'snapshot-load', + 'arguments': { 'job-id': 'load0', 'tag': 'snap0', + 'vmstate': '$snapshot_node', + 'devices': [\"$snapshot_node\"] } }" \ + 'return' + silent=3Dyes _send_qemu_cmd $QEMU_HANDLE '' '"concluded"' + + _send_qemu_cmd $QEMU_HANDLE \ + "{ 'execute': 'quit' }" \ + 'return' + wait=3D1 _cleanup_qemu + + $QEMU_IMG snapshot -l "$TEST_IMG" | _filter_date | _filter_vmstate_size + echo } =20 =20 @@ -87,31 +104,31 @@ echo echo "=3D=3D=3D No block devices at all =3D=3D=3D" echo =20 -run_test +run_test nonexistent =20 echo echo "=3D=3D=3D -drive if=3Dnone =3D=3D=3D" echo =20 -run_test -drive driver=3Dfile,file=3D"$TEST_IMG",if=3Dnone -run_test -drive driver=3D$IMGFMT,file=3D"$TEST_IMG",if=3Dnone -run_test -drive driver=3D$IMGFMT,file=3D"$TEST_IMG",if=3Dnone -device virt= io-blk,drive=3Dnone0 +run_test drv0 -drive driver=3Dfile,file=3D"$TEST_IMG",if=3Dnone,node-name= =3Ddrv0 +run_test drv0 -drive driver=3D$IMGFMT,file=3D"$TEST_IMG",if=3Dnone,node-na= me=3Ddrv0 +run_test drv0 -drive driver=3D$IMGFMT,file=3D"$TEST_IMG",if=3Dnone,node-na= me=3Ddrv0 -device virtio-blk,drive=3Dnone0 =20 echo echo "=3D=3D=3D -drive if=3Dvirtio =3D=3D=3D" echo =20 -run_test -drive driver=3Dfile,file=3D"$TEST_IMG",if=3Dvirtio -run_test -drive driver=3D$IMGFMT,file=3D"$TEST_IMG",if=3Dvirtio +run_test drv0 -drive driver=3Dfile,file=3D"$TEST_IMG",if=3Dvirtio,node-nam= e=3Ddrv0 +run_test drv0 -drive driver=3D$IMGFMT,file=3D"$TEST_IMG",if=3Dvirtio,node-= name=3Ddrv0 =20 echo echo "=3D=3D=3D Simple -blockdev =3D=3D=3D" echo =20 -run_test -blockdev driver=3Dfile,filename=3D"$TEST_IMG",node-name=3Dfile -run_test -blockdev driver=3Dfile,filename=3D"$TEST_IMG",node-name=3Dfile \ +run_test file -blockdev driver=3Dfile,filename=3D"$TEST_IMG",node-name=3Df= ile +run_test fmt -blockdev driver=3Dfile,filename=3D"$TEST_IMG",node-name=3Dfi= le \ -blockdev driver=3D$IMGFMT,file=3Dfile,node-name=3Dfmt -run_test -blockdev driver=3Dfile,filename=3D"$TEST_IMG",node-name=3Dfile \ +run_test fmt -blockdev driver=3Dfile,filename=3D"$TEST_IMG",node-name=3Dfi= le \ -blockdev driver=3Draw,file=3Dfile,node-name=3Draw \ -blockdev driver=3D$IMGFMT,file=3Draw,node-name=3Dfmt =20 @@ -119,7 +136,7 @@ echo echo "=3D=3D=3D -blockdev with a filter on top =3D=3D=3D" echo =20 -run_test -blockdev driver=3Dfile,filename=3D"$TEST_IMG",node-name=3Dfile \ +run_test fmt -blockdev driver=3Dfile,filename=3D"$TEST_IMG",node-name=3Dfi= le \ -blockdev driver=3D$IMGFMT,file=3Dfile,node-name=3Dfmt \ -blockdev driver=3Dcopy-on-read,file=3Dfmt,node-name=3Dfilter =20 @@ -130,12 +147,12 @@ echo TEST_IMG=3D"$TEST_IMG.base" _make_test_img $size =20 BACKING_FILE=3D"$TEST_IMG.base" \ -run_test -blockdev driver=3Dfile,filename=3D"$TEST_IMG.base",node-name=3Db= acking-file \ +run_test fmt -blockdev driver=3Dfile,filename=3D"$TEST_IMG.base",node-name= =3Dbacking-file \ -blockdev driver=3Dfile,filename=3D"$TEST_IMG",node-name=3Dfile \ -blockdev driver=3D$IMGFMT,file=3Dfile,backing=3Dbacking-file,nod= e-name=3Dfmt =20 BACKING_FILE=3D"$TEST_IMG.base" \ -run_test -blockdev driver=3Dfile,filename=3D"$TEST_IMG.base",node-name=3Db= acking-file \ +run_test fmt -blockdev driver=3Dfile,filename=3D"$TEST_IMG.base",node-name= =3Dbacking-file \ -blockdev driver=3D$IMGFMT,file=3Dbacking-file,node-name=3Dbackin= g-fmt \ -blockdev driver=3Dfile,filename=3D"$TEST_IMG",node-name=3Dfile \ -blockdev driver=3D$IMGFMT,file=3Dfile,backing=3Dbacking-fmt,node= -name=3Dfmt @@ -152,18 +169,48 @@ echo "=3D=3D=3D -blockdev with NBD server on the back= ing file =3D=3D=3D" echo =20 _make_test_img -b "$TEST_IMG.base" -F $IMGFMT $size -cat < (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 1790108956267965.8472333055951; Tue, 22 Sep 2026 13:29:16 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists1p.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1x975T-00060O-13; Tue, 22 Sep 2026 16:27:35 -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 1x972N-0001KK-7z for qemu-devel@nongnu.org; Tue, 22 Sep 2026 16:24:25 -0400 Received: from us-smtp-delivery-124.mimecast.com ([170.10.133.124]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1x972H-0000an-2J for qemu-devel@nongnu.org; Tue, 22 Sep 2026 16:24:22 -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-584-Q3YxwCgYPe6DP-Bzzz0-1Q-1; Tue, 22 Sep 2026 16:24:12 -0400 Received: from mx-prod-int-05.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-05.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.17]) (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 4FB8D18009FC; Tue, 22 Sep 2026 20:24:11 +0000 (UTC) Received: from localhost (headnet03.pony-001.prod.iad2.dc.redhat.com [10.2.32.114]) by mx-prod-int-05.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id 955C91956095; Tue, 22 Sep 2026 20:24:09 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1790108655; 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=vnb3vnzFH71VWXNcWg//rZ8ayuAg8z7/dRTP9L3L/7U=; b=P9nMdYEA+qsNoc5v6XpVuMp612jgAh3kLod+WJh3/lyi2cs821Sp+DF1ln19vhmJZz86rx hppr00gwIQOLBbXWx3vG9//6dLyrgci0x9ey91QbQTxK8wjHzv8Q8LPl9T70dnh/txjn9c FKC0h0nJz9Ogl4uKjjrxGwOmTN8wRE0= X-MC-Unique: Q3YxwCgYPe6DP-Bzzz0-1Q-1 X-Mimecast-MFC-AGG-ID: Q3YxwCgYPe6DP-Bzzz0-1Q_1790108651 From: =?utf-8?q?Marc-Andr=C3=A9_Lureau?= Date: Wed, 23 Sep 2026 00:18:31 +0400 Subject: [PATCH 84/88] qemu-iotests/051: migrate away from HMP MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Message-Id: <20260923-nohmp-v1-84-ebc029d4bd80@redhat.com> References: <20260923-nohmp-v1-0-ebc029d4bd80@redhat.com> In-Reply-To: <20260923-nohmp-v1-0-ebc029d4bd80@redhat.com> To: qemu-devel@nongnu.org Cc: Kevin Wolf , =?utf-8?q?Marc-Andr=C3=A9_Lureau?= , Hanna Reitz , qemu-block@nongnu.org X-Developer-Signature: v=1; a=openpgp-sha256; l=99142; i=marcandre.lureau@redhat.com; h=from:subject:message-id; bh=FMO7H+RAdAXwQlf6GIRCKS7KDhEy80nAoYeixjwoToI=; b=owEBbQKS/ZANAwAKAdro4Ql1lpzlAcsmYgBqsuK0DzjgCFr/yrO2HwFL2mrEQxfU1KMeTAB18 RYCPNcLcRmJAjMEAAEKAB0WIQSHqb2TP4fGBtJ29i3a6OEJdZac5QUCarLitAAKCRDa6OEJdZac 5QYZD/4lLgK+UhIqnsDi4e4flz+7v5MUQ0jFHR/3WLGB8rvjpReRs9w50Kh6koCYFWNrcv+9D4k xyY82hlA7yW2QP02QlWO17m8c4oyvOPF4Nw3RhIwhli5fJy3y3SxJX/7eoXvOt1nnbZWbFjPzHU qXIhQ2jhFNX++fQVgy79FoUVxMGwSOiFXVoqeHY9ETKE92tjE/5PqMVL4SMwugwt1Nl4XFDbIEU YsZO21beQPlinUVROosG6LhGzfXWCWc8aoBua72FbzQeTgqA5UPU9m3kdi8fgFoxlxUcUDcX9TO sQgA+p06y7HxLrDE9NEC7FsqbOHTtszjngNfvHeC4h1e5tM8jdYXdxMFLXSGzFy8hyqDhYyKTqR 74PH4NLqCgZIdq4o/WUtv9G6I5CsJLWa0XhTY3JH8EznLfFXdw2igmXUcWxrpiSxsdh0VvPb/31 fFm55ZxoIz87/EB6RKGbmtLoPySuMQe2c20Nn1JJyb/M4oAkE7U9bxxptoR8brjurS25Z0NYxoY KJnj3SXtZ5W1Sdjq+auquTFemdWHWT0TaNq6SRSBV1GNH7w3KulEfsrBlsHXCYJxO29+LP672Nx PRmw5EOqQNnTN5Icj8cnQXe2DrMQZ/y7VAr4YyzxQdHzVx2UK/DUHY6HZf0zKgkG5VfY5h/cHeU biJP9E3B8VX5JtQ== X-Developer-Key: i=marcandre.lureau@redhat.com; a=openpgp; fpr=87A9BD933F87C606D276F62DDAE8E10975969CE5 X-Scanned-By: MIMEDefang 3.0 on 10.30.177.17 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.133.124; envelope-from=marcandre.lureau@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 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_H3=0.001, RCVD_IN_MSPIKE_WL=0.001, SPF_HELO_PASS=-0.001, SPF_PASS=-0.001 autolearn=unavailable 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: 1790108958615158500 Replace pipe-based HMP monitor with QMP. Convert info block, qemu-io, and commit commands to their QMP equivalents. Use existing filter helpers (_filter_qmp, _filter_qmp_empty_return, _filter_actual_image_size) instead of custom Python filters. Signed-off-by: Marc-Andr=C3=A9 Lureau --- tests/qemu-iotests/051 | 75 ++++++---- tests/qemu-iotests/051.out | 241 ++++++++++++-------------------- tests/qemu-iotests/051.pc.out | 311 ++++++++++++++++----------------------= ---- 3 files changed, 258 insertions(+), 369 deletions(-) diff --git a/tests/qemu-iotests/051 b/tests/qemu-iotests/051 index a722c0c1bc8f..fd9074f978bc 100755 --- a/tests/qemu-iotests/051 +++ b/tests/qemu-iotests/051 @@ -29,6 +29,7 @@ status=3D1 # failure is the default! =20 _cleanup() { + _cleanup_qemu _cleanup_test_img } trap "_cleanup; exit \$status" 0 1 2 3 15 @@ -36,6 +37,7 @@ trap "_cleanup; exit \$status" 0 1 2 3 15 # get standard environment, filters and checks . ./common.rc . ./common.filter +. ./common.qemu =20 _supported_fmt qcow2 _supported_proto file @@ -45,7 +47,6 @@ _supported_proto file _unsupported_imgopts 'refcount_bits=3D\([^1]\|.\([^6]\|$\)\)' data_file \ compression_type _require_drivers nbd -_require_hmp =20 if [ "$QEMU_DEFAULT_MACHINE" =3D "pc" ]; then _require_devices lsi53c895a @@ -55,20 +56,22 @@ do_run_qemu() { echo Testing: "$@" ( + echo '{"execute":"qmp_capabilities"}' if ! test -t 0; then while read cmd; do - echo $cmd + echo "$cmd" done fi - echo quit - ) | $QEMU -nographic -monitor stdio -serial none "$@" + echo '{"execute":"quit"}' + ) | $QEMU -nographic -qmp stdio -serial none "$@" echo } =20 run_qemu() { - do_run_qemu "$@" 2>&1 | _filter_testdir | _filter_qemu | - _filter_generated_node_ids | _filter_hmp + do_run_qemu "$@" 2>&1 | _filter_testdir | _filter_qemu \ + | _filter_generated_node_ids | _filter_qmp | _filter_qmp_empty_ret= urn \ + | _filter_actual_image_size } =20 size=3D128M @@ -131,8 +134,8 @@ echo echo =3D=3D=3D Overriding backing file =3D=3D=3D echo =20 -echo "info block" | run_qemu -drive file=3D"$TEST_IMG",driver=3Dqcow2,back= ing.file.filename=3D"$TEST_IMG.orig",if=3Dnone,id=3D$device_id -nodefaults\ - | _filter_generated_node_ids +echo "{ 'execute': 'query-block' }" | \ + run_qemu -drive file=3D"$TEST_IMG",driver=3Dqcow2,backing.file.filenam= e=3D"$TEST_IMG.orig",if=3Dnone,id=3D$device_id -nodefaults =20 # Drivers that don't support backing files run_qemu -drive file=3D"$TEST_IMG",driver=3Draw,backing.file.filename=3D"$= TEST_IMG.orig" @@ -257,7 +260,7 @@ run_qemu -drive driver=3Dnull-co,cache=3Dinvalid_value # Test 142 checks the direct=3Don cases =20 for cache in writeback writethrough unsafe invalid_value; do - printf "info block %s\n" '' file backing backing-file | \ + printf '%s\n' "{ 'execute': 'query-block' }" "{ 'execute': 'query-name= d-block-nodes' }" | \ run_qemu -drive file=3D"$TEST_IMG",cache=3D$cache,backing.file.filenam= e=3D"$TEST_IMG.base",backing.cache.no-flush=3Don,backing.node-name=3Dbackin= g,backing.file.node-name=3Dbacking-file,file.node-name=3Dfile,if=3Dnone,id= =3D$device_id -nodefaults done =20 @@ -343,31 +346,56 @@ echo =20 $QEMU_IO -c "write -P 0x11 0 4k" "$TEST_IMG" | _filter_qemu_io =20 +qmp_write_22=3D"{ 'execute': 'x-qemu-io', 'arguments': { 'device': '$devic= e_id', 'command': 'write -P 0x22 0 4k' } }" =20 -echo "qemu-io $device_id \"write -P 0x22 0 4k\"" | run_qemu -drive file=3D= "$TEST_IMG",if=3Dnone,id=3D$device_id -snapshot | _filter_qemu_io -echo "qemu-io $device_id \"write -P 0x22 0 4k\"" | run_qemu -drive file=3D= "$TEST_IMG",snapshot=3Don,if=3Dnone,id=3D$device_id | _filter_qemu_io -echo "qemu-io $device_id \"write -P 0x22 0 4k\"" | run_qemu -drive file.fi= lename=3D"$TEST_IMG",driver=3Dqcow2,snapshot=3Don,if=3Dnone,id=3D$device_id\ +echo "$qmp_write_22" | run_qemu -drive file=3D"$TEST_IMG",if=3Dnone,id=3D$= device_id -snapshot | _filter_qemu_io +echo "$qmp_write_22" | run_qemu -drive file=3D"$TEST_IMG",snapshot=3Don,if= =3Dnone,id=3D$device_id | _filter_qemu_io +echo "$qmp_write_22" | run_qemu -drive file.filename=3D"$TEST_IMG",driver= =3Dqcow2,snapshot=3Don,if=3Dnone,id=3D$device_id\ | _filter_qemu_io -echo "qemu-io $device_id \"write -P 0x22 0 4k\"" | run_qemu -drive file.fi= lename=3D"$TEST_IMG",driver=3Dqcow2,if=3Dnone,id=3D$device_id -snapshot\ +echo "$qmp_write_22" | run_qemu -drive file.filename=3D"$TEST_IMG",driver= =3Dqcow2,if=3Dnone,id=3D$device_id -snapshot\ | _filter_qemu_io -echo "qemu-io $device_id \"write -P 0x22 0 4k\"" | run_qemu -drive file=3D= "file:$TEST_IMG",if=3Dnone,id=3D$device_id -snapshot | _filter_qemu_io -echo "qemu-io $device_id \"write -P 0x22 0 4k\"" | run_qemu -drive file=3D= "file:$TEST_IMG",snapshot=3Don,if=3Dnone,id=3D$device_id | _filter_qemu_io +echo "$qmp_write_22" | run_qemu -drive file=3D"file:$TEST_IMG",if=3Dnone,i= d=3D$device_id -snapshot | _filter_qemu_io +echo "$qmp_write_22" | run_qemu -drive file=3D"file:$TEST_IMG",snapshot=3D= on,if=3Dnone,id=3D$device_id | _filter_qemu_io =20 # Opening a read-only file r/w with snapshot=3Don chmod u-w "$TEST_IMG" -echo "qemu-io $device_id \"write -P 0x22 0 4k\"" | run_qemu -drive file=3D= "$TEST_IMG",if=3Dnone,id=3D$device_id -snapshot | _filter_qemu_io -echo "qemu-io $device_id \"write -P 0x22 0 4k\"" | run_qemu -drive file=3D= "$TEST_IMG",snapshot=3Don,if=3Dnone,id=3D$device_id | _filter_qemu_io +echo "$qmp_write_22" | run_qemu -drive file=3D"$TEST_IMG",if=3Dnone,id=3D$= device_id -snapshot | _filter_qemu_io +echo "$qmp_write_22" | run_qemu -drive file=3D"$TEST_IMG",snapshot=3Don,if= =3Dnone,id=3D$device_id | _filter_qemu_io chmod u+w "$TEST_IMG" =20 $QEMU_IO -c "read -P 0x11 0 4k" "$TEST_IMG" | _filter_qemu_io =20 -echo "qemu-io $device_id \"write -P 0x22 0 4k\"" | run_qemu -drive file=3D= "$TEST_IMG",snapshot=3Doff,if=3Dnone,id=3D$device_id | _filter_qemu_io +echo "$qmp_write_22" | run_qemu -drive file=3D"$TEST_IMG",snapshot=3Doff,i= f=3Dnone,id=3D$device_id | _filter_qemu_io =20 $QEMU_IO -c "read -P 0x22 0 4k" "$TEST_IMG" | _filter_qemu_io =20 -printf %b "qemu-io $device_id \"write -P 0x33 0 4k\"\ncommit $device_id\n"= | - run_qemu -drive file=3D"$TEST_IMG",snapshot=3Don,if=3Dnone,id=3D$devic= e_id | - _filter_qemu_io +echo "Testing: -drive file=3D$TEST_IMG,snapshot=3Don,if=3Dnone,id=3D$devic= e_id" | + _filter_testdir +_launch_qemu -drive file=3D"$TEST_IMG",snapshot=3Don,if=3Dnone,id=3D$devic= e_id +silent=3Dyes _send_qemu_cmd $QEMU_HANDLE \ + "{ 'execute': 'qmp_capabilities' }" \ + 'return' +_send_qemu_cmd $QEMU_HANDLE \ + "{ 'execute': 'x-qemu-io', 'arguments': { 'device': '$device_id', 'com= mand': 'write -P 0x33 0 4k' } }" \ + 'return' +qmp_commit=3D"{ 'execute': 'block-commit', 'arguments': { 'device': '$devi= ce_id', 'job-id': 'job0' } }" +echo "$qmp_commit" +silent=3Dyes _send_qemu_cmd $QEMU_HANDLE \ + "$qmp_commit" \ + 'return' +silent=3Dyes _timed_wait_for $QEMU_HANDLE '"ready"' +qmp_complete=3D"{ 'execute': 'block-job-complete', 'arguments': { 'device'= : 'job0' } }" +echo "$qmp_complete" +silent=3Dyes _send_qemu_cmd $QEMU_HANDLE \ + "$qmp_complete" \ + 'return' +silent=3Dyes _timed_wait_for $QEMU_HANDLE '"null"' +echo "block job completed" +silent=3Dyes _send_qemu_cmd $QEMU_HANDLE \ + "{ 'execute': 'quit' }" \ + 'return' +wait=3D1 _cleanup_qemu +echo =20 $QEMU_IO -c "read -P 0x33 0 4k" "$TEST_IMG" | _filter_qemu_io =20 @@ -380,10 +408,9 @@ TMPDIR=3D/nonexistent run_qemu -drive driver=3Dnull-co= ,snapshot=3Don | sed -e "s#'[^']*/vl\.[A-Za-z0-9]\{6\}'#SNAPSHOT_PATH#g" =20 # Using snapshot=3Don together with read-only=3Don -echo "info block" | +echo "{ 'execute': 'query-block' }" | run_qemu -drive file=3D"$TEST_IMG",snapshot=3Don,read-only=3Don,if=3Dn= one,id=3D$device_id | - _filter_qemu_io | - sed -e 's#"[^"]*/vl\.[A-Za-z0-9]\{6\}"#SNAPSHOT_PATH#g' + sed -e 's|/[^"[:space:]]*/vl\.[A-Za-z0-9]\{6\}|SNAPSHOT_PATH|g' =20 =20 # success, all done diff --git a/tests/qemu-iotests/051.out b/tests/qemu-iotests/051.out index d46215640506..30972e390e75 100644 --- a/tests/qemu-iotests/051.out +++ b/tests/qemu-iotests/051.out @@ -50,15 +50,15 @@ QEMU_PROG: -drive file=3DTEST_DIR/t.qcow2,driver=3Dqcow= 2,format=3Dqcow2: Cannot specif =3D=3D=3D Node names =3D=3D=3D =20 Testing: -drive file=3DTEST_DIR/t.qcow2,node-name=3Dx123456789012345678901= 234567890 -QEMU X.Y.Z monitor - type 'help' for more information -(qemu) quit +QMP_VERSION +{"timestamp": {"seconds": TIMESTAMP, "microseconds": TIMESTAMP}, "event"= : "SHUTDOWN", "data": {"guest": false, "reason": "host-qmp-quit"}} =20 Testing: -drive file=3DTEST_DIR/t.qcow2,node-name=3Dx123456789012345678901= 2345678901 QEMU_PROG: -drive file=3DTEST_DIR/t.qcow2,node-name=3Dx1234567890123456789= 012345678901: Node name too long =20 Testing: -drive file=3DTEST_DIR/t.qcow2,node-name=3DAll-Types.of_all0wed_c= hars -QEMU X.Y.Z monitor - type 'help' for more information -(qemu) quit +QMP_VERSION +{"timestamp": {"seconds": TIMESTAMP, "microseconds": TIMESTAMP}, "event"= : "SHUTDOWN", "data": {"guest": false, "reason": "host-qmp-quit"}} =20 Testing: -drive file=3DTEST_DIR/t.qcow2,node-name=3D123foo QEMU_PROG: -drive file=3DTEST_DIR/t.qcow2,node-name=3D123foo: Invalid node= -name: '123foo' @@ -73,20 +73,16 @@ QEMU_PROG: -drive file=3DTEST_DIR/t.qcow2,node-name=3Df= oo#12: Invalid node-name: 'fo =3D=3D=3D Device without drive =3D=3D=3D =20 Testing: -device virtio-scsi -device scsi-hd -QEMU X.Y.Z monitor - type 'help' for more information +QMP_VERSION QEMU_PROG: -device scsi-hd: drive property not set =20 =20 =3D=3D=3D Overriding backing file =3D=3D=3D =20 Testing: -drive file=3DTEST_DIR/t.qcow2,driver=3Dqcow2,backing.file.filena= me=3DTEST_DIR/t.qcow2.orig,if=3Dnone,id=3Ddrive0 -nodefaults -QEMU X.Y.Z monitor - type 'help' for more information -(qemu) info block -drive0 (NODE_NAME): json:{"backing": {"driver": "qcow2", "file": {"driver"= : "file", "filename": "TEST_DIR/t.qcow2.orig"}}, "driver": "qcow2", "file":= {"driver": "file", "filename": "TEST_DIR/t.qcow2"}} (qcow2) - Removable device: not locked, tray closed - Cache mode: writeback - Backing file: TEST_DIR/t.qcow2.orig (chain depth: 1) -(qemu) quit +QMP_VERSION +{"return": [{"device": "drive0", "locked": false, "removable": true, "inse= rted": {"iops_rd": 0, "detect_zeroes": "off", "active": true, "image": {"ba= cking-image": {"limits": {"write-zeroes-alignment": 65536, "request-alignme= nt": 1, "min-mem-alignment": 1, "discard-alignment": 65536, "opt-mem-alignm= ent": 4096, "max-iov": 1024}, "virtual-size": 134217728, "filename": "TEST_= DIR/t.qcow2.orig", "cluster-size": 65536, "format": "qcow2", "actual-size":= SIZE, "format-specific": {"type": "qcow2", "data": {"compat": "1.1", "comp= ression-type": "zlib", "lazy-refcounts": false, "refcount-bits": 16, "corru= pt": false, "extended-l2": false}}, "dirty-flag": false}, "limits": {"write= -zeroes-alignment": 65536, "request-alignment": 1, "min-mem-alignment": 1, = "discard-alignment": 65536, "opt-mem-alignment": 4096, "max-iov": 1024}, "b= acking-filename-format": "qcow2", "virtual-size": 134217728, "filename": "j= son:{\"backing\": {\"driver\": \"qcow2\", \"file\": {\"driver\": \"file\", = \"filename\": \"TEST_DI R/t.qcow2.orig\"}}, \"driver\": \"qcow2\", \"file\": {\"driver\": \"file\"= , \"filename\": \"TEST_DIR/t.qcow2\"}}", "cluster-size": 65536, "format": "= qcow2", "actual-size": SIZE, "format-specific": {"type": "qcow2", "data": {= "compat": "1.1", "compression-type": "zlib", "lazy-refcounts": false, "refc= ount-bits": 16, "corrupt": false, "extended-l2": false}}, "full-backing-fil= ename": "TEST_DIR/t.qcow2.base", "backing-filename": "TEST_DIR/t.qcow2.base= ", "dirty-flag": false}, "iops_wr": 0, "ro": false, "children": [{"node-nam= e": "NODE_NAME", "child": "backing"}, {"node-name": "NODE_NAME", "child": "= file"}], "node-name": "NODE_NAME", "backing_file_depth": 1, "drv": "qcow2",= "iops": 0, "bps_wr": 0, "write_threshold": 0, "backing_file": "TEST_DIR/t.= qcow2.orig", "encrypted": false, "bps": 0, "bps_rd": 0, "cache": {"no-flush= ": false, "direct": false, "writeback": true}, "file": "json:{\"backing\": = {\"driver\": \"qcow2\", \"file\": {\"driver\": \"file\", \"filename\": \"TE= ST_DIR/t.qcow2.orig\"}} , \"driver\": \"qcow2\", \"file\": {\"driver\": \"file\", \"filename\": \"= TEST_DIR/t.qcow2\"}}"}, "type": "unknown"}]} +{"timestamp": {"seconds": TIMESTAMP, "microseconds": TIMESTAMP}, "event"= : "SHUTDOWN", "data": {"guest": false, "reason": "host-qmp-quit"}} =20 Testing: -drive file=3DTEST_DIR/t.qcow2,driver=3Draw,backing.file.filename= =3DTEST_DIR/t.qcow2.orig QEMU_PROG: -drive file=3DTEST_DIR/t.qcow2,driver=3Draw,backing.file.filena= me=3DTEST_DIR/t.qcow2.orig: Driver doesn't support backing files @@ -102,12 +98,12 @@ QEMU_PROG: -drive file=3DTEST_DIR/t.qcow2,file.backing= .driver=3Dqcow2,file.backing.f =20 Formatting 'TEST_DIR/t.IMGFMT', fmt=3DIMGFMT size=3D134217728 Testing: -drive file=3DTEST_DIR/t.qcow2,format=3Dqcow2,lazy-refcounts=3Don -QEMU X.Y.Z monitor - type 'help' for more information -(qemu) quit +QMP_VERSION +{"timestamp": {"seconds": TIMESTAMP, "microseconds": TIMESTAMP}, "event"= : "SHUTDOWN", "data": {"guest": false, "reason": "host-qmp-quit"}} =20 Testing: -drive file=3DTEST_DIR/t.qcow2,format=3Dqcow2,lazy-refcounts=3Doff -QEMU X.Y.Z monitor - type 'help' for more information -(qemu) quit +QMP_VERSION +{"timestamp": {"seconds": TIMESTAMP, "microseconds": TIMESTAMP}, "event"= : "SHUTDOWN", "data": {"guest": false, "reason": "host-qmp-quit"}} =20 Testing: -drive file=3DTEST_DIR/t.qcow2,format=3Dqcow2,lazy-refcounts=3D QEMU_PROG: -drive file=3DTEST_DIR/t.qcow2,format=3Dqcow2,lazy-refcounts=3D= : Parameter 'lazy-refcounts' expects 'on' or 'off' @@ -126,14 +122,14 @@ Testing: -drive file=3DTEST_DIR/t.qcow2,format=3Dqcow= 2,lazy-refcounts=3Don QEMU_PROG: -drive file=3DTEST_DIR/t.qcow2,format=3Dqcow2,lazy-refcounts=3D= on: Lazy refcounts require a qcow2 image with at least qemu 1.1 compatibili= ty level =20 Testing: -drive file=3DTEST_DIR/t.qcow2,format=3Dqcow2,lazy-refcounts=3Doff -QEMU X.Y.Z monitor - type 'help' for more information -(qemu) quit +QMP_VERSION +{"timestamp": {"seconds": TIMESTAMP, "microseconds": TIMESTAMP}, "event"= : "SHUTDOWN", "data": {"guest": false, "reason": "host-qmp-quit"}} =20 =20 =3D=3D=3D No medium =3D=3D=3D =20 Testing: -drive if=3Dvirtio -QEMU X.Y.Z monitor - type 'help' for more information +QMP_VERSION QEMU_PROG: -drive if=3Dvirtio: Device needs media, but drive is empty =20 =20 @@ -143,94 +139,52 @@ QEMU_PROG: -drive if=3Dvirtio: Device needs media, bu= t drive is empty =3D=3D=3D Read-only =3D=3D=3D =20 Testing: -drive file=3DTEST_DIR/t.qcow2,if=3Dvirtio,readonly=3Don -QEMU X.Y.Z monitor - type 'help' for more information -(qemu) quit +QMP_VERSION +{"timestamp": {"seconds": TIMESTAMP, "microseconds": TIMESTAMP}, "event"= : "SHUTDOWN", "data": {"guest": false, "reason": "host-qmp-quit"}} =20 =20 =3D=3D=3D Cache modes =3D=3D=3D =20 Testing: -drive driver=3Dnull-co,read-zeroes=3Don,cache=3Dnone -QEMU X.Y.Z monitor - type 'help' for more information -(qemu) quit +QMP_VERSION +{"timestamp": {"seconds": TIMESTAMP, "microseconds": TIMESTAMP}, "event"= : "SHUTDOWN", "data": {"guest": false, "reason": "host-qmp-quit"}} =20 Testing: -drive driver=3Dnull-co,read-zeroes=3Don,cache=3Ddirectsync -QEMU X.Y.Z monitor - type 'help' for more information -(qemu) quit +QMP_VERSION +{"timestamp": {"seconds": TIMESTAMP, "microseconds": TIMESTAMP}, "event"= : "SHUTDOWN", "data": {"guest": false, "reason": "host-qmp-quit"}} =20 Testing: -drive driver=3Dnull-co,read-zeroes=3Don,cache=3Dwriteback -QEMU X.Y.Z monitor - type 'help' for more information -(qemu) quit +QMP_VERSION +{"timestamp": {"seconds": TIMESTAMP, "microseconds": TIMESTAMP}, "event"= : "SHUTDOWN", "data": {"guest": false, "reason": "host-qmp-quit"}} =20 Testing: -drive driver=3Dnull-co,read-zeroes=3Don,cache=3Dwritethrough -QEMU X.Y.Z monitor - type 'help' for more information -(qemu) quit +QMP_VERSION +{"timestamp": {"seconds": TIMESTAMP, "microseconds": TIMESTAMP}, "event"= : "SHUTDOWN", "data": {"guest": false, "reason": "host-qmp-quit"}} =20 Testing: -drive driver=3Dnull-co,read-zeroes=3Don,cache=3Dunsafe -QEMU X.Y.Z monitor - type 'help' for more information -(qemu) quit +QMP_VERSION +{"timestamp": {"seconds": TIMESTAMP, "microseconds": TIMESTAMP}, "event"= : "SHUTDOWN", "data": {"guest": false, "reason": "host-qmp-quit"}} =20 Testing: -drive driver=3Dnull-co,cache=3Dinvalid_value QEMU_PROG: -drive driver=3Dnull-co,cache=3Dinvalid_value: invalid cache op= tion =20 Testing: -drive file=3DTEST_DIR/t.qcow2,cache=3Dwriteback,backing.file.fil= ename=3DTEST_DIR/t.qcow2.base,backing.cache.no-flush=3Don,backing.node-name= =3Dbacking,backing.file.node-name=3Dbacking-file,file.node-name=3Dfile,if= =3Dnone,id=3Ddrive0 -nodefaults -QEMU X.Y.Z monitor - type 'help' for more information -(qemu) info block -drive0 (NODE_NAME): json:{"backing": {"driver": "qcow2", "file": {"driver"= : "file", "filename": "TEST_DIR/t.qcow2.base"}}, "driver": "qcow2", "file":= {"driver": "file", "filename": "TEST_DIR/t.qcow2"}} (qcow2) - Removable device: not locked, tray closed - Cache mode: writeback - Backing file: TEST_DIR/t.qcow2.base (chain depth: 1) -(qemu) info block file - -file: TEST_DIR/t.qcow2 (file) - Cache mode: writeback -(qemu) info block backing -backing: TEST_DIR/t.qcow2.base (qcow2, read-only) - Cache mode: writeback, ignore flushes -(qemu) info block backing-file - -backing-file: TEST_DIR/t.qcow2.base (file, read-only) - Cache mode: writeback, ignore flushes -(qemu) quit +QMP_VERSION +{"return": [{"device": "drive0", "locked": false, "removable": true, "inse= rted": {"iops_rd": 0, "detect_zeroes": "off", "active": true, "image": {"ba= cking-image": {"limits": {"write-zeroes-alignment": 65536, "request-alignme= nt": 1, "min-mem-alignment": 1, "discard-alignment": 65536, "opt-mem-alignm= ent": 4096, "max-iov": 1024}, "virtual-size": 134217728, "filename": "TEST_= DIR/t.qcow2.base", "cluster-size": 65536, "format": "qcow2", "actual-size":= SIZE, "format-specific": {"type": "qcow2", "data": {"compat": "1.1", "comp= ression-type": "zlib", "lazy-refcounts": false, "refcount-bits": 16, "corru= pt": false, "extended-l2": false}}, "dirty-flag": false}, "limits": {"write= -zeroes-alignment": 65536, "request-alignment": 1, "min-mem-alignment": 1, = "discard-alignment": 65536, "opt-mem-alignment": 4096, "max-iov": 1024}, "v= irtual-size": 134217728, "filename": "json:{\"backing\": {\"driver\": \"qco= w2\", \"file\": {\"driver\": \"file\", \"filename\": \"TEST_DIR/t.qcow2.bas= e\"}}, \"driver\": \"qc ow2\", \"file\": {\"driver\": \"file\", \"filename\": \"TEST_DIR/t.qcow2\"= }}", "cluster-size": 65536, "format": "qcow2", "actual-size": SIZE, "format= -specific": {"type": "qcow2", "data": {"compat": "0.10", "compression-type"= : "zlib", "refcount-bits": 16}}, "dirty-flag": false}, "iops_wr": 0, "ro": = false, "children": [{"node-name": "backing", "child": "backing"}, {"node-na= me": "file", "child": "file"}], "node-name": "NODE_NAME", "backing_file_dep= th": 1, "drv": "qcow2", "iops": 0, "bps_wr": 0, "write_threshold": 0, "back= ing_file": "TEST_DIR/t.qcow2.base", "encrypted": false, "bps": 0, "bps_rd":= 0, "cache": {"no-flush": false, "direct": false, "writeback": true}, "file= ": "json:{\"backing\": {\"driver\": \"qcow2\", \"file\": {\"driver\": \"fil= e\", \"filename\": \"TEST_DIR/t.qcow2.base\"}}, \"driver\": \"qcow2\", \"fi= le\": {\"driver\": \"file\", \"filename\": \"TEST_DIR/t.qcow2\"}}"}, "type"= : "unknown"}]} +{"return": [{"iops_rd": 0, "detect_zeroes": "off", "active": true, "image"= : {"limits": {"write-zeroes-alignment": 65536, "request-alignment": 1, "min= -mem-alignment": 1, "discard-alignment": 65536, "opt-mem-alignment": 4096, = "max-iov": 1024}, "virtual-size": 134217728, "filename": "TEST_DIR/t.qcow2.= base", "cluster-size": 65536, "format": "qcow2", "actual-size": SIZE, "form= at-specific": {"type": "qcow2", "data": {"compat": "1.1", "compression-type= ": "zlib", "lazy-refcounts": false, "refcount-bits": 16, "corrupt": false, = "extended-l2": false}}, "dirty-flag": false}, "iops_wr": 0, "ro": true, "ch= ildren": [{"node-name": "backing-file", "child": "file"}], "node-name": "ba= cking", "backing_file_depth": 0, "drv": "qcow2", "iops": 0, "bps_wr": 0, "w= rite_threshold": 0, "encrypted": false, "bps": 0, "bps_rd": 0, "cache": {"n= o-flush": true, "direct": false, "writeback": true}, "file": "TEST_DIR/t.qc= ow2.base"}, {"iops_rd": 0, "detect_zeroes": "off", "active": true, "image":= {"limits": {"request-a lignment": 1, "min-mem-alignment": 1, "opt-mem-alignment": 4096, "max-iov"= : 1024}, "virtual-size": 197120, "filename": "TEST_DIR/t.qcow2.base", "form= at": "file", "actual-size": SIZE, "format-specific": {"type": "file", "data= ": {}}, "dirty-flag": false}, "iops_wr": 0, "ro": true, "children": [], "no= de-name": "backing-file", "backing_file_depth": 0, "drv": "file", "iops": 0= , "bps_wr": 0, "write_threshold": 0, "encrypted": false, "bps": 0, "bps_rd"= : 0, "cache": {"no-flush": true, "direct": false, "writeback": true}, "file= ": "TEST_DIR/t.qcow2.base"}, {"iops_rd": 0, "detect_zeroes": "off", "active= ": true, "image": {"backing-image": {"limits": {"write-zeroes-alignment": 6= 5536, "request-alignment": 1, "min-mem-alignment": 1, "discard-alignment": = 65536, "opt-mem-alignment": 4096, "max-iov": 1024}, "virtual-size": 1342177= 28, "filename": "TEST_DIR/t.qcow2.base", "cluster-size": 65536, "format": "= qcow2", "actual-size": SIZE, "format-specific": {"type": "qcow2", "data": {= "compat": "1.1", "compr ession-type": "zlib", "lazy-refcounts": false, "refcount-bits": 16, "corru= pt": false, "extended-l2": false}}, "dirty-flag": false}, "limits": {"write= -zeroes-alignment": 65536, "request-alignment": 1, "min-mem-alignment": 1, = "discard-alignment": 65536, "opt-mem-alignment": 4096, "max-iov": 1024}, "v= irtual-size": 134217728, "filename": "json:{\"backing\": {\"driver\": \"qco= w2\", \"file\": {\"driver\": \"file\", \"filename\": \"TEST_DIR/t.qcow2.bas= e\"}}, \"driver\": \"qcow2\", \"file\": {\"driver\": \"file\", \"filename\"= : \"TEST_DIR/t.qcow2\"}}", "cluster-size": 65536, "format": "qcow2", "actua= l-size": SIZE, "format-specific": {"type": "qcow2", "data": {"compat": "0.1= 0", "compression-type": "zlib", "refcount-bits": 16}}, "dirty-flag": false}= , "iops_wr": 0, "ro": false, "children": [{"node-name": "backing", "child":= "backing"}, {"node-name": "file", "child": "file"}], "node-name": "NODE_NA= ME", "backing_file_depth": 1, "drv": "qcow2", "iops": 0, "bps_wr": 0, "writ= e_threshold": 0, "backi ng_file": "TEST_DIR/t.qcow2.base", "encrypted": false, "bps": 0, "bps_rd":= 0, "cache": {"no-flush": false, "direct": false, "writeback": true}, "file= ": "json:{\"backing\": {\"driver\": \"qcow2\", \"file\": {\"driver\": \"fil= e\", \"filename\": \"TEST_DIR/t.qcow2.base\"}}, \"driver\": \"qcow2\", \"fi= le\": {\"driver\": \"file\", \"filename\": \"TEST_DIR/t.qcow2\"}}"}, {"iops= _rd": 0, "detect_zeroes": "off", "active": true, "image": {"limits": {"requ= est-alignment": 1, "min-mem-alignment": 1, "opt-mem-alignment": 4096, "max-= iov": 1024}, "virtual-size": 197120, "filename": "TEST_DIR/t.qcow2", "forma= t": "file", "actual-size": SIZE, "format-specific": {"type": "file", "data"= : {}}, "dirty-flag": false}, "iops_wr": 0, "ro": false, "children": [], "no= de-name": "file", "backing_file_depth": 0, "drv": "file", "iops": 0, "bps_w= r": 0, "write_threshold": 0, "encrypted": false, "bps": 0, "bps_rd": 0, "ca= che": {"no-flush": false, "direct": false, "writeback": true}, "file": "TES= T_DIR/t.qcow2"}]} +{"timestamp": {"seconds": TIMESTAMP, "microseconds": TIMESTAMP}, "event"= : "SHUTDOWN", "data": {"guest": false, "reason": "host-qmp-quit"}} =20 Testing: -drive file=3DTEST_DIR/t.qcow2,cache=3Dwritethrough,backing.file.= filename=3DTEST_DIR/t.qcow2.base,backing.cache.no-flush=3Don,backing.node-n= ame=3Dbacking,backing.file.node-name=3Dbacking-file,file.node-name=3Dfile,i= f=3Dnone,id=3Ddrive0 -nodefaults -QEMU X.Y.Z monitor - type 'help' for more information -(qemu) info block -drive0 (NODE_NAME): json:{"backing": {"driver": "qcow2", "file": {"driver"= : "file", "filename": "TEST_DIR/t.qcow2.base"}}, "driver": "qcow2", "file":= {"driver": "file", "filename": "TEST_DIR/t.qcow2"}} (qcow2) - Removable device: not locked, tray closed - Cache mode: writethrough - Backing file: TEST_DIR/t.qcow2.base (chain depth: 1) -(qemu) info block file - -file: TEST_DIR/t.qcow2 (file) - Cache mode: writeback -(qemu) info block backing -backing: TEST_DIR/t.qcow2.base (qcow2, read-only) - Cache mode: writeback, ignore flushes -(qemu) info block backing-file - -backing-file: TEST_DIR/t.qcow2.base (file, read-only) - Cache mode: writeback, ignore flushes -(qemu) quit +QMP_VERSION +{"return": [{"device": "drive0", "locked": false, "removable": true, "inse= rted": {"iops_rd": 0, "detect_zeroes": "off", "active": true, "image": {"ba= cking-image": {"limits": {"write-zeroes-alignment": 65536, "request-alignme= nt": 1, "min-mem-alignment": 1, "discard-alignment": 65536, "opt-mem-alignm= ent": 4096, "max-iov": 1024}, "virtual-size": 134217728, "filename": "TEST_= DIR/t.qcow2.base", "cluster-size": 65536, "format": "qcow2", "actual-size":= SIZE, "format-specific": {"type": "qcow2", "data": {"compat": "1.1", "comp= ression-type": "zlib", "lazy-refcounts": false, "refcount-bits": 16, "corru= pt": false, "extended-l2": false}}, "dirty-flag": false}, "limits": {"write= -zeroes-alignment": 65536, "request-alignment": 1, "min-mem-alignment": 1, = "discard-alignment": 65536, "opt-mem-alignment": 4096, "max-iov": 1024}, "v= irtual-size": 134217728, "filename": "json:{\"backing\": {\"driver\": \"qco= w2\", \"file\": {\"driver\": \"file\", \"filename\": \"TEST_DIR/t.qcow2.bas= e\"}}, \"driver\": \"qc ow2\", \"file\": {\"driver\": \"file\", \"filename\": \"TEST_DIR/t.qcow2\"= }}", "cluster-size": 65536, "format": "qcow2", "actual-size": SIZE, "format= -specific": {"type": "qcow2", "data": {"compat": "0.10", "compression-type"= : "zlib", "refcount-bits": 16}}, "dirty-flag": false}, "iops_wr": 0, "ro": = false, "children": [{"node-name": "backing", "child": "backing"}, {"node-na= me": "file", "child": "file"}], "node-name": "NODE_NAME", "backing_file_dep= th": 1, "drv": "qcow2", "iops": 0, "bps_wr": 0, "write_threshold": 0, "back= ing_file": "TEST_DIR/t.qcow2.base", "encrypted": false, "bps": 0, "bps_rd":= 0, "cache": {"no-flush": false, "direct": false, "writeback": false}, "fil= e": "json:{\"backing\": {\"driver\": \"qcow2\", \"file\": {\"driver\": \"fi= le\", \"filename\": \"TEST_DIR/t.qcow2.base\"}}, \"driver\": \"qcow2\", \"f= ile\": {\"driver\": \"file\", \"filename\": \"TEST_DIR/t.qcow2\"}}"}, "type= ": "unknown"}]} +{"return": [{"iops_rd": 0, "detect_zeroes": "off", "active": true, "image"= : {"limits": {"write-zeroes-alignment": 65536, "request-alignment": 1, "min= -mem-alignment": 1, "discard-alignment": 65536, "opt-mem-alignment": 4096, = "max-iov": 1024}, "virtual-size": 134217728, "filename": "TEST_DIR/t.qcow2.= base", "cluster-size": 65536, "format": "qcow2", "actual-size": SIZE, "form= at-specific": {"type": "qcow2", "data": {"compat": "1.1", "compression-type= ": "zlib", "lazy-refcounts": false, "refcount-bits": 16, "corrupt": false, = "extended-l2": false}}, "dirty-flag": false}, "iops_wr": 0, "ro": true, "ch= ildren": [{"node-name": "backing-file", "child": "file"}], "node-name": "ba= cking", "backing_file_depth": 0, "drv": "qcow2", "iops": 0, "bps_wr": 0, "w= rite_threshold": 0, "encrypted": false, "bps": 0, "bps_rd": 0, "cache": {"n= o-flush": true, "direct": false, "writeback": true}, "file": "TEST_DIR/t.qc= ow2.base"}, {"iops_rd": 0, "detect_zeroes": "off", "active": true, "image":= {"limits": {"request-a lignment": 1, "min-mem-alignment": 1, "opt-mem-alignment": 4096, "max-iov"= : 1024}, "virtual-size": 197120, "filename": "TEST_DIR/t.qcow2.base", "form= at": "file", "actual-size": SIZE, "format-specific": {"type": "file", "data= ": {}}, "dirty-flag": false}, "iops_wr": 0, "ro": true, "children": [], "no= de-name": "backing-file", "backing_file_depth": 0, "drv": "file", "iops": 0= , "bps_wr": 0, "write_threshold": 0, "encrypted": false, "bps": 0, "bps_rd"= : 0, "cache": {"no-flush": true, "direct": false, "writeback": true}, "file= ": "TEST_DIR/t.qcow2.base"}, {"iops_rd": 0, "detect_zeroes": "off", "active= ": true, "image": {"backing-image": {"limits": {"write-zeroes-alignment": 6= 5536, "request-alignment": 1, "min-mem-alignment": 1, "discard-alignment": = 65536, "opt-mem-alignment": 4096, "max-iov": 1024}, "virtual-size": 1342177= 28, "filename": "TEST_DIR/t.qcow2.base", "cluster-size": 65536, "format": "= qcow2", "actual-size": SIZE, "format-specific": {"type": "qcow2", "data": {= "compat": "1.1", "compr ession-type": "zlib", "lazy-refcounts": false, "refcount-bits": 16, "corru= pt": false, "extended-l2": false}}, "dirty-flag": false}, "limits": {"write= -zeroes-alignment": 65536, "request-alignment": 1, "min-mem-alignment": 1, = "discard-alignment": 65536, "opt-mem-alignment": 4096, "max-iov": 1024}, "v= irtual-size": 134217728, "filename": "json:{\"backing\": {\"driver\": \"qco= w2\", \"file\": {\"driver\": \"file\", \"filename\": \"TEST_DIR/t.qcow2.bas= e\"}}, \"driver\": \"qcow2\", \"file\": {\"driver\": \"file\", \"filename\"= : \"TEST_DIR/t.qcow2\"}}", "cluster-size": 65536, "format": "qcow2", "actua= l-size": SIZE, "format-specific": {"type": "qcow2", "data": {"compat": "0.1= 0", "compression-type": "zlib", "refcount-bits": 16}}, "dirty-flag": false}= , "iops_wr": 0, "ro": false, "children": [{"node-name": "backing", "child":= "backing"}, {"node-name": "file", "child": "file"}], "node-name": "NODE_NA= ME", "backing_file_depth": 1, "drv": "qcow2", "iops": 0, "bps_wr": 0, "writ= e_threshold": 0, "backi ng_file": "TEST_DIR/t.qcow2.base", "encrypted": false, "bps": 0, "bps_rd":= 0, "cache": {"no-flush": false, "direct": false, "writeback": true}, "file= ": "json:{\"backing\": {\"driver\": \"qcow2\", \"file\": {\"driver\": \"fil= e\", \"filename\": \"TEST_DIR/t.qcow2.base\"}}, \"driver\": \"qcow2\", \"fi= le\": {\"driver\": \"file\", \"filename\": \"TEST_DIR/t.qcow2\"}}"}, {"iops= _rd": 0, "detect_zeroes": "off", "active": true, "image": {"limits": {"requ= est-alignment": 1, "min-mem-alignment": 1, "opt-mem-alignment": 4096, "max-= iov": 1024}, "virtual-size": 197120, "filename": "TEST_DIR/t.qcow2", "forma= t": "file", "actual-size": SIZE, "format-specific": {"type": "file", "data"= : {}}, "dirty-flag": false}, "iops_wr": 0, "ro": false, "children": [], "no= de-name": "file", "backing_file_depth": 0, "drv": "file", "iops": 0, "bps_w= r": 0, "write_threshold": 0, "encrypted": false, "bps": 0, "bps_rd": 0, "ca= che": {"no-flush": false, "direct": false, "writeback": true}, "file": "TES= T_DIR/t.qcow2"}]} +{"timestamp": {"seconds": TIMESTAMP, "microseconds": TIMESTAMP}, "event"= : "SHUTDOWN", "data": {"guest": false, "reason": "host-qmp-quit"}} =20 Testing: -drive file=3DTEST_DIR/t.qcow2,cache=3Dunsafe,backing.file.filena= me=3DTEST_DIR/t.qcow2.base,backing.cache.no-flush=3Don,backing.node-name=3D= backing,backing.file.node-name=3Dbacking-file,file.node-name=3Dfile,if=3Dno= ne,id=3Ddrive0 -nodefaults -QEMU X.Y.Z monitor - type 'help' for more information -(qemu) info block -drive0 (NODE_NAME): json:{"backing": {"driver": "qcow2", "file": {"driver"= : "file", "filename": "TEST_DIR/t.qcow2.base"}}, "driver": "qcow2", "file":= {"driver": "file", "filename": "TEST_DIR/t.qcow2"}} (qcow2) - Removable device: not locked, tray closed - Cache mode: writeback, ignore flushes - Backing file: TEST_DIR/t.qcow2.base (chain depth: 1) -(qemu) info block file - -file: TEST_DIR/t.qcow2 (file) - Cache mode: writeback, ignore flushes -(qemu) info block backing -backing: TEST_DIR/t.qcow2.base (qcow2, read-only) - Cache mode: writeback, ignore flushes -(qemu) info block backing-file - -backing-file: TEST_DIR/t.qcow2.base (file, read-only) - Cache mode: writeback, ignore flushes -(qemu) quit +QMP_VERSION +{"return": [{"device": "drive0", "locked": false, "removable": true, "inse= rted": {"iops_rd": 0, "detect_zeroes": "off", "active": true, "image": {"ba= cking-image": {"limits": {"write-zeroes-alignment": 65536, "request-alignme= nt": 1, "min-mem-alignment": 1, "discard-alignment": 65536, "opt-mem-alignm= ent": 4096, "max-iov": 1024}, "virtual-size": 134217728, "filename": "TEST_= DIR/t.qcow2.base", "cluster-size": 65536, "format": "qcow2", "actual-size":= SIZE, "format-specific": {"type": "qcow2", "data": {"compat": "1.1", "comp= ression-type": "zlib", "lazy-refcounts": false, "refcount-bits": 16, "corru= pt": false, "extended-l2": false}}, "dirty-flag": false}, "limits": {"write= -zeroes-alignment": 65536, "request-alignment": 1, "min-mem-alignment": 1, = "discard-alignment": 65536, "opt-mem-alignment": 4096, "max-iov": 1024}, "v= irtual-size": 134217728, "filename": "json:{\"backing\": {\"driver\": \"qco= w2\", \"file\": {\"driver\": \"file\", \"filename\": \"TEST_DIR/t.qcow2.bas= e\"}}, \"driver\": \"qc ow2\", \"file\": {\"driver\": \"file\", \"filename\": \"TEST_DIR/t.qcow2\"= }}", "cluster-size": 65536, "format": "qcow2", "actual-size": SIZE, "format= -specific": {"type": "qcow2", "data": {"compat": "0.10", "compression-type"= : "zlib", "refcount-bits": 16}}, "dirty-flag": false}, "iops_wr": 0, "ro": = false, "children": [{"node-name": "backing", "child": "backing"}, {"node-na= me": "file", "child": "file"}], "node-name": "NODE_NAME", "backing_file_dep= th": 1, "drv": "qcow2", "iops": 0, "bps_wr": 0, "write_threshold": 0, "back= ing_file": "TEST_DIR/t.qcow2.base", "encrypted": false, "bps": 0, "bps_rd":= 0, "cache": {"no-flush": true, "direct": false, "writeback": true}, "file"= : "json:{\"backing\": {\"driver\": \"qcow2\", \"file\": {\"driver\": \"file= \", \"filename\": \"TEST_DIR/t.qcow2.base\"}}, \"driver\": \"qcow2\", \"fil= e\": {\"driver\": \"file\", \"filename\": \"TEST_DIR/t.qcow2\"}}"}, "type":= "unknown"}]} +{"return": [{"iops_rd": 0, "detect_zeroes": "off", "active": true, "image"= : {"limits": {"write-zeroes-alignment": 65536, "request-alignment": 1, "min= -mem-alignment": 1, "discard-alignment": 65536, "opt-mem-alignment": 4096, = "max-iov": 1024}, "virtual-size": 134217728, "filename": "TEST_DIR/t.qcow2.= base", "cluster-size": 65536, "format": "qcow2", "actual-size": SIZE, "form= at-specific": {"type": "qcow2", "data": {"compat": "1.1", "compression-type= ": "zlib", "lazy-refcounts": false, "refcount-bits": 16, "corrupt": false, = "extended-l2": false}}, "dirty-flag": false}, "iops_wr": 0, "ro": true, "ch= ildren": [{"node-name": "backing-file", "child": "file"}], "node-name": "ba= cking", "backing_file_depth": 0, "drv": "qcow2", "iops": 0, "bps_wr": 0, "w= rite_threshold": 0, "encrypted": false, "bps": 0, "bps_rd": 0, "cache": {"n= o-flush": true, "direct": false, "writeback": true}, "file": "TEST_DIR/t.qc= ow2.base"}, {"iops_rd": 0, "detect_zeroes": "off", "active": true, "image":= {"limits": {"request-a lignment": 1, "min-mem-alignment": 1, "opt-mem-alignment": 4096, "max-iov"= : 1024}, "virtual-size": 197120, "filename": "TEST_DIR/t.qcow2.base", "form= at": "file", "actual-size": SIZE, "format-specific": {"type": "file", "data= ": {}}, "dirty-flag": false}, "iops_wr": 0, "ro": true, "children": [], "no= de-name": "backing-file", "backing_file_depth": 0, "drv": "file", "iops": 0= , "bps_wr": 0, "write_threshold": 0, "encrypted": false, "bps": 0, "bps_rd"= : 0, "cache": {"no-flush": true, "direct": false, "writeback": true}, "file= ": "TEST_DIR/t.qcow2.base"}, {"iops_rd": 0, "detect_zeroes": "off", "active= ": true, "image": {"backing-image": {"limits": {"write-zeroes-alignment": 6= 5536, "request-alignment": 1, "min-mem-alignment": 1, "discard-alignment": = 65536, "opt-mem-alignment": 4096, "max-iov": 1024}, "virtual-size": 1342177= 28, "filename": "TEST_DIR/t.qcow2.base", "cluster-size": 65536, "format": "= qcow2", "actual-size": SIZE, "format-specific": {"type": "qcow2", "data": {= "compat": "1.1", "compr ession-type": "zlib", "lazy-refcounts": false, "refcount-bits": 16, "corru= pt": false, "extended-l2": false}}, "dirty-flag": false}, "limits": {"write= -zeroes-alignment": 65536, "request-alignment": 1, "min-mem-alignment": 1, = "discard-alignment": 65536, "opt-mem-alignment": 4096, "max-iov": 1024}, "v= irtual-size": 134217728, "filename": "json:{\"backing\": {\"driver\": \"qco= w2\", \"file\": {\"driver\": \"file\", \"filename\": \"TEST_DIR/t.qcow2.bas= e\"}}, \"driver\": \"qcow2\", \"file\": {\"driver\": \"file\", \"filename\"= : \"TEST_DIR/t.qcow2\"}}", "cluster-size": 65536, "format": "qcow2", "actua= l-size": SIZE, "format-specific": {"type": "qcow2", "data": {"compat": "0.1= 0", "compression-type": "zlib", "refcount-bits": 16}}, "dirty-flag": false}= , "iops_wr": 0, "ro": false, "children": [{"node-name": "backing", "child":= "backing"}, {"node-name": "file", "child": "file"}], "node-name": "NODE_NA= ME", "backing_file_depth": 1, "drv": "qcow2", "iops": 0, "bps_wr": 0, "writ= e_threshold": 0, "backi ng_file": "TEST_DIR/t.qcow2.base", "encrypted": false, "bps": 0, "bps_rd":= 0, "cache": {"no-flush": true, "direct": false, "writeback": true}, "file"= : "json:{\"backing\": {\"driver\": \"qcow2\", \"file\": {\"driver\": \"file= \", \"filename\": \"TEST_DIR/t.qcow2.base\"}}, \"driver\": \"qcow2\", \"fil= e\": {\"driver\": \"file\", \"filename\": \"TEST_DIR/t.qcow2\"}}"}, {"iops_= rd": 0, "detect_zeroes": "off", "active": true, "image": {"limits": {"reque= st-alignment": 1, "min-mem-alignment": 1, "opt-mem-alignment": 4096, "max-i= ov": 1024}, "virtual-size": 197120, "filename": "TEST_DIR/t.qcow2", "format= ": "file", "actual-size": SIZE, "format-specific": {"type": "file", "data":= {}}, "dirty-flag": false}, "iops_wr": 0, "ro": false, "children": [], "nod= e-name": "file", "backing_file_depth": 0, "drv": "file", "iops": 0, "bps_wr= ": 0, "write_threshold": 0, "encrypted": false, "bps": 0, "bps_rd": 0, "cac= he": {"no-flush": true, "direct": false, "writeback": true}, "file": "TEST_= DIR/t.qcow2"}]} +{"timestamp": {"seconds": TIMESTAMP, "microseconds": TIMESTAMP}, "event"= : "SHUTDOWN", "data": {"guest": false, "reason": "host-qmp-quit"}} =20 Testing: -drive file=3DTEST_DIR/t.qcow2,cache=3Dinvalid_value,backing.file= .filename=3DTEST_DIR/t.qcow2.base,backing.cache.no-flush=3Don,backing.node-= name=3Dbacking,backing.file.node-name=3Dbacking-file,file.node-name=3Dfile,= if=3Dnone,id=3Ddrive0 -nodefaults QEMU_PROG: -drive file=3DTEST_DIR/t.qcow2,cache=3Dinvalid_value,backing.fi= le.filename=3DTEST_DIR/t.qcow2.base,backing.cache.no-flush=3Don,backing.nod= e-name=3Dbacking,backing.file.node-name=3Dbacking-file,file.node-name=3Dfil= e,if=3Dnone,id=3Ddrive0: invalid cache option @@ -239,8 +193,8 @@ QEMU_PROG: -drive file=3DTEST_DIR/t.qcow2,cache=3Dinval= id_value,backing.file.filenam =3D=3D=3D Specifying the protocol layer =3D=3D=3D =20 Testing: -drive file=3DTEST_DIR/t.qcow2,file.driver=3Dfile -QEMU X.Y.Z monitor - type 'help' for more information -(qemu) quit +QMP_VERSION +{"timestamp": {"seconds": TIMESTAMP, "microseconds": TIMESTAMP}, "event"= : "SHUTDOWN", "data": {"guest": false, "reason": "host-qmp-quit"}} =20 =20 =3D=3D=3D Leaving out required options =3D=3D=3D @@ -336,16 +290,16 @@ Testing: -drive file=3DTEST_DIR/t.qcow2,throttling.bp= s-total=3D-5 QEMU_PROG: -drive file=3DTEST_DIR/t.qcow2,throttling.bps-total=3D-5: bps/i= ops/max values must be within [0, 1000000000000000] =20 Testing: -drive file=3DTEST_DIR/t.qcow2,bps=3D0 -QEMU X.Y.Z monitor - type 'help' for more information -(qemu) quit +QMP_VERSION +{"timestamp": {"seconds": TIMESTAMP, "microseconds": TIMESTAMP}, "event"= : "SHUTDOWN", "data": {"guest": false, "reason": "host-qmp-quit"}} =20 Testing: -drive file=3DTEST_DIR/t.qcow2,bps=3D1 -QEMU X.Y.Z monitor - type 'help' for more information -(qemu) quit +QMP_VERSION +{"timestamp": {"seconds": TIMESTAMP, "microseconds": TIMESTAMP}, "event"= : "SHUTDOWN", "data": {"guest": false, "reason": "host-qmp-quit"}} =20 Testing: -drive file=3DTEST_DIR/t.qcow2,bps=3D1000000000000000 -QEMU X.Y.Z monitor - type 'help' for more information -(qemu) quit +QMP_VERSION +{"timestamp": {"seconds": TIMESTAMP, "microseconds": TIMESTAMP}, "event"= : "SHUTDOWN", "data": {"guest": false, "reason": "host-qmp-quit"}} =20 Testing: -drive file=3DTEST_DIR/t.qcow2,bps=3D1000000000000001 QEMU_PROG: -drive file=3DTEST_DIR/t.qcow2,bps=3D1000000000000001: bps/iops= /max values must be within [0, 1000000000000000] @@ -366,12 +320,12 @@ Testing: -drive file.filename=3Dfoo:bar QEMU_PROG: -drive file.filename=3Dfoo:bar: Could not open 'foo:bar': No su= ch file or directory =20 Testing: -hda file:TEST_DIR/t.qcow2 -QEMU X.Y.Z monitor - type 'help' for more information -(qemu) quit +QMP_VERSION +{"timestamp": {"seconds": TIMESTAMP, "microseconds": TIMESTAMP}, "event"= : "SHUTDOWN", "data": {"guest": false, "reason": "host-qmp-quit"}} =20 Testing: -drive file=3Dfile:TEST_DIR/t.qcow2 -QEMU X.Y.Z monitor - type 'help' for more information -(qemu) quit +QMP_VERSION +{"timestamp": {"seconds": TIMESTAMP, "microseconds": TIMESTAMP}, "event"= : "SHUTDOWN", "data": {"guest": false, "reason": "host-qmp-quit"}} =20 Testing: -drive file.filename=3Dfile:TEST_DIR/t.qcow2 QEMU_PROG: -drive file.filename=3Dfile:TEST_DIR/t.qcow2: Could not open 'f= ile:TEST_DIR/t.qcow2': No such file or directory @@ -382,79 +336,60 @@ QEMU_PROG: -drive file.filename=3Dfile:TEST_DIR/t.qco= w2: Could not open 'file:TEST wrote 4096/4096 bytes at offset 0 4 KiB, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec) Testing: -drive file=3DTEST_DIR/t.qcow2,if=3Dnone,id=3Ddrive0 -snapshot -QEMU X.Y.Z monitor - type 'help' for more information -(qemu) qemu-io drive0 "write -P 0x22 0 4k" -wrote 4096/4096 bytes at offset 0 -4 KiB, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec) -(qemu) quit +QMP_VERSION +{"return": {"human-readable-text": "wrote 4096/4096 bytes at offset 0\n4 K= iB, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec)\n"}} +{"timestamp": {"seconds": TIMESTAMP, "microseconds": TIMESTAMP}, "event"= : "SHUTDOWN", "data": {"guest": false, "reason": "host-qmp-quit"}} =20 Testing: -drive file=3DTEST_DIR/t.qcow2,snapshot=3Don,if=3Dnone,id=3Ddrive0 -QEMU X.Y.Z monitor - type 'help' for more information -(qemu) qemu-io drive0 "write -P 0x22 0 4k" -wrote 4096/4096 bytes at offset 0 -4 KiB, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec) -(qemu) quit +QMP_VERSION +{"return": {"human-readable-text": "wrote 4096/4096 bytes at offset 0\n4 K= iB, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec)\n"}} +{"timestamp": {"seconds": TIMESTAMP, "microseconds": TIMESTAMP}, "event"= : "SHUTDOWN", "data": {"guest": false, "reason": "host-qmp-quit"}} =20 Testing: -drive file.filename=3DTEST_DIR/t.qcow2,driver=3Dqcow2,snapshot= =3Don,if=3Dnone,id=3Ddrive0 -QEMU X.Y.Z monitor - type 'help' for more information -(qemu) qemu-io drive0 "write -P 0x22 0 4k" -wrote 4096/4096 bytes at offset 0 -4 KiB, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec) -(qemu) quit +QMP_VERSION +{"return": {"human-readable-text": "wrote 4096/4096 bytes at offset 0\n4 K= iB, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec)\n"}} +{"timestamp": {"seconds": TIMESTAMP, "microseconds": TIMESTAMP}, "event"= : "SHUTDOWN", "data": {"guest": false, "reason": "host-qmp-quit"}} =20 Testing: -drive file.filename=3DTEST_DIR/t.qcow2,driver=3Dqcow2,if=3Dnone,= id=3Ddrive0 -snapshot -QEMU X.Y.Z monitor - type 'help' for more information -(qemu) qemu-io drive0 "write -P 0x22 0 4k" -wrote 4096/4096 bytes at offset 0 -4 KiB, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec) -(qemu) quit +QMP_VERSION +{"return": {"human-readable-text": "wrote 4096/4096 bytes at offset 0\n4 K= iB, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec)\n"}} +{"timestamp": {"seconds": TIMESTAMP, "microseconds": TIMESTAMP}, "event"= : "SHUTDOWN", "data": {"guest": false, "reason": "host-qmp-quit"}} =20 Testing: -drive file=3Dfile:TEST_DIR/t.qcow2,if=3Dnone,id=3Ddrive0 -snapsh= ot -QEMU X.Y.Z monitor - type 'help' for more information -(qemu) qemu-io drive0 "write -P 0x22 0 4k" -wrote 4096/4096 bytes at offset 0 -4 KiB, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec) -(qemu) quit +QMP_VERSION +{"return": {"human-readable-text": "wrote 4096/4096 bytes at offset 0\n4 K= iB, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec)\n"}} +{"timestamp": {"seconds": TIMESTAMP, "microseconds": TIMESTAMP}, "event"= : "SHUTDOWN", "data": {"guest": false, "reason": "host-qmp-quit"}} =20 Testing: -drive file=3Dfile:TEST_DIR/t.qcow2,snapshot=3Don,if=3Dnone,id=3D= drive0 -QEMU X.Y.Z monitor - type 'help' for more information -(qemu) qemu-io drive0 "write -P 0x22 0 4k" -wrote 4096/4096 bytes at offset 0 -4 KiB, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec) -(qemu) quit +QMP_VERSION +{"return": {"human-readable-text": "wrote 4096/4096 bytes at offset 0\n4 K= iB, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec)\n"}} +{"timestamp": {"seconds": TIMESTAMP, "microseconds": TIMESTAMP}, "event"= : "SHUTDOWN", "data": {"guest": false, "reason": "host-qmp-quit"}} =20 Testing: -drive file=3DTEST_DIR/t.qcow2,if=3Dnone,id=3Ddrive0 -snapshot -QEMU X.Y.Z monitor - type 'help' for more information -(qemu) qemu-io drive0 "write -P 0x22 0 4k" -wrote 4096/4096 bytes at offset 0 -4 KiB, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec) -(qemu) quit +QMP_VERSION +{"return": {"human-readable-text": "wrote 4096/4096 bytes at offset 0\n4 K= iB, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec)\n"}} +{"timestamp": {"seconds": TIMESTAMP, "microseconds": TIMESTAMP}, "event"= : "SHUTDOWN", "data": {"guest": false, "reason": "host-qmp-quit"}} =20 Testing: -drive file=3DTEST_DIR/t.qcow2,snapshot=3Don,if=3Dnone,id=3Ddrive0 -QEMU X.Y.Z monitor - type 'help' for more information -(qemu) qemu-io drive0 "write -P 0x22 0 4k" -wrote 4096/4096 bytes at offset 0 -4 KiB, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec) -(qemu) quit +QMP_VERSION +{"return": {"human-readable-text": "wrote 4096/4096 bytes at offset 0\n4 K= iB, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec)\n"}} +{"timestamp": {"seconds": TIMESTAMP, "microseconds": TIMESTAMP}, "event"= : "SHUTDOWN", "data": {"guest": false, "reason": "host-qmp-quit"}} =20 read 4096/4096 bytes at offset 0 4 KiB, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec) Testing: -drive file=3DTEST_DIR/t.qcow2,snapshot=3Doff,if=3Dnone,id=3Ddriv= e0 -QEMU X.Y.Z monitor - type 'help' for more information -(qemu) qemu-io drive0 "write -P 0x22 0 4k" -wrote 4096/4096 bytes at offset 0 -4 KiB, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec) -(qemu) quit +QMP_VERSION +{"return": {"human-readable-text": "wrote 4096/4096 bytes at offset 0\n4 K= iB, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec)\n"}} +{"timestamp": {"seconds": TIMESTAMP, "microseconds": TIMESTAMP}, "event"= : "SHUTDOWN", "data": {"guest": false, "reason": "host-qmp-quit"}} =20 read 4096/4096 bytes at offset 0 4 KiB, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec) Testing: -drive file=3DTEST_DIR/t.qcow2,snapshot=3Don,if=3Dnone,id=3Ddrive0 -QEMU X.Y.Z monitor - type 'help' for more information -(qemu) qemu-io drive0 "write -P 0x33 0 4k" -wrote 4096/4096 bytes at offset 0 -4 KiB, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec) -(qemu) commit drive0 -(qemu) quit +{ 'execute': 'x-qemu-io', 'arguments': { 'device': 'drive0', 'command': 'w= rite -P 0x33 0 4k' } } +{"return": {"human-readable-text": "wrote 4096/4096 bytes at offset 0\n4 K= iB, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec)\n"}} +{ 'execute': 'block-commit', 'arguments': { 'device': 'drive0', 'job-id': = 'job0' } } +{ 'execute': 'block-job-complete', 'arguments': { 'device': 'job0' } } +block job completed =20 read 4096/4096 bytes at offset 0 4 KiB, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec) @@ -462,12 +397,8 @@ Testing: -drive driver=3Dnull-co,snapshot=3Don QEMU_PROG: -drive driver=3Dnull-co,snapshot=3Don: Could not open temporary= file SNAPSHOT_PATH: No such file or directory =20 Testing: -drive file=3DTEST_DIR/t.qcow2,snapshot=3Don,read-only=3Don,if=3D= none,id=3Ddrive0 -QEMU X.Y.Z monitor - type 'help' for more information -(qemu) info block -drive0 (NODE_NAME): json:{"backing": {"driver": "qcow2", "file": {"driver"= : "file", "filename": "TEST_DIR/t.qcow2"}}, "driver": "qcow2", "file": {"dr= iver": "file", "filename": SNAPSHOT_PATH}} (qcow2, read-only) - Removable device: not locked, tray closed - Cache mode: writeback, ignore flushes - Backing file: TEST_DIR/t.qcow2 (chain depth: 1) -(qemu) quit +QMP_VERSION +{"return": [{"device": "drive0", "locked": false, "removable": true, "inse= rted": {"iops_rd": 0, "detect_zeroes": "off", "active": true, "image": {"ba= cking-image": {"limits": {"write-zeroes-alignment": 65536, "request-alignme= nt": 1, "min-mem-alignment": 1, "discard-alignment": 65536, "opt-mem-alignm= ent": 4096, "max-iov": 1024}, "virtual-size": 134217728, "filename": "TEST_= DIR/t.qcow2", "cluster-size": 65536, "format": "qcow2", "actual-size": SIZE= , "format-specific": {"type": "qcow2", "data": {"compat": "0.10", "compress= ion-type": "zlib", "refcount-bits": 16}}, "dirty-flag": false}, "limits": {= "write-zeroes-alignment": 65536, "request-alignment": 1, "min-mem-alignment= ": 1, "discard-alignment": 65536, "opt-mem-alignment": 4096, "max-iov": 102= 4}, "virtual-size": 134217728, "filename": "json:{\"backing\": {\"driver\":= \"qcow2\", \"file\": {\"driver\": \"file\", \"filename\": \"TEST_DIR/t.qco= w2\"}}, \"driver\": \"qcow2\", \"file\": {\"driver\": \"file\", \"filename\= ": \"SNAPSHOT_PATH\"}}" , "cluster-size": 65536, "format": "qcow2", "actual-size": SIZE, "format-s= pecific": {"type": "qcow2", "data": {"compat": "1.1", "compression-type": "= zlib", "lazy-refcounts": false, "refcount-bits": 16, "corrupt": false, "ext= ended-l2": false}}, "dirty-flag": false}, "iops_wr": 0, "ro": true, "childr= en": [{"node-name": "NODE_NAME", "child": "backing"}, {"node-name": "NODE_N= AME", "child": "file"}], "node-name": "NODE_NAME", "backing_file_depth": 1,= "drv": "qcow2", "iops": 0, "bps_wr": 0, "write_threshold": 0, "backing_fil= e": "TEST_DIR/t.qcow2", "encrypted": false, "bps": 0, "bps_rd": 0, "cache":= {"no-flush": true, "direct": false, "writeback": true}, "file": "json:{\"b= acking\": {\"driver\": \"qcow2\", \"file\": {\"driver\": \"file\", \"filena= me\": \"TEST_DIR/t.qcow2\"}}, \"driver\": \"qcow2\", \"file\": {\"driver\":= \"file\", \"filename\": \"SNAPSHOT_PATH\"}}"}, "type": "unknown"}]} +{"timestamp": {"seconds": TIMESTAMP, "microseconds": TIMESTAMP}, "event"= : "SHUTDOWN", "data": {"guest": false, "reason": "host-qmp-quit"}} =20 *** done diff --git a/tests/qemu-iotests/051.pc.out b/tests/qemu-iotests/051.pc.out index f19b532eb9b6..7348aad4d464 100644 --- a/tests/qemu-iotests/051.pc.out +++ b/tests/qemu-iotests/051.pc.out @@ -50,15 +50,15 @@ QEMU_PROG: -drive file=3DTEST_DIR/t.qcow2,driver=3Dqcow= 2,format=3Dqcow2: Cannot specif =3D=3D=3D Node names =3D=3D=3D =20 Testing: -drive file=3DTEST_DIR/t.qcow2,node-name=3Dx123456789012345678901= 234567890 -QEMU X.Y.Z monitor - type 'help' for more information -(qemu) quit +QMP_VERSION +{"timestamp": {"seconds": TIMESTAMP, "microseconds": TIMESTAMP}, "event"= : "SHUTDOWN", "data": {"guest": false, "reason": "host-qmp-quit"}} =20 Testing: -drive file=3DTEST_DIR/t.qcow2,node-name=3Dx123456789012345678901= 2345678901 QEMU_PROG: -drive file=3DTEST_DIR/t.qcow2,node-name=3Dx1234567890123456789= 012345678901: Node name too long =20 Testing: -drive file=3DTEST_DIR/t.qcow2,node-name=3DAll-Types.of_all0wed_c= hars -QEMU X.Y.Z monitor - type 'help' for more information -(qemu) quit +QMP_VERSION +{"timestamp": {"seconds": TIMESTAMP, "microseconds": TIMESTAMP}, "event"= : "SHUTDOWN", "data": {"guest": false, "reason": "host-qmp-quit"}} =20 Testing: -drive file=3DTEST_DIR/t.qcow2,node-name=3D123foo QEMU_PROG: -drive file=3DTEST_DIR/t.qcow2,node-name=3D123foo: Invalid node= -name: '123foo' @@ -73,20 +73,16 @@ QEMU_PROG: -drive file=3DTEST_DIR/t.qcow2,node-name=3Df= oo#12: Invalid node-name: 'fo =3D=3D=3D Device without drive =3D=3D=3D =20 Testing: -device virtio-scsi -device scsi-hd -QEMU X.Y.Z monitor - type 'help' for more information +QMP_VERSION QEMU_PROG: -device scsi-hd: drive property not set =20 =20 =3D=3D=3D Overriding backing file =3D=3D=3D =20 Testing: -drive file=3DTEST_DIR/t.qcow2,driver=3Dqcow2,backing.file.filena= me=3DTEST_DIR/t.qcow2.orig,if=3Dnone,id=3Ddrive0 -nodefaults -QEMU X.Y.Z monitor - type 'help' for more information -(qemu) info block -drive0 (NODE_NAME): json:{"backing": {"driver": "qcow2", "file": {"driver"= : "file", "filename": "TEST_DIR/t.qcow2.orig"}}, "driver": "qcow2", "file":= {"driver": "file", "filename": "TEST_DIR/t.qcow2"}} (qcow2) - Removable device: not locked, tray closed - Cache mode: writeback - Backing file: TEST_DIR/t.qcow2.orig (chain depth: 1) -(qemu) quit +QMP_VERSION +{"return": [{"device": "drive0", "locked": false, "removable": true, "inse= rted": {"iops_rd": 0, "detect_zeroes": "off", "active": true, "image": {"ba= cking-image": {"limits": {"write-zeroes-alignment": 65536, "request-alignme= nt": 1, "min-mem-alignment": 1, "discard-alignment": 65536, "opt-mem-alignm= ent": 4096, "max-iov": 1024}, "virtual-size": 134217728, "filename": "TEST_= DIR/t.qcow2.orig", "cluster-size": 65536, "format": "qcow2", "actual-size":= SIZE, "format-specific": {"type": "qcow2", "data": {"compat": "1.1", "comp= ression-type": "zlib", "lazy-refcounts": false, "refcount-bits": 16, "corru= pt": false, "extended-l2": false}}, "dirty-flag": false}, "limits": {"write= -zeroes-alignment": 65536, "request-alignment": 1, "min-mem-alignment": 1, = "discard-alignment": 65536, "opt-mem-alignment": 4096, "max-iov": 1024}, "b= acking-filename-format": "qcow2", "virtual-size": 134217728, "filename": "j= son:{\"backing\": {\"driver\": \"qcow2\", \"file\": {\"driver\": \"file\", = \"filename\": \"TEST_DI R/t.qcow2.orig\"}}, \"driver\": \"qcow2\", \"file\": {\"driver\": \"file\"= , \"filename\": \"TEST_DIR/t.qcow2\"}}", "cluster-size": 65536, "format": "= qcow2", "actual-size": SIZE, "format-specific": {"type": "qcow2", "data": {= "compat": "1.1", "compression-type": "zlib", "lazy-refcounts": false, "refc= ount-bits": 16, "corrupt": false, "extended-l2": false}}, "full-backing-fil= ename": "TEST_DIR/t.qcow2.base", "backing-filename": "TEST_DIR/t.qcow2.base= ", "dirty-flag": false}, "iops_wr": 0, "ro": false, "children": [{"node-nam= e": "NODE_NAME", "child": "backing"}, {"node-name": "NODE_NAME", "child": "= file"}], "node-name": "NODE_NAME", "backing_file_depth": 1, "drv": "qcow2",= "iops": 0, "bps_wr": 0, "write_threshold": 0, "backing_file": "TEST_DIR/t.= qcow2.orig", "encrypted": false, "bps": 0, "bps_rd": 0, "cache": {"no-flush= ": false, "direct": false, "writeback": true}, "file": "json:{\"backing\": = {\"driver\": \"qcow2\", \"file\": {\"driver\": \"file\", \"filename\": \"TE= ST_DIR/t.qcow2.orig\"}} , \"driver\": \"qcow2\", \"file\": {\"driver\": \"file\", \"filename\": \"= TEST_DIR/t.qcow2\"}}"}, "type": "unknown"}]} +{"timestamp": {"seconds": TIMESTAMP, "microseconds": TIMESTAMP}, "event"= : "SHUTDOWN", "data": {"guest": false, "reason": "host-qmp-quit"}} =20 Testing: -drive file=3DTEST_DIR/t.qcow2,driver=3Draw,backing.file.filename= =3DTEST_DIR/t.qcow2.orig QEMU_PROG: -drive file=3DTEST_DIR/t.qcow2,driver=3Draw,backing.file.filena= me=3DTEST_DIR/t.qcow2.orig: Driver doesn't support backing files @@ -102,12 +98,12 @@ QEMU_PROG: -drive file=3DTEST_DIR/t.qcow2,file.backing= .driver=3Dqcow2,file.backing.f =20 Formatting 'TEST_DIR/t.IMGFMT', fmt=3DIMGFMT size=3D134217728 Testing: -drive file=3DTEST_DIR/t.qcow2,format=3Dqcow2,lazy-refcounts=3Don -QEMU X.Y.Z monitor - type 'help' for more information -(qemu) quit +QMP_VERSION +{"timestamp": {"seconds": TIMESTAMP, "microseconds": TIMESTAMP}, "event"= : "SHUTDOWN", "data": {"guest": false, "reason": "host-qmp-quit"}} =20 Testing: -drive file=3DTEST_DIR/t.qcow2,format=3Dqcow2,lazy-refcounts=3Doff -QEMU X.Y.Z monitor - type 'help' for more information -(qemu) quit +QMP_VERSION +{"timestamp": {"seconds": TIMESTAMP, "microseconds": TIMESTAMP}, "event"= : "SHUTDOWN", "data": {"guest": false, "reason": "host-qmp-quit"}} =20 Testing: -drive file=3DTEST_DIR/t.qcow2,format=3Dqcow2,lazy-refcounts=3D QEMU_PROG: -drive file=3DTEST_DIR/t.qcow2,format=3Dqcow2,lazy-refcounts=3D= : Parameter 'lazy-refcounts' expects 'on' or 'off' @@ -126,191 +122,149 @@ Testing: -drive file=3DTEST_DIR/t.qcow2,format=3Dqc= ow2,lazy-refcounts=3Don QEMU_PROG: -drive file=3DTEST_DIR/t.qcow2,format=3Dqcow2,lazy-refcounts=3D= on: Lazy refcounts require a qcow2 image with at least qemu 1.1 compatibili= ty level =20 Testing: -drive file=3DTEST_DIR/t.qcow2,format=3Dqcow2,lazy-refcounts=3Doff -QEMU X.Y.Z monitor - type 'help' for more information -(qemu) quit +QMP_VERSION +{"timestamp": {"seconds": TIMESTAMP, "microseconds": TIMESTAMP}, "event"= : "SHUTDOWN", "data": {"guest": false, "reason": "host-qmp-quit"}} =20 =20 =3D=3D=3D No medium =3D=3D=3D =20 Testing: -drive if=3Dfloppy -QEMU X.Y.Z monitor - type 'help' for more information -(qemu) quit +QMP_VERSION +{"timestamp": {"seconds": TIMESTAMP, "microseconds": TIMESTAMP}, "event"= : "SHUTDOWN", "data": {"guest": false, "reason": "host-qmp-quit"}} =20 Testing: -drive if=3Dide,media=3Dcdrom -QEMU X.Y.Z monitor - type 'help' for more information -(qemu) quit +QMP_VERSION +{"timestamp": {"seconds": TIMESTAMP, "microseconds": TIMESTAMP}, "event"= : "SHUTDOWN", "data": {"guest": false, "reason": "host-qmp-quit"}} =20 Testing: -drive if=3Dide -QEMU X.Y.Z monitor - type 'help' for more information +QMP_VERSION QEMU_PROG: Device needs media, but drive is empty =20 Testing: -drive if=3Dvirtio -QEMU X.Y.Z monitor - type 'help' for more information +QMP_VERSION QEMU_PROG: -drive if=3Dvirtio: Device needs media, but drive is empty =20 Testing: -drive if=3Dnone,id=3Ddisk -device ide-cd,drive=3Ddisk -QEMU X.Y.Z monitor - type 'help' for more information -(qemu) quit +QMP_VERSION +{"timestamp": {"seconds": TIMESTAMP, "microseconds": TIMESTAMP}, "event"= : "SHUTDOWN", "data": {"guest": false, "reason": "host-qmp-quit"}} =20 Testing: -drive if=3Dnone,id=3Ddisk -device lsi53c895a -device scsi-cd,dri= ve=3Ddisk -QEMU X.Y.Z monitor - type 'help' for more information -(qemu) quit +QMP_VERSION +{"timestamp": {"seconds": TIMESTAMP, "microseconds": TIMESTAMP}, "event"= : "SHUTDOWN", "data": {"guest": false, "reason": "host-qmp-quit"}} =20 Testing: -drive if=3Dnone,id=3Ddisk -device ide-hd,drive=3Ddisk -QEMU X.Y.Z monitor - type 'help' for more information +QMP_VERSION QEMU_PROG: -device ide-hd,drive=3Ddisk: Device needs media, but drive is e= mpty =20 Testing: -drive if=3Dnone,id=3Ddisk -device lsi53c895a -device scsi-hd,dri= ve=3Ddisk -QEMU X.Y.Z monitor - type 'help' for more information +QMP_VERSION QEMU_PROG: -device scsi-hd,drive=3Ddisk: Device needs media, but drive is = empty =20 =20 =3D=3D=3D Attach to node in non-default iothread =3D=3D=3D =20 Testing: -drive file=3DTEST_DIR/t.qcow2,if=3Dnone,node-name=3Ddisk -object= iothread,id=3Dthread0 -device virtio-scsi,iothread=3Dthread0,id=3Dvirtio-s= csi0 -device scsi-hd,bus=3Dvirtio-scsi0.0,drive=3Ddisk,share-rw=3Don -devic= e ide-hd,drive=3Ddisk,share-rw=3Don -QEMU X.Y.Z monitor - type 'help' for more information -(qemu) QEMU_PROG: -device ide-hd,drive=3Ddisk,share-rw=3Don: Cannot change= iothread of active block backend +QMP_VERSION +QEMU_PROG: -device ide-hd,drive=3Ddisk,share-rw=3Don: Cannot change iothre= ad of active block backend =20 Testing: -drive file=3DTEST_DIR/t.qcow2,if=3Dnone,node-name=3Ddisk -object= iothread,id=3Dthread0 -device virtio-scsi,iothread=3Dthread0,id=3Dvirtio-s= csi0 -device scsi-hd,bus=3Dvirtio-scsi0.0,drive=3Ddisk,share-rw=3Don -devic= e virtio-blk-pci,drive=3Ddisk,share-rw=3Don -QEMU X.Y.Z monitor - type 'help' for more information -(qemu) QEMU_PROG: -device virtio-blk-pci,drive=3Ddisk,share-rw=3Don: Canno= t change iothread of active block backend +QMP_VERSION +QEMU_PROG: -device virtio-blk-pci,drive=3Ddisk,share-rw=3Don: Cannot chang= e iothread of active block backend =20 Testing: -drive file=3DTEST_DIR/t.qcow2,if=3Dnone,node-name=3Ddisk -object= iothread,id=3Dthread0 -device virtio-scsi,iothread=3Dthread0,id=3Dvirtio-s= csi0 -device scsi-hd,bus=3Dvirtio-scsi0.0,drive=3Ddisk,share-rw=3Don -devic= e lsi53c895a,id=3Dlsi0 -device scsi-hd,bus=3Dlsi0.0,drive=3Ddisk,share-rw= =3Don -QEMU X.Y.Z monitor - type 'help' for more information -(qemu) QEMU_PROG: -device scsi-hd,bus=3Dlsi0.0,drive=3Ddisk,share-rw=3Don:= HBA does not support iothreads +QMP_VERSION +QEMU_PROG: -device scsi-hd,bus=3Dlsi0.0,drive=3Ddisk,share-rw=3Don: HBA do= es not support iothreads =20 Testing: -drive file=3DTEST_DIR/t.qcow2,if=3Dnone,node-name=3Ddisk -object= iothread,id=3Dthread0 -device virtio-scsi,iothread=3Dthread0,id=3Dvirtio-s= csi0 -device scsi-hd,bus=3Dvirtio-scsi0.0,drive=3Ddisk,share-rw=3Don -devic= e virtio-scsi,id=3Dvirtio-scsi1 -device scsi-hd,bus=3Dvirtio-scsi1.0,drive= =3Ddisk,share-rw=3Don -QEMU X.Y.Z monitor - type 'help' for more information -(qemu) quit +QMP_VERSION +{"timestamp": {"seconds": TIMESTAMP, "microseconds": TIMESTAMP}, "event"= : "SHUTDOWN", "data": {"guest": false, "reason": "host-qmp-quit"}} =20 Testing: -drive file=3DTEST_DIR/t.qcow2,if=3Dnone,node-name=3Ddisk -object= iothread,id=3Dthread0 -device virtio-scsi,iothread=3Dthread0,id=3Dvirtio-s= csi0 -device scsi-hd,bus=3Dvirtio-scsi0.0,drive=3Ddisk,share-rw=3Don -devic= e virtio-blk-pci,drive=3Ddisk,iothread=3Dthread0,share-rw=3Don -QEMU X.Y.Z monitor - type 'help' for more information -(qemu) QEMU_PROG: -device virtio-blk-pci,drive=3Ddisk,iothread=3Dthread0,s= hare-rw=3Don: Cannot change iothread of active block backend +QMP_VERSION +QEMU_PROG: -device virtio-blk-pci,drive=3Ddisk,iothread=3Dthread0,share-rw= =3Don: Cannot change iothread of active block backend =20 Testing: -drive file=3DTEST_DIR/t.qcow2,if=3Dnone,node-name=3Ddisk -object= iothread,id=3Dthread0 -device virtio-scsi,iothread=3Dthread0,id=3Dvirtio-s= csi0 -device scsi-hd,bus=3Dvirtio-scsi0.0,drive=3Ddisk,share-rw=3Don -devic= e virtio-scsi,id=3Dvirtio-scsi1,iothread=3Dthread0 -device scsi-hd,bus=3Dvi= rtio-scsi1.0,drive=3Ddisk,share-rw=3Don -QEMU X.Y.Z monitor - type 'help' for more information -(qemu) quit +QMP_VERSION +{"timestamp": {"seconds": TIMESTAMP, "microseconds": TIMESTAMP}, "event"= : "SHUTDOWN", "data": {"guest": false, "reason": "host-qmp-quit"}} =20 =20 =3D=3D=3D Read-only =3D=3D=3D =20 Testing: -drive file=3DTEST_DIR/t.qcow2,if=3Dfloppy,readonly=3Don -QEMU X.Y.Z monitor - type 'help' for more information -(qemu) quit +QMP_VERSION +{"timestamp": {"seconds": TIMESTAMP, "microseconds": TIMESTAMP}, "event"= : "SHUTDOWN", "data": {"guest": false, "reason": "host-qmp-quit"}} =20 Testing: -drive file=3DTEST_DIR/t.qcow2,if=3Dide,media=3Dcdrom,readonly=3D= on -QEMU X.Y.Z monitor - type 'help' for more information -(qemu) quit +QMP_VERSION +{"timestamp": {"seconds": TIMESTAMP, "microseconds": TIMESTAMP}, "event"= : "SHUTDOWN", "data": {"guest": false, "reason": "host-qmp-quit"}} =20 Testing: -drive file=3DTEST_DIR/t.qcow2,if=3Dide,readonly=3Don -QEMU X.Y.Z monitor - type 'help' for more information +QMP_VERSION QEMU_PROG: Block node is read-only =20 Testing: -drive file=3DTEST_DIR/t.qcow2,if=3Dvirtio,readonly=3Don -QEMU X.Y.Z monitor - type 'help' for more information -(qemu) quit +QMP_VERSION +{"timestamp": {"seconds": TIMESTAMP, "microseconds": TIMESTAMP}, "event"= : "SHUTDOWN", "data": {"guest": false, "reason": "host-qmp-quit"}} =20 Testing: -drive file=3DTEST_DIR/t.qcow2,if=3Dnone,id=3Ddisk,readonly=3Don = -device ide-cd,drive=3Ddisk -QEMU X.Y.Z monitor - type 'help' for more information -(qemu) quit +QMP_VERSION +{"timestamp": {"seconds": TIMESTAMP, "microseconds": TIMESTAMP}, "event"= : "SHUTDOWN", "data": {"guest": false, "reason": "host-qmp-quit"}} =20 Testing: -drive file=3DTEST_DIR/t.qcow2,if=3Dnone,id=3Ddisk,readonly=3Don = -device lsi53c895a -device scsi-cd,drive=3Ddisk -QEMU X.Y.Z monitor - type 'help' for more information -(qemu) quit +QMP_VERSION +{"timestamp": {"seconds": TIMESTAMP, "microseconds": TIMESTAMP}, "event"= : "SHUTDOWN", "data": {"guest": false, "reason": "host-qmp-quit"}} =20 Testing: -drive file=3DTEST_DIR/t.qcow2,if=3Dnone,id=3Ddisk,readonly=3Don = -device ide-hd,drive=3Ddisk -QEMU X.Y.Z monitor - type 'help' for more information +QMP_VERSION QEMU_PROG: -device ide-hd,drive=3Ddisk: Block node is read-only =20 Testing: -drive file=3DTEST_DIR/t.qcow2,if=3Dnone,id=3Ddisk,readonly=3Don = -device lsi53c895a -device scsi-hd,drive=3Ddisk -QEMU X.Y.Z monitor - type 'help' for more information -(qemu) quit +QMP_VERSION +{"timestamp": {"seconds": TIMESTAMP, "microseconds": TIMESTAMP}, "event"= : "SHUTDOWN", "data": {"guest": false, "reason": "host-qmp-quit"}} =20 =20 =3D=3D=3D Cache modes =3D=3D=3D =20 Testing: -drive driver=3Dnull-co,read-zeroes=3Don,cache=3Dnone -QEMU X.Y.Z monitor - type 'help' for more information -(qemu) quit +QMP_VERSION +{"timestamp": {"seconds": TIMESTAMP, "microseconds": TIMESTAMP}, "event"= : "SHUTDOWN", "data": {"guest": false, "reason": "host-qmp-quit"}} =20 Testing: -drive driver=3Dnull-co,read-zeroes=3Don,cache=3Ddirectsync -QEMU X.Y.Z monitor - type 'help' for more information -(qemu) quit +QMP_VERSION +{"timestamp": {"seconds": TIMESTAMP, "microseconds": TIMESTAMP}, "event"= : "SHUTDOWN", "data": {"guest": false, "reason": "host-qmp-quit"}} =20 Testing: -drive driver=3Dnull-co,read-zeroes=3Don,cache=3Dwriteback -QEMU X.Y.Z monitor - type 'help' for more information -(qemu) quit +QMP_VERSION +{"timestamp": {"seconds": TIMESTAMP, "microseconds": TIMESTAMP}, "event"= : "SHUTDOWN", "data": {"guest": false, "reason": "host-qmp-quit"}} =20 Testing: -drive driver=3Dnull-co,read-zeroes=3Don,cache=3Dwritethrough -QEMU X.Y.Z monitor - type 'help' for more information -(qemu) quit +QMP_VERSION +{"timestamp": {"seconds": TIMESTAMP, "microseconds": TIMESTAMP}, "event"= : "SHUTDOWN", "data": {"guest": false, "reason": "host-qmp-quit"}} =20 Testing: -drive driver=3Dnull-co,read-zeroes=3Don,cache=3Dunsafe -QEMU X.Y.Z monitor - type 'help' for more information -(qemu) quit +QMP_VERSION +{"timestamp": {"seconds": TIMESTAMP, "microseconds": TIMESTAMP}, "event"= : "SHUTDOWN", "data": {"guest": false, "reason": "host-qmp-quit"}} =20 Testing: -drive driver=3Dnull-co,cache=3Dinvalid_value QEMU_PROG: -drive driver=3Dnull-co,cache=3Dinvalid_value: invalid cache op= tion =20 Testing: -drive file=3DTEST_DIR/t.qcow2,cache=3Dwriteback,backing.file.fil= ename=3DTEST_DIR/t.qcow2.base,backing.cache.no-flush=3Don,backing.node-name= =3Dbacking,backing.file.node-name=3Dbacking-file,file.node-name=3Dfile,if= =3Dnone,id=3Ddrive0 -nodefaults -QEMU X.Y.Z monitor - type 'help' for more information -(qemu) info block -drive0 (NODE_NAME): json:{"backing": {"driver": "qcow2", "file": {"driver"= : "file", "filename": "TEST_DIR/t.qcow2.base"}}, "driver": "qcow2", "file":= {"driver": "file", "filename": "TEST_DIR/t.qcow2"}} (qcow2) - Removable device: not locked, tray closed - Cache mode: writeback - Backing file: TEST_DIR/t.qcow2.base (chain depth: 1) -(qemu) info block file - -file: TEST_DIR/t.qcow2 (file) - Cache mode: writeback -(qemu) info block backing -backing: TEST_DIR/t.qcow2.base (qcow2, read-only) - Cache mode: writeback, ignore flushes -(qemu) info block backing-file - -backing-file: TEST_DIR/t.qcow2.base (file, read-only) - Cache mode: writeback, ignore flushes -(qemu) quit +QMP_VERSION +{"return": [{"device": "drive0", "locked": false, "removable": true, "inse= rted": {"iops_rd": 0, "detect_zeroes": "off", "active": true, "image": {"ba= cking-image": {"limits": {"write-zeroes-alignment": 65536, "request-alignme= nt": 1, "min-mem-alignment": 1, "discard-alignment": 65536, "opt-mem-alignm= ent": 4096, "max-iov": 1024}, "virtual-size": 134217728, "filename": "TEST_= DIR/t.qcow2.base", "cluster-size": 65536, "format": "qcow2", "actual-size":= SIZE, "format-specific": {"type": "qcow2", "data": {"compat": "1.1", "comp= ression-type": "zlib", "lazy-refcounts": false, "refcount-bits": 16, "corru= pt": false, "extended-l2": false}}, "dirty-flag": false}, "limits": {"write= -zeroes-alignment": 65536, "request-alignment": 1, "min-mem-alignment": 1, = "discard-alignment": 65536, "opt-mem-alignment": 4096, "max-iov": 1024}, "v= irtual-size": 134217728, "filename": "json:{\"backing\": {\"driver\": \"qco= w2\", \"file\": {\"driver\": \"file\", \"filename\": \"TEST_DIR/t.qcow2.bas= e\"}}, \"driver\": \"qc ow2\", \"file\": {\"driver\": \"file\", \"filename\": \"TEST_DIR/t.qcow2\"= }}", "cluster-size": 65536, "format": "qcow2", "actual-size": SIZE, "format= -specific": {"type": "qcow2", "data": {"compat": "0.10", "compression-type"= : "zlib", "refcount-bits": 16}}, "dirty-flag": false}, "iops_wr": 0, "ro": = false, "children": [{"node-name": "backing", "child": "backing"}, {"node-na= me": "file", "child": "file"}], "node-name": "NODE_NAME", "backing_file_dep= th": 1, "drv": "qcow2", "iops": 0, "bps_wr": 0, "write_threshold": 0, "back= ing_file": "TEST_DIR/t.qcow2.base", "encrypted": false, "bps": 0, "bps_rd":= 0, "cache": {"no-flush": false, "direct": false, "writeback": true}, "file= ": "json:{\"backing\": {\"driver\": \"qcow2\", \"file\": {\"driver\": \"fil= e\", \"filename\": \"TEST_DIR/t.qcow2.base\"}}, \"driver\": \"qcow2\", \"fi= le\": {\"driver\": \"file\", \"filename\": \"TEST_DIR/t.qcow2\"}}"}, "type"= : "unknown"}]} +{"return": [{"iops_rd": 0, "detect_zeroes": "off", "active": true, "image"= : {"limits": {"write-zeroes-alignment": 65536, "request-alignment": 1, "min= -mem-alignment": 1, "discard-alignment": 65536, "opt-mem-alignment": 4096, = "max-iov": 1024}, "virtual-size": 134217728, "filename": "TEST_DIR/t.qcow2.= base", "cluster-size": 65536, "format": "qcow2", "actual-size": SIZE, "form= at-specific": {"type": "qcow2", "data": {"compat": "1.1", "compression-type= ": "zlib", "lazy-refcounts": false, "refcount-bits": 16, "corrupt": false, = "extended-l2": false}}, "dirty-flag": false}, "iops_wr": 0, "ro": true, "ch= ildren": [{"node-name": "backing-file", "child": "file"}], "node-name": "ba= cking", "backing_file_depth": 0, "drv": "qcow2", "iops": 0, "bps_wr": 0, "w= rite_threshold": 0, "encrypted": false, "bps": 0, "bps_rd": 0, "cache": {"n= o-flush": true, "direct": false, "writeback": true}, "file": "TEST_DIR/t.qc= ow2.base"}, {"iops_rd": 0, "detect_zeroes": "off", "active": true, "image":= {"limits": {"request-a lignment": 1, "min-mem-alignment": 1, "opt-mem-alignment": 4096, "max-iov"= : 1024}, "virtual-size": 197120, "filename": "TEST_DIR/t.qcow2.base", "form= at": "file", "actual-size": SIZE, "format-specific": {"type": "file", "data= ": {}}, "dirty-flag": false}, "iops_wr": 0, "ro": true, "children": [], "no= de-name": "backing-file", "backing_file_depth": 0, "drv": "file", "iops": 0= , "bps_wr": 0, "write_threshold": 0, "encrypted": false, "bps": 0, "bps_rd"= : 0, "cache": {"no-flush": true, "direct": false, "writeback": true}, "file= ": "TEST_DIR/t.qcow2.base"}, {"iops_rd": 0, "detect_zeroes": "off", "active= ": true, "image": {"backing-image": {"limits": {"write-zeroes-alignment": 6= 5536, "request-alignment": 1, "min-mem-alignment": 1, "discard-alignment": = 65536, "opt-mem-alignment": 4096, "max-iov": 1024}, "virtual-size": 1342177= 28, "filename": "TEST_DIR/t.qcow2.base", "cluster-size": 65536, "format": "= qcow2", "actual-size": SIZE, "format-specific": {"type": "qcow2", "data": {= "compat": "1.1", "compr ession-type": "zlib", "lazy-refcounts": false, "refcount-bits": 16, "corru= pt": false, "extended-l2": false}}, "dirty-flag": false}, "limits": {"write= -zeroes-alignment": 65536, "request-alignment": 1, "min-mem-alignment": 1, = "discard-alignment": 65536, "opt-mem-alignment": 4096, "max-iov": 1024}, "v= irtual-size": 134217728, "filename": "json:{\"backing\": {\"driver\": \"qco= w2\", \"file\": {\"driver\": \"file\", \"filename\": \"TEST_DIR/t.qcow2.bas= e\"}}, \"driver\": \"qcow2\", \"file\": {\"driver\": \"file\", \"filename\"= : \"TEST_DIR/t.qcow2\"}}", "cluster-size": 65536, "format": "qcow2", "actua= l-size": SIZE, "format-specific": {"type": "qcow2", "data": {"compat": "0.1= 0", "compression-type": "zlib", "refcount-bits": 16}}, "dirty-flag": false}= , "iops_wr": 0, "ro": false, "children": [{"node-name": "backing", "child":= "backing"}, {"node-name": "file", "child": "file"}], "node-name": "NODE_NA= ME", "backing_file_depth": 1, "drv": "qcow2", "iops": 0, "bps_wr": 0, "writ= e_threshold": 0, "backi ng_file": "TEST_DIR/t.qcow2.base", "encrypted": false, "bps": 0, "bps_rd":= 0, "cache": {"no-flush": false, "direct": false, "writeback": true}, "file= ": "json:{\"backing\": {\"driver\": \"qcow2\", \"file\": {\"driver\": \"fil= e\", \"filename\": \"TEST_DIR/t.qcow2.base\"}}, \"driver\": \"qcow2\", \"fi= le\": {\"driver\": \"file\", \"filename\": \"TEST_DIR/t.qcow2\"}}"}, {"iops= _rd": 0, "detect_zeroes": "off", "active": true, "image": {"limits": {"requ= est-alignment": 1, "min-mem-alignment": 1, "opt-mem-alignment": 4096, "max-= iov": 1024}, "virtual-size": 197120, "filename": "TEST_DIR/t.qcow2", "forma= t": "file", "actual-size": SIZE, "format-specific": {"type": "file", "data"= : {}}, "dirty-flag": false}, "iops_wr": 0, "ro": false, "children": [], "no= de-name": "file", "backing_file_depth": 0, "drv": "file", "iops": 0, "bps_w= r": 0, "write_threshold": 0, "encrypted": false, "bps": 0, "bps_rd": 0, "ca= che": {"no-flush": false, "direct": false, "writeback": true}, "file": "TES= T_DIR/t.qcow2"}]} +{"timestamp": {"seconds": TIMESTAMP, "microseconds": TIMESTAMP}, "event"= : "SHUTDOWN", "data": {"guest": false, "reason": "host-qmp-quit"}} =20 Testing: -drive file=3DTEST_DIR/t.qcow2,cache=3Dwritethrough,backing.file.= filename=3DTEST_DIR/t.qcow2.base,backing.cache.no-flush=3Don,backing.node-n= ame=3Dbacking,backing.file.node-name=3Dbacking-file,file.node-name=3Dfile,i= f=3Dnone,id=3Ddrive0 -nodefaults -QEMU X.Y.Z monitor - type 'help' for more information -(qemu) info block -drive0 (NODE_NAME): json:{"backing": {"driver": "qcow2", "file": {"driver"= : "file", "filename": "TEST_DIR/t.qcow2.base"}}, "driver": "qcow2", "file":= {"driver": "file", "filename": "TEST_DIR/t.qcow2"}} (qcow2) - Removable device: not locked, tray closed - Cache mode: writethrough - Backing file: TEST_DIR/t.qcow2.base (chain depth: 1) -(qemu) info block file - -file: TEST_DIR/t.qcow2 (file) - Cache mode: writeback -(qemu) info block backing -backing: TEST_DIR/t.qcow2.base (qcow2, read-only) - Cache mode: writeback, ignore flushes -(qemu) info block backing-file - -backing-file: TEST_DIR/t.qcow2.base (file, read-only) - Cache mode: writeback, ignore flushes -(qemu) quit +QMP_VERSION +{"return": [{"device": "drive0", "locked": false, "removable": true, "inse= rted": {"iops_rd": 0, "detect_zeroes": "off", "active": true, "image": {"ba= cking-image": {"limits": {"write-zeroes-alignment": 65536, "request-alignme= nt": 1, "min-mem-alignment": 1, "discard-alignment": 65536, "opt-mem-alignm= ent": 4096, "max-iov": 1024}, "virtual-size": 134217728, "filename": "TEST_= DIR/t.qcow2.base", "cluster-size": 65536, "format": "qcow2", "actual-size":= SIZE, "format-specific": {"type": "qcow2", "data": {"compat": "1.1", "comp= ression-type": "zlib", "lazy-refcounts": false, "refcount-bits": 16, "corru= pt": false, "extended-l2": false}}, "dirty-flag": false}, "limits": {"write= -zeroes-alignment": 65536, "request-alignment": 1, "min-mem-alignment": 1, = "discard-alignment": 65536, "opt-mem-alignment": 4096, "max-iov": 1024}, "v= irtual-size": 134217728, "filename": "json:{\"backing\": {\"driver\": \"qco= w2\", \"file\": {\"driver\": \"file\", \"filename\": \"TEST_DIR/t.qcow2.bas= e\"}}, \"driver\": \"qc ow2\", \"file\": {\"driver\": \"file\", \"filename\": \"TEST_DIR/t.qcow2\"= }}", "cluster-size": 65536, "format": "qcow2", "actual-size": SIZE, "format= -specific": {"type": "qcow2", "data": {"compat": "0.10", "compression-type"= : "zlib", "refcount-bits": 16}}, "dirty-flag": false}, "iops_wr": 0, "ro": = false, "children": [{"node-name": "backing", "child": "backing"}, {"node-na= me": "file", "child": "file"}], "node-name": "NODE_NAME", "backing_file_dep= th": 1, "drv": "qcow2", "iops": 0, "bps_wr": 0, "write_threshold": 0, "back= ing_file": "TEST_DIR/t.qcow2.base", "encrypted": false, "bps": 0, "bps_rd":= 0, "cache": {"no-flush": false, "direct": false, "writeback": false}, "fil= e": "json:{\"backing\": {\"driver\": \"qcow2\", \"file\": {\"driver\": \"fi= le\", \"filename\": \"TEST_DIR/t.qcow2.base\"}}, \"driver\": \"qcow2\", \"f= ile\": {\"driver\": \"file\", \"filename\": \"TEST_DIR/t.qcow2\"}}"}, "type= ": "unknown"}]} +{"return": [{"iops_rd": 0, "detect_zeroes": "off", "active": true, "image"= : {"limits": {"write-zeroes-alignment": 65536, "request-alignment": 1, "min= -mem-alignment": 1, "discard-alignment": 65536, "opt-mem-alignment": 4096, = "max-iov": 1024}, "virtual-size": 134217728, "filename": "TEST_DIR/t.qcow2.= base", "cluster-size": 65536, "format": "qcow2", "actual-size": SIZE, "form= at-specific": {"type": "qcow2", "data": {"compat": "1.1", "compression-type= ": "zlib", "lazy-refcounts": false, "refcount-bits": 16, "corrupt": false, = "extended-l2": false}}, "dirty-flag": false}, "iops_wr": 0, "ro": true, "ch= ildren": [{"node-name": "backing-file", "child": "file"}], "node-name": "ba= cking", "backing_file_depth": 0, "drv": "qcow2", "iops": 0, "bps_wr": 0, "w= rite_threshold": 0, "encrypted": false, "bps": 0, "bps_rd": 0, "cache": {"n= o-flush": true, "direct": false, "writeback": true}, "file": "TEST_DIR/t.qc= ow2.base"}, {"iops_rd": 0, "detect_zeroes": "off", "active": true, "image":= {"limits": {"request-a lignment": 1, "min-mem-alignment": 1, "opt-mem-alignment": 4096, "max-iov"= : 1024}, "virtual-size": 197120, "filename": "TEST_DIR/t.qcow2.base", "form= at": "file", "actual-size": SIZE, "format-specific": {"type": "file", "data= ": {}}, "dirty-flag": false}, "iops_wr": 0, "ro": true, "children": [], "no= de-name": "backing-file", "backing_file_depth": 0, "drv": "file", "iops": 0= , "bps_wr": 0, "write_threshold": 0, "encrypted": false, "bps": 0, "bps_rd"= : 0, "cache": {"no-flush": true, "direct": false, "writeback": true}, "file= ": "TEST_DIR/t.qcow2.base"}, {"iops_rd": 0, "detect_zeroes": "off", "active= ": true, "image": {"backing-image": {"limits": {"write-zeroes-alignment": 6= 5536, "request-alignment": 1, "min-mem-alignment": 1, "discard-alignment": = 65536, "opt-mem-alignment": 4096, "max-iov": 1024}, "virtual-size": 1342177= 28, "filename": "TEST_DIR/t.qcow2.base", "cluster-size": 65536, "format": "= qcow2", "actual-size": SIZE, "format-specific": {"type": "qcow2", "data": {= "compat": "1.1", "compr ession-type": "zlib", "lazy-refcounts": false, "refcount-bits": 16, "corru= pt": false, "extended-l2": false}}, "dirty-flag": false}, "limits": {"write= -zeroes-alignment": 65536, "request-alignment": 1, "min-mem-alignment": 1, = "discard-alignment": 65536, "opt-mem-alignment": 4096, "max-iov": 1024}, "v= irtual-size": 134217728, "filename": "json:{\"backing\": {\"driver\": \"qco= w2\", \"file\": {\"driver\": \"file\", \"filename\": \"TEST_DIR/t.qcow2.bas= e\"}}, \"driver\": \"qcow2\", \"file\": {\"driver\": \"file\", \"filename\"= : \"TEST_DIR/t.qcow2\"}}", "cluster-size": 65536, "format": "qcow2", "actua= l-size": SIZE, "format-specific": {"type": "qcow2", "data": {"compat": "0.1= 0", "compression-type": "zlib", "refcount-bits": 16}}, "dirty-flag": false}= , "iops_wr": 0, "ro": false, "children": [{"node-name": "backing", "child":= "backing"}, {"node-name": "file", "child": "file"}], "node-name": "NODE_NA= ME", "backing_file_depth": 1, "drv": "qcow2", "iops": 0, "bps_wr": 0, "writ= e_threshold": 0, "backi ng_file": "TEST_DIR/t.qcow2.base", "encrypted": false, "bps": 0, "bps_rd":= 0, "cache": {"no-flush": false, "direct": false, "writeback": true}, "file= ": "json:{\"backing\": {\"driver\": \"qcow2\", \"file\": {\"driver\": \"fil= e\", \"filename\": \"TEST_DIR/t.qcow2.base\"}}, \"driver\": \"qcow2\", \"fi= le\": {\"driver\": \"file\", \"filename\": \"TEST_DIR/t.qcow2\"}}"}, {"iops= _rd": 0, "detect_zeroes": "off", "active": true, "image": {"limits": {"requ= est-alignment": 1, "min-mem-alignment": 1, "opt-mem-alignment": 4096, "max-= iov": 1024}, "virtual-size": 197120, "filename": "TEST_DIR/t.qcow2", "forma= t": "file", "actual-size": SIZE, "format-specific": {"type": "file", "data"= : {}}, "dirty-flag": false}, "iops_wr": 0, "ro": false, "children": [], "no= de-name": "file", "backing_file_depth": 0, "drv": "file", "iops": 0, "bps_w= r": 0, "write_threshold": 0, "encrypted": false, "bps": 0, "bps_rd": 0, "ca= che": {"no-flush": false, "direct": false, "writeback": true}, "file": "TES= T_DIR/t.qcow2"}]} +{"timestamp": {"seconds": TIMESTAMP, "microseconds": TIMESTAMP}, "event"= : "SHUTDOWN", "data": {"guest": false, "reason": "host-qmp-quit"}} =20 Testing: -drive file=3DTEST_DIR/t.qcow2,cache=3Dunsafe,backing.file.filena= me=3DTEST_DIR/t.qcow2.base,backing.cache.no-flush=3Don,backing.node-name=3D= backing,backing.file.node-name=3Dbacking-file,file.node-name=3Dfile,if=3Dno= ne,id=3Ddrive0 -nodefaults -QEMU X.Y.Z monitor - type 'help' for more information -(qemu) info block -drive0 (NODE_NAME): json:{"backing": {"driver": "qcow2", "file": {"driver"= : "file", "filename": "TEST_DIR/t.qcow2.base"}}, "driver": "qcow2", "file":= {"driver": "file", "filename": "TEST_DIR/t.qcow2"}} (qcow2) - Removable device: not locked, tray closed - Cache mode: writeback, ignore flushes - Backing file: TEST_DIR/t.qcow2.base (chain depth: 1) -(qemu) info block file - -file: TEST_DIR/t.qcow2 (file) - Cache mode: writeback, ignore flushes -(qemu) info block backing -backing: TEST_DIR/t.qcow2.base (qcow2, read-only) - Cache mode: writeback, ignore flushes -(qemu) info block backing-file - -backing-file: TEST_DIR/t.qcow2.base (file, read-only) - Cache mode: writeback, ignore flushes -(qemu) quit +QMP_VERSION +{"return": [{"device": "drive0", "locked": false, "removable": true, "inse= rted": {"iops_rd": 0, "detect_zeroes": "off", "active": true, "image": {"ba= cking-image": {"limits": {"write-zeroes-alignment": 65536, "request-alignme= nt": 1, "min-mem-alignment": 1, "discard-alignment": 65536, "opt-mem-alignm= ent": 4096, "max-iov": 1024}, "virtual-size": 134217728, "filename": "TEST_= DIR/t.qcow2.base", "cluster-size": 65536, "format": "qcow2", "actual-size":= SIZE, "format-specific": {"type": "qcow2", "data": {"compat": "1.1", "comp= ression-type": "zlib", "lazy-refcounts": false, "refcount-bits": 16, "corru= pt": false, "extended-l2": false}}, "dirty-flag": false}, "limits": {"write= -zeroes-alignment": 65536, "request-alignment": 1, "min-mem-alignment": 1, = "discard-alignment": 65536, "opt-mem-alignment": 4096, "max-iov": 1024}, "v= irtual-size": 134217728, "filename": "json:{\"backing\": {\"driver\": \"qco= w2\", \"file\": {\"driver\": \"file\", \"filename\": \"TEST_DIR/t.qcow2.bas= e\"}}, \"driver\": \"qc ow2\", \"file\": {\"driver\": \"file\", \"filename\": \"TEST_DIR/t.qcow2\"= }}", "cluster-size": 65536, "format": "qcow2", "actual-size": SIZE, "format= -specific": {"type": "qcow2", "data": {"compat": "0.10", "compression-type"= : "zlib", "refcount-bits": 16}}, "dirty-flag": false}, "iops_wr": 0, "ro": = false, "children": [{"node-name": "backing", "child": "backing"}, {"node-na= me": "file", "child": "file"}], "node-name": "NODE_NAME", "backing_file_dep= th": 1, "drv": "qcow2", "iops": 0, "bps_wr": 0, "write_threshold": 0, "back= ing_file": "TEST_DIR/t.qcow2.base", "encrypted": false, "bps": 0, "bps_rd":= 0, "cache": {"no-flush": true, "direct": false, "writeback": true}, "file"= : "json:{\"backing\": {\"driver\": \"qcow2\", \"file\": {\"driver\": \"file= \", \"filename\": \"TEST_DIR/t.qcow2.base\"}}, \"driver\": \"qcow2\", \"fil= e\": {\"driver\": \"file\", \"filename\": \"TEST_DIR/t.qcow2\"}}"}, "type":= "unknown"}]} +{"return": [{"iops_rd": 0, "detect_zeroes": "off", "active": true, "image"= : {"limits": {"write-zeroes-alignment": 65536, "request-alignment": 1, "min= -mem-alignment": 1, "discard-alignment": 65536, "opt-mem-alignment": 4096, = "max-iov": 1024}, "virtual-size": 134217728, "filename": "TEST_DIR/t.qcow2.= base", "cluster-size": 65536, "format": "qcow2", "actual-size": SIZE, "form= at-specific": {"type": "qcow2", "data": {"compat": "1.1", "compression-type= ": "zlib", "lazy-refcounts": false, "refcount-bits": 16, "corrupt": false, = "extended-l2": false}}, "dirty-flag": false}, "iops_wr": 0, "ro": true, "ch= ildren": [{"node-name": "backing-file", "child": "file"}], "node-name": "ba= cking", "backing_file_depth": 0, "drv": "qcow2", "iops": 0, "bps_wr": 0, "w= rite_threshold": 0, "encrypted": false, "bps": 0, "bps_rd": 0, "cache": {"n= o-flush": true, "direct": false, "writeback": true}, "file": "TEST_DIR/t.qc= ow2.base"}, {"iops_rd": 0, "detect_zeroes": "off", "active": true, "image":= {"limits": {"request-a lignment": 1, "min-mem-alignment": 1, "opt-mem-alignment": 4096, "max-iov"= : 1024}, "virtual-size": 197120, "filename": "TEST_DIR/t.qcow2.base", "form= at": "file", "actual-size": SIZE, "format-specific": {"type": "file", "data= ": {}}, "dirty-flag": false}, "iops_wr": 0, "ro": true, "children": [], "no= de-name": "backing-file", "backing_file_depth": 0, "drv": "file", "iops": 0= , "bps_wr": 0, "write_threshold": 0, "encrypted": false, "bps": 0, "bps_rd"= : 0, "cache": {"no-flush": true, "direct": false, "writeback": true}, "file= ": "TEST_DIR/t.qcow2.base"}, {"iops_rd": 0, "detect_zeroes": "off", "active= ": true, "image": {"backing-image": {"limits": {"write-zeroes-alignment": 6= 5536, "request-alignment": 1, "min-mem-alignment": 1, "discard-alignment": = 65536, "opt-mem-alignment": 4096, "max-iov": 1024}, "virtual-size": 1342177= 28, "filename": "TEST_DIR/t.qcow2.base", "cluster-size": 65536, "format": "= qcow2", "actual-size": SIZE, "format-specific": {"type": "qcow2", "data": {= "compat": "1.1", "compr ession-type": "zlib", "lazy-refcounts": false, "refcount-bits": 16, "corru= pt": false, "extended-l2": false}}, "dirty-flag": false}, "limits": {"write= -zeroes-alignment": 65536, "request-alignment": 1, "min-mem-alignment": 1, = "discard-alignment": 65536, "opt-mem-alignment": 4096, "max-iov": 1024}, "v= irtual-size": 134217728, "filename": "json:{\"backing\": {\"driver\": \"qco= w2\", \"file\": {\"driver\": \"file\", \"filename\": \"TEST_DIR/t.qcow2.bas= e\"}}, \"driver\": \"qcow2\", \"file\": {\"driver\": \"file\", \"filename\"= : \"TEST_DIR/t.qcow2\"}}", "cluster-size": 65536, "format": "qcow2", "actua= l-size": SIZE, "format-specific": {"type": "qcow2", "data": {"compat": "0.1= 0", "compression-type": "zlib", "refcount-bits": 16}}, "dirty-flag": false}= , "iops_wr": 0, "ro": false, "children": [{"node-name": "backing", "child":= "backing"}, {"node-name": "file", "child": "file"}], "node-name": "NODE_NA= ME", "backing_file_depth": 1, "drv": "qcow2", "iops": 0, "bps_wr": 0, "writ= e_threshold": 0, "backi ng_file": "TEST_DIR/t.qcow2.base", "encrypted": false, "bps": 0, "bps_rd":= 0, "cache": {"no-flush": true, "direct": false, "writeback": true}, "file"= : "json:{\"backing\": {\"driver\": \"qcow2\", \"file\": {\"driver\": \"file= \", \"filename\": \"TEST_DIR/t.qcow2.base\"}}, \"driver\": \"qcow2\", \"fil= e\": {\"driver\": \"file\", \"filename\": \"TEST_DIR/t.qcow2\"}}"}, {"iops_= rd": 0, "detect_zeroes": "off", "active": true, "image": {"limits": {"reque= st-alignment": 1, "min-mem-alignment": 1, "opt-mem-alignment": 4096, "max-i= ov": 1024}, "virtual-size": 197120, "filename": "TEST_DIR/t.qcow2", "format= ": "file", "actual-size": SIZE, "format-specific": {"type": "file", "data":= {}}, "dirty-flag": false}, "iops_wr": 0, "ro": false, "children": [], "nod= e-name": "file", "backing_file_depth": 0, "drv": "file", "iops": 0, "bps_wr= ": 0, "write_threshold": 0, "encrypted": false, "bps": 0, "bps_rd": 0, "cac= he": {"no-flush": true, "direct": false, "writeback": true}, "file": "TEST_= DIR/t.qcow2"}]} +{"timestamp": {"seconds": TIMESTAMP, "microseconds": TIMESTAMP}, "event"= : "SHUTDOWN", "data": {"guest": false, "reason": "host-qmp-quit"}} =20 Testing: -drive file=3DTEST_DIR/t.qcow2,cache=3Dinvalid_value,backing.file= .filename=3DTEST_DIR/t.qcow2.base,backing.cache.no-flush=3Don,backing.node-= name=3Dbacking,backing.file.node-name=3Dbacking-file,file.node-name=3Dfile,= if=3Dnone,id=3Ddrive0 -nodefaults QEMU_PROG: -drive file=3DTEST_DIR/t.qcow2,cache=3Dinvalid_value,backing.fi= le.filename=3DTEST_DIR/t.qcow2.base,backing.cache.no-flush=3Don,backing.nod= e-name=3Dbacking,backing.file.node-name=3Dbacking-file,file.node-name=3Dfil= e,if=3Dnone,id=3Ddrive0: invalid cache option @@ -319,8 +273,8 @@ QEMU_PROG: -drive file=3DTEST_DIR/t.qcow2,cache=3Dinval= id_value,backing.file.filenam =3D=3D=3D Specifying the protocol layer =3D=3D=3D =20 Testing: -drive file=3DTEST_DIR/t.qcow2,file.driver=3Dfile -QEMU X.Y.Z monitor - type 'help' for more information -(qemu) quit +QMP_VERSION +{"timestamp": {"seconds": TIMESTAMP, "microseconds": TIMESTAMP}, "event"= : "SHUTDOWN", "data": {"guest": false, "reason": "host-qmp-quit"}} =20 =20 =3D=3D=3D Leaving out required options =3D=3D=3D @@ -416,16 +370,16 @@ Testing: -drive file=3DTEST_DIR/t.qcow2,throttling.bp= s-total=3D-5 QEMU_PROG: -drive file=3DTEST_DIR/t.qcow2,throttling.bps-total=3D-5: bps/i= ops/max values must be within [0, 1000000000000000] =20 Testing: -drive file=3DTEST_DIR/t.qcow2,bps=3D0 -QEMU X.Y.Z monitor - type 'help' for more information -(qemu) quit +QMP_VERSION +{"timestamp": {"seconds": TIMESTAMP, "microseconds": TIMESTAMP}, "event"= : "SHUTDOWN", "data": {"guest": false, "reason": "host-qmp-quit"}} =20 Testing: -drive file=3DTEST_DIR/t.qcow2,bps=3D1 -QEMU X.Y.Z monitor - type 'help' for more information -(qemu) quit +QMP_VERSION +{"timestamp": {"seconds": TIMESTAMP, "microseconds": TIMESTAMP}, "event"= : "SHUTDOWN", "data": {"guest": false, "reason": "host-qmp-quit"}} =20 Testing: -drive file=3DTEST_DIR/t.qcow2,bps=3D1000000000000000 -QEMU X.Y.Z monitor - type 'help' for more information -(qemu) quit +QMP_VERSION +{"timestamp": {"seconds": TIMESTAMP, "microseconds": TIMESTAMP}, "event"= : "SHUTDOWN", "data": {"guest": false, "reason": "host-qmp-quit"}} =20 Testing: -drive file=3DTEST_DIR/t.qcow2,bps=3D1000000000000001 QEMU_PROG: -drive file=3DTEST_DIR/t.qcow2,bps=3D1000000000000001: bps/iops= /max values must be within [0, 1000000000000000] @@ -446,12 +400,12 @@ Testing: -drive file.filename=3Dfoo:bar QEMU_PROG: -drive file.filename=3Dfoo:bar: Could not open 'foo:bar': No su= ch file or directory =20 Testing: -hda file:TEST_DIR/t.qcow2 -QEMU X.Y.Z monitor - type 'help' for more information -(qemu) quit +QMP_VERSION +{"timestamp": {"seconds": TIMESTAMP, "microseconds": TIMESTAMP}, "event"= : "SHUTDOWN", "data": {"guest": false, "reason": "host-qmp-quit"}} =20 Testing: -drive file=3Dfile:TEST_DIR/t.qcow2 -QEMU X.Y.Z monitor - type 'help' for more information -(qemu) quit +QMP_VERSION +{"timestamp": {"seconds": TIMESTAMP, "microseconds": TIMESTAMP}, "event"= : "SHUTDOWN", "data": {"guest": false, "reason": "host-qmp-quit"}} =20 Testing: -drive file.filename=3Dfile:TEST_DIR/t.qcow2 QEMU_PROG: -drive file.filename=3Dfile:TEST_DIR/t.qcow2: Could not open 'f= ile:TEST_DIR/t.qcow2': No such file or directory @@ -462,79 +416,60 @@ QEMU_PROG: -drive file.filename=3Dfile:TEST_DIR/t.qco= w2: Could not open 'file:TEST wrote 4096/4096 bytes at offset 0 4 KiB, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec) Testing: -drive file=3DTEST_DIR/t.qcow2,if=3Dnone,id=3Ddrive0 -snapshot -QEMU X.Y.Z monitor - type 'help' for more information -(qemu) qemu-io drive0 "write -P 0x22 0 4k" -wrote 4096/4096 bytes at offset 0 -4 KiB, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec) -(qemu) quit +QMP_VERSION +{"return": {"human-readable-text": "wrote 4096/4096 bytes at offset 0\n4 K= iB, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec)\n"}} +{"timestamp": {"seconds": TIMESTAMP, "microseconds": TIMESTAMP}, "event"= : "SHUTDOWN", "data": {"guest": false, "reason": "host-qmp-quit"}} =20 Testing: -drive file=3DTEST_DIR/t.qcow2,snapshot=3Don,if=3Dnone,id=3Ddrive0 -QEMU X.Y.Z monitor - type 'help' for more information -(qemu) qemu-io drive0 "write -P 0x22 0 4k" -wrote 4096/4096 bytes at offset 0 -4 KiB, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec) -(qemu) quit +QMP_VERSION +{"return": {"human-readable-text": "wrote 4096/4096 bytes at offset 0\n4 K= iB, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec)\n"}} +{"timestamp": {"seconds": TIMESTAMP, "microseconds": TIMESTAMP}, "event"= : "SHUTDOWN", "data": {"guest": false, "reason": "host-qmp-quit"}} =20 Testing: -drive file.filename=3DTEST_DIR/t.qcow2,driver=3Dqcow2,snapshot= =3Don,if=3Dnone,id=3Ddrive0 -QEMU X.Y.Z monitor - type 'help' for more information -(qemu) qemu-io drive0 "write -P 0x22 0 4k" -wrote 4096/4096 bytes at offset 0 -4 KiB, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec) -(qemu) quit +QMP_VERSION +{"return": {"human-readable-text": "wrote 4096/4096 bytes at offset 0\n4 K= iB, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec)\n"}} +{"timestamp": {"seconds": TIMESTAMP, "microseconds": TIMESTAMP}, "event"= : "SHUTDOWN", "data": {"guest": false, "reason": "host-qmp-quit"}} =20 Testing: -drive file.filename=3DTEST_DIR/t.qcow2,driver=3Dqcow2,if=3Dnone,= id=3Ddrive0 -snapshot -QEMU X.Y.Z monitor - type 'help' for more information -(qemu) qemu-io drive0 "write -P 0x22 0 4k" -wrote 4096/4096 bytes at offset 0 -4 KiB, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec) -(qemu) quit +QMP_VERSION +{"return": {"human-readable-text": "wrote 4096/4096 bytes at offset 0\n4 K= iB, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec)\n"}} +{"timestamp": {"seconds": TIMESTAMP, "microseconds": TIMESTAMP}, "event"= : "SHUTDOWN", "data": {"guest": false, "reason": "host-qmp-quit"}} =20 Testing: -drive file=3Dfile:TEST_DIR/t.qcow2,if=3Dnone,id=3Ddrive0 -snapsh= ot -QEMU X.Y.Z monitor - type 'help' for more information -(qemu) qemu-io drive0 "write -P 0x22 0 4k" -wrote 4096/4096 bytes at offset 0 -4 KiB, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec) -(qemu) quit +QMP_VERSION +{"return": {"human-readable-text": "wrote 4096/4096 bytes at offset 0\n4 K= iB, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec)\n"}} +{"timestamp": {"seconds": TIMESTAMP, "microseconds": TIMESTAMP}, "event"= : "SHUTDOWN", "data": {"guest": false, "reason": "host-qmp-quit"}} =20 Testing: -drive file=3Dfile:TEST_DIR/t.qcow2,snapshot=3Don,if=3Dnone,id=3D= drive0 -QEMU X.Y.Z monitor - type 'help' for more information -(qemu) qemu-io drive0 "write -P 0x22 0 4k" -wrote 4096/4096 bytes at offset 0 -4 KiB, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec) -(qemu) quit +QMP_VERSION +{"return": {"human-readable-text": "wrote 4096/4096 bytes at offset 0\n4 K= iB, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec)\n"}} +{"timestamp": {"seconds": TIMESTAMP, "microseconds": TIMESTAMP}, "event"= : "SHUTDOWN", "data": {"guest": false, "reason": "host-qmp-quit"}} =20 Testing: -drive file=3DTEST_DIR/t.qcow2,if=3Dnone,id=3Ddrive0 -snapshot -QEMU X.Y.Z monitor - type 'help' for more information -(qemu) qemu-io drive0 "write -P 0x22 0 4k" -wrote 4096/4096 bytes at offset 0 -4 KiB, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec) -(qemu) quit +QMP_VERSION +{"return": {"human-readable-text": "wrote 4096/4096 bytes at offset 0\n4 K= iB, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec)\n"}} +{"timestamp": {"seconds": TIMESTAMP, "microseconds": TIMESTAMP}, "event"= : "SHUTDOWN", "data": {"guest": false, "reason": "host-qmp-quit"}} =20 Testing: -drive file=3DTEST_DIR/t.qcow2,snapshot=3Don,if=3Dnone,id=3Ddrive0 -QEMU X.Y.Z monitor - type 'help' for more information -(qemu) qemu-io drive0 "write -P 0x22 0 4k" -wrote 4096/4096 bytes at offset 0 -4 KiB, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec) -(qemu) quit +QMP_VERSION +{"return": {"human-readable-text": "wrote 4096/4096 bytes at offset 0\n4 K= iB, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec)\n"}} +{"timestamp": {"seconds": TIMESTAMP, "microseconds": TIMESTAMP}, "event"= : "SHUTDOWN", "data": {"guest": false, "reason": "host-qmp-quit"}} =20 read 4096/4096 bytes at offset 0 4 KiB, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec) Testing: -drive file=3DTEST_DIR/t.qcow2,snapshot=3Doff,if=3Dnone,id=3Ddriv= e0 -QEMU X.Y.Z monitor - type 'help' for more information -(qemu) qemu-io drive0 "write -P 0x22 0 4k" -wrote 4096/4096 bytes at offset 0 -4 KiB, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec) -(qemu) quit +QMP_VERSION +{"return": {"human-readable-text": "wrote 4096/4096 bytes at offset 0\n4 K= iB, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec)\n"}} +{"timestamp": {"seconds": TIMESTAMP, "microseconds": TIMESTAMP}, "event"= : "SHUTDOWN", "data": {"guest": false, "reason": "host-qmp-quit"}} =20 read 4096/4096 bytes at offset 0 4 KiB, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec) Testing: -drive file=3DTEST_DIR/t.qcow2,snapshot=3Don,if=3Dnone,id=3Ddrive0 -QEMU X.Y.Z monitor - type 'help' for more information -(qemu) qemu-io drive0 "write -P 0x33 0 4k" -wrote 4096/4096 bytes at offset 0 -4 KiB, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec) -(qemu) commit drive0 -(qemu) quit +{ 'execute': 'x-qemu-io', 'arguments': { 'device': 'drive0', 'command': 'w= rite -P 0x33 0 4k' } } +{"return": {"human-readable-text": "wrote 4096/4096 bytes at offset 0\n4 K= iB, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec)\n"}} +{ 'execute': 'block-commit', 'arguments': { 'device': 'drive0', 'job-id': = 'job0' } } +{ 'execute': 'block-job-complete', 'arguments': { 'device': 'job0' } } +block job completed =20 read 4096/4096 bytes at offset 0 4 KiB, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec) @@ -542,12 +477,8 @@ Testing: -drive driver=3Dnull-co,snapshot=3Don QEMU_PROG: -drive driver=3Dnull-co,snapshot=3Don: Could not open temporary= file SNAPSHOT_PATH: No such file or directory =20 Testing: -drive file=3DTEST_DIR/t.qcow2,snapshot=3Don,read-only=3Don,if=3D= none,id=3Ddrive0 -QEMU X.Y.Z monitor - type 'help' for more information -(qemu) info block -drive0 (NODE_NAME): json:{"backing": {"driver": "qcow2", "file": {"driver"= : "file", "filename": "TEST_DIR/t.qcow2"}}, "driver": "qcow2", "file": {"dr= iver": "file", "filename": SNAPSHOT_PATH}} (qcow2, read-only) - Removable device: not locked, tray closed - Cache mode: writeback, ignore flushes - Backing file: TEST_DIR/t.qcow2 (chain depth: 1) -(qemu) quit +QMP_VERSION +{"return": [{"device": "drive0", "locked": false, "removable": true, "inse= rted": {"iops_rd": 0, "detect_zeroes": "off", "active": true, "image": {"ba= cking-image": {"limits": {"write-zeroes-alignment": 65536, "request-alignme= nt": 1, "min-mem-alignment": 1, "discard-alignment": 65536, "opt-mem-alignm= ent": 4096, "max-iov": 1024}, "virtual-size": 134217728, "filename": "TEST_= DIR/t.qcow2", "cluster-size": 65536, "format": "qcow2", "actual-size": SIZE= , "format-specific": {"type": "qcow2", "data": {"compat": "0.10", "compress= ion-type": "zlib", "refcount-bits": 16}}, "dirty-flag": false}, "limits": {= "write-zeroes-alignment": 65536, "request-alignment": 1, "min-mem-alignment= ": 1, "discard-alignment": 65536, "opt-mem-alignment": 4096, "max-iov": 102= 4}, "virtual-size": 134217728, "filename": "json:{\"backing\": {\"driver\":= \"qcow2\", \"file\": {\"driver\": \"file\", \"filename\": \"TEST_DIR/t.qco= w2\"}}, \"driver\": \"qcow2\", \"file\": {\"driver\": \"file\", \"filename\= ": \"SNAPSHOT_PATH\"}}" , "cluster-size": 65536, "format": "qcow2", "actual-size": SIZE, "format-s= pecific": {"type": "qcow2", "data": {"compat": "1.1", "compression-type": "= zlib", "lazy-refcounts": false, "refcount-bits": 16, "corrupt": false, "ext= ended-l2": false}}, "dirty-flag": false}, "iops_wr": 0, "ro": true, "childr= en": [{"node-name": "NODE_NAME", "child": "backing"}, {"node-name": "NODE_N= AME", "child": "file"}], "node-name": "NODE_NAME", "backing_file_depth": 1,= "drv": "qcow2", "iops": 0, "bps_wr": 0, "write_threshold": 0, "backing_fil= e": "TEST_DIR/t.qcow2", "encrypted": false, "bps": 0, "bps_rd": 0, "cache":= {"no-flush": true, "direct": false, "writeback": true}, "file": "json:{\"b= acking\": {\"driver\": \"qcow2\", \"file\": {\"driver\": \"file\", \"filena= me\": \"TEST_DIR/t.qcow2\"}}, \"driver\": \"qcow2\", \"file\": {\"driver\":= \"file\", \"filename\": \"SNAPSHOT_PATH\"}}"}, "type": "unknown"}]} +{"timestamp": {"seconds": TIMESTAMP, "microseconds": TIMESTAMP}, "event"= : "SHUTDOWN", "data": {"guest": false, "reason": "host-qmp-quit"}} =20 *** done --=20 2.56.0.rc0.29.g47ce80527c56 From nobody Sat Sep 26 20:01:40 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of lists.xenproject.org designates 192.237.175.120 as permitted sender) client-ip=192.237.175.120; envelope-from=xen-devel-bounces@lists.xenproject.org; helo=lists.xenproject.org; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of lists.xenproject.org designates 192.237.175.120 as permitted sender) smtp.mailfrom=xen-devel-bounces@lists.xenproject.org; dmarc=pass(p=quarantine dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1790108707; cv=none; d=zohomail.com; s=zohoarc; b=IWx3LQhTJ7UMrCxsvk2jiRbVozWg05EdONDAzmf2BSLL0CgKDTAFQ158BvfIiHd4G9lRMNGRoB3cHa0czYkzmCGkkKy5qZkyUvhlRynulwWW5B1IngBe3Me/ulwLFA2qi3BMd/4UOqG9WPOE6SpoMPeULR+EpnrJ/PFwwbEgQJ0= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1790108707; h=Content-Type:Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Help:List-Unsubscribe:MIME-Version:Message-ID:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=ArBsudPGq56rGaGjJckWrplo0/hGiKQk5vOivYLgX9k=; b=ImJozDYM88NQCanrrmDVWpTR/n9ka70Jt1nd6/FCSNDSc1MvfjX0g7epG5Yvj3W9/csOuNJmZ3EIDD4oGx3GWktOqqI9WekveelnhKrhQjpOMslYMFaXGvbM9IqU1OKk0v1TzMQ4fO6UIJpYtb6940MQcvcxZqJgX0JBzvoO4KI= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of lists.xenproject.org designates 192.237.175.120 as permitted sender) smtp.mailfrom=xen-devel-bounces@lists.xenproject.org; dmarc=pass header.from= (p=quarantine dis=none) Return-Path: Received: from lists.xenproject.org (lists.xenproject.org [192.237.175.120]) by mx.zohomail.com with SMTPS id 1790108707209220.48977979072106; Tue, 22 Sep 2026 13:25:07 -0700 (PDT) Received: from list by lists.xenproject.org with outflank-mailman.1429471.1652323 (Exim 4.92) (envelope-from ) id 1x972V-0003sI-26; Tue, 22 Sep 2026 20:24:31 +0000 Received: by outflank-mailman (output) from mailman id 1429471.1652323; Tue, 22 Sep 2026 20:24:31 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1x972U-0003sB-VR; Tue, 22 Sep 2026 20:24:30 +0000 Received: by outflank-mailman (input) for mailman id 1429471; Tue, 22 Sep 2026 20:24:29 +0000 Received: from mx.expurgate.net ([195.190.135.20]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1x972S-0003s5-W1 for xen-devel@lists.xenproject.org; Tue, 22 Sep 2026 20:24:29 +0000 Received: from mx.expurgate.net (helo=localhost) by mx.expurgate.net with esmtp id 1x972R-00BPgi-Mt for xen-devel@lists.xenproject.org; Tue, 22 Sep 2026 22:24:27 +0200 Received: from [10.42.69.8] (helo=localhost) by localhost with ESMTP (eXpurgate MTA 0.9.1) (envelope-from ) id 6ab2e3fb-2eae-0a2a0a5409dd-0a2a4508b96e-0 for ; Tue, 22 Sep 2026 22:24:27 +0200 Received: from [170.10.133.124] (helo=us-smtp-delivery-124.mimecast.com) by tlsNG-c1860d.mxtls.expurgate.net with ESMTPS (eXpurgate 4.57.1) (envelope-from ) id 6ab2e3f5-f659-0a2a45080019-aa0a857cda23-3 for ; Tue, 22 Sep 2026 22:24:22 +0200 Received: from mx-prod-mc-05.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-684-Ljz03s7FNHWwafDBITVPiw-1; Tue, 22 Sep 2026 16:24:17 -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-05.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id 28C9C19772E4; Tue, 22 Sep 2026 20:24:16 +0000 (UTC) Received: from localhost (headnet03.pony-001.prod.iad2.dc.redhat.com [10.2.32.114]) by mx-prod-int-10.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id 5100141D; Tue, 22 Sep 2026 20:24:13 +0000 (UTC) X-Outflank-Mailman: Message body and most headers restored to incoming version X-BeenThere: xen-devel@lists.xenproject.org List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-devel-bounces@lists.xenproject.org Precedence: list Sender: "Xen-devel" Authentication-Results: eu.smtp.expurgate.cloud; dkim=pass header.s=mimecast20190719 header.d=redhat.com header.i="@redhat.com" header.h="From:Subject:Date:Message-Id:To:Cc:MIME-Version:Content-Type:Content-Transfer-Encoding:In-Reply-To:References" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1790108661; 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=ArBsudPGq56rGaGjJckWrplo0/hGiKQk5vOivYLgX9k=; b=QIsZgVeuuzl2ZhjQwuC/Ev2xRT58M/N7eE3GyQ2PPEj97XWOBxLhTCzf5CsY9pKGxyykX4 z6FWOxTu+0pX+b/4zC8XGk+KDtJrgYL02t9+2A3kHbNlntRyT/WL+QNPBwAQ5YbkBSK5EM 4F2WcO4yumsE7YO4QyZ8GK1uAgTE4/4= X-MC-Unique: Ljz03s7FNHWwafDBITVPiw-1 X-Mimecast-MFC-AGG-ID: Ljz03s7FNHWwafDBITVPiw_1790108656 From: =?utf-8?q?Marc-Andr=C3=A9_Lureau?= Date: Wed, 23 Sep 2026 00:18:32 +0400 Subject: [PATCH 85/88] qdev: add x-query-qtree QMP command MIME-Version: 1.0 Message-Id: <20260923-nohmp-v1-85-ebc029d4bd80@redhat.com> References: <20260923-nohmp-v1-0-ebc029d4bd80@redhat.com> In-Reply-To: <20260923-nohmp-v1-0-ebc029d4bd80@redhat.com> To: qemu-devel@nongnu.org Cc: Kevin Wolf , =?utf-8?q?Marc-Andr=C3=A9_Lureau?= , "Michael S. Tsirkin" , Laurent Vivier , Amit Shah , Paolo Bonzini , =?utf-8?q?Daniel_P=2E_Berrang=C3=A9?= , Stefano Stabellini , Anthony PERARD , "Edgar E. Iglesias" , Eric Blake , Markus Armbruster , xen-devel@lists.xenproject.org, qemu-rust@nongnu.org X-Developer-Signature: v=1; a=openpgp-sha256; l=22716; i=marcandre.lureau@redhat.com; h=from:subject:message-id; bh=kgwmlhrAVDXi4XANRljYDT/ER4YlpkwkFlzObaLlJCI=; b=owEBbQKS/ZANAwAKAdro4Ql1lpzlAcsmYgBqsuK0thVU45gjDBEnQecKc50CZGgIu1NnS+HpQ rZ5RvqAZ+eJAjMEAAEKAB0WIQSHqb2TP4fGBtJ29i3a6OEJdZac5QUCarLitAAKCRDa6OEJdZac 5b9tD/4kNJbyz4x+KPGlvhyk8IVrVHJKZHe5UYHPfmbGRKG3E/CkRpYoSW1VZREd5AXbD30foTk uH2iuDdZSIVyKgvaXZ7nI5VUgdRygOG4goAHwzLFHxxhq3Vclj4UBupzOvP0tPftLwnrGsOF4+p TYYtzzoFntv8G+lZZandIG3ufOMhbd+YxevKBYq3enEueT7AqZQZZ1ASg38GYKqxTaqtcj3gQ/p 13tMoUCCnxkpLfRr9R3+4ZYMWXoaE9ORpoiK8yxM22Esgy4mTBrQxYpib+lhhY4TtgsuBa0YIqV soeVaFz8aT2ePEv3xAjpVz6sIj6WqNFoQF2DN/9t7Z0AtT3InmQKtWd3YgA9zKYYwRcJYyR6x3m 8Fk/M4VVDAweUT4vsJc1/PgrRp+Ll66Rhe/Xc2Vcmi0sy8Fu5zhpXlE2gid+F5Cxo8sn5E1Sz9D 8XSclNJ44UE1JsizmaE27ACxJM73V4DHmoQap/RElPzw3KQ/HzT2/UShIHIUqzEwTWCaBgoNn7r hQbqa9uiSvX4TpmFSQ3JFg9RaqcKlNJaZKIi7sjB042G13pfc52ZVxT2zvSzculhKrJxk5Wza5U hnukq7c231Kr1MQI6F87bTKMT7GXKQrxiJah4/1xyrbK9ZfTjfo+yDV7uv0DZpTujvcd7Ht/igg DtXX3YvV6KvoVZg== X-Developer-Key: i=marcandre.lureau@redhat.com; a=openpgp; fpr=87A9BD933F87C606D276F62DDAE8E10975969CE5 X-Scanned-By: MIMEDefang 3.6 on 10.30.177.95 X-Mimecast-MFC-PROC-ID: rwj2S0dtMkQfFOHf-l19XsiugOfoLzfkG1or5F3ApqI_1790108656 X-Mimecast-Originator: redhat.com Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-purgate-ID: tlsNG-c1860d/1790108667-D457487B-72E35ECC/0/0 X-purgate-type: clean X-purgate-size: 22718 X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1790108709283158500 Add x-query-qtree QMP command returning HumanReadableText with the device tree. Supports an optional "brief" parameter to omit device properties, matching the -b flag of "info qtree". Refactor the BusClass print_dev callback and qbus_print/qdev_print functions to write to a GString buffer instead of requiring a Monitor, so the QMP command can collect the output directly without needing monitor internals. Rewire hmp_info_qtree to use the new QMP command. Eventually, qom-list and properties retrieval should be enhanced to do tree traversal and make this pretty-printing method obsolete and return structured data instead. Signed-off-by: Marc-Andr=C3=A9 Lureau --- hw/char/virtio-serial-bus.c | 23 ++++++++-------------- hw/core/sysbus.c | 17 +++++------------ hw/misc/auxbus.c | 22 ++++++++------------- hw/pci/pci-hmp-cmds.c | 38 ------------------------------------- hw/pci/pci-internal.h | 2 +- hw/pci/pci.c | 40 +++++++++++++++++++++++++++++++++++++= -- hw/usb/bus.c | 23 ++++++++-------------- hw/xen/xen-bus.c | 12 +++--------- include/hw/core/qdev.h | 4 +--- qapi/qdev.json | 31 ++++++++++++++++++++++++++++++ rust/bindings/hwcore-sys/lib.rs | 2 +- system/qdev-monitor.c | 42 +++++++++++++++++++++++++++----------= ---- 12 files changed, 132 insertions(+), 124 deletions(-) diff --git a/hw/char/virtio-serial-bus.c b/hw/char/virtio-serial-bus.c index c36e18a4cfb5..af438316f1a4 100644 --- a/hw/char/virtio-serial-bus.c +++ b/hw/char/virtio-serial-bus.c @@ -24,8 +24,6 @@ #include "qemu/main-loop.h" #include "qemu/module.h" #include "migration/qemu-file-types.h" -#include "monitor/monitor.h" -#include "monitor/hmp.h" #include "qemu/error-report.h" #include "qemu/queue.h" #include "hw/core/qdev-properties.h" @@ -818,9 +816,7 @@ static int virtio_serial_load_device(VirtIODevice *vdev= , QEMUFile *f, return 0; } =20 -#ifdef CONFIG_HMP -static void virtser_bus_dev_print(MonitorHMP *hmp, DeviceState *qdev, int = indent); -#endif +static void virtser_bus_dev_print(GString *buf, DeviceState *qdev, int ind= ent); =20 static const Property virtser_props[] =3D { DEFINE_PROP_UINT32("nr", VirtIOSerialPort, id, VIRTIO_CONSOLE_BAD_ID), @@ -829,10 +825,8 @@ static const Property virtser_props[] =3D { =20 static void virtser_bus_class_init(ObjectClass *klass, const void *data) { -#ifdef CONFIG_HMP BusClass *k =3D BUS_CLASS(klass); k->print_dev =3D virtser_bus_dev_print; -#endif } =20 static const TypeInfo virtser_bus_info =3D { @@ -842,18 +836,17 @@ static const TypeInfo virtser_bus_info =3D { .class_init =3D virtser_bus_class_init, }; =20 -#ifdef CONFIG_HMP -static void virtser_bus_dev_print(MonitorHMP *hmp, DeviceState *qdev, int = indent) +static void virtser_bus_dev_print(GString *buf, DeviceState *qdev, int ind= ent) { VirtIOSerialPort *port =3D VIRTIO_SERIAL_PORT(qdev); =20 - monitor_hmp_printf(hmp, "%*sport %d, guest %s, host %s, throttle %s\n", - indent, "", port->id, - port->guest_connected ? "on" : "off", - port->host_connected ? "on" : "off", - port->throttled ? "on" : "off"); + g_string_append_printf(buf, + "%*sport %d, guest %s, host %s, throttle %s\n", + indent, "", port->id, + port->guest_connected ? "on" : "off", + port->host_connected ? "on" : "off", + port->throttled ? "on" : "off"); } -#endif =20 /* This function is only used if a port id is not provided by the user */ static uint32_t find_free_port_id(VirtIOSerial *vser) diff --git a/hw/core/sysbus.c b/hw/core/sysbus.c index fe8f867a8d9c..3a5fd52192d8 100644 --- a/hw/core/sysbus.c +++ b/hw/core/sysbus.c @@ -20,13 +20,9 @@ #include "qemu/osdep.h" #include "qapi/error.h" #include "hw/core/sysbus.h" -#include "monitor/monitor.h" -#include "monitor/hmp.h" #include "system/address-spaces.h" =20 -#ifdef CONFIG_HMP -static void sysbus_dev_print(MonitorHMP *hmp, DeviceState *dev, int indent= ); -#endif +static void sysbus_dev_print(GString *buf, DeviceState *dev, int indent); static char *sysbus_get_fw_dev_path(DeviceState *dev); =20 typedef struct SysBusFind { @@ -78,9 +74,7 @@ static void system_bus_class_init(ObjectClass *klass, con= st void *data) { BusClass *k =3D BUS_CLASS(klass); =20 -#ifdef CONFIG_HMP k->print_dev =3D sysbus_dev_print; -#endif k->get_fw_dev_path =3D sysbus_get_fw_dev_path; } =20 @@ -253,8 +247,7 @@ bool sysbus_realize_and_unref(SysBusDevice *dev, Error = **errp) return qdev_realize_and_unref(DEVICE(dev), sysbus_get_default(), errp); } =20 -#ifdef CONFIG_HMP -static void sysbus_dev_print(MonitorHMP *hmp, DeviceState *dev, int indent) +static void sysbus_dev_print(GString *buf, DeviceState *dev, int indent) { SysBusDevice *s =3D SYS_BUS_DEVICE(dev); hwaddr size; @@ -262,11 +255,11 @@ static void sysbus_dev_print(MonitorHMP *hmp, DeviceS= tate *dev, int indent) =20 for (i =3D 0; i < s->num_mmio; i++) { size =3D memory_region_size(s->mmio[i].memory); - monitor_hmp_printf(hmp, "%*smmio " HWADDR_FMT_plx "/" HWADDR_FMT_p= lx "\n", - indent, "", s->mmio[i].addr, size); + g_string_append_printf(buf, "%*smmio " + HWADDR_FMT_plx "/" HWADDR_FMT_plx "\n", + indent, "", s->mmio[i].addr, size); } } -#endif =20 static char *sysbus_get_fw_dev_path(DeviceState *dev) { diff --git a/hw/misc/auxbus.c b/hw/misc/auxbus.c index 3f17784d9b8a..17033433147a 100644 --- a/hw/misc/auxbus.c +++ b/hw/misc/auxbus.c @@ -32,8 +32,6 @@ #include "qemu/module.h" #include "hw/misc/auxbus.h" #include "hw/i2c/i2c.h" -#include "monitor/monitor.h" -#include "monitor/hmp.h" #include "qapi/error.h" =20 #ifndef DEBUG_AUX @@ -47,22 +45,18 @@ } while (0) =20 =20 -#ifdef CONFIG_HMP -static void aux_slave_dev_print(MonitorHMP *hmp, DeviceState *dev, int ind= ent); -#endif +static void aux_slave_dev_print(GString *buf, DeviceState *dev, int indent= ); static inline I2CBus *aux_bridge_get_i2c_bus(AUXTOI2CState *bridge); =20 /* aux-bus implementation (internal not public) */ static void aux_bus_class_init(ObjectClass *klass, const void *data) { -#ifdef CONFIG_HMP BusClass *k =3D BUS_CLASS(klass); =20 /* AUXSlave has an MMIO so we need to change the way we print informat= ion * in monitor. */ k->print_dev =3D aux_slave_dev_print; -#endif } =20 AUXBus *aux_bus_init(DeviceState *parent, const char *name) @@ -287,13 +281,12 @@ static const TypeInfo aux_to_i2c_type_info =3D { }; =20 /* aux-slave implementation */ -#ifdef CONFIG_HMP static bool aux_bus_is_bridge(AUXBus *bus, DeviceState *dev) { return (dev =3D=3D DEVICE(bus->bridge)); } =20 -static void aux_slave_dev_print(MonitorHMP *hmp, DeviceState *dev, int ind= ent) +static void aux_slave_dev_print(GString *buf, DeviceState *dev, int indent) { AUXBus *bus =3D AUX_BUS(qdev_get_parent_bus(dev)); AUXSlave *s; @@ -305,12 +298,13 @@ static void aux_slave_dev_print(MonitorHMP *hmp, Devi= ceState *dev, int indent) =20 s =3D AUX_SLAVE(dev); =20 - monitor_hmp_printf(hmp, "%*smemory " HWADDR_FMT_plx "/" HWADDR_FMT_plx= "\n", - indent, "", - object_property_get_uint(OBJECT(s->mmio), "addr", N= ULL), - memory_region_size(s->mmio)); + g_string_append_printf(buf, + "%*smemory " HWADDR_FMT_plx "/" HWADDR_FMT_plx = "\n", + indent, "", + object_property_get_uint(OBJECT(s->mmio), + "addr", NULL), + memory_region_size(s->mmio)); } -#endif =20 void aux_init_mmio(AUXSlave *aux_slave, MemoryRegion *mmio) { diff --git a/hw/pci/pci-hmp-cmds.c b/hw/pci/pci-hmp-cmds.c index 879011da1384..776762f18fa5 100644 --- a/hw/pci/pci-hmp-cmds.c +++ b/hw/pci/pci-hmp-cmds.c @@ -135,44 +135,6 @@ void hmp_info_pci(MonitorHMP *hmp, const QDict *qdict) qapi_free_PciInfoList(info_list); } =20 -#ifdef CONFIG_HMP -void pcibus_dev_print(MonitorHMP *hmp, DeviceState *dev, int indent) -{ - PCIDevice *d =3D (PCIDevice *)dev; - int class =3D pci_get_word(d->config + PCI_CLASS_DEVICE); - const pci_class_desc *desc =3D get_class_desc(class); - char ctxt[64]; - PCIIORegion *r; - int i; - - if (desc->desc) { - snprintf(ctxt, sizeof(ctxt), "%s", desc->desc); - } else { - snprintf(ctxt, sizeof(ctxt), "Class %04x", class); - } - - monitor_hmp_printf(hmp, "%*sclass %s, addr %02x:%02x.%x, " - "pci id %04x:%04x (sub %04x:%04x)\n", - indent, "", ctxt, pci_dev_bus_num(d), - PCI_SLOT(d->devfn), PCI_FUNC(d->devfn), - pci_get_word(d->config + PCI_VENDOR_ID), - pci_get_word(d->config + PCI_DEVICE_ID), - pci_get_word(d->config + PCI_SUBSYSTEM_VENDOR_ID), - pci_get_word(d->config + PCI_SUBSYSTEM_ID)); - for (i =3D 0; i < PCI_NUM_REGIONS; i++) { - r =3D &d->io_regions[i]; - if (!r->size) { - continue; - } - monitor_hmp_printf(hmp, "%*sbar %d: %s at 0x%"FMT_PCIBUS - " [0x%"FMT_PCIBUS"]\n", - indent, "", - i, r->type & PCI_BASE_ADDRESS_SPACE_IO ? "i/o" = : "mem", - r->addr, r->addr + r->size - 1); - } -} -#endif - void hmp_pcie_aer_inject_error(MonitorHMP *hmp, const QDict *qdict) { Error *err =3D NULL; diff --git a/hw/pci/pci-internal.h b/hw/pci/pci-internal.h index b7231fab5dc9..68a169488d09 100644 --- a/hw/pci/pci-internal.h +++ b/hw/pci/pci-internal.h @@ -16,7 +16,7 @@ extern PCIHostStateList pci_host_bridges; =20 const pci_class_desc *get_class_desc(int class); PCIBus *pci_find_bus_nr(PCIBus *bus, int bus_num); -void pcibus_dev_print(MonitorHMP *mon, DeviceState *dev, int indent); +void pcibus_dev_print(GString *buf, DeviceState *dev, int indent); =20 int pcie_aer_parse_error_string(const char *error_name, uint32_t *status, bool *correctable); diff --git a/hw/pci/pci.c b/hw/pci/pci.c index 0efb4eb4bb03..433568440853 100644 --- a/hw/pci/pci.c +++ b/hw/pci/pci.c @@ -293,9 +293,7 @@ static void pci_bus_class_init(ObjectClass *klass, cons= t void *data) ResettableClass *rc =3D RESETTABLE_CLASS(klass); FWCfgDataGeneratorClass *fwgc =3D FW_CFG_DATA_GENERATOR_CLASS(klass); =20 -#ifdef CONFIG_HMP k->print_dev =3D pcibus_dev_print; -#endif k->get_dev_path =3D pcibus_get_dev_path; k->get_fw_dev_path =3D pcibus_get_fw_dev_path; k->realize =3D pci_bus_realize; @@ -2094,6 +2092,44 @@ const pci_class_desc *get_class_desc(int class) return desc; } =20 +void pcibus_dev_print(GString *buf, DeviceState *dev, int indent) +{ + PCIDevice *d =3D (PCIDevice *)dev; + int class =3D pci_get_word(d->config + PCI_CLASS_DEVICE); + const pci_class_desc *desc =3D get_class_desc(class); + char ctxt[64]; + PCIIORegion *r; + int i; + + if (desc->desc) { + snprintf(ctxt, sizeof(ctxt), "%s", desc->desc); + } else { + snprintf(ctxt, sizeof(ctxt), "Class %04x", class); + } + + g_string_append_printf(buf, "%*sclass %s, addr %02x:%02x.%x, " + "pci id %04x:%04x (sub %04x:%04x)\n", + indent, "", ctxt, pci_dev_bus_num(d), + PCI_SLOT(d->devfn), PCI_FUNC(d->devfn), + pci_get_word(d->config + PCI_VENDOR_ID), + pci_get_word(d->config + PCI_DEVICE_ID), + pci_get_word(d->config + PCI_SUBSYSTEM_VENDOR_I= D), + pci_get_word(d->config + PCI_SUBSYSTEM_ID)); + for (i =3D 0; i < PCI_NUM_REGIONS; i++) { + r =3D &d->io_regions[i]; + if (!r->size) { + continue; + } + g_string_append_printf(buf, "%*sbar %d: %s at 0x%"FMT_PCIBUS + " [0x%"FMT_PCIBUS"]\n", + indent, "", + i, + r->type & PCI_BASE_ADDRESS_SPACE_IO + ? "i/o" : "mem", + r->addr, r->addr + r->size - 1); + } +} + void pci_init_nic_devices(PCIBus *bus, const char *default_model) { qemu_create_nic_bus_devices(&bus->qbus, TYPE_PCI_DEVICE, default_model, diff --git a/hw/usb/bus.c b/hw/usb/bus.c index 5cc5ffec33a1..c6d65274771f 100644 --- a/hw/usb/bus.c +++ b/hw/usb/bus.c @@ -8,14 +8,10 @@ #include "qemu/module.h" #include "system/system.h" #include "migration/vmstate.h" -#include "monitor/monitor.h" -#include "monitor/hmp.h" #include "trace.h" #include "qemu/cutils.h" =20 -#ifdef CONFIG_HMP -static void usb_bus_dev_print(MonitorHMP *hmp, DeviceState *qdev, int inde= nt); -#endif +static void usb_bus_dev_print(GString *buf, DeviceState *qdev, int indent); =20 static char *usb_get_dev_path(DeviceState *dev); static char *usb_get_fw_dev_path(DeviceState *qdev); @@ -34,9 +30,7 @@ static void usb_bus_class_init(ObjectClass *klass, const = void *data) BusClass *k =3D BUS_CLASS(klass); HotplugHandlerClass *hc =3D HOTPLUG_HANDLER_CLASS(klass); =20 -#ifdef CONFIG_HMP k->print_dev =3D usb_bus_dev_print; -#endif k->get_dev_path =3D usb_get_dev_path; k->get_fw_dev_path =3D usb_get_fw_dev_path; hc->unplug =3D qdev_simple_device_unplug_cb; @@ -548,19 +542,18 @@ static const char *usb_speed(unsigned int speed) return txt[speed]; } =20 -#ifdef CONFIG_HMP -static void usb_bus_dev_print(MonitorHMP *hmp, DeviceState *qdev, int inde= nt) +static void usb_bus_dev_print(GString *buf, DeviceState *qdev, int indent) { USBDevice *dev =3D USB_DEVICE(qdev); USBBus *bus =3D usb_bus_from_device(dev); =20 - monitor_hmp_printf(hmp, "%*saddr %d.%d, port %s, speed %s, name %s%s\n= ", - indent, "", bus->busnr, dev->addr, - dev->port ? dev->port->path : "-", - usb_speed(dev->speed), dev->product_desc, - dev->attached ? ", attached" : ""); + g_string_append_printf(buf, + "%*saddr %d.%d, port %s, speed %s, name %s%s\n", + indent, "", bus->busnr, dev->addr, + dev->port ? dev->port->path : "-", + usb_speed(dev->speed), dev->product_desc, + dev->attached ? ", attached" : ""); } -#endif =20 static char *usb_get_dev_path(DeviceState *qdev) { diff --git a/hw/xen/xen-bus.c b/hw/xen/xen-bus.c index 8def3bb68bc6..cc98034230e8 100644 --- a/hw/xen/xen-bus.c +++ b/hw/xen/xen-bus.c @@ -16,8 +16,6 @@ #include "hw/xen/xen-legacy-backend.h" /* xen_be_init() */ #include "hw/xen/xen-bus.h" #include "hw/xen/xen-bus-helper.h" -#include "monitor/monitor.h" -#include "monitor/hmp.h" #include "qapi/error.h" #include "qobject/qdict.h" #include "system/system.h" @@ -101,15 +99,13 @@ abort: qemu_xen_xs_transaction_end(xenbus->xsh, tid, true); } =20 -#ifdef CONFIG_HMP -static void xen_bus_print_dev(MonitorHMP *hmp, DeviceState *dev, int inden= t) +static void xen_bus_print_dev(GString *buf, DeviceState *dev, int indent) { XenDevice *xendev =3D XEN_DEVICE(dev); =20 - monitor_hmp_printf(hmp, "%*sname =3D '%s' frontend_id =3D %u\n", - indent, "", xendev->name, xendev->frontend_id); + g_string_append_printf(buf, "%*sname =3D '%s' frontend_id =3D %u\n", + indent, "", xendev->name, xendev->frontend_id); } -#endif =20 static char *xen_bus_get_dev_path(DeviceState *dev) { @@ -388,9 +384,7 @@ static void xen_bus_class_init(ObjectClass *class, cons= t void *data) BusClass *bus_class =3D BUS_CLASS(class); HotplugHandlerClass *hotplug_class =3D HOTPLUG_HANDLER_CLASS(class); =20 -#ifdef CONFIG_HMP bus_class->print_dev =3D xen_bus_print_dev; -#endif bus_class->get_dev_path =3D xen_bus_get_dev_path; bus_class->realize =3D xen_bus_realize; bus_class->unrealize =3D xen_bus_unrealize; diff --git a/include/hw/core/qdev.h b/include/hw/core/qdev.h index 1f6bf3fc1abf..e8399d8541fb 100644 --- a/include/hw/core/qdev.h +++ b/include/hw/core/qdev.h @@ -323,10 +323,8 @@ DECLARE_OBJ_CHECKERS(BusState, BusClass, struct BusClass { ObjectClass parent_class; =20 -#ifdef CONFIG_HMP /* FIXME first arg should be BusState */ - void (*print_dev)(MonitorHMP *mon, DeviceState *dev, int indent); -#endif + void (*print_dev)(GString *buf, DeviceState *dev, int indent); /* * Return a newly allocated string containing the path of the * device on this bus. diff --git a/qapi/qdev.json b/qapi/qdev.json index 974cf9c5830e..4b5ccfb37687 100644 --- a/qapi/qdev.json +++ b/qapi/qdev.json @@ -165,6 +165,37 @@ { 'event': 'DEVICE_UNPLUG_GUEST_ERROR', 'data': { '*device': 'str', 'path': 'str' } } =20 +## +# @x-query-qtree: +# +# Query device tree +# +# @brief: if true, omit device properties. (default: false) +# +# Features: +# +# @unstable: This command is meant for debugging. +# +# Returns: device tree +# +# Since: 11.2 +# +# .. qmp-example:: +# +# -> { "execute": "x-query-qtree" } +# <- { "return": { "human-readable-text": "..." } } +# +# .. qmp-example:: +# +# -> { "execute": "x-query-qtree", +# "arguments": { "brief": true } } +# <- { "return": { "human-readable-text": "..." } } +## +{ 'command': 'x-query-qtree', + 'data': { '*brief': 'bool' }, + 'returns': 'HumanReadableText', + 'features': [ 'unstable' ] } + ## # @device-sync-config: # diff --git a/rust/bindings/hwcore-sys/lib.rs b/rust/bindings/hwcore-sys/lib= .rs index cecbf808dd09..a28f5ab90f69 100644 --- a/rust/bindings/hwcore-sys/lib.rs +++ b/rust/bindings/hwcore-sys/lib.rs @@ -21,7 +21,7 @@ =20 use chardev_sys::Chardev; use common::Zeroable; -use glib_sys::GSList; +use glib_sys::{GSList, GString}; use migration_sys::VMStateDescription; use qom_sys::{ InterfaceClass, Object, ObjectClass, ObjectProperty, ObjectPropertyAcc= essor, diff --git a/system/qdev-monitor.c b/system/qdev-monitor.c index 8185822daa71..1a4af35f9db1 100644 --- a/system/qdev-monitor.c +++ b/system/qdev-monitor.c @@ -27,6 +27,7 @@ #include "system/runstate.h" #include "qapi/error.h" #include "qapi/qapi-commands-qdev.h" +#include "qapi/type-helpers.h" #include "qapi/qmp-registry.h" #include "qobject/qdict.h" #include "qapi/qmp/qerror.h" @@ -770,11 +771,10 @@ DeviceState *qdev_device_add(QemuOpts *opts, Error **= errp) return ret; } =20 -#ifdef CONFIG_HMP #define qdev_printf(fmt, ...) \ - monitor_hmp_printf(hmp, "%*s" fmt, indent, "", ## __VA_ARGS__) + g_string_append_printf(buf, "%*s" fmt, indent, "", ## __VA_ARGS__) =20 -static void qdev_print_props(MonitorHMP *hmp, DeviceState *dev, DeviceClas= s *dc, +static void qdev_print_props(GString *buf, DeviceState *dev, DeviceClass *= dc, int indent) { for (int i =3D 0, n =3D dc->props_count_; i < n; ++i) { @@ -798,16 +798,17 @@ static void qdev_print_props(MonitorHMP *hmp, DeviceS= tate *dev, DeviceClass *dc, } } =20 -static void bus_print_dev(BusState *bus, MonitorHMP *hmp, DeviceState *dev= , int indent) +static void bus_print_dev(BusState *bus, GString *buf, DeviceState *dev, + int indent) { BusClass *bc =3D BUS_GET_CLASS(bus); =20 if (bc->print_dev) { - bc->print_dev(hmp, dev, indent); + bc->print_dev(buf, dev, indent); } } =20 -static void qdev_print(MonitorHMP *hmp, DeviceState *dev, int indent) +static void qdev_print(GString *buf, DeviceState *dev, int indent) { ObjectClass *class; NamedGPIOList *ngl; @@ -832,13 +833,13 @@ static void qdev_print(MonitorHMP *hmp, DeviceState *= dev, int indent) } class =3D object_get_class(OBJECT(dev)); do { - qdev_print_props(hmp, dev, DEVICE_CLASS(class), indent); + qdev_print_props(buf, dev, DEVICE_CLASS(class), indent); class =3D object_class_get_parent(class); } while (class !=3D object_class_by_name(TYPE_DEVICE)); - bus_print_dev(dev->parent_bus, hmp, dev, indent); + bus_print_dev(dev->parent_bus, buf, dev, indent); } =20 -static void qbus_print(MonitorHMP *hmp, BusState *bus, int indent, bool de= tails) +static void qbus_print(GString *buf, BusState *bus, int indent, bool detai= ls) { BusChild *kid; =20 @@ -851,22 +852,35 @@ static void qbus_print(MonitorHMP *hmp, BusState *bus= , int indent, bool details) qdev_printf("dev: %s, id \"%s\"\n", object_get_typename(OBJECT(dev= )), dev->id ? dev->id : ""); if (details) { - qdev_print(hmp, dev, indent + 2); + qdev_print(buf, dev, indent + 2); } QLIST_FOREACH(child_bus, &dev->child_bus, sibling) { - qbus_print(hmp, child_bus, indent + 2, details); + qbus_print(buf, child_bus, indent + 2, details); } } } #undef qdev_printf =20 -void hmp_info_qtree(MonitorHMP *hmp, const QDict *qdict) +HumanReadableText *qmp_x_query_qtree(bool has_brief, bool brief, Error **e= rrp) { - bool details =3D !qdict_get_try_bool(qdict, "brief", false); + g_autoptr(GString) buf =3D g_string_new(""); + bool details =3D !(has_brief && brief); =20 if (sysbus_get_default()) { - qbus_print(hmp, sysbus_get_default(), 0, details); + qbus_print(buf, sysbus_get_default(), 0, details); } + + return human_readable_text_from_str(buf); +} + +#ifdef CONFIG_HMP +void hmp_info_qtree(MonitorHMP *hmp, const QDict *qdict) +{ + bool brief =3D qdict_get_try_bool(qdict, "brief", false); + g_autoptr(HumanReadableText) info =3D + qmp_x_query_qtree(true, brief, &error_abort); + + monitor_hmp_printf(hmp, "%s", info->human_readable_text); } =20 void hmp_info_qdm(MonitorHMP *hmp, const QDict *qdict) --=20 2.56.0.rc0.29.g47ce80527c56 From nobody Sat Sep 26 20:01:40 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=1790108898; cv=none; d=zohomail.com; s=zohoarc; b=al0rzOEKKCJLdPE73alhIO1zKGT/To5vhQvROxqeeuomWUaj5rojhV57Hpxoa4rxSU/o5ssjfR616ZfUkQ+cqoiqMcq+vPGu3HOzw/1wFJFaLqd3EdGzxzI/nRX6ZwzIG/2l1NVrw/4CCUZhiI+5A0iSgmq/zR4FsYRIFPIKzF0= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1790108898; 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:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=Q9Xx1QgV60HnWy/D1qs5SVHk5j8YzgWxCyt6p1UWbXQ=; b=Etyeh7R3662Q3Db2VTtzddk0VsWv3kS2CmuJYYo5/4Cg3mPPc1yewUmhmv5EAeJwvTOcKHwBmCx+DmSh7rwLJqi9K1MRc7uUc1HTCOeMN96iDM+7/sNnFavrwdD2GaLQY63WSZXx+HdHuxXXzyhSguOQBK3R08p4QANqIgDhNjk= 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 1790108898164212.25465025740186; Tue, 22 Sep 2026 13:28:18 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists1p.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1x975M-0005kG-H4; Tue, 22 Sep 2026 16:27:32 -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 1x972V-0001YK-8z for qemu-devel@nongnu.org; Tue, 22 Sep 2026 16:24:31 -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 1x972P-0000bf-B8 for qemu-devel@nongnu.org; Tue, 22 Sep 2026 16:24:30 -0400 Received: from mx-prod-mc-08.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-607-YcSFxw1gOY2CMb5SmLTtGw-1; Tue, 22 Sep 2026 16:24:21 -0400 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-08.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id 32B0D18052E0; Tue, 22 Sep 2026 20:24:20 +0000 (UTC) Received: from localhost (headnet03.pony-001.prod.iad2.dc.redhat.com [10.2.32.114]) by mx-prod-int-08.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id A9E9B1800446; Tue, 22 Sep 2026 20:24:18 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1790108664; 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=Q9Xx1QgV60HnWy/D1qs5SVHk5j8YzgWxCyt6p1UWbXQ=; b=X5Vn/0X3STSRfMMKK3wvYXI3s2s8yR4GpLMFSgl6cfabt1VLTxNd0T8eGcQ6zWFZvL1XYU ITryQapy0uDgAgCVvZHMCavGruZpTEU5Hn98Yo5ANyEDXI1AzCyio5HRKVVyDsaig6n2AC UXyyiNWmyERC5fuv+aNARSQFcRq46+E= X-MC-Unique: YcSFxw1gOY2CMb5SmLTtGw-1 X-Mimecast-MFC-AGG-ID: YcSFxw1gOY2CMb5SmLTtGw_1790108660 From: =?utf-8?q?Marc-Andr=C3=A9_Lureau?= Date: Wed, 23 Sep 2026 00:18:33 +0400 Subject: [PATCH 86/88] qemu-iotests/172: migrate away from HMP MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Message-Id: <20260923-nohmp-v1-86-ebc029d4bd80@redhat.com> References: <20260923-nohmp-v1-0-ebc029d4bd80@redhat.com> In-Reply-To: <20260923-nohmp-v1-0-ebc029d4bd80@redhat.com> To: qemu-devel@nongnu.org Cc: Kevin Wolf , =?utf-8?q?Marc-Andr=C3=A9_Lureau?= , Hanna Reitz , qemu-block@nongnu.org X-Developer-Signature: v=1; a=openpgp-sha256; l=59416; i=marcandre.lureau@redhat.com; h=from:subject:message-id; bh=Z7zWiYPoHXujB3Ip3/2kCX5nmNzZ2k9eAEMT2Fd8030=; b=owEBbQKS/ZANAwAKAdro4Ql1lpzlAcsmYgBqsuK09a/Az8Mpb8dKX3j/epaB5CfamM6lwI4x9 VCmEnKiOgGJAjMEAAEKAB0WIQSHqb2TP4fGBtJ29i3a6OEJdZac5QUCarLitAAKCRDa6OEJdZac 5cGfD/9yNFXIzWMs8pOAcgY8vOmz20t0Udxkl/0v0So/qDS0Rx1uPwdGlEBiPsb9iPnL8GBniJg 7PTEWOqHpnbRseqUFtbv49ZMmgqNJ6Ng3Ew01fpdDxKM3toW1eq7KgBBamDGOUh82FxT44Qoq5O D9HdF3uUGVnGmn2i/7LKB80W58xDqrpRKPzLe6Vu049X7Y0RnlKt62zFrYsp9qzsMrt6vN62bV1 E+Qq/TBic+d8NU8zIFSg25WdanG6qrU/+Jo2hxr32ZUVKjCcQXM8AmcQctngqheLBQMV0BwQwO/ 8DXb9UOP6fzwC2WSJVz6l8HSaNhwbJk6u3ugWe2WgxNcayFGcp7x6EgMWu75KTj88R6VpYuAKGW WAzQ8e2X70fwSo8u5T/CAXypOTxLvNPbymJGuVZsbxwoMh+wi2Kp67xn5d0Ccyr18QasNtUlHs/ Vi9+Bkn78bMpr/1ijaMDMGE6qiapKXcfbJcKHVDwsKFvEvto46xeuvwjDiDaiaz/YQnBvdjzFXH ryKe26/G+Ar/3mfNIJq7dNaryXA5r7ZpqBPd32R7jLzcp8V9home557syIT2oRoDmljXrCXTclu cFF6RX2Ogph9Eym+PFV3IFTREaEdx7Ji78f4DwVUbSQe+nSi+X59sEgqve3pMsfpoUC89uoyzry 6+xuKw+vlbGbBAw== X-Developer-Key: i=marcandre.lureau@redhat.com; a=openpgp; fpr=87A9BD933F87C606D276F62DDAE8E10975969CE5 X-Scanned-By: MIMEDefang 3.4.1 on 10.30.177.111 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: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 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, 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: 1790108900208158500 Replace HMP with QMP, using x-query-qtree for the device tree and query-block for block device info. The query-block output now includes all block devices, including those without media inserted (e.g. ide1-cd0, empty floppy drives). Signed-off-by: Marc-Andr=C3=A9 Lureau --- tests/qemu-iotests/172 | 76 +++++++++-- tests/qemu-iotests/172.out | 305 ++++-------------------------------------= ---- 2 files changed, 89 insertions(+), 292 deletions(-) diff --git a/tests/qemu-iotests/172 b/tests/qemu-iotests/172 index a78e42ff0adf..b2b06f404772 100755 --- a/tests/qemu-iotests/172 +++ b/tests/qemu-iotests/172 @@ -42,7 +42,6 @@ trap "_cleanup; exit \$status" 0 1 2 3 15 _supported_fmt qcow2 _supported_proto file _supported_os Linux -_require_hmp =20 if [ "$QEMU_DEFAULT_MACHINE" !=3D "pc" ]; then _notrun "Requires a PC machine" @@ -51,16 +50,70 @@ fi do_run_qemu() { ( + echo '{"execute":"qmp_capabilities"}' if ! test -t 0; then while read cmd; do - echo $cmd + echo "$cmd" done fi - echo quit - ) | $QEMU -accel qtest -nographic -monitor stdio -serial none -vga non= e -nic none "$@" + echo '{"execute":"quit"}' + ) | $QEMU -accel qtest -nographic -qmp stdio -serial none -vga none -n= ic none "$@" echo } =20 +_filter_qmp_responses() +{ + $PYTHON -c ' +import sys, json, re +for line in sys.stdin: + try: + j =3D json.loads(line) + except Exception: + continue + if "error" in j: + print(json.dumps(j["error"])) + continue + r =3D j.get("return") + if r is None: + continue + if isinstance(r, dict) and "human-readable-text" in r: + p =3D False + for l in r["human-readable-text"].split("\n"): + if "dev: isa-fdc" in l: + p =3D True + elif p and l.startswith(" dev:"): + p =3D False + if p: + print(l) + elif isinstance(r, list): + if r: + s =3D json.dumps(r) + s =3D re.sub(r"device\[\d+\]", "device[N]", s) + print(s) +' +} + +_filter_block_cache() +{ + $PYTHON -c ' +import sys, json +for line in sys.stdin: + try: + r =3D json.loads(line).get("return") + except Exception: + continue + if not isinstance(r, list): + continue + for entry in r: + if entry.get("device") =3D=3D "none0" and "inserted" in entry: + cache =3D entry["inserted"]["cache"] + if cache["writeback"]: + print(" Cache mode: writeback") + else: + print(" Cache mode: writethrough") +' +} + check_floppy_qtree() { echo @@ -68,21 +121,18 @@ check_floppy_qtree() =20 # QEMU_OPTIONS contains -nodefaults, we don't want that here because t= he # defaults are part of what should be checked here. - # - # Apply the sed filter to stdout only, but keep the stderr output and - # filter the qemu program name in it. - printf "info qtree\ninfo block\n" | + printf '{"execute":"x-query-qtree"}\n{"execute":"query-block"}\n' | (QEMU_OPTIONS=3D"" do_run_qemu "$@" | - _filter_testdir |_filter_generated_node_ids | _filter_hmp | - sed -ne '/^ dev: isa-fdc/,/^ dev:/{x;p};/^[a-z][= ^ ]* (NODE_NAME):* /,/^(qemu)$/{p}') 2>&1 | - _filter_win32 | _filter_qemu | _filter_qom_path + _filter_testdir | _filter_generated_node_ids | + _filter_qmp_responses | _filter_actual_image_size) 2>&1 | + _filter_win32 | _filter_qemu } =20 check_cache_mode() { - echo "info block none0" | + printf '{"execute":"query-block"}\n' | QEMU_OPTIONS=3D"" do_run_qemu -drive if=3Dnone,file=3D"$TEST_IMG" "$@"= | - _filter_win32 | _filter_qemu | grep "Cache mode" + _filter_block_cache } =20 =20 diff --git a/tests/qemu-iotests/172.out b/tests/qemu-iotests/172.out index a023cd407dee..e9310bd34f39 100644 --- a/tests/qemu-iotests/172.out +++ b/tests/qemu-iotests/172.out @@ -7,7 +7,6 @@ Formatting 'TEST_DIR/t.IMGFMT.3', fmt=3DIMGFMT size=3D737280 =3D=3D=3D Default =3D=3D=3D =20 Testing: - dev: isa-fdc, id "" iobase =3D 1008 (0x3f0) irq =3D 6 (0x6) @@ -32,12 +31,12 @@ Testing: account-failed =3D "auto" stats-intervals =3D drive-type =3D "288" +[{"io-status": "ok", "device": "ide1-cd0", "locked": false, "removable": t= rue, "qdev": "/machine/unattached/device[N]", "tray_open": false, "type": "= unknown"}, {"device": "floppy0", "locked": false, "removable": true, "qdev"= : "/machine/unattached/device[N]", "type": "unknown"}] =20 =20 =3D=3D=3D Using -fda/-fdb options =3D=3D=3D =20 Testing: -fda TEST_DIR/t.qcow2 - dev: isa-fdc, id "" iobase =3D 1008 (0x3f0) irq =3D 6 (0x6) @@ -62,19 +61,9 @@ Testing: -fda TEST_DIR/t.qcow2 account-failed =3D "auto" stats-intervals =3D drive-type =3D "144" -floppy0 (NODE_NAME): TEST_DIR/t.qcow2 (qcow2) - Attached to: /machine/unattached/device[N] - Removable device: not locked, tray closed - Cache mode: writeback - -ide1-cd0: [not inserted] - Attached to: /machine/unattached/device[N] - Removable device: not locked, tray closed -(qemu) quit - +[{"device": "floppy0", "locked": false, "removable": true, "inserted": {"i= ops_rd": 0, "detect_zeroes": "off", "active": true, "image": {"limits": {"w= rite-zeroes-alignment": 65536, "request-alignment": 1, "min-mem-alignment":= 1, "discard-alignment": 65536, "opt-mem-alignment": 4096, "max-iov": 1024}= , "virtual-size": 737280, "filename": "TEST_DIR/t.qcow2", "cluster-size": 6= 5536, "format": "qcow2", "actual-size": SIZE, "format-specific": {"type": "= qcow2", "data": {"compat": "1.1", "compression-type": "zlib", "lazy-refcoun= ts": false, "refcount-bits": 16, "corrupt": false, "extended-l2": false}}, = "dirty-flag": false}, "iops_wr": 0, "ro": false, "children": [{"node-name":= "NODE_NAME", "child": "file"}], "node-name": "NODE_NAME", "backing_file_de= pth": 0, "drv": "qcow2", "iops": 0, "bps_wr": 0, "write_threshold": 0, "enc= rypted": false, "bps": 0, "bps_rd": 0, "cache": {"no-flush": false, "direct= ": false, "writeback": true}, "file": "TEST_DIR/t.qcow2"}, "qdev": "/machin= e/unattached/device[N]" , "type": "unknown"}, {"io-status": "ok", "device": "ide1-cd0", "locked": = false, "removable": true, "qdev": "/machine/unattached/device[N]", "tray_op= en": false, "type": "unknown"}] =20 Testing: -fdb TEST_DIR/t.qcow2 - dev: isa-fdc, id "" iobase =3D 1008 (0x3f0) irq =3D 6 (0x6) @@ -114,23 +103,9 @@ Testing: -fdb TEST_DIR/t.qcow2 account-failed =3D "auto" stats-intervals =3D drive-type =3D "288" -floppy1 (NODE_NAME): TEST_DIR/t.qcow2 (qcow2) - Attached to: /machine/unattached/device[N] - Removable device: not locked, tray closed - Cache mode: writeback - -ide1-cd0: [not inserted] - Attached to: /machine/unattached/device[N] - Removable device: not locked, tray closed - -floppy0: [not inserted] - Attached to: /machine/unattached/device[N] - Removable device: not locked, tray closed -(qemu) quit - +[{"device": "floppy1", "locked": false, "removable": true, "inserted": {"i= ops_rd": 0, "detect_zeroes": "off", "active": true, "image": {"limits": {"w= rite-zeroes-alignment": 65536, "request-alignment": 1, "min-mem-alignment":= 1, "discard-alignment": 65536, "opt-mem-alignment": 4096, "max-iov": 1024}= , "virtual-size": 737280, "filename": "TEST_DIR/t.qcow2", "cluster-size": 6= 5536, "format": "qcow2", "actual-size": SIZE, "format-specific": {"type": "= qcow2", "data": {"compat": "1.1", "compression-type": "zlib", "lazy-refcoun= ts": false, "refcount-bits": 16, "corrupt": false, "extended-l2": false}}, = "dirty-flag": false}, "iops_wr": 0, "ro": false, "children": [{"node-name":= "NODE_NAME", "child": "file"}], "node-name": "NODE_NAME", "backing_file_de= pth": 0, "drv": "qcow2", "iops": 0, "bps_wr": 0, "write_threshold": 0, "enc= rypted": false, "bps": 0, "bps_rd": 0, "cache": {"no-flush": false, "direct= ": false, "writeback": true}, "file": "TEST_DIR/t.qcow2"}, "qdev": "/machin= e/unattached/device[N]" , "type": "unknown"}, {"io-status": "ok", "device": "ide1-cd0", "locked": = false, "removable": true, "qdev": "/machine/unattached/device[N]", "tray_op= en": false, "type": "unknown"}, {"device": "floppy0", "locked": false, "rem= ovable": true, "qdev": "/machine/unattached/device[N]", "type": "unknown"}] =20 Testing: -fda TEST_DIR/t.qcow2 -fdb TEST_DIR/t.qcow2.2 - dev: isa-fdc, id "" iobase =3D 1008 (0x3f0) irq =3D 6 (0x6) @@ -170,24 +145,9 @@ Testing: -fda TEST_DIR/t.qcow2 -fdb TEST_DIR/t.qcow2.2 account-failed =3D "auto" stats-intervals =3D drive-type =3D "144" -floppy0 (NODE_NAME): TEST_DIR/t.qcow2 (qcow2) - Attached to: /machine/unattached/device[N] - Removable device: not locked, tray closed - Cache mode: writeback - -floppy1 (NODE_NAME): TEST_DIR/t.qcow2.2 (qcow2) - Attached to: /machine/unattached/device[N] - Removable device: not locked, tray closed - Cache mode: writeback - -ide1-cd0: [not inserted] - Attached to: /machine/unattached/device[N] - Removable device: not locked, tray closed -(qemu) quit - +[{"device": "floppy0", "locked": false, "removable": true, "inserted": {"i= ops_rd": 0, "detect_zeroes": "off", "active": true, "image": {"limits": {"w= rite-zeroes-alignment": 65536, "request-alignment": 1, "min-mem-alignment":= 1, "discard-alignment": 65536, "opt-mem-alignment": 4096, "max-iov": 1024}= , "virtual-size": 737280, "filename": "TEST_DIR/t.qcow2", "cluster-size": 6= 5536, "format": "qcow2", "actual-size": SIZE, "format-specific": {"type": "= qcow2", "data": {"compat": "1.1", "compression-type": "zlib", "lazy-refcoun= ts": false, "refcount-bits": 16, "corrupt": false, "extended-l2": false}}, = "dirty-flag": false}, "iops_wr": 0, "ro": false, "children": [{"node-name":= "NODE_NAME", "child": "file"}], "node-name": "NODE_NAME", "backing_file_de= pth": 0, "drv": "qcow2", "iops": 0, "bps_wr": 0, "write_threshold": 0, "enc= rypted": false, "bps": 0, "bps_rd": 0, "cache": {"no-flush": false, "direct= ": false, "writeback": true}, "file": "TEST_DIR/t.qcow2"}, "qdev": "/machin= e/unattached/device[N]" , "type": "unknown"}, {"device": "floppy1", "locked": false, "removable": = true, "inserted": {"iops_rd": 0, "detect_zeroes": "off", "active": true, "i= mage": {"limits": {"write-zeroes-alignment": 65536, "request-alignment": 1,= "min-mem-alignment": 1, "discard-alignment": 65536, "opt-mem-alignment": 4= 096, "max-iov": 1024}, "virtual-size": 737280, "filename": "TEST_DIR/t.qcow= 2.2", "cluster-size": 65536, "format": "qcow2", "actual-size": SIZE, "forma= t-specific": {"type": "qcow2", "data": {"compat": "1.1", "compression-type"= : "zlib", "lazy-refcounts": false, "refcount-bits": 16, "corrupt": false, "= extended-l2": false}}, "dirty-flag": false}, "iops_wr": 0, "ro": false, "ch= ildren": [{"node-name": "NODE_NAME", "child": "file"}], "node-name": "NODE_= NAME", "backing_file_depth": 0, "drv": "qcow2", "iops": 0, "bps_wr": 0, "wr= ite_threshold": 0, "encrypted": false, "bps": 0, "bps_rd": 0, "cache": {"no= -flush": false, "direct": false, "writeback": true}, "file": "TEST_DIR/t.qc= ow2.2"}, "qdev": "/mach ine/unattached/device[N]", "type": "unknown"}, {"io-status": "ok", "device= ": "ide1-cd0", "locked": false, "removable": true, "qdev": "/machine/unatta= ched/device[N]", "tray_open": false, "type": "unknown"}] =20 Testing: -fdb=20 - dev: isa-fdc, id "" iobase =3D 1008 (0x3f0) irq =3D 6 (0x6) @@ -227,12 +187,12 @@ Testing: -fdb account-failed =3D "auto" stats-intervals =3D drive-type =3D "288" +[{"device": "floppy1", "locked": false, "removable": true, "qdev": "/machi= ne/unattached/device[N]", "type": "unknown"}, {"io-status": "ok", "device":= "ide1-cd0", "locked": false, "removable": true, "qdev": "/machine/unattach= ed/device[N]", "tray_open": false, "type": "unknown"}, {"device": "floppy0"= , "locked": false, "removable": true, "qdev": "/machine/unattached/device[N= ]", "type": "unknown"}] =20 =20 =3D=3D=3D Using -drive options =3D=3D=3D =20 Testing: -drive if=3Dfloppy,file=3DTEST_DIR/t.qcow2 - dev: isa-fdc, id "" iobase =3D 1008 (0x3f0) irq =3D 6 (0x6) @@ -257,19 +217,9 @@ Testing: -drive if=3Dfloppy,file=3DTEST_DIR/t.qcow2 account-failed =3D "auto" stats-intervals =3D drive-type =3D "144" -floppy0 (NODE_NAME): TEST_DIR/t.qcow2 (qcow2) - Attached to: /machine/unattached/device[N] - Removable device: not locked, tray closed - Cache mode: writeback - -ide1-cd0: [not inserted] - Attached to: /machine/unattached/device[N] - Removable device: not locked, tray closed -(qemu) quit - +[{"device": "floppy0", "locked": false, "removable": true, "inserted": {"i= ops_rd": 0, "detect_zeroes": "off", "active": true, "image": {"limits": {"w= rite-zeroes-alignment": 65536, "request-alignment": 1, "min-mem-alignment":= 1, "discard-alignment": 65536, "opt-mem-alignment": 4096, "max-iov": 1024}= , "virtual-size": 737280, "filename": "TEST_DIR/t.qcow2", "cluster-size": 6= 5536, "format": "qcow2", "actual-size": SIZE, "format-specific": {"type": "= qcow2", "data": {"compat": "1.1", "compression-type": "zlib", "lazy-refcoun= ts": false, "refcount-bits": 16, "corrupt": false, "extended-l2": false}}, = "dirty-flag": false}, "iops_wr": 0, "ro": false, "children": [{"node-name":= "NODE_NAME", "child": "file"}], "node-name": "NODE_NAME", "backing_file_de= pth": 0, "drv": "qcow2", "iops": 0, "bps_wr": 0, "write_threshold": 0, "enc= rypted": false, "bps": 0, "bps_rd": 0, "cache": {"no-flush": false, "direct= ": false, "writeback": true}, "file": "TEST_DIR/t.qcow2"}, "qdev": "/machin= e/unattached/device[N]" , "type": "unknown"}, {"io-status": "ok", "device": "ide1-cd0", "locked": = false, "removable": true, "qdev": "/machine/unattached/device[N]", "tray_op= en": false, "type": "unknown"}] =20 Testing: -drive if=3Dfloppy,file=3DTEST_DIR/t.qcow2,index=3D1 - dev: isa-fdc, id "" iobase =3D 1008 (0x3f0) irq =3D 6 (0x6) @@ -309,23 +259,9 @@ Testing: -drive if=3Dfloppy,file=3DTEST_DIR/t.qcow2,in= dex=3D1 account-failed =3D "auto" stats-intervals =3D drive-type =3D "288" -floppy1 (NODE_NAME): TEST_DIR/t.qcow2 (qcow2) - Attached to: /machine/unattached/device[N] - Removable device: not locked, tray closed - Cache mode: writeback - -ide1-cd0: [not inserted] - Attached to: /machine/unattached/device[N] - Removable device: not locked, tray closed - -floppy0: [not inserted] - Attached to: /machine/unattached/device[N] - Removable device: not locked, tray closed -(qemu) quit - +[{"device": "floppy1", "locked": false, "removable": true, "inserted": {"i= ops_rd": 0, "detect_zeroes": "off", "active": true, "image": {"limits": {"w= rite-zeroes-alignment": 65536, "request-alignment": 1, "min-mem-alignment":= 1, "discard-alignment": 65536, "opt-mem-alignment": 4096, "max-iov": 1024}= , "virtual-size": 737280, "filename": "TEST_DIR/t.qcow2", "cluster-size": 6= 5536, "format": "qcow2", "actual-size": SIZE, "format-specific": {"type": "= qcow2", "data": {"compat": "1.1", "compression-type": "zlib", "lazy-refcoun= ts": false, "refcount-bits": 16, "corrupt": false, "extended-l2": false}}, = "dirty-flag": false}, "iops_wr": 0, "ro": false, "children": [{"node-name":= "NODE_NAME", "child": "file"}], "node-name": "NODE_NAME", "backing_file_de= pth": 0, "drv": "qcow2", "iops": 0, "bps_wr": 0, "write_threshold": 0, "enc= rypted": false, "bps": 0, "bps_rd": 0, "cache": {"no-flush": false, "direct= ": false, "writeback": true}, "file": "TEST_DIR/t.qcow2"}, "qdev": "/machin= e/unattached/device[N]" , "type": "unknown"}, {"io-status": "ok", "device": "ide1-cd0", "locked": = false, "removable": true, "qdev": "/machine/unattached/device[N]", "tray_op= en": false, "type": "unknown"}, {"device": "floppy0", "locked": false, "rem= ovable": true, "qdev": "/machine/unattached/device[N]", "type": "unknown"}] =20 Testing: -drive if=3Dfloppy,file=3DTEST_DIR/t.qcow2 -drive if=3Dfloppy,fil= e=3DTEST_DIR/t.qcow2.2,index=3D1 - dev: isa-fdc, id "" iobase =3D 1008 (0x3f0) irq =3D 6 (0x6) @@ -365,27 +301,12 @@ Testing: -drive if=3Dfloppy,file=3DTEST_DIR/t.qcow2 -= drive if=3Dfloppy,file=3DTEST_DIR/t account-failed =3D "auto" stats-intervals =3D drive-type =3D "144" -floppy0 (NODE_NAME): TEST_DIR/t.qcow2 (qcow2) - Attached to: /machine/unattached/device[N] - Removable device: not locked, tray closed - Cache mode: writeback - -floppy1 (NODE_NAME): TEST_DIR/t.qcow2.2 (qcow2) - Attached to: /machine/unattached/device[N] - Removable device: not locked, tray closed - Cache mode: writeback - -ide1-cd0: [not inserted] - Attached to: /machine/unattached/device[N] - Removable device: not locked, tray closed -(qemu) quit - +[{"device": "floppy0", "locked": false, "removable": true, "inserted": {"i= ops_rd": 0, "detect_zeroes": "off", "active": true, "image": {"limits": {"w= rite-zeroes-alignment": 65536, "request-alignment": 1, "min-mem-alignment":= 1, "discard-alignment": 65536, "opt-mem-alignment": 4096, "max-iov": 1024}= , "virtual-size": 737280, "filename": "TEST_DIR/t.qcow2", "cluster-size": 6= 5536, "format": "qcow2", "actual-size": SIZE, "format-specific": {"type": "= qcow2", "data": {"compat": "1.1", "compression-type": "zlib", "lazy-refcoun= ts": false, "refcount-bits": 16, "corrupt": false, "extended-l2": false}}, = "dirty-flag": false}, "iops_wr": 0, "ro": false, "children": [{"node-name":= "NODE_NAME", "child": "file"}], "node-name": "NODE_NAME", "backing_file_de= pth": 0, "drv": "qcow2", "iops": 0, "bps_wr": 0, "write_threshold": 0, "enc= rypted": false, "bps": 0, "bps_rd": 0, "cache": {"no-flush": false, "direct= ": false, "writeback": true}, "file": "TEST_DIR/t.qcow2"}, "qdev": "/machin= e/unattached/device[N]" , "type": "unknown"}, {"device": "floppy1", "locked": false, "removable": = true, "inserted": {"iops_rd": 0, "detect_zeroes": "off", "active": true, "i= mage": {"limits": {"write-zeroes-alignment": 65536, "request-alignment": 1,= "min-mem-alignment": 1, "discard-alignment": 65536, "opt-mem-alignment": 4= 096, "max-iov": 1024}, "virtual-size": 737280, "filename": "TEST_DIR/t.qcow= 2.2", "cluster-size": 65536, "format": "qcow2", "actual-size": SIZE, "forma= t-specific": {"type": "qcow2", "data": {"compat": "1.1", "compression-type"= : "zlib", "lazy-refcounts": false, "refcount-bits": 16, "corrupt": false, "= extended-l2": false}}, "dirty-flag": false}, "iops_wr": 0, "ro": false, "ch= ildren": [{"node-name": "NODE_NAME", "child": "file"}], "node-name": "NODE_= NAME", "backing_file_depth": 0, "drv": "qcow2", "iops": 0, "bps_wr": 0, "wr= ite_threshold": 0, "encrypted": false, "bps": 0, "bps_rd": 0, "cache": {"no= -flush": false, "direct": false, "writeback": true}, "file": "TEST_DIR/t.qc= ow2.2"}, "qdev": "/mach ine/unattached/device[N]", "type": "unknown"}, {"io-status": "ok", "device= ": "ide1-cd0", "locked": false, "removable": true, "qdev": "/machine/unatta= ched/device[N]", "tray_open": false, "type": "unknown"}] =20 =20 =3D=3D=3D Using -drive if=3Dnone and -device =3D=3D=3D =20 Testing: -drive if=3Dnone,file=3DTEST_DIR/t.qcow2 -device floppy,drive=3Dn= one0 - dev: isa-fdc, id "" iobase =3D 1008 (0x3f0) irq =3D 6 (0x6) @@ -410,19 +331,9 @@ Testing: -drive if=3Dnone,file=3DTEST_DIR/t.qcow2 -dev= ice floppy,drive=3Dnone0 account-failed =3D "auto" stats-intervals =3D drive-type =3D "144" -none0 (NODE_NAME): TEST_DIR/t.qcow2 (qcow2) - Attached to: /machine/peripheral-anon/device[N] - Removable device: not locked, tray closed - Cache mode: writeback - -ide1-cd0: [not inserted] - Attached to: /machine/unattached/device[N] - Removable device: not locked, tray closed -(qemu) quit - +[{"device": "none0", "locked": false, "removable": true, "inserted": {"iop= s_rd": 0, "detect_zeroes": "off", "active": true, "image": {"limits": {"wri= te-zeroes-alignment": 65536, "request-alignment": 1, "min-mem-alignment": 1= , "discard-alignment": 65536, "opt-mem-alignment": 4096, "max-iov": 1024}, = "virtual-size": 737280, "filename": "TEST_DIR/t.qcow2", "cluster-size": 655= 36, "format": "qcow2", "actual-size": SIZE, "format-specific": {"type": "qc= ow2", "data": {"compat": "1.1", "compression-type": "zlib", "lazy-refcounts= ": false, "refcount-bits": 16, "corrupt": false, "extended-l2": false}}, "d= irty-flag": false}, "iops_wr": 0, "ro": false, "children": [{"node-name": "= NODE_NAME", "child": "file"}], "node-name": "NODE_NAME", "backing_file_dept= h": 0, "drv": "qcow2", "iops": 0, "bps_wr": 0, "write_threshold": 0, "encry= pted": false, "bps": 0, "bps_rd": 0, "cache": {"no-flush": false, "direct":= false, "writeback": true}, "file": "TEST_DIR/t.qcow2"}, "qdev": "/machine/= peripheral-anon/device[ N]", "type": "unknown"}, {"io-status": "ok", "device": "ide1-cd0", "locked= ": false, "removable": true, "qdev": "/machine/unattached/device[N]", "tray= _open": false, "type": "unknown"}] =20 Testing: -drive if=3Dnone,file=3DTEST_DIR/t.qcow2 -device floppy,drive=3Dn= one0,unit=3D1 - dev: isa-fdc, id "" iobase =3D 1008 (0x3f0) irq =3D 6 (0x6) @@ -447,19 +358,9 @@ Testing: -drive if=3Dnone,file=3DTEST_DIR/t.qcow2 -dev= ice floppy,drive=3Dnone0,unit=3D1 account-failed =3D "auto" stats-intervals =3D drive-type =3D "144" -none0 (NODE_NAME): TEST_DIR/t.qcow2 (qcow2) - Attached to: /machine/peripheral-anon/device[N] - Removable device: not locked, tray closed - Cache mode: writeback - -ide1-cd0: [not inserted] - Attached to: /machine/unattached/device[N] - Removable device: not locked, tray closed -(qemu) quit - +[{"device": "none0", "locked": false, "removable": true, "inserted": {"iop= s_rd": 0, "detect_zeroes": "off", "active": true, "image": {"limits": {"wri= te-zeroes-alignment": 65536, "request-alignment": 1, "min-mem-alignment": 1= , "discard-alignment": 65536, "opt-mem-alignment": 4096, "max-iov": 1024}, = "virtual-size": 737280, "filename": "TEST_DIR/t.qcow2", "cluster-size": 655= 36, "format": "qcow2", "actual-size": SIZE, "format-specific": {"type": "qc= ow2", "data": {"compat": "1.1", "compression-type": "zlib", "lazy-refcounts= ": false, "refcount-bits": 16, "corrupt": false, "extended-l2": false}}, "d= irty-flag": false}, "iops_wr": 0, "ro": false, "children": [{"node-name": "= NODE_NAME", "child": "file"}], "node-name": "NODE_NAME", "backing_file_dept= h": 0, "drv": "qcow2", "iops": 0, "bps_wr": 0, "write_threshold": 0, "encry= pted": false, "bps": 0, "bps_rd": 0, "cache": {"no-flush": false, "direct":= false, "writeback": true}, "file": "TEST_DIR/t.qcow2"}, "qdev": "/machine/= peripheral-anon/device[ N]", "type": "unknown"}, {"io-status": "ok", "device": "ide1-cd0", "locked= ": false, "removable": true, "qdev": "/machine/unattached/device[N]", "tray= _open": false, "type": "unknown"}] =20 Testing: -drive if=3Dnone,file=3DTEST_DIR/t.qcow2 -drive if=3Dnone,file=3D= TEST_DIR/t.qcow2.2 -device floppy,drive=3Dnone0 -device floppy,drive=3Dnone= 1,unit=3D1 - dev: isa-fdc, id "" iobase =3D 1008 (0x3f0) irq =3D 6 (0x6) @@ -499,21 +400,7 @@ Testing: -drive if=3Dnone,file=3DTEST_DIR/t.qcow2 -dri= ve if=3Dnone,file=3DTEST_DIR/t.qco account-failed =3D "auto" stats-intervals =3D drive-type =3D "144" -none0 (NODE_NAME): TEST_DIR/t.qcow2 (qcow2) - Attached to: /machine/peripheral-anon/device[N] - Removable device: not locked, tray closed - Cache mode: writeback - -none1 (NODE_NAME): TEST_DIR/t.qcow2.2 (qcow2) - Attached to: /machine/peripheral-anon/device[N] - Removable device: not locked, tray closed - Cache mode: writeback - -ide1-cd0: [not inserted] - Attached to: /machine/unattached/device[N] - Removable device: not locked, tray closed -(qemu) quit - +[{"device": "none0", "locked": false, "removable": true, "inserted": {"iop= s_rd": 0, "detect_zeroes": "off", "active": true, "image": {"limits": {"wri= te-zeroes-alignment": 65536, "request-alignment": 1, "min-mem-alignment": 1= , "discard-alignment": 65536, "opt-mem-alignment": 4096, "max-iov": 1024}, = "virtual-size": 737280, "filename": "TEST_DIR/t.qcow2", "cluster-size": 655= 36, "format": "qcow2", "actual-size": SIZE, "format-specific": {"type": "qc= ow2", "data": {"compat": "1.1", "compression-type": "zlib", "lazy-refcounts= ": false, "refcount-bits": 16, "corrupt": false, "extended-l2": false}}, "d= irty-flag": false}, "iops_wr": 0, "ro": false, "children": [{"node-name": "= NODE_NAME", "child": "file"}], "node-name": "NODE_NAME", "backing_file_dept= h": 0, "drv": "qcow2", "iops": 0, "bps_wr": 0, "write_threshold": 0, "encry= pted": false, "bps": 0, "bps_rd": 0, "cache": {"no-flush": false, "direct":= false, "writeback": true}, "file": "TEST_DIR/t.qcow2"}, "qdev": "/machine/= peripheral-anon/device[ N]", "type": "unknown"}, {"device": "none1", "locked": false, "removable":= true, "inserted": {"iops_rd": 0, "detect_zeroes": "off", "active": true, "= image": {"limits": {"write-zeroes-alignment": 65536, "request-alignment": 1= , "min-mem-alignment": 1, "discard-alignment": 65536, "opt-mem-alignment": = 4096, "max-iov": 1024}, "virtual-size": 737280, "filename": "TEST_DIR/t.qco= w2.2", "cluster-size": 65536, "format": "qcow2", "actual-size": SIZE, "form= at-specific": {"type": "qcow2", "data": {"compat": "1.1", "compression-type= ": "zlib", "lazy-refcounts": false, "refcount-bits": 16, "corrupt": false, = "extended-l2": false}}, "dirty-flag": false}, "iops_wr": 0, "ro": false, "c= hildren": [{"node-name": "NODE_NAME", "child": "file"}], "node-name": "NODE= _NAME", "backing_file_depth": 0, "drv": "qcow2", "iops": 0, "bps_wr": 0, "w= rite_threshold": 0, "encrypted": false, "bps": 0, "bps_rd": 0, "cache": {"n= o-flush": false, "direct": false, "writeback": true}, "file": "TEST_DIR/t.q= cow2.2"}, "qdev": "/mac hine/peripheral-anon/device[N]", "type": "unknown"}, {"io-status": "ok", "= device": "ide1-cd0", "locked": false, "removable": true, "qdev": "/machine/= unattached/device[N]", "tray_open": false, "type": "unknown"}] =20 =20 =3D=3D=3D Mixing -fdX and -global =3D=3D=3D @@ -525,7 +412,6 @@ QEMU_PROG: -global floppy.drive=3D... conflicts with dr= ive=3Dfloppy0 =3D=3D=3D Mixing -fdX and -device =3D=3D=3D =20 Testing: -fda TEST_DIR/t.qcow2 -drive if=3Dnone,file=3DTEST_DIR/t.qcow2.2 = -device floppy,drive=3Dnone0 - dev: isa-fdc, id "" iobase =3D 1008 (0x3f0) irq =3D 6 (0x6) @@ -565,24 +451,9 @@ Testing: -fda TEST_DIR/t.qcow2 -drive if=3Dnone,file= =3DTEST_DIR/t.qcow2.2 -device fl account-failed =3D "auto" stats-intervals =3D drive-type =3D "144" -floppy0 (NODE_NAME): TEST_DIR/t.qcow2 (qcow2) - Attached to: /machine/unattached/device[N] - Removable device: not locked, tray closed - Cache mode: writeback - -none0 (NODE_NAME): TEST_DIR/t.qcow2.2 (qcow2) - Attached to: /machine/peripheral-anon/device[N] - Removable device: not locked, tray closed - Cache mode: writeback - -ide1-cd0: [not inserted] - Attached to: /machine/unattached/device[N] - Removable device: not locked, tray closed -(qemu) quit - +[{"device": "floppy0", "locked": false, "removable": true, "inserted": {"i= ops_rd": 0, "detect_zeroes": "off", "active": true, "image": {"limits": {"w= rite-zeroes-alignment": 65536, "request-alignment": 1, "min-mem-alignment":= 1, "discard-alignment": 65536, "opt-mem-alignment": 4096, "max-iov": 1024}= , "virtual-size": 737280, "filename": "TEST_DIR/t.qcow2", "cluster-size": 6= 5536, "format": "qcow2", "actual-size": SIZE, "format-specific": {"type": "= qcow2", "data": {"compat": "1.1", "compression-type": "zlib", "lazy-refcoun= ts": false, "refcount-bits": 16, "corrupt": false, "extended-l2": false}}, = "dirty-flag": false}, "iops_wr": 0, "ro": false, "children": [{"node-name":= "NODE_NAME", "child": "file"}], "node-name": "NODE_NAME", "backing_file_de= pth": 0, "drv": "qcow2", "iops": 0, "bps_wr": 0, "write_threshold": 0, "enc= rypted": false, "bps": 0, "bps_rd": 0, "cache": {"no-flush": false, "direct= ": false, "writeback": true}, "file": "TEST_DIR/t.qcow2"}, "qdev": "/machin= e/unattached/device[N]" , "type": "unknown"}, {"device": "none0", "locked": false, "removable": tr= ue, "inserted": {"iops_rd": 0, "detect_zeroes": "off", "active": true, "ima= ge": {"limits": {"write-zeroes-alignment": 65536, "request-alignment": 1, "= min-mem-alignment": 1, "discard-alignment": 65536, "opt-mem-alignment": 409= 6, "max-iov": 1024}, "virtual-size": 737280, "filename": "TEST_DIR/t.qcow2.= 2", "cluster-size": 65536, "format": "qcow2", "actual-size": SIZE, "format-= specific": {"type": "qcow2", "data": {"compat": "1.1", "compression-type": = "zlib", "lazy-refcounts": false, "refcount-bits": 16, "corrupt": false, "ex= tended-l2": false}}, "dirty-flag": false}, "iops_wr": 0, "ro": false, "chil= dren": [{"node-name": "NODE_NAME", "child": "file"}], "node-name": "NODE_NA= ME", "backing_file_depth": 0, "drv": "qcow2", "iops": 0, "bps_wr": 0, "writ= e_threshold": 0, "encrypted": false, "bps": 0, "bps_rd": 0, "cache": {"no-f= lush": false, "direct": false, "writeback": true}, "file": "TEST_DIR/t.qcow= 2.2"}, "qdev": "/machin e/peripheral-anon/device[N]", "type": "unknown"}, {"io-status": "ok", "dev= ice": "ide1-cd0", "locked": false, "removable": true, "qdev": "/machine/una= ttached/device[N]", "tray_open": false, "type": "unknown"}] =20 Testing: -fda TEST_DIR/t.qcow2 -drive if=3Dnone,file=3DTEST_DIR/t.qcow2.2 = -device floppy,drive=3Dnone0,unit=3D1 - dev: isa-fdc, id "" iobase =3D 1008 (0x3f0) irq =3D 6 (0x6) @@ -622,24 +493,9 @@ Testing: -fda TEST_DIR/t.qcow2 -drive if=3Dnone,file= =3DTEST_DIR/t.qcow2.2 -device fl account-failed =3D "auto" stats-intervals =3D drive-type =3D "144" -floppy0 (NODE_NAME): TEST_DIR/t.qcow2 (qcow2) - Attached to: /machine/unattached/device[N] - Removable device: not locked, tray closed - Cache mode: writeback - -none0 (NODE_NAME): TEST_DIR/t.qcow2.2 (qcow2) - Attached to: /machine/peripheral-anon/device[N] - Removable device: not locked, tray closed - Cache mode: writeback - -ide1-cd0: [not inserted] - Attached to: /machine/unattached/device[N] - Removable device: not locked, tray closed -(qemu) quit - +[{"device": "floppy0", "locked": false, "removable": true, "inserted": {"i= ops_rd": 0, "detect_zeroes": "off", "active": true, "image": {"limits": {"w= rite-zeroes-alignment": 65536, "request-alignment": 1, "min-mem-alignment":= 1, "discard-alignment": 65536, "opt-mem-alignment": 4096, "max-iov": 1024}= , "virtual-size": 737280, "filename": "TEST_DIR/t.qcow2", "cluster-size": 6= 5536, "format": "qcow2", "actual-size": SIZE, "format-specific": {"type": "= qcow2", "data": {"compat": "1.1", "compression-type": "zlib", "lazy-refcoun= ts": false, "refcount-bits": 16, "corrupt": false, "extended-l2": false}}, = "dirty-flag": false}, "iops_wr": 0, "ro": false, "children": [{"node-name":= "NODE_NAME", "child": "file"}], "node-name": "NODE_NAME", "backing_file_de= pth": 0, "drv": "qcow2", "iops": 0, "bps_wr": 0, "write_threshold": 0, "enc= rypted": false, "bps": 0, "bps_rd": 0, "cache": {"no-flush": false, "direct= ": false, "writeback": true}, "file": "TEST_DIR/t.qcow2"}, "qdev": "/machin= e/unattached/device[N]" , "type": "unknown"}, {"device": "none0", "locked": false, "removable": tr= ue, "inserted": {"iops_rd": 0, "detect_zeroes": "off", "active": true, "ima= ge": {"limits": {"write-zeroes-alignment": 65536, "request-alignment": 1, "= min-mem-alignment": 1, "discard-alignment": 65536, "opt-mem-alignment": 409= 6, "max-iov": 1024}, "virtual-size": 737280, "filename": "TEST_DIR/t.qcow2.= 2", "cluster-size": 65536, "format": "qcow2", "actual-size": SIZE, "format-= specific": {"type": "qcow2", "data": {"compat": "1.1", "compression-type": = "zlib", "lazy-refcounts": false, "refcount-bits": 16, "corrupt": false, "ex= tended-l2": false}}, "dirty-flag": false}, "iops_wr": 0, "ro": false, "chil= dren": [{"node-name": "NODE_NAME", "child": "file"}], "node-name": "NODE_NA= ME", "backing_file_depth": 0, "drv": "qcow2", "iops": 0, "bps_wr": 0, "writ= e_threshold": 0, "encrypted": false, "bps": 0, "bps_rd": 0, "cache": {"no-f= lush": false, "direct": false, "writeback": true}, "file": "TEST_DIR/t.qcow= 2.2"}, "qdev": "/machin e/peripheral-anon/device[N]", "type": "unknown"}, {"io-status": "ok", "dev= ice": "ide1-cd0", "locked": false, "removable": true, "qdev": "/machine/una= ttached/device[N]", "tray_open": false, "type": "unknown"}] =20 Testing: -fdb TEST_DIR/t.qcow2 -drive if=3Dnone,file=3DTEST_DIR/t.qcow2.2 = -device floppy,drive=3Dnone0 - dev: isa-fdc, id "" iobase =3D 1008 (0x3f0) irq =3D 6 (0x6) @@ -679,24 +535,9 @@ Testing: -fdb TEST_DIR/t.qcow2 -drive if=3Dnone,file= =3DTEST_DIR/t.qcow2.2 -device fl account-failed =3D "auto" stats-intervals =3D drive-type =3D "144" -floppy1 (NODE_NAME): TEST_DIR/t.qcow2 (qcow2) - Attached to: /machine/unattached/device[N] - Removable device: not locked, tray closed - Cache mode: writeback - -none0 (NODE_NAME): TEST_DIR/t.qcow2.2 (qcow2) - Attached to: /machine/peripheral-anon/device[N] - Removable device: not locked, tray closed - Cache mode: writeback - -ide1-cd0: [not inserted] - Attached to: /machine/unattached/device[N] - Removable device: not locked, tray closed -(qemu) quit - +[{"device": "floppy1", "locked": false, "removable": true, "inserted": {"i= ops_rd": 0, "detect_zeroes": "off", "active": true, "image": {"limits": {"w= rite-zeroes-alignment": 65536, "request-alignment": 1, "min-mem-alignment":= 1, "discard-alignment": 65536, "opt-mem-alignment": 4096, "max-iov": 1024}= , "virtual-size": 737280, "filename": "TEST_DIR/t.qcow2", "cluster-size": 6= 5536, "format": "qcow2", "actual-size": SIZE, "format-specific": {"type": "= qcow2", "data": {"compat": "1.1", "compression-type": "zlib", "lazy-refcoun= ts": false, "refcount-bits": 16, "corrupt": false, "extended-l2": false}}, = "dirty-flag": false}, "iops_wr": 0, "ro": false, "children": [{"node-name":= "NODE_NAME", "child": "file"}], "node-name": "NODE_NAME", "backing_file_de= pth": 0, "drv": "qcow2", "iops": 0, "bps_wr": 0, "write_threshold": 0, "enc= rypted": false, "bps": 0, "bps_rd": 0, "cache": {"no-flush": false, "direct= ": false, "writeback": true}, "file": "TEST_DIR/t.qcow2"}, "qdev": "/machin= e/unattached/device[N]" , "type": "unknown"}, {"device": "none0", "locked": false, "removable": tr= ue, "inserted": {"iops_rd": 0, "detect_zeroes": "off", "active": true, "ima= ge": {"limits": {"write-zeroes-alignment": 65536, "request-alignment": 1, "= min-mem-alignment": 1, "discard-alignment": 65536, "opt-mem-alignment": 409= 6, "max-iov": 1024}, "virtual-size": 737280, "filename": "TEST_DIR/t.qcow2.= 2", "cluster-size": 65536, "format": "qcow2", "actual-size": SIZE, "format-= specific": {"type": "qcow2", "data": {"compat": "1.1", "compression-type": = "zlib", "lazy-refcounts": false, "refcount-bits": 16, "corrupt": false, "ex= tended-l2": false}}, "dirty-flag": false}, "iops_wr": 0, "ro": false, "chil= dren": [{"node-name": "NODE_NAME", "child": "file"}], "node-name": "NODE_NA= ME", "backing_file_depth": 0, "drv": "qcow2", "iops": 0, "bps_wr": 0, "writ= e_threshold": 0, "encrypted": false, "bps": 0, "bps_rd": 0, "cache": {"no-f= lush": false, "direct": false, "writeback": true}, "file": "TEST_DIR/t.qcow= 2.2"}, "qdev": "/machin e/peripheral-anon/device[N]", "type": "unknown"}, {"io-status": "ok", "dev= ice": "ide1-cd0", "locked": false, "removable": true, "qdev": "/machine/una= ttached/device[N]", "tray_open": false, "type": "unknown"}] =20 Testing: -fdb TEST_DIR/t.qcow2 -drive if=3Dnone,file=3DTEST_DIR/t.qcow2.2 = -device floppy,drive=3Dnone0,unit=3D0 - dev: isa-fdc, id "" iobase =3D 1008 (0x3f0) irq =3D 6 (0x6) @@ -736,21 +577,7 @@ Testing: -fdb TEST_DIR/t.qcow2 -drive if=3Dnone,file= =3DTEST_DIR/t.qcow2.2 -device fl account-failed =3D "auto" stats-intervals =3D drive-type =3D "144" -floppy1 (NODE_NAME): TEST_DIR/t.qcow2 (qcow2) - Attached to: /machine/unattached/device[N] - Removable device: not locked, tray closed - Cache mode: writeback - -none0 (NODE_NAME): TEST_DIR/t.qcow2.2 (qcow2) - Attached to: /machine/peripheral-anon/device[N] - Removable device: not locked, tray closed - Cache mode: writeback - -ide1-cd0: [not inserted] - Attached to: /machine/unattached/device[N] - Removable device: not locked, tray closed -(qemu) quit - +[{"device": "floppy1", "locked": false, "removable": true, "inserted": {"i= ops_rd": 0, "detect_zeroes": "off", "active": true, "image": {"limits": {"w= rite-zeroes-alignment": 65536, "request-alignment": 1, "min-mem-alignment":= 1, "discard-alignment": 65536, "opt-mem-alignment": 4096, "max-iov": 1024}= , "virtual-size": 737280, "filename": "TEST_DIR/t.qcow2", "cluster-size": 6= 5536, "format": "qcow2", "actual-size": SIZE, "format-specific": {"type": "= qcow2", "data": {"compat": "1.1", "compression-type": "zlib", "lazy-refcoun= ts": false, "refcount-bits": 16, "corrupt": false, "extended-l2": false}}, = "dirty-flag": false}, "iops_wr": 0, "ro": false, "children": [{"node-name":= "NODE_NAME", "child": "file"}], "node-name": "NODE_NAME", "backing_file_de= pth": 0, "drv": "qcow2", "iops": 0, "bps_wr": 0, "write_threshold": 0, "enc= rypted": false, "bps": 0, "bps_rd": 0, "cache": {"no-flush": false, "direct= ": false, "writeback": true}, "file": "TEST_DIR/t.qcow2"}, "qdev": "/machin= e/unattached/device[N]" , "type": "unknown"}, {"device": "none0", "locked": false, "removable": tr= ue, "inserted": {"iops_rd": 0, "detect_zeroes": "off", "active": true, "ima= ge": {"limits": {"write-zeroes-alignment": 65536, "request-alignment": 1, "= min-mem-alignment": 1, "discard-alignment": 65536, "opt-mem-alignment": 409= 6, "max-iov": 1024}, "virtual-size": 737280, "filename": "TEST_DIR/t.qcow2.= 2", "cluster-size": 65536, "format": "qcow2", "actual-size": SIZE, "format-= specific": {"type": "qcow2", "data": {"compat": "1.1", "compression-type": = "zlib", "lazy-refcounts": false, "refcount-bits": 16, "corrupt": false, "ex= tended-l2": false}}, "dirty-flag": false}, "iops_wr": 0, "ro": false, "chil= dren": [{"node-name": "NODE_NAME", "child": "file"}], "node-name": "NODE_NA= ME", "backing_file_depth": 0, "drv": "qcow2", "iops": 0, "bps_wr": 0, "writ= e_threshold": 0, "encrypted": false, "bps": 0, "bps_rd": 0, "cache": {"no-f= lush": false, "direct": false, "writeback": true}, "file": "TEST_DIR/t.qcow= 2.2"}, "qdev": "/machin e/peripheral-anon/device[N]", "type": "unknown"}, {"io-status": "ok", "dev= ice": "ide1-cd0", "locked": false, "removable": true, "qdev": "/machine/una= ttached/device[N]", "tray_open": false, "type": "unknown"}] =20 Testing: -fda TEST_DIR/t.qcow2 -drive if=3Dnone,file=3DTEST_DIR/t.qcow2.2 = -device floppy,drive=3Dnone0,unit=3D0 QEMU_PROG: -device floppy,drive=3Dnone0,unit=3D0: Floppy unit 0 is in use @@ -762,7 +589,6 @@ QEMU_PROG: -device floppy,drive=3Dnone0,unit=3D1: Flopp= y unit 1 is in use =3D=3D=3D Mixing -drive and -device =3D=3D=3D =20 Testing: -drive if=3Dfloppy,file=3DTEST_DIR/t.qcow2 -drive if=3Dnone,file= =3DTEST_DIR/t.qcow2.2 -device floppy,drive=3Dnone0 - dev: isa-fdc, id "" iobase =3D 1008 (0x3f0) irq =3D 6 (0x6) @@ -802,24 +628,9 @@ Testing: -drive if=3Dfloppy,file=3DTEST_DIR/t.qcow2 -d= rive if=3Dnone,file=3DTEST_DIR/t.q account-failed =3D "auto" stats-intervals =3D drive-type =3D "144" -floppy0 (NODE_NAME): TEST_DIR/t.qcow2 (qcow2) - Attached to: /machine/unattached/device[N] - Removable device: not locked, tray closed - Cache mode: writeback - -none0 (NODE_NAME): TEST_DIR/t.qcow2.2 (qcow2) - Attached to: /machine/peripheral-anon/device[N] - Removable device: not locked, tray closed - Cache mode: writeback - -ide1-cd0: [not inserted] - Attached to: /machine/unattached/device[N] - Removable device: not locked, tray closed -(qemu) quit - +[{"device": "floppy0", "locked": false, "removable": true, "inserted": {"i= ops_rd": 0, "detect_zeroes": "off", "active": true, "image": {"limits": {"w= rite-zeroes-alignment": 65536, "request-alignment": 1, "min-mem-alignment":= 1, "discard-alignment": 65536, "opt-mem-alignment": 4096, "max-iov": 1024}= , "virtual-size": 737280, "filename": "TEST_DIR/t.qcow2", "cluster-size": 6= 5536, "format": "qcow2", "actual-size": SIZE, "format-specific": {"type": "= qcow2", "data": {"compat": "1.1", "compression-type": "zlib", "lazy-refcoun= ts": false, "refcount-bits": 16, "corrupt": false, "extended-l2": false}}, = "dirty-flag": false}, "iops_wr": 0, "ro": false, "children": [{"node-name":= "NODE_NAME", "child": "file"}], "node-name": "NODE_NAME", "backing_file_de= pth": 0, "drv": "qcow2", "iops": 0, "bps_wr": 0, "write_threshold": 0, "enc= rypted": false, "bps": 0, "bps_rd": 0, "cache": {"no-flush": false, "direct= ": false, "writeback": true}, "file": "TEST_DIR/t.qcow2"}, "qdev": "/machin= e/unattached/device[N]" , "type": "unknown"}, {"device": "none0", "locked": false, "removable": tr= ue, "inserted": {"iops_rd": 0, "detect_zeroes": "off", "active": true, "ima= ge": {"limits": {"write-zeroes-alignment": 65536, "request-alignment": 1, "= min-mem-alignment": 1, "discard-alignment": 65536, "opt-mem-alignment": 409= 6, "max-iov": 1024}, "virtual-size": 737280, "filename": "TEST_DIR/t.qcow2.= 2", "cluster-size": 65536, "format": "qcow2", "actual-size": SIZE, "format-= specific": {"type": "qcow2", "data": {"compat": "1.1", "compression-type": = "zlib", "lazy-refcounts": false, "refcount-bits": 16, "corrupt": false, "ex= tended-l2": false}}, "dirty-flag": false}, "iops_wr": 0, "ro": false, "chil= dren": [{"node-name": "NODE_NAME", "child": "file"}], "node-name": "NODE_NA= ME", "backing_file_depth": 0, "drv": "qcow2", "iops": 0, "bps_wr": 0, "writ= e_threshold": 0, "encrypted": false, "bps": 0, "bps_rd": 0, "cache": {"no-f= lush": false, "direct": false, "writeback": true}, "file": "TEST_DIR/t.qcow= 2.2"}, "qdev": "/machin e/peripheral-anon/device[N]", "type": "unknown"}, {"io-status": "ok", "dev= ice": "ide1-cd0", "locked": false, "removable": true, "qdev": "/machine/una= ttached/device[N]", "tray_open": false, "type": "unknown"}] =20 Testing: -drive if=3Dfloppy,file=3DTEST_DIR/t.qcow2 -drive if=3Dnone,file= =3DTEST_DIR/t.qcow2.2 -device floppy,drive=3Dnone0,unit=3D1 - dev: isa-fdc, id "" iobase =3D 1008 (0x3f0) irq =3D 6 (0x6) @@ -859,21 +670,7 @@ Testing: -drive if=3Dfloppy,file=3DTEST_DIR/t.qcow2 -d= rive if=3Dnone,file=3DTEST_DIR/t.q account-failed =3D "auto" stats-intervals =3D drive-type =3D "144" -floppy0 (NODE_NAME): TEST_DIR/t.qcow2 (qcow2) - Attached to: /machine/unattached/device[N] - Removable device: not locked, tray closed - Cache mode: writeback - -none0 (NODE_NAME): TEST_DIR/t.qcow2.2 (qcow2) - Attached to: /machine/peripheral-anon/device[N] - Removable device: not locked, tray closed - Cache mode: writeback - -ide1-cd0: [not inserted] - Attached to: /machine/unattached/device[N] - Removable device: not locked, tray closed -(qemu) quit - +[{"device": "floppy0", "locked": false, "removable": true, "inserted": {"i= ops_rd": 0, "detect_zeroes": "off", "active": true, "image": {"limits": {"w= rite-zeroes-alignment": 65536, "request-alignment": 1, "min-mem-alignment":= 1, "discard-alignment": 65536, "opt-mem-alignment": 4096, "max-iov": 1024}= , "virtual-size": 737280, "filename": "TEST_DIR/t.qcow2", "cluster-size": 6= 5536, "format": "qcow2", "actual-size": SIZE, "format-specific": {"type": "= qcow2", "data": {"compat": "1.1", "compression-type": "zlib", "lazy-refcoun= ts": false, "refcount-bits": 16, "corrupt": false, "extended-l2": false}}, = "dirty-flag": false}, "iops_wr": 0, "ro": false, "children": [{"node-name":= "NODE_NAME", "child": "file"}], "node-name": "NODE_NAME", "backing_file_de= pth": 0, "drv": "qcow2", "iops": 0, "bps_wr": 0, "write_threshold": 0, "enc= rypted": false, "bps": 0, "bps_rd": 0, "cache": {"no-flush": false, "direct= ": false, "writeback": true}, "file": "TEST_DIR/t.qcow2"}, "qdev": "/machin= e/unattached/device[N]" , "type": "unknown"}, {"device": "none0", "locked": false, "removable": tr= ue, "inserted": {"iops_rd": 0, "detect_zeroes": "off", "active": true, "ima= ge": {"limits": {"write-zeroes-alignment": 65536, "request-alignment": 1, "= min-mem-alignment": 1, "discard-alignment": 65536, "opt-mem-alignment": 409= 6, "max-iov": 1024}, "virtual-size": 737280, "filename": "TEST_DIR/t.qcow2.= 2", "cluster-size": 65536, "format": "qcow2", "actual-size": SIZE, "format-= specific": {"type": "qcow2", "data": {"compat": "1.1", "compression-type": = "zlib", "lazy-refcounts": false, "refcount-bits": 16, "corrupt": false, "ex= tended-l2": false}}, "dirty-flag": false}, "iops_wr": 0, "ro": false, "chil= dren": [{"node-name": "NODE_NAME", "child": "file"}], "node-name": "NODE_NA= ME", "backing_file_depth": 0, "drv": "qcow2", "iops": 0, "bps_wr": 0, "writ= e_threshold": 0, "encrypted": false, "bps": 0, "bps_rd": 0, "cache": {"no-f= lush": false, "direct": false, "writeback": true}, "file": "TEST_DIR/t.qcow= 2.2"}, "qdev": "/machin e/peripheral-anon/device[N]", "type": "unknown"}, {"io-status": "ok", "dev= ice": "ide1-cd0", "locked": false, "removable": true, "qdev": "/machine/una= ttached/device[N]", "tray_open": false, "type": "unknown"}] =20 Testing: -drive if=3Dfloppy,file=3DTEST_DIR/t.qcow2 -drive if=3Dnone,file= =3DTEST_DIR/t.qcow2.2 -device floppy,drive=3Dnone0,unit=3D0 QEMU_PROG: -device floppy,drive=3Dnone0,unit=3D0: Floppy unit 0 is in use @@ -882,7 +679,6 @@ QEMU_PROG: -device floppy,drive=3Dnone0,unit=3D0: Flopp= y unit 0 is in use =3D=3D=3D Mixing -global and -device =3D=3D=3D =20 Testing: -drive if=3Dnone,file=3DTEST_DIR/t.qcow2 -global floppy.drive=3Dn= one0 -device floppy,unit=3D0 - dev: isa-fdc, id "" iobase =3D 1008 (0x3f0) irq =3D 6 (0x6) @@ -907,16 +703,7 @@ Testing: -drive if=3Dnone,file=3DTEST_DIR/t.qcow2 -glo= bal floppy.drive=3Dnone0 -device account-failed =3D "auto" stats-intervals =3D drive-type =3D "144" -none0 (NODE_NAME): TEST_DIR/t.qcow2 (qcow2) - Attached to: /machine/peripheral-anon/device[N] - Removable device: not locked, tray closed - Cache mode: writeback - -ide1-cd0: [not inserted] - Attached to: /machine/unattached/device[N] - Removable device: not locked, tray closed -(qemu) quit - +[{"device": "none0", "locked": false, "removable": true, "inserted": {"iop= s_rd": 0, "detect_zeroes": "off", "active": true, "image": {"limits": {"wri= te-zeroes-alignment": 65536, "request-alignment": 1, "min-mem-alignment": 1= , "discard-alignment": 65536, "opt-mem-alignment": 4096, "max-iov": 1024}, = "virtual-size": 737280, "filename": "TEST_DIR/t.qcow2", "cluster-size": 655= 36, "format": "qcow2", "actual-size": SIZE, "format-specific": {"type": "qc= ow2", "data": {"compat": "1.1", "compression-type": "zlib", "lazy-refcounts= ": false, "refcount-bits": 16, "corrupt": false, "extended-l2": false}}, "d= irty-flag": false}, "iops_wr": 0, "ro": false, "children": [{"node-name": "= NODE_NAME", "child": "file"}], "node-name": "NODE_NAME", "backing_file_dept= h": 0, "drv": "qcow2", "iops": 0, "bps_wr": 0, "write_threshold": 0, "encry= pted": false, "bps": 0, "bps_rd": 0, "cache": {"no-flush": false, "direct":= false, "writeback": true}, "file": "TEST_DIR/t.qcow2"}, "qdev": "/machine/= peripheral-anon/device[ N]", "type": "unknown"}, {"io-status": "ok", "device": "ide1-cd0", "locked= ": false, "removable": true, "qdev": "/machine/unattached/device[N]", "tray= _open": false, "type": "unknown"}] =20 Testing: -drive if=3Dnone,file=3DTEST_DIR/t.qcow2 -drive if=3Dnone,file=3D= TEST_DIR/t.qcow2.2 -global floppy.drive=3Dnone0 -device floppy,drive=3Dnone= 1,unit=3D0 QEMU_PROG: -device floppy,drive=3Dnone1,unit=3D0: -global floppy.drive=3D.= .. conflicts with drive=3Dnone1 @@ -949,7 +736,6 @@ QEMU_PROG: -device floppy,drive=3Dnone1: Can't create f= loppy unit 2, bus supports =3D=3D=3D Creating an empty drive with anonymous BB =3D=3D=3D =20 Testing: -device floppy - dev: isa-fdc, id "" iobase =3D 1008 (0x3f0) irq =3D 6 (0x6) @@ -974,9 +760,9 @@ Testing: -device floppy account-failed =3D "auto" stats-intervals =3D drive-type =3D "288" +[{"io-status": "ok", "device": "ide1-cd0", "locked": false, "removable": t= rue, "qdev": "/machine/unattached/device[N]", "tray_open": false, "type": "= unknown"}, {"device": "", "locked": false, "removable": true, "qdev": "/mac= hine/peripheral-anon/device[N]", "type": "unknown"}] =20 Testing: -device floppy,drive-type=3D120 - dev: isa-fdc, id "" iobase =3D 1008 (0x3f0) irq =3D 6 (0x6) @@ -1001,9 +787,9 @@ Testing: -device floppy,drive-type=3D120 account-failed =3D "auto" stats-intervals =3D drive-type =3D "120" +[{"io-status": "ok", "device": "ide1-cd0", "locked": false, "removable": t= rue, "qdev": "/machine/unattached/device[N]", "tray_open": false, "type": "= unknown"}, {"device": "", "locked": false, "removable": true, "qdev": "/mac= hine/peripheral-anon/device[N]", "type": "unknown"}] =20 Testing: -device floppy,drive-type=3D144 - dev: isa-fdc, id "" iobase =3D 1008 (0x3f0) irq =3D 6 (0x6) @@ -1028,9 +814,9 @@ Testing: -device floppy,drive-type=3D144 account-failed =3D "auto" stats-intervals =3D drive-type =3D "144" +[{"io-status": "ok", "device": "ide1-cd0", "locked": false, "removable": t= rue, "qdev": "/machine/unattached/device[N]", "tray_open": false, "type": "= unknown"}, {"device": "", "locked": false, "removable": true, "qdev": "/mac= hine/peripheral-anon/device[N]", "type": "unknown"}] =20 Testing: -device floppy,drive-type=3D288 - dev: isa-fdc, id "" iobase =3D 1008 (0x3f0) irq =3D 6 (0x6) @@ -1055,12 +841,12 @@ Testing: -device floppy,drive-type=3D288 account-failed =3D "auto" stats-intervals =3D drive-type =3D "288" +[{"io-status": "ok", "device": "ide1-cd0", "locked": false, "removable": t= rue, "qdev": "/machine/unattached/device[N]", "tray_open": false, "type": "= unknown"}, {"device": "", "locked": false, "removable": true, "qdev": "/mac= hine/peripheral-anon/device[N]", "type": "unknown"}] =20 =20 =3D=3D=3D Try passing different drive size with image =3D=3D=3D =20 Testing: -drive if=3Dnone,file=3DTEST_DIR/t.qcow2 -device floppy,drive=3Dn= one0,drive-type=3D120 - dev: isa-fdc, id "" iobase =3D 1008 (0x3f0) irq =3D 6 (0x6) @@ -1085,19 +871,9 @@ Testing: -drive if=3Dnone,file=3DTEST_DIR/t.qcow2 -de= vice floppy,drive=3Dnone0,drive-t account-failed =3D "auto" stats-intervals =3D drive-type =3D "120" -none0 (NODE_NAME): TEST_DIR/t.qcow2 (qcow2) - Attached to: /machine/peripheral-anon/device[N] - Removable device: not locked, tray closed - Cache mode: writeback - -ide1-cd0: [not inserted] - Attached to: /machine/unattached/device[N] - Removable device: not locked, tray closed -(qemu) quit - +[{"device": "none0", "locked": false, "removable": true, "inserted": {"iop= s_rd": 0, "detect_zeroes": "off", "active": true, "image": {"limits": {"wri= te-zeroes-alignment": 65536, "request-alignment": 1, "min-mem-alignment": 1= , "discard-alignment": 65536, "opt-mem-alignment": 4096, "max-iov": 1024}, = "virtual-size": 737280, "filename": "TEST_DIR/t.qcow2", "cluster-size": 655= 36, "format": "qcow2", "actual-size": SIZE, "format-specific": {"type": "qc= ow2", "data": {"compat": "1.1", "compression-type": "zlib", "lazy-refcounts= ": false, "refcount-bits": 16, "corrupt": false, "extended-l2": false}}, "d= irty-flag": false}, "iops_wr": 0, "ro": false, "children": [{"node-name": "= NODE_NAME", "child": "file"}], "node-name": "NODE_NAME", "backing_file_dept= h": 0, "drv": "qcow2", "iops": 0, "bps_wr": 0, "write_threshold": 0, "encry= pted": false, "bps": 0, "bps_rd": 0, "cache": {"no-flush": false, "direct":= false, "writeback": true}, "file": "TEST_DIR/t.qcow2"}, "qdev": "/machine/= peripheral-anon/device[ N]", "type": "unknown"}, {"io-status": "ok", "device": "ide1-cd0", "locked= ": false, "removable": true, "qdev": "/machine/unattached/device[N]", "tray= _open": false, "type": "unknown"}] =20 Testing: -drive if=3Dnone,file=3DTEST_DIR/t.qcow2 -device floppy,drive=3Dn= one0,drive-type=3D288 - dev: isa-fdc, id "" iobase =3D 1008 (0x3f0) irq =3D 6 (0x6) @@ -1122,22 +898,12 @@ Testing: -drive if=3Dnone,file=3DTEST_DIR/t.qcow2 -d= evice floppy,drive=3Dnone0,drive-t account-failed =3D "auto" stats-intervals =3D drive-type =3D "288" -none0 (NODE_NAME): TEST_DIR/t.qcow2 (qcow2) - Attached to: /machine/peripheral-anon/device[N] - Removable device: not locked, tray closed - Cache mode: writeback - -ide1-cd0: [not inserted] - Attached to: /machine/unattached/device[N] - Removable device: not locked, tray closed -(qemu) quit - +[{"device": "none0", "locked": false, "removable": true, "inserted": {"iop= s_rd": 0, "detect_zeroes": "off", "active": true, "image": {"limits": {"wri= te-zeroes-alignment": 65536, "request-alignment": 1, "min-mem-alignment": 1= , "discard-alignment": 65536, "opt-mem-alignment": 4096, "max-iov": 1024}, = "virtual-size": 737280, "filename": "TEST_DIR/t.qcow2", "cluster-size": 655= 36, "format": "qcow2", "actual-size": SIZE, "format-specific": {"type": "qc= ow2", "data": {"compat": "1.1", "compression-type": "zlib", "lazy-refcounts= ": false, "refcount-bits": 16, "corrupt": false, "extended-l2": false}}, "d= irty-flag": false}, "iops_wr": 0, "ro": false, "children": [{"node-name": "= NODE_NAME", "child": "file"}], "node-name": "NODE_NAME", "backing_file_dept= h": 0, "drv": "qcow2", "iops": 0, "bps_wr": 0, "write_threshold": 0, "encry= pted": false, "bps": 0, "bps_rd": 0, "cache": {"no-flush": false, "direct":= false, "writeback": true}, "file": "TEST_DIR/t.qcow2"}, "qdev": "/machine/= peripheral-anon/device[ N]", "type": "unknown"}, {"io-status": "ok", "device": "ide1-cd0", "locked= ": false, "removable": true, "qdev": "/machine/unattached/device[N]", "tray= _open": false, "type": "unknown"}] =20 =20 =3D=3D=3D Try passing different block sizes =3D=3D=3D =20 Testing: -drive if=3Dnone,file=3DTEST_DIR/t.qcow2 -device floppy,drive=3Dn= one0,logical_block_size=3D512 - dev: isa-fdc, id "" iobase =3D 1008 (0x3f0) irq =3D 6 (0x6) @@ -1162,19 +928,9 @@ Testing: -drive if=3Dnone,file=3DTEST_DIR/t.qcow2 -de= vice floppy,drive=3Dnone0,logical account-failed =3D "auto" stats-intervals =3D drive-type =3D "144" -none0 (NODE_NAME): TEST_DIR/t.qcow2 (qcow2) - Attached to: /machine/peripheral-anon/device[N] - Removable device: not locked, tray closed - Cache mode: writeback - -ide1-cd0: [not inserted] - Attached to: /machine/unattached/device[N] - Removable device: not locked, tray closed -(qemu) quit - +[{"device": "none0", "locked": false, "removable": true, "inserted": {"iop= s_rd": 0, "detect_zeroes": "off", "active": true, "image": {"limits": {"wri= te-zeroes-alignment": 65536, "request-alignment": 1, "min-mem-alignment": 1= , "discard-alignment": 65536, "opt-mem-alignment": 4096, "max-iov": 1024}, = "virtual-size": 737280, "filename": "TEST_DIR/t.qcow2", "cluster-size": 655= 36, "format": "qcow2", "actual-size": SIZE, "format-specific": {"type": "qc= ow2", "data": {"compat": "1.1", "compression-type": "zlib", "lazy-refcounts= ": false, "refcount-bits": 16, "corrupt": false, "extended-l2": false}}, "d= irty-flag": false}, "iops_wr": 0, "ro": false, "children": [{"node-name": "= NODE_NAME", "child": "file"}], "node-name": "NODE_NAME", "backing_file_dept= h": 0, "drv": "qcow2", "iops": 0, "bps_wr": 0, "write_threshold": 0, "encry= pted": false, "bps": 0, "bps_rd": 0, "cache": {"no-flush": false, "direct":= false, "writeback": true}, "file": "TEST_DIR/t.qcow2"}, "qdev": "/machine/= peripheral-anon/device[ N]", "type": "unknown"}, {"io-status": "ok", "device": "ide1-cd0", "locked= ": false, "removable": true, "qdev": "/machine/unattached/device[N]", "tray= _open": false, "type": "unknown"}] =20 Testing: -drive if=3Dnone,file=3DTEST_DIR/t.qcow2 -device floppy,drive=3Dn= one0,physical_block_size=3D512 - dev: isa-fdc, id "" iobase =3D 1008 (0x3f0) irq =3D 6 (0x6) @@ -1199,16 +955,7 @@ Testing: -drive if=3Dnone,file=3DTEST_DIR/t.qcow2 -de= vice floppy,drive=3Dnone0,physica account-failed =3D "auto" stats-intervals =3D drive-type =3D "144" -none0 (NODE_NAME): TEST_DIR/t.qcow2 (qcow2) - Attached to: /machine/peripheral-anon/device[N] - Removable device: not locked, tray closed - Cache mode: writeback - -ide1-cd0: [not inserted] - Attached to: /machine/unattached/device[N] - Removable device: not locked, tray closed -(qemu) quit - +[{"device": "none0", "locked": false, "removable": true, "inserted": {"iop= s_rd": 0, "detect_zeroes": "off", "active": true, "image": {"limits": {"wri= te-zeroes-alignment": 65536, "request-alignment": 1, "min-mem-alignment": 1= , "discard-alignment": 65536, "opt-mem-alignment": 4096, "max-iov": 1024}, = "virtual-size": 737280, "filename": "TEST_DIR/t.qcow2", "cluster-size": 655= 36, "format": "qcow2", "actual-size": SIZE, "format-specific": {"type": "qc= ow2", "data": {"compat": "1.1", "compression-type": "zlib", "lazy-refcounts= ": false, "refcount-bits": 16, "corrupt": false, "extended-l2": false}}, "d= irty-flag": false}, "iops_wr": 0, "ro": false, "children": [{"node-name": "= NODE_NAME", "child": "file"}], "node-name": "NODE_NAME", "backing_file_dept= h": 0, "drv": "qcow2", "iops": 0, "bps_wr": 0, "write_threshold": 0, "encry= pted": false, "bps": 0, "bps_rd": 0, "cache": {"no-flush": false, "direct":= false, "writeback": true}, "file": "TEST_DIR/t.qcow2"}, "qdev": "/machine/= peripheral-anon/device[ N]", "type": "unknown"}, {"io-status": "ok", "device": "ide1-cd0", "locked= ": false, "removable": true, "qdev": "/machine/unattached/device[N]", "tray= _open": false, "type": "unknown"}] =20 Testing: -drive if=3Dnone,file=3DTEST_DIR/t.qcow2 -device floppy,drive=3Dn= one0,logical_block_size=3D4096 QEMU_PROG: -device floppy,drive=3Dnone0,logical_block_size=3D4096: logical= _block_size > physical_block_size not supported --=20 2.56.0.rc0.29.g47ce80527c56 From nobody Sat Sep 26 20:01:40 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=1790108945; cv=none; d=zohomail.com; s=zohoarc; b=U3mVndquGJ09lOsrZMwd+fZZOsathwi7XX9to6qZzIdXnMOyW5Bu0DKyXg0C++fp4cGFO6JmDci9C2W5PW/uFNoSsAyGoPHpQ8hRqK/BqV6WG2LbpIl7bgZiC55mU2DLGyHOtV6K2U5YuZMuKJa5IQAZRblMq7F1Q6PFtgFAmqk= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1790108945; 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:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=gR49i4+niEICCi44ryps2dZ91z+ksJEBI0Zh0aQGr5E=; b=dGQ0jXcVvLAt20TkjZkk+iabd22cqnicCZ933943o0ltuUUCqnin1LI3IDy7SoZAxIY/Y8y/7PYJuFR2uTOvSpz3Xkn6IfCXBt4PDy/iMNCFwRZhtgFSnLUnphiBIJTxAmGyIduDPOOYhCyFOYkBtPdPR1rG0OJM4L+AaqqTyeY= 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 1790108945843200.37193998129692; Tue, 22 Sep 2026 13:29:05 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists1p.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1x9732-00035S-GO; Tue, 22 Sep 2026 16:25:06 -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 1x972T-0001TF-R7 for qemu-devel@nongnu.org; Tue, 22 Sep 2026 16:24:29 -0400 Received: from us-smtp-delivery-124.mimecast.com ([170.10.133.124]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1x972Q-0000bx-Q1 for qemu-devel@nongnu.org; Tue, 22 Sep 2026 16:24:28 -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-78-jHVxkblvN-SBepJ4uU9kfQ-1; Tue, 22 Sep 2026 16:24:24 -0400 Received: from mx-prod-int-01.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-01.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.4]) (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 D315F1800630; Tue, 22 Sep 2026 20:24:23 +0000 (UTC) Received: from localhost (headnet03.pony-001.prod.iad2.dc.redhat.com [10.2.32.114]) by mx-prod-int-01.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id D2464300106D; Tue, 22 Sep 2026 20:24:22 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1790108666; 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=gR49i4+niEICCi44ryps2dZ91z+ksJEBI0Zh0aQGr5E=; b=avwH8B15r4hTQj7skFdP7KXcOuoWL5t6JjRiq8AkwMoS5N/vzN/12QCyQDL8wXrDNUa2kr zbWY3AFyk/EMoDE+nJrDEsO2Z1IDA7erzyQgiH5AX7+fG6ciqg5LLKXvCZ/wfeYLWyb9Mn E4O6Bpy5y7sVyLvhl9WVeIyHg7XIPas= X-MC-Unique: jHVxkblvN-SBepJ4uU9kfQ-1 X-Mimecast-MFC-AGG-ID: jHVxkblvN-SBepJ4uU9kfQ_1790108663 From: =?utf-8?q?Marc-Andr=C3=A9_Lureau?= Date: Wed, 23 Sep 2026 00:18:34 +0400 Subject: [PATCH 87/88] qemu-iotests: remove HMP framework support MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Message-Id: <20260923-nohmp-v1-87-ebc029d4bd80@redhat.com> References: <20260923-nohmp-v1-0-ebc029d4bd80@redhat.com> In-Reply-To: <20260923-nohmp-v1-0-ebc029d4bd80@redhat.com> To: qemu-devel@nongnu.org Cc: Kevin Wolf , =?utf-8?q?Marc-Andr=C3=A9_Lureau?= , Hanna Reitz , qemu-block@nongnu.org X-Developer-Signature: v=1; a=openpgp-sha256; l=8553; i=marcandre.lureau@redhat.com; h=from:subject:message-id; bh=VOUjYlRNJjQNTrtdMtPqLAZ8ycUHBKNzr6j7Y2dPJHE=; b=kA0DAAoB2ujhCXWWnOUByyZiAGqy4rSgow6t+neNiZ2tZxP4SuChH2wdKTkkSVPlGxH7X46R+ YkCMwQAAQoAHRYhBIepvZM/h8YG0nb2Ldro4Ql1lpzlBQJqsuK0AAoJENro4Ql1lpzlUyIP+QHI 2rZ+OOpBzg2Nzf+q7HaRoT4SSS7Zz0hGS7qXNpUmjh50NsFQvIrg6hOY4KhKnvSZXzy68kPyTa7 3Pnb1VCcGUAiB7wkfSVobgJxsJNBI8lcd9AA+HDI/IEcRRRbNdbYavlYVkqfV0JHDj49E5r2brs jk03pVAJsThcs1+wxvbxVvxiqcvf1yTyLwS5pxQmp94snkOLWKd2pWEgD9+w76b7xU5GTx65JFj SdlVeX6MDp2C6BlfjusbKRsfGcdxvOptJaZtCaqE9rOTmp4IWZTKxRBCOBlz79XEWApkZNl0a5S C1Hvne+qdtY5hbDNn856ehzMknCIQHucKjXUNQSxOt/EbpGoa34GbjLC1gIp/kBaSIWnyLUGVLi IsbBkmS9Me5ulNRD2ddbvWB3m4PkgLQEhsQtSxvKyX3eDGZDFVWrJOGktokfaJVO8XKezrnzo2W HRJZ1VgTbzk/TFRgrYw+/jQ//ycvwT7zwKDBZm5evk2C9CscbEtifS+SvGyMp9e9HT0AOhf2lRl kRxusW2IKWaJwUC3KEBgo96pBHf1I6OoIRdHXw8fXKx6PNvhmTKRvVtlZ8AGV4CvpcJEh6HOmvZ jhhF+v8SG4PYXPW68I2mOzR5XtylI1mRciGBwKYt7hSmlohnZgBFr6Wj74rF87aQ3psxMjQHCjT T9CrR X-Developer-Key: i=marcandre.lureau@redhat.com; a=openpgp; fpr=87A9BD933F87C606D276F62DDAE8E10975969CE5 X-Scanned-By: MIMEDefang 3.4.1 on 10.30.177.4 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.133.124; envelope-from=marcandre.lureau@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 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_H3=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: 1790108946485158500 All tests have been migrated to QMP. Remove: - _require_hmp() from common.rc - _filter_hmp() from common.filter - _filter_hmp from pipelines in common.qemu - HMP monitor mode from _launch_qemu() in common.qemu - hmp() method from iotests.py VM class - _verify_hmp() and require_hmp parameter from iotests.py Signed-off-by: Marc-Andr=C3=A9 Lureau --- tests/qemu-iotests/common.filter | 7 ------- tests/qemu-iotests/common.qemu | 34 +++++++++++----------------------- tests/qemu-iotests/common.rc | 8 -------- tests/qemu-iotests/iotests.py | 28 +--------------------------- 4 files changed, 12 insertions(+), 65 deletions(-) diff --git a/tests/qemu-iotests/common.filter b/tests/qemu-iotests/common.f= ilter index f6d94f993691..1ed2004c494f 100644 --- a/tests/qemu-iotests/common.filter +++ b/tests/qemu-iotests/common.filter @@ -102,13 +102,6 @@ _filter_qmp() -e ' QMP_VERSION' } =20 -# readline makes HMP command strings so long that git complains -_filter_hmp() -{ - gsed -e $'s/^\\((qemu) \\)\\?.*\e\\[D/\\1/g' \ - -e $'s/\e\\[K//g' -} - # replace block job offset _filter_block_job_offset() { diff --git a/tests/qemu-iotests/common.qemu b/tests/qemu-iotests/common.qemu index 458ea9566818..dbc286320b3d 100644 --- a/tests/qemu-iotests/common.qemu +++ b/tests/qemu-iotests/common.qemu @@ -119,7 +119,7 @@ _timed_wait_for() =20 if [ -z "${silent}" ] && [ -z "${mismatch_only}" ]; then echo "${resp}" | _filter_testdir | _filter_qemu \ - | _filter_qemu_io | _filter_qmp | _filter_hmp + | _filter_qemu_io | _filter_qmp fi if [ -n "${failure_match}" ]; then grep -q "${failure_match}" < <(echo "${resp}") @@ -134,7 +134,7 @@ _timed_wait_for() fi if [ -z "${silent}" ] && [ -n "${mismatch_only}" ]; then echo "${resp}" | _filter_testdir | _filter_qemu \ - | _filter_qemu_io | _filter_qmp | _filter_hmp + | _filter_qemu_io | _filter_qmp fi =20 done @@ -244,7 +244,7 @@ _check_cached_events() grep -q "$match" < <(echo "${ev}") if [ $? -eq 0 ] && [ $matched =3D 0 ]; then echo "${ev}" | _filter_testdir | _filter_qemu \ - | _filter_qemu_io | _filter_qmp | _filter_hmp + | _filter_qemu_io | _filter_qmp matched=3D1 else QEMU_EVENTS=3D"${QEMU_EVENTS:+${QEMU_EVENTS}%}${ev}" @@ -312,9 +312,6 @@ _run_qmp_job() # Launch a QEMU process. # # Input parameters: -# $qemu_comm_method: set this variable to 'monitor' (case insensitive) -# to use the QEMU HMP monitor for communication. -# Otherwise, the default of QMP is used. # $qmp_pretty: Set this variable to 'y' to enable QMP pretty printing. # $keep_stderr: Set this variable to 'y' to keep QEMU's stderr output on s= tderr. # If this variable is empty, stderr will be redirected to st= dout. @@ -327,16 +324,10 @@ _launch_qemu() local fifo_out=3D local fifo_in=3D =20 - if (shopt -s nocasematch; [[ "${qemu_comm_method}" =3D=3D "monitor" ]]) - then - comm=3D"-monitor stdio" + if [ "$qmp_pretty" =3D "y" ]; then + comm=3D"-monitor none -qmp-pretty stdio" else - local qemu_comm_method=3D"qmp" - if [ "$qmp_pretty" =3D "y" ]; then - comm=3D"-monitor none -qmp-pretty stdio" - else - comm=3D"-monitor none -qmp stdio" - fi + comm=3D"-monitor none -qmp stdio" fi =20 fifo_out=3D${QEMU_FIFO_OUT}_${_QEMU_HANDLE} @@ -379,13 +370,10 @@ _launch_qemu() QEMU_IN[${_QEMU_HANDLE}]=3D${_in_fd} QEMU_STATUS[${_QEMU_HANDLE}]=3D0 =20 - if [ "${qemu_comm_method}" =3D=3D "qmp" ] - then - # Don't print response, since it has version information in it - silent=3Dyes _timed_wait_for ${_QEMU_HANDLE} "capabilities" - if [ "$qmp_pretty" =3D "y" ]; then - silent=3Dyes _timed_wait_for ${_QEMU_HANDLE} "^}" - fi + # Don't print response, since it has version information in it + silent=3Dyes _timed_wait_for ${_QEMU_HANDLE} "capabilities" + if [ "$qmp_pretty" =3D "y" ]; then + silent=3Dyes _timed_wait_for ${_QEMU_HANDLE} "^}" fi QEMU_HANDLE=3D${_QEMU_HANDLE} let _QEMU_HANDLE++ @@ -416,7 +404,7 @@ _cleanup_qemu() =20 if [ -n "${wait}" ]; then cat <&${QEMU_OUT[$i]} | _filter_testdir | _filter_qemu \ - | _filter_qemu_io | _filter_qmp | _filte= r_hmp + | _filter_qemu_io | _filter_qmp fi rm -f "${QEMU_FIFO_IN}_${i}" "${QEMU_FIFO_OUT}_${i}" eval "exec ${QEMU_IN[$i]}<&-" # close file descriptors diff --git a/tests/qemu-iotests/common.rc b/tests/qemu-iotests/common.rc index 262fe63da820..bcb1ec50a93d 100644 --- a/tests/qemu-iotests/common.rc +++ b/tests/qemu-iotests/common.rc @@ -995,14 +995,6 @@ _notrun_on_fuse_error() esac } =20 -_require_hmp() -{ - if echo quit | $QEMU -M none -display none -monitor stdio 2>&1 | - grep -q "HMP monitor is not available"; then - _notrun "HMP monitor not available" - fi -} - # Check that we have a file system that allows huge (but very sparse) files # _require_large_file() diff --git a/tests/qemu-iotests/iotests.py b/tests/qemu-iotests/iotests.py index 5d9b5ded64ac..b9c6878c3bce 100644 --- a/tests/qemu-iotests/iotests.py +++ b/tests/qemu-iotests/iotests.py @@ -934,14 +934,6 @@ def add_paused(self): self._args.append('-S') return self =20 - def hmp(self, command_line: str, use_log: bool =3D False) -> QMPMessag= e: - cmd =3D 'human-monitor-command' - kwargs: Dict[str, Any] =3D {'command-line': command_line} - if use_log: - return self.qmp_log(cmd, **kwargs) - else: - return self.qmp(cmd, **kwargs) - def pause_drive(self, drive: str, event: Optional[str] =3D None) -> No= ne: """Pause drive r/w operations""" if not event: @@ -954,12 +946,6 @@ def resume_drive(self, drive: str) -> None: """Resume drive r/w operations""" self.qmp_qemu_io(drive, f'remove_break bp_{drive}') =20 - def hmp_qemu_io(self, drive: str, cmd: str, - use_log: bool =3D False, qdev: bool =3D False) -> QMPM= essage: - """Write to a given drive using an HMP command""" - d =3D '-d ' if qdev else '' - return self.hmp(f'qemu-io {d}{drive} "{cmd}"', use_log=3Duse_log) - def qmp_qemu_io(self, drive: str, cmd: str, use_log: bool =3D False, qdev: bool =3D False) -> str: """Write to a given drive using the x-qemu-io QMP command""" @@ -1464,15 +1450,6 @@ def _verify_formats(required_formats: Sequence[str] = =3D ()) -> None: notrun(f'formats {usf_list} are not whitelisted') =20 =20 -def _verify_hmp() -> None: - args =3D [qemu_prog] + qemu_opts + ['-M', 'none', '-monitor', 'stdio'] - with subprocess.Popen(args, stdin=3Dsubprocess.PIPE, - stdout=3Dsubprocess.PIPE, stderr=3Dsubprocess.ST= DOUT, - universal_newlines=3DTrue) as subp: - out, _ =3D subp.communicate('quit\n') - if 'HMP monitor is not available' in out: - notrun('HMP monitor not available') - def _verify_virtio_blk() -> None: out =3D qemu_pipe('-M', 'none', '-device', 'help') if 'virtio-blk' not in out: @@ -1711,8 +1688,7 @@ def execute_setup_common(supported_fmts: Sequence[str= ] =3D (), supported_protocols: Sequence[str] =3D (), unsupported_protocols: Sequence[str] =3D (), required_fmts: Sequence[str] =3D (), - unsupported_imgopts: Sequence[str] =3D (), - require_hmp: bool =3D False) -> bool: + unsupported_imgopts: Sequence[str] =3D ()) -> boo= l: """ Perform necessary setup for either script-style or unittest-style test= s. =20 @@ -1733,8 +1709,6 @@ def execute_setup_common(supported_fmts: Sequence[str= ] =3D (), _verify_formats(required_fmts) _verify_virtio_blk() _verify_imgopts(unsupported_imgopts) - if require_hmp: - _verify_hmp() =20 return debug =20 --=20 2.56.0.rc0.29.g47ce80527c56 From nobody Sat Sep 26 20:01:40 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=1790108956; cv=none; d=zohomail.com; s=zohoarc; b=g3C10GqY3CmKbToRIUfN0iWsiwzuA0rrTHpx4g+p3J3x6c5EjE8C1k7eeVV6MXw4SiK1PN/u2S4wtxBNeFhNT9qh41QrHCjNlrePUfGNVGnD5e2axWB276JNiDU1dQSiFnXNNbRbMJQQgY3rkLARwi6lSQpibhUlD4GuOlO71kg= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1790108956; 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:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=7QnVogbhUbKdgZBYIdVlAq+P5/ZtfauAADlehJVHlos=; b=TU/tDo2DyBiCfSrAtFG0E+t3Sb1wQycmzqU1ImRYURE31n1pxysokewJMmIKOxWX7hOC9zFRNMiIDJ8aGnfSgubjPvRQlq7RqjEzIOwj7Y8i6MJIHah/tsoN6ZcOTHtqEG4W35yh6MMX7mRzybujbW60UdZwaWD4xWaEg9EZgPY= 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 1790108956170938.0323371274343; Tue, 22 Sep 2026 13:29:16 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists1p.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1x9763-0007GM-WA; Tue, 22 Sep 2026 16:28:12 -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 1x972W-0001cm-Gf for qemu-devel@nongnu.org; Tue, 22 Sep 2026 16:24:32 -0400 Received: from us-smtp-delivery-124.mimecast.com ([170.10.133.124]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1x972U-0000cU-Nj for qemu-devel@nongnu.org; Tue, 22 Sep 2026 16:24:32 -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-662-inAEdBCRNCusul06X7p7nw-1; Tue, 22 Sep 2026 16:24:28 -0400 Received: from mx-prod-int-01.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-01.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.4]) (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 35D73180062D; Tue, 22 Sep 2026 20:24:27 +0000 (UTC) Received: from localhost (headnet03.pony-001.prod.iad2.dc.redhat.com [10.2.32.114]) by mx-prod-int-01.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id 4643E3000223; Tue, 22 Sep 2026 20:24:25 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1790108669; 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=7QnVogbhUbKdgZBYIdVlAq+P5/ZtfauAADlehJVHlos=; b=hTM3cEQml95rvynyQ1U1eDMfuKq9OfwMKFhSkB8rBflXOqdEvdrtA5+JGsgm7WSF5fQRWx C43jml+lmjNKO4i6Rw5N/gy4SNFMQ5R+wMGKjWYOHsm7/Dmfdf5oBy0bdVeVRVz9MoT25C yug05C/JmHIRTFH2j1eIRReT8MdyOoA= X-MC-Unique: inAEdBCRNCusul06X7p7nw-1 X-Mimecast-MFC-AGG-ID: inAEdBCRNCusul06X7p7nw_1790108667 From: =?utf-8?q?Marc-Andr=C3=A9_Lureau?= Date: Wed, 23 Sep 2026 00:18:35 +0400 Subject: [PATCH 88/88] block/monitor: redirect HMP qemu-io to HMP stream MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Message-Id: <20260923-nohmp-v1-88-ebc029d4bd80@redhat.com> References: <20260923-nohmp-v1-0-ebc029d4bd80@redhat.com> In-Reply-To: <20260923-nohmp-v1-0-ebc029d4bd80@redhat.com> To: qemu-devel@nongnu.org Cc: Kevin Wolf , =?utf-8?q?Marc-Andr=C3=A9_Lureau?= , Hanna Reitz , qemu-block@nongnu.org X-Developer-Signature: v=1; a=openpgp-sha256; l=852; i=marcandre.lureau@redhat.com; h=from:subject:message-id; bh=uV7/bbEQoJq2iAPaDJgtHcGaWRlRRLOYr9IFh9xCnKo=; b=owEBbQKS/ZANAwAKAdro4Ql1lpzlAcsmYgBqsuK0NtPldp9EwcV5HDIK9XGYM4eXuphytHemu UsN2qRQ6KmJAjMEAAEKAB0WIQSHqb2TP4fGBtJ29i3a6OEJdZac5QUCarLitAAKCRDa6OEJdZac 5YdYEACgL8eKPeJ/lfwSf+lqCOcHoPXeQaGEmjwafPJrI/5qxVS6Al6W8JsyKeJt46hJRVRK7KJ hdxDIN6wqQOowKPPBSsXe4ETqEi9s6Onr8AGDHxndBIpVQUQCBvEGSL6Vu3zy/aMGWYYsBPasBS 9cEzkjB7ll2A2xe33+K9GvGuEf7veCVSUXkSSVptCWTZCH1DYyz3oiehDc4jhI9HvR93tSfYa5Y MTX6eMtEEt807RPu326OmrJBXmo3mLy+SnUCa+a8KmVMomQEWuXoWPX/DcbSyqmtUNx4DY6l/YS NSetMa7PECpkroGqY+nQX8QQsN4rweoxMhUlJkyjB9+oQnWkEUT7W0bSkkCbN+9zH2IWLBoEGZF +oJbT3m1YTotAzF+ifvTpFTguPSCMuazj9Sx4APbgTW8TSfvlGEV2mcii+gq0uii5ID45SQQ0gX UWX1ug9PYu3cpQs6NQpfOYclCyYNLHK3capVF3fvlWLCoXy56JVXDGdUq2qWfWP7ftc3/LWWH1R 4YtmqLAHjGuj5obWKFYGIBP/mACy+qa0r7x7YRfaDJ0rN5i8iBsRspNtDshiiI1G1aOHA6Rqyxo O5pRMupbCOAzkR1nQRh7HuFmkQBbmjLx+qV/UD7KbaLeukXHAzw/nkDlAzXSGVzRWTUqmL3zi6H IJhc2iOQIgOV9bg== X-Developer-Key: i=marcandre.lureau@redhat.com; a=openpgp; fpr=87A9BD933F87C606D276F62DDAE8E10975969CE5 X-Scanned-By: MIMEDefang 3.4.1 on 10.30.177.4 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.133.124; envelope-from=marcandre.lureau@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 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_H3=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: 1790108958426158500 Now that all tests have been converted to rely on QMP stream result, we can also redirect HMP output. Signed-off-by: Marc-Andr=C3=A9 Lureau --- block/monitor/block-hmp-cmds.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/block/monitor/block-hmp-cmds.c b/block/monitor/block-hmp-cmds.c index ed071c0f4144..b1a1b4bae127 100644 --- a/block/monitor/block-hmp-cmds.c +++ b/block/monitor/block-hmp-cmds.c @@ -553,8 +553,7 @@ void hmp_qemu_io(MonitorHMP *hmp, const QDict *qdict) return; } =20 - /* use stdout and not monitor_puts() for compatiblity reasons */ - printf("%s", out->human_readable_text); + monitor_puts(MONITOR(hmp), out->human_readable_text); } =20 static void print_block_info(MonitorHMP *hmp, BlockInfo *info, --=20 2.56.0.rc0.29.g47ce80527c56