From patchwork Sat Nov 9 12:07:27 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Tokarev X-Patchwork-Id: 842097 Delivered-To: patch@linaro.org Received: by 2002:a5d:6307:0:b0:381:e71e:8f7b with SMTP id i7csp2118491wru; Sat, 9 Nov 2024 04:23:04 -0800 (PST) X-Forwarded-Encrypted: i=2; AJvYcCXxahF96JjdENsusqXqLP8eSjZEQcDF2BkU7jdqiM6nQpzRJyveZ5J9QL/awtWikj6uQf+znQ==@linaro.org X-Google-Smtp-Source: AGHT+IFa2pdydqHyUSxrwGQ9jNlhK9+VldTZlnrGHHfMiCvn2PTmTaVfXYwl/SOPQcYMGheVWdGb X-Received: by 2002:a05:620a:2889:b0:7a9:a63a:9f48 with SMTP id af79cd13be357-7b331e98d7emr875779985a.11.1731154983893; Sat, 09 Nov 2024 04:23:03 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1731154983; cv=none; d=google.com; s=arc-20240605; b=QYCe+7LXUX2+vK68VgS5TWquHypk1fPCHvcXzJtcCKY6b9gyJ0U4+q/mtvZLYSDUEX Nejh5PHfodE4VfiulezMJqdCQ+C+ucpjOdL3L7Q55iURbMfNqciPTBAfpL/4ZZNEa41u iwNIrN0jphgmIGLiCNeax5+RKZSPMEzuZC+ie2BQOahML61u3AvxYPciFScYVAJ7nA8w 1dLJzN6g8WmldPtb4iezq+aliRTOHC+eu2DpoWTmCpVXzLNnBQhZXiuZPwalBRFzeQmx WNR54vSjSb62INg7InWXNGlaozU5OGnxuqOCnPEyHg5UcjP8GUdC65HItuXGB8S7UXAd T22Q== 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=KbIkTvdLJAaPDB4wUTxOeySG/GiUHv6NwOUapHjEYIbAC4LHTMfpHECIh5rpWfsBry ZTRf4zrK+VKhFoIwvdmK43WQDTLWkPrFZ0H7kx8hcQsBjYpoJ3kgD6f9sCv3IitO1p5D EDe/6njt3gxjVK3IwuFH1SP6HXDhUp8LNdL/ICbwB5xin9a7HVeWl9eNEC37Zt9kasI/ ekZYmbYBbQMpkVkMSGYi0rWzEQDxhrwj0BxiWglvIoURJCYbdFcKlgQ5RXbkvQ+t0yXX htYNIrLll+ztnmfIlQN5FG5EKt6UFy0rNoAjiJNdEtAb7XtE4p8+lG8ynK9+rEiuZ4jM trvw==; 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 6a1803df08f44-6d3966b2892si71400216d6.448.2024.11.09.04.23.03 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Sat, 09 Nov 2024 04:23:03 -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 1t9kJD-00054Z-ID; Sat, 09 Nov 2024 07:11:21 -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 1t9kI7-00035I-46; Sat, 09 Nov 2024 07:10:11 -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 1t9kI5-00042w-7u; Sat, 09 Nov 2024 07:10:10 -0500 Received: from tsrv.corpit.ru (tsrv.tls.msk.ru [192.168.177.2]) by isrv.corpit.ru (Postfix) with ESMTP id 2DE2FA1601; Sat, 9 Nov 2024 15:07:08 +0300 (MSK) Received: from tls.msk.ru (mjt.wg.tls.msk.ru [192.168.177.130]) by tsrv.corpit.ru (Postfix) with SMTP id E98E0167F8F; Sat, 9 Nov 2024 15:08:02 +0300 (MSK) Received: (nullmailer pid 3295328 invoked by uid 1000); Sat, 09 Nov 2024 12:08:01 -0000 From: Michael Tokarev To: qemu-devel@nongnu.org Cc: qemu-stable@nongnu.org, Peter Maydell , Kevin Wolf , Michael Tokarev Subject: [Stable-9.0.4 25/57] tests/qemu-iotests/211.out: Update to expect MapEntry 'compressed' field Date: Sat, 9 Nov 2024 15:07:27 +0300 Message-Id: <20241109120801.3295120-25-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}}}