From patchwork Tue Oct 8 16:47:07 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Peter Maydell X-Patchwork-Id: 833581 Delivered-To: patch@linaro.org Received: by 2002:adf:a1d9:0:b0:367:895a:4699 with SMTP id v25csp395138wrv; Tue, 8 Oct 2024 09:48:17 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCVWlW0WINLi9pdpQBzLkX6i/RjGqqSo47iMt+tOdrxzEIGHa0ymjsrtQokubq5YuDzBDIms+A==@linaro.org X-Google-Smtp-Source: AGHT+IE4bQEHToKmjk8Yuacfp6fOAjGQWcbhhZ6BpHhaBAcSvuWDZBKGwCYwlNMYN3K++qYhK99W X-Received: by 2002:a05:620a:4694:b0:7a9:be54:4b00 with SMTP id af79cd13be357-7ae6f454397mr2329011685a.35.1728406096816; Tue, 08 Oct 2024 09:48:16 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1728406096; cv=none; d=google.com; s=arc-20240605; b=VGxomPi+hRujBVoliItVHNeFFdezV3SMjtW3aAzGhuz/vDhgk+X1WezVN951vSPaF8 Ssw2jsCPxGBkT4g30ngaR7lM6Ux6SPiGzHVny0J9NNw7cZIuhbRGkkouenVYmfL0xV+P A2oD4a714qRlXTSswopMIszI5oHDOzocWshDlx+k+JkhakpwFQ+cQQbuDwa0XDxqugYZ HtQ7TMAU4PJLhNSGjBBVpAMhlPQ03Xj0NFxW+caakWF/HA6x01tj8K6ugF7ftlS5kpb0 Z7/cGI6QALk9aIdqxaN5QgwN2kybQIA6F5i4i+mHvUtumfTe68siArZQjP0ZOh5AACmW xAhw== 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:dkim-signature; bh=MFPIz1m97xBQWFJEuvJDqUyJljE1qr1cdlwIzcHgEvs=; fh=GeYAnZnQ/hHVwF5xM/bbpAEr03LDLLn0NlNLYifVRZ0=; b=ksw6V2MSU1GkoqlZQjqUSXOu0swpb24eivx9zjg+HZ4WjjgCDtVaZmVfywQz3bQ7Xg 0gDEd2T+wGlkAM/dADK+eWgSvMASGopI2/a05zqgYG8mow2RpM7VY1jpprNnQK54ykbL mG1OrdEgdMW9LZUdnnEvhb0bX4FjLBBJLu2k5+DPZ0kXIWyPekA/DIlksqFTdxm01dhF TbfNU4DtaaJ59Xx5kI+8gHJ7PKja19BaiZcWVj9eGtN/VDqxqqnWNYHxBui1M9x8H2I6 NYIejUi1x2Pa6fbXt+pikGC7hc8DpOtUbdwQFFgpUbK5HmzEtjYChYEj84xEId25wOJ9 eIVw==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=sEqfNWi6; 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"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org; dara=neutral header.i=@linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id af79cd13be357-7afcb59289asi117256085a.275.2024.10.08.09.48.16 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Tue, 08 Oct 2024 09:48:16 -0700 (PDT) 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; dkim=pass header.i=@linaro.org header.s=google header.b=sEqfNWi6; 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"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org; dara=neutral header.i=@linaro.org Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1syDMi-0003C4-QX; Tue, 08 Oct 2024 12:47:16 -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 1syDMh-0003Ax-Bx for qemu-devel@nongnu.org; Tue, 08 Oct 2024 12:47:15 -0400 Received: from mail-wr1-x42d.google.com ([2a00:1450:4864:20::42d]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1syDMf-00038n-AP for qemu-devel@nongnu.org; Tue, 08 Oct 2024 12:47:15 -0400 Received: by mail-wr1-x42d.google.com with SMTP id ffacd0b85a97d-37d375ddfc0so358477f8f.2 for ; Tue, 08 Oct 2024 09:47:12 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1728406031; x=1729010831; darn=nongnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=MFPIz1m97xBQWFJEuvJDqUyJljE1qr1cdlwIzcHgEvs=; b=sEqfNWi6N1n+f3qhJCXyIZIxR83rm2K1cInBk0JTFsHpRvfHxff7rWZqOBz4kRu0tZ 4xjT+kzqgVAZfOs1zWtf+zvekgaCFugyX/wagoLrVV3+Gs+QyP1/QqL3vABc7ok66MMB Is/czDiCjzr3AmGFrO9DLFo8W5dylu/iyc3+XDwpJ61P92S/85cH/qwINeM7pkeKwBGU beDRA2iBXFASsgUwBTUimcJ8wKW9ZX2tNJ3oE89KhblyO2/RLmKmNJf/Sj/je2KNMa+8 VQe8+BSU8he4Wn8irkHAVSEnMpw43TN7MNESeeRvIETwMiKf9KZN8b3zAMc4L1EXvsVh cBkg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1728406031; x=1729010831; 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=MFPIz1m97xBQWFJEuvJDqUyJljE1qr1cdlwIzcHgEvs=; b=Ov31Iyo/Ho0P0RNuUfWAMbhGJcJFFMHGnJbPro4JLGZ3bizhEMU1F9hdtFl6Rsi3J3 g8vPNEaMWfX8s2EgA9KUKG8jKRNuH9z/gcLKFBNSrx0FTH3sSZpxnhN/RcpWWDaZi/Fk MuywxP3xF03TvnV8eSq1mdWTcYQaSGIxyopGL/hi/94ObMc2KF6N6q82t2zG780gjNu9 vtcEulPGjYjhfHRCVkjv1EH76WmFef7vDobriq7LZkaZloswWdcEF+wwgIoHKXxmmM2X rTEQzCseXO6zPtMMlpuGE/glxdT7XUMdaB8v6p9Ooi0i1/qZ0NwwlS3H6eEIRXcYjAkJ cvDQ== X-Gm-Message-State: AOJu0Yzefs+nV8v7ZEwLINccLBsYhmSPIX+dlbhJKB6eE7lyYkUnDqn+ 6BRsHy48lCtHkua0gsAFTWLq9sFPiNr/yTOSlKj/8zmfWu59+f37dthGcq3v3jnDCiOyKpe39m3 N X-Received: by 2002:a5d:608b:0:b0:37c:c628:51bc with SMTP id ffacd0b85a97d-37d0eaea1a3mr8961595f8f.57.1728406031541; Tue, 08 Oct 2024 09:47:11 -0700 (PDT) Received: from orth.archaic.org.uk (orth.archaic.org.uk. [2001:8b0:1d0::2]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-37d32ea1d98sm1490936f8f.68.2024.10.08.09.47.10 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 08 Oct 2024 09:47:11 -0700 (PDT) From: Peter Maydell To: qemu-devel@nongnu.org Cc: qemu-block@nongnu.org, Kevin Wolf , Hanna Reitz , Stefan Weil Subject: [PATCH v2 3/4] tests/qemu-iotests/211.out: Update to expect MapEntry 'compressed' field Date: Tue, 8 Oct 2024 17:47:07 +0100 Message-Id: <20241008164708.2966400-4-peter.maydell@linaro.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20241008164708.2966400-1-peter.maydell@linaro.org> References: <20241008164708.2966400-1-peter.maydell@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::42d; envelope-from=peter.maydell@linaro.org; helo=mail-wr1-x42d.google.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, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, 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 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 --- tests/qemu-iotests/211.out | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/tests/qemu-iotests/211.out b/tests/qemu-iotests/211.out index f02c75409ca..ff9f9a6913a 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}}}