From patchwork Sat Nov 9 12:08:09 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Tokarev X-Patchwork-Id: 842101 Delivered-To: patch@linaro.org Received: by 2002:a5d:6307:0:b0:381:e71e:8f7b with SMTP id i7csp2119068wru; Sat, 9 Nov 2024 04:24:45 -0800 (PST) X-Forwarded-Encrypted: i=2; AJvYcCWBYu72HiMt6PAHPElx8/pZcncQhO3oKmkA4E1dxABycxamuoYKCbCFjJxgjEAcldMNTeGlLg==@linaro.org X-Google-Smtp-Source: AGHT+IEDms1rZcnFaLD6Q7V7xyXx6ta/bmP0EG8+exiCgrhegd0vXiTnmt5XQlWgrAXNiARPylYF X-Received: by 2002:a05:6214:4883:b0:6cc:1f0:d382 with SMTP id 6a1803df08f44-6d39e1077f9mr86389866d6.8.1731155085445; Sat, 09 Nov 2024 04:24:45 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1731155085; cv=none; d=google.com; s=arc-20240605; b=dqT+Xciu/onG6LtSH2EgzV9/FngBViHEEvpKcS0DbsgQIJvQAeAu2qcuGTFEbpCnzs kd8/BpvkXc+Bnx78Lkhgc0bcTQGOpKTW417A5xLm/bRsOmnoh6t1ckVKVkco5QDSzA0g caasOdNNlgb3HhzS9LaQoBkX6zMlLNUqE4m1Fa8uKOETGA53GlEGMbG0UWwwldHa95Ud gBz2qkesQKI/LnFhorKfSqyS1JWeG04s8xgkTSWq/1ZS7tkWyX1kFkCzvcW5RhMz4MMQ 10bYVbNQmUWhUQWBPQSJtu4+M8PlrG4zXqDhO2KgwpvC2lpCGlGN3qWGxj5b6QiqRirl 98NQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20240605; h=sender:errors-to:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:content-transfer-encoding :mime-version:references:in-reply-to:message-id:date:subject:cc:to :from; bh=vekVV3PMv4fi3QNwvENGjfmoprF09aDBj2Un/BnwnKs=; fh=tGYCtd4Yk/5t63XyS9rxnTAEGu/ewInjrHJiBkfyCpE=; b=In+1p8UUzdKyVut2Ii1UKgg7qGGM2+jjJ4rjbdiYL6L0t3CPL38wmQBkycxHP6ElC/ xr33ZOaW5XRe7EZoPcnUnHKleBrPO8aWMv+mmadTyKHlIpjJljDcGybglGpfAeC6BUwi TYP95bcrthw1aPdI0dkvcuRPg82Daf7maUTI4tBtYwTMPIybX8tj5ty5grTXwsmb3SVu XE3gzpD1zXTYnNsDR+/aHkN2WxP9yRYIf/fXjpR2ApRGo8Yn7MSMc5eMHL7MijvIaIpf VuCGbJa46WanqMDS2OK0NI+Ub061JbZLdU6AvLWkmQvD8PDNOtqDieGaJhOoaHNW5hEl 5UFA==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org" Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id af79cd13be357-7b32ace8113si630435585a.405.2024.11.09.04.24.45 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Sat, 09 Nov 2024 04:24:45 -0800 (PST) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org" Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1t9kNh-00045d-A0; Sat, 09 Nov 2024 07:15:57 -0500 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 1t9kNO-0003pz-Oo; Sat, 09 Nov 2024 07:15:39 -0500 Received: from isrv.corpit.ru ([86.62.121.231]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1t9kNM-000549-Kd; Sat, 09 Nov 2024 07:15:38 -0500 Received: from tsrv.corpit.ru (tsrv.tls.msk.ru [192.168.177.2]) by isrv.corpit.ru (Postfix) with ESMTP id 1B68FA1631; Sat, 9 Nov 2024 15:08:07 +0300 (MSK) Received: from tls.msk.ru (mjt.wg.tls.msk.ru [192.168.177.130]) by tsrv.corpit.ru (Postfix) with SMTP id D6E33167FB8; Sat, 9 Nov 2024 15:09:01 +0300 (MSK) Received: (nullmailer pid 3296151 invoked by uid 1000); Sat, 09 Nov 2024 12:09:01 -0000 From: Michael Tokarev To: qemu-devel@nongnu.org Cc: qemu-stable@nongnu.org, Peter Maydell , Kevin Wolf , Michael Tokarev Subject: [Stable-9.1.2 08/58] tests/qemu-iotests/211.out: Update to expect MapEntry 'compressed' field Date: Sat, 9 Nov 2024 15:08:09 +0300 Message-Id: <20241109120901.3295995-8-mjt@tls.msk.ru> X-Mailer: git-send-email 2.39.5 In-Reply-To: References: MIME-Version: 1.0 Received-SPF: pass client-ip=86.62.121.231; envelope-from=mjt@tls.msk.ru; helo=isrv.corpit.ru X-Spam_score_int: -68 X-Spam_score: -6.9 X-Spam_bar: ------ X-Spam_report: (-6.9 / 5.0 requ) BAYES_00=-1.9, RCVD_IN_DNSWL_HI=-5, RCVD_IN_VALIDITY_CERTIFIED_BLOCKED=0.001, RCVD_IN_VALIDITY_RPBL_BLOCKED=0.001, SPF_HELO_NONE=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+patch=linaro.org@nongnu.org Sender: qemu-devel-bounces+patch=linaro.org@nongnu.org From: Peter Maydell In commit 52b10c9c0c68e90f in 2023 the QAPI MapEntry struct was updated to add a 'compressed' field. That commit updated a number of iotest expected-output files, but missed 211, which is vdi specific. The result is that ./check -vdi and more specifically ./check -vdi 211 fails because the expected and actual output don't match. Update the reference output. Cc: qemu-stable@nongnu.org Fixes: 52b10c9c0c68e90f ("qemu-img: map: report compressed data blocks") Signed-off-by: Peter Maydell Message-ID: <20241008164708.2966400-4-peter.maydell@linaro.org> Reviewed-by: Kevin Wolf Signed-off-by: Kevin Wolf (cherry picked from commit d60bd080e783107cb876a6f16561fe03f9dcbca7) Signed-off-by: Michael Tokarev diff --git a/tests/qemu-iotests/211.out b/tests/qemu-iotests/211.out index f02c75409c..ff9f9a6913 100644 --- a/tests/qemu-iotests/211.out +++ b/tests/qemu-iotests/211.out @@ -17,7 +17,7 @@ file format: IMGFMT virtual size: 128 MiB (134217728 bytes) cluster_size: 1048576 -[{"data": false, "depth": 0, "length": 134217728, "present": true, "start": 0, "zero": true}] +[{"compressed": false, "data": false, "depth": 0, "length": 134217728, "present": true, "start": 0, "zero": true}] === Successful image creation (explicit defaults) === {"execute": "blockdev-create", "arguments": {"job-id": "job0", "options": {"driver": "file", "filename": "TEST_DIR/PID-t.vdi", "size": 0}}} @@ -35,7 +35,7 @@ file format: IMGFMT virtual size: 64 MiB (67108864 bytes) cluster_size: 1048576 -[{"data": false, "depth": 0, "length": 67108864, "present": true, "start": 0, "zero": true}] +[{"compressed": false, "data": false, "depth": 0, "length": 67108864, "present": true, "start": 0, "zero": true}] === Successful image creation (with non-default options) === {"execute": "blockdev-create", "arguments": {"job-id": "job0", "options": {"driver": "file", "filename": "TEST_DIR/PID-t.vdi", "size": 0}}} @@ -53,7 +53,7 @@ file format: IMGFMT virtual size: 32 MiB (33554432 bytes) cluster_size: 1048576 -[{"data": true, "depth": 0, "length": 3072, "offset": 1024, "present": true, "start": 0, "zero": false}, {"data": true, "depth": 0, "length": 33551360, "offset": 4096, "present": true, "start": 3072, "zero": true}] +[{"compressed": false, "data": true, "depth": 0, "length": 3072, "offset": 1024, "present": true, "start": 0, "zero": false}, {"compressed": false, "data": true, "depth": 0, "length": 33551360, "offset": 4096, "present": true, "start": 3072, "zero": true}] === Invalid BlockdevRef === {"execute": "blockdev-create", "arguments": {"job-id": "job0", "options": {"driver": "vdi", "file": "this doesn't exist", "size": 33554432}}}