From nobody Sat Nov 15 06:32:20 2025 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=1754062693; cv=none; d=zohomail.com; s=zohoarc; b=JjaB408jLAtQQp6D1U9dmmUPA/iTPUqBNXORHC6fB4pnNuVXVD5VuDxNe3QZrXNP/NeB7zrzDf8oVt6gglKXdYhHALgfabJ3Xanu2dsUlBF3TAt10xlHyJAV4qBp60zIGUkQO0ZCHKFDI2lMH4+xnF5Pjk/k7+W6H2bwWY/BcHA= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1754062693; h=Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=m4GgfrFhV1Kr06Y/gRom0+hi3JwWpWM8uAug65G2aKQ=; b=bG/pObqtpkKNZcJX64AmbQDOHjbeTmGYK4drfrf+4B4lcAegohbQrmMIwwvb8wpYXqoBDkZvMIdKyplfkysQg2kghZplPX0geSdhYhE2GCIqCevh6p45JOb5Nb917WrIrvB3ZtlkykyWcdGDsUmOQA2qYlUjcuxRvPVnx9RYM/M= 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 lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 175406269357218.52215255023998; Fri, 1 Aug 2025 08:38:13 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1uhroc-0007db-JN; Fri, 01 Aug 2025 11:37:03 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1uhrFy-0008Td-Ko for qemu-devel@nongnu.org; Fri, 01 Aug 2025 11:01: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 1uhrFq-0000PO-S6 for qemu-devel@nongnu.org; Fri, 01 Aug 2025 11:01:14 -0400 Received: from mail-wm1-f69.google.com (mail-wm1-f69.google.com [209.85.128.69]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-160-SCEQKkcROqijM8MYrlNT3Q-1; Fri, 01 Aug 2025 10:59:54 -0400 Received: by mail-wm1-f69.google.com with SMTP id 5b1f17b1804b1-4561dfd07bcso8503715e9.1 for ; Fri, 01 Aug 2025 07:59:54 -0700 (PDT) Received: from wheatley.localdomain ([85.93.96.130]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-458af87a773sm14938815e9.1.2025.08.01.07.59.51 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 01 Aug 2025 07:59:51 -0700 (PDT) Received: from wheatley.pinto-pinecone.ts.net (wheatley.k8r.cz [127.0.0.1]) by wheatley.localdomain (Postfix) with ESMTP id 20617C5A9A3D; Fri, 01 Aug 2025 16:59:51 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1754060462; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=m4GgfrFhV1Kr06Y/gRom0+hi3JwWpWM8uAug65G2aKQ=; b=Db3lokvZ7XZLwxiuL4evZYJiXfJI0NbwipHgzLoF9CEBGJ2fSw3UZXiSKaYXkMzO15jYyr SiIvftDIKOgPgzvZlvWOnpcjUEldpUIT/jWN43NUeFYpTXWHfcDUXmNYetm7QCNozlzws6 CDbCWfi5aIIJOCVzHXDGGWH32Glv5R8= X-MC-Unique: SCEQKkcROqijM8MYrlNT3Q-1 X-Mimecast-MFC-AGG-ID: SCEQKkcROqijM8MYrlNT3Q_1754060393 X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1754060393; x=1754665193; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=m4GgfrFhV1Kr06Y/gRom0+hi3JwWpWM8uAug65G2aKQ=; b=QwxejFFZ7q0Mjb5SrpV1xS3HMzUdb7uqzO1tQ0La4B0UgEjEAKEx8RjufZGlMWJLtx VMk9LBbSbQosS4KvK3+cYP/clvNIpmuxnT2GopIpbG6435iMn6qT6XWcNfejzZqIexVE coadaVS5EY1x8fpAmAbguriDiaQYMx6qHpA9ZqOkwT0s/+xWAybbCbDJKn79+XDF02b9 ZSjSS6hNHBIfrD/Q/Xbta47U4BiU9KkTTfgLA29tKSx06R9+SRzWJqDmxZsAN6fdAu7U USXTi8knYtaBMgM6loNxRScNLhdgabccaw3Vo/RwSWIwTHowftK8u9Jb6NnXE/m2Gg69 MlMQ== X-Gm-Message-State: AOJu0YzgsnmDTIBtyvVJQog+pSNUBTg/qidIPV/lKD6nM7YXvU6RxPAT tKtgPI2daqxs/q4/CUfQQEkHYqW2MkkEnXA0fzRoo6sQL+G6S4OgKXwwFynRFOfyh+zhhRdraUJ ltE3nH3uQ4QQBSp59M8ITwpJqaNo3P1F4L1Nt40hVY1t4nyKFIDkBmiLJ X-Gm-Gg: ASbGnculq/Y46n0jzVZ77l+U2soP0RDWoqbX9rBduyeX8QedNJI1BoavlQRISSAM+GN p4flyUzO2x+k2SFzVzhiNLSk0S82P0oc1DJkPnQaYuoqFSIMKsklIvabnOx5UGBphr3LtRWu/5t QwLRiZmDmhx+KYgc2jAZapzBzuDVRwFCOlILdsUKsKaXpQ0XdxnwP7lQ4LEPgi4xj9KwosmJ9M8 hqzROw9468rkLns5BarjDvGvz9zzsZwr13P22r+22QcqJZWsGdU0SHcpoHadgShIB5Q4tHDe3KQ 4Pq80+lz8fVAdvpIJ7p65Wxl2j0Vvwjg03PhaM5dg3as0emy X-Received: by 2002:a05:600c:c4a2:b0:450:ceb2:67dd with SMTP id 5b1f17b1804b1-458aa4636cdmr24104175e9.33.1754060392978; Fri, 01 Aug 2025 07:59:52 -0700 (PDT) X-Google-Smtp-Source: AGHT+IHpAaGpuW4PG6FOT1Zg8v45B3c99iWIUZCeh737ACA8E8ljCIdZubk3Xhouql36EWdB5FrjEw== X-Received: by 2002:a05:600c:c4a2:b0:450:ceb2:67dd with SMTP id 5b1f17b1804b1-458aa4636cdmr24103945e9.33.1754060392500; Fri, 01 Aug 2025 07:59:52 -0700 (PDT) From: Martin Kletzander To: qemu-devel@nongnu.org Cc: qemu-block@nongnu.org, Manos Pitsidianakis , Paolo Bonzini , qemu-rust@nongnu.org, Hanna Reitz , Kevin Wolf Subject: [PATCH 1/2] rust: Add antoher variant for impl_vmstate_struct! macro Date: Fri, 1 Aug 2025 16:59:49 +0200 Message-ID: X-Mailer: git-send-email 2.50.1 In-Reply-To: References: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable 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=lists.gnu.org; Received-SPF: pass client-ip=170.10.129.124; envelope-from=mkletzan@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_H5=0.001, RCVD_IN_MSPIKE_WL=0.001, RCVD_IN_VALIDITY_CERTIFIED_BLOCKED=0.001, RCVD_IN_VALIDITY_RPBL_BLOCKED=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: 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: 1754062695410124100 Content-Type: text/plain; charset="utf-8" From: Martin Kletzander In some cases (e.g. in vmstate_tests.rs) the second argument to impl_vmstate_struct! is actually an existing struct which is then copied (since VMStateDescription implements Copy) when saved into the static VMSD using .get(). That is not a problem because it is part of the data segment and the pointers are not being free'd since they point to static data. But it is a problem when tests rely on comparing the VMState descriptions as pointers rather than contents. And it also wastes space, more or less. Introduce second variant of the macro which can, instead of the expression, take an identifier or what looks like a reference. This second variant is added before the current variant so that it has preference, and only references the existing static data from it. This way tests are fixed and space is saved. And now that the VMStateDescription checking is fixed we can also check for the right value in test_vmstate_struct_varray_uint8_wrapper(). Signed-off-by: Martin Kletzander --- I'm not sure whether this is caused by different utility on my system or ba= sh version or whatever, but without this patch these three tests fail for me a= nd this patch fixes it. rust/qemu-api/src/vmstate.rs | 11 +++++++++++ rust/qemu-api/tests/vmstate_tests.rs | 1 + 2 files changed, 12 insertions(+) diff --git a/rust/qemu-api/src/vmstate.rs b/rust/qemu-api/src/vmstate.rs index b5c6b764fbba..716e52afe740 100644 --- a/rust/qemu-api/src/vmstate.rs +++ b/rust/qemu-api/src/vmstate.rs @@ -449,6 +449,17 @@ macro_rules! vmstate_validate { /// description of the struct. #[macro_export] macro_rules! impl_vmstate_struct { + ($type:ty, $(&)?$vmsd:ident) =3D> { + unsafe impl $crate::vmstate::VMState for $type { + const BASE: $crate::bindings::VMStateField =3D + $crate::bindings::VMStateField { + vmsd: $vmsd.as_ref(), + size: ::core::mem::size_of::<$type>(), + flags: $crate::bindings::VMStateFlags::VMS_STRUCT, + ..$crate::zeroable::Zeroable::ZERO + }; + } + }; ($type:ty, $vmsd:expr) =3D> { unsafe impl $crate::vmstate::VMState for $type { const BASE: $crate::bindings::VMStateField =3D { diff --git a/rust/qemu-api/tests/vmstate_tests.rs b/rust/qemu-api/tests/vms= tate_tests.rs index 2c0670ba0eed..7d3180e6c2ea 100644 --- a/rust/qemu-api/tests/vmstate_tests.rs +++ b/rust/qemu-api/tests/vmstate_tests.rs @@ -320,6 +320,7 @@ fn test_vmstate_struct_varray_uint8_wrapper() { b"arr_a_wrap\0" ); assert_eq!(foo_fields[5].num_offset, 228); + assert_eq!(foo_fields[5].vmsd, VMSTATE_FOOA.as_ref()); assert!(unsafe { foo_fields[5].field_exists.unwrap()(foo_b_p, 0) }); =20 // The last VMStateField in VMSTATE_FOOB. --=20 2.50.1 From nobody Sat Nov 15 06:32:20 2025 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=1754062659; cv=none; d=zohomail.com; s=zohoarc; b=f2cvqnF+0eoftk4CLdvstrBTAc0BzMaLqwji+jOgNV5whOoaxP9qsqpLIr31+d8O5Ic2vT1Wb8+1CMl053qmIWUwrZmLIgsSGkBs3T+ONRxJSTO0F2zrDtvHkmKDS3BFNe1a4n3YAB8RsC5ufU8PQe2UXHen7HJSOqktWhFIOrY= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1754062659; h=Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=EaW4z6pH2A7AGWyyg4rFylZ1OvKeQrkAV0IRhaxTnnA=; b=WiqbvF79mnCFztyg41lvYdYsNUeGuql+WHxzxIQrNf6AgBF/qOsYuAMzVZV5Xz0CdRnp7hck8TuQ/dTfu6Ob6RoYKgAhG1ppMOlPHXQinfuA4ivoymB71uxFpe92AUtTpQcIBfbE0N5zq/aH6YlJqKxUEDM7544RAxaADXaiR/0= 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 lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1754062659281312.8681017281285; Fri, 1 Aug 2025 08:37:39 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1uhroX-0006fP-Si; Fri, 01 Aug 2025 11:36:58 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1uhrFz-0008Tl-Px for qemu-devel@nongnu.org; Fri, 01 Aug 2025 11:01:27 -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 1uhrFq-0000QE-P6 for qemu-devel@nongnu.org; Fri, 01 Aug 2025 11:01:15 -0400 Received: from mail-wm1-f71.google.com (mail-wm1-f71.google.com [209.85.128.71]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-520-VKpg3hxSMsaUzNBwn1uT0A-1; Fri, 01 Aug 2025 10:59:54 -0400 Received: by mail-wm1-f71.google.com with SMTP id 5b1f17b1804b1-4588fb6854cso9446885e9.0 for ; Fri, 01 Aug 2025 07:59:54 -0700 (PDT) Received: from wheatley.localdomain ([85.93.96.130]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-458953f887asm109225805e9.29.2025.08.01.07.59.51 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 01 Aug 2025 07:59:52 -0700 (PDT) Received: from wheatley.pinto-pinecone.ts.net (wheatley.k8r.cz [127.0.0.1]) by wheatley.localdomain (Postfix) with ESMTP id 2E0A1C5A9A3E; Fri, 01 Aug 2025 16:59:51 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1754060464; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=EaW4z6pH2A7AGWyyg4rFylZ1OvKeQrkAV0IRhaxTnnA=; b=KseXmxy4CdHQ6qfKG++jH4Xp5nYYau7aiJBQP/lqwVrUKKbl+Ov089fE5GQytZm0my62Nk eJrnQgsxyUKowiyvrWOixGIaCPhq0VVEDs+0EqI6zSbJ30lFMu+Nqv7+W2ARdGd6+8uT9N /i2mvUWDohdSVm8uiLZGR4zRPk6FCoQ= X-MC-Unique: VKpg3hxSMsaUzNBwn1uT0A-1 X-Mimecast-MFC-AGG-ID: VKpg3hxSMsaUzNBwn1uT0A_1754060393 X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1754060393; x=1754665193; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=EaW4z6pH2A7AGWyyg4rFylZ1OvKeQrkAV0IRhaxTnnA=; b=oP1R1ZHPZaTUHYSWvkKaC1P52febKJ82HBPvWcbZ73IBLcHRseK+p+dnjmdeAHjbNM 9qaZ2gxD+qHlqYYDL0Zyiu7+oxwi77CAas7UgsXpgYvRryGGKYPsjgH0G/7DJ4ifyvtv R7kgZ6HlMr7BnSk4FrA2CNJCgWPBag5pC6twlXRFEEUHTUw7LcZ1YNA8UpIjfx5TLJyt sN2CkAaUmasQYNq/8zZTPgpH9UnI47Y2iox8YkJec2Prr5O5I4lP0ZKdXtoLT8MRQGQ0 q+bag21TcC0EVEfOWwq1cWlqSemdFldU8Du53hQ1rPA6L51O+nGrg5IKNdDYO4mKhxGA 4C8A== X-Gm-Message-State: AOJu0Ywh6sCGvxs0s4qRp+37/Jj8LtRXxGmGDXslkIaUQfu+R/4aBDhK VN1cjRS2L2aZWjR6LShGapODp7QvYrq2E7TvFCfILu52CBoqJAL+uiCPaHdEy/ncemBqtKfroV0 Hb+p7gXghiUs3otuEczNdlxVuHJxTszixYQ2tptZf0u3+nCI5c/WN4RAo X-Gm-Gg: ASbGncsyX2SRC5e/smI4jF67TW+YZ9dgllHrtKGd5E8w5PXw5b/UeptH59PQQiDlaML CKm6JB+b9JPlO5Tr25z4vrU0/AscZEu1vlTshnYifobWo3UtNDFNWeFDDea1189eP4iaZ2ij6Oz 8Rygqh9s0Zv0u4DNyb2uDQmMxA52H3nb3VdIh8M0kVgYvhGHkpJ7mySVbBx9it968SJqsQK2ZmO IScMjRJS+WqL5wQn8ii4X/1rmDoqTEp1lIw42S1t5OrCOoL7Eni54Uq0wSyOEgQGChVpvA9h7L4 MQHwzqOPHr10gDDsledBtT+hOKge6jbGYvTYMbTQMS1ICM+J X-Received: by 2002:a05:600c:1d98:b0:456:18cf:66b5 with SMTP id 5b1f17b1804b1-45892bc58a1mr101675975e9.22.1754060393301; Fri, 01 Aug 2025 07:59:53 -0700 (PDT) X-Google-Smtp-Source: AGHT+IHHygTdJHRX475Z44aiMZeHmh5KPq5DtHm9GoL6A5CjlEt7nJUVodHY2Ks/w3FlyOeEWeNS+Q== X-Received: by 2002:a05:600c:1d98:b0:456:18cf:66b5 with SMTP id 5b1f17b1804b1-45892bc58a1mr101675645e9.22.1754060392844; Fri, 01 Aug 2025 07:59:52 -0700 (PDT) From: Martin Kletzander To: qemu-devel@nongnu.org Cc: qemu-block@nongnu.org, Manos Pitsidianakis , Paolo Bonzini , qemu-rust@nongnu.org, Hanna Reitz , Kevin Wolf Subject: [PATCH 2/2] tests/qemu-iotests: Indent expected error messages Date: Fri, 1 Aug 2025 16:59:50 +0200 Message-ID: X-Mailer: git-send-email 2.50.1 In-Reply-To: References: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable 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=lists.gnu.org; Received-SPF: pass client-ip=170.10.129.124; envelope-from=mkletzan@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_H5=0.001, RCVD_IN_MSPIKE_WL=0.001, RCVD_IN_VALIDITY_CERTIFIED_BLOCKED=0.001, RCVD_IN_VALIDITY_RPBL_BLOCKED=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: 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: 1754062691628124100 Content-Type: text/plain; charset="utf-8" From: Martin Kletzander When running all tests the expected "killed" messages are indented differently than the actual ones, by three more spaces. Change it so that the messages match and tests pass. Signed-off-by: Martin Kletzander Tested-by: Martin Kletzander --- tests/qemu-iotests/039.out | 10 +++++----- tests/qemu-iotests/061.out | 4 ++-- tests/qemu-iotests/137.out | 2 +- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/tests/qemu-iotests/039.out b/tests/qemu-iotests/039.out index e52484d4be1b..87809c534ba3 100644 --- a/tests/qemu-iotests/039.out +++ b/tests/qemu-iotests/039.out @@ -11,7 +11,7 @@ No errors were found on the image. Formatting 'TEST_DIR/t.IMGFMT', fmt=3DIMGFMT size=3D134217728 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_exec "${VALGRIND_LOGFILE}" "$QEMU_IO_PROG" $QEMU_IO_ARGS "$@"= ) +./common.rc: Killed ( VALGRIND_QEMU=3D"${VALGRIND_QEMU= _IO}" _qemu_proc_exec "${VALGRIND_LOGFILE}" "$QEMU_IO_PROG" $QEMU_IO_ARGS "= $@" ) incompatible_features [0] ERROR cluster 5 refcount=3D0 reference=3D1 ERROR OFLAG_COPIED data cluster: l2_entry=3D8000000000050000 refcount=3D0 @@ -46,7 +46,7 @@ read 512/512 bytes at offset 0 Formatting 'TEST_DIR/t.IMGFMT', fmt=3DIMGFMT size=3D134217728 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_exec "${VALGRIND_LOGFILE}" "$QEMU_IO_PROG" $QEMU_IO_ARGS "$@"= ) +./common.rc: Killed ( VALGRIND_QEMU=3D"${VALGRIND_QEMU= _IO}" _qemu_proc_exec "${VALGRIND_LOGFILE}" "$QEMU_IO_PROG" $QEMU_IO_ARGS "= $@" ) incompatible_features [0] ERROR cluster 5 refcount=3D0 reference=3D1 Rebuilding refcount structure @@ -60,7 +60,7 @@ incompatible_features [] Formatting 'TEST_DIR/t.IMGFMT', fmt=3DIMGFMT size=3D134217728 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_exec "${VALGRIND_LOGFILE}" "$QEMU_IO_PROG" $QEMU_IO_ARGS "$@"= ) +./common.rc: Killed ( VALGRIND_QEMU=3D"${VALGRIND_QEMU= _IO}" _qemu_proc_exec "${VALGRIND_LOGFILE}" "$QEMU_IO_PROG" $QEMU_IO_ARGS "= $@" ) incompatible_features [] No errors were found on the image. =20 @@ -79,7 +79,7 @@ No errors were found on the image. Formatting 'TEST_DIR/t.IMGFMT', fmt=3DIMGFMT size=3D134217728 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_exec "${VALGRIND_LOGFILE}" "$QEMU_IO_PROG" $QEMU_IO_ARGS "$@"= ) +./common.rc: Killed ( VALGRIND_QEMU=3D"${VALGRIND_QEMU= _IO}" _qemu_proc_exec "${VALGRIND_LOGFILE}" "$QEMU_IO_PROG" $QEMU_IO_ARGS "= $@" ) incompatible_features [0] ERROR cluster 5 refcount=3D0 reference=3D1 ERROR OFLAG_COPIED data cluster: l2_entry=3D8000000000050000 refcount=3D0 @@ -89,7 +89,7 @@ Data may be corrupted, or further writes to the image may= corrupt it. Formatting 'TEST_DIR/t.IMGFMT', fmt=3DIMGFMT size=3D134217728 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_exec "${VALGRIND_LOGFILE}" "$QEMU_IO_PROG" $QEMU_IO_ARGS "$@"= ) +./common.rc: Killed ( VALGRIND_QEMU=3D"${VALGRIND_QEMU= _IO}" _qemu_proc_exec "${VALGRIND_LOGFILE}" "$QEMU_IO_PROG" $QEMU_IO_ARGS "= $@" ) incompatible_features [] No errors were found on the image. *** done diff --git a/tests/qemu-iotests/061.out b/tests/qemu-iotests/061.out index 24c33add7ce6..ae4c0d37bbbe 100644 --- a/tests/qemu-iotests/061.out +++ b/tests/qemu-iotests/061.out @@ -118,7 +118,7 @@ No errors were found on the image. Formatting 'TEST_DIR/t.IMGFMT', fmt=3DIMGFMT size=3D67108864 wrote 131072/131072 bytes at offset 0 128 KiB, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec) -./common.rc: Killed ( VALGRIND_QEMU=3D"${VALGRIND_QEMU_IO= }" _qemu_proc_exec "${VALGRIND_LOGFILE}" "$QEMU_IO_PROG" $QEMU_IO_ARGS "$@"= ) +./common.rc: Killed ( VALGRIND_QEMU=3D"${VALGRIND_QEMU= _IO}" _qemu_proc_exec "${VALGRIND_LOGFILE}" "$QEMU_IO_PROG" $QEMU_IO_ARGS "= $@" ) magic 0x514649fb version 3 backing_file_offset 0x0 @@ -304,7 +304,7 @@ No errors were found on the image. Formatting 'TEST_DIR/t.IMGFMT', fmt=3DIMGFMT size=3D67108864 wrote 131072/131072 bytes at offset 0 128 KiB, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec) -./common.rc: Killed ( VALGRIND_QEMU=3D"${VALGRIND_QEMU_IO= }" _qemu_proc_exec "${VALGRIND_LOGFILE}" "$QEMU_IO_PROG" $QEMU_IO_ARGS "$@"= ) +./common.rc: Killed ( VALGRIND_QEMU=3D"${VALGRIND_QEMU= _IO}" _qemu_proc_exec "${VALGRIND_LOGFILE}" "$QEMU_IO_PROG" $QEMU_IO_ARGS "= $@" ) magic 0x514649fb version 3 backing_file_offset 0x0 diff --git a/tests/qemu-iotests/137.out b/tests/qemu-iotests/137.out index 86377c80cde6..f3b12fbb04b0 100644 --- a/tests/qemu-iotests/137.out +++ b/tests/qemu-iotests/137.out @@ -35,7 +35,7 @@ Formatting 'TEST_DIR/t.IMGFMT', fmt=3DIMGFMT size=3D67108= 864 qemu-io: Unsupported value 'blubb' for qcow2 option 'overlap-check'. Allow= ed are any 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_exec "${VALGRIND_LOGFILE}" "$QEMU_IO_PROG" $QEMU_IO_ARGS "$@"= ) +./common.rc: Killed ( VALGRIND_QEMU=3D"${VALGRIND_QEMU= _IO}" _qemu_proc_exec "${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' --=20 2.50.1