From patchwork Fri Feb 24 15:20:17 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= X-Patchwork-Id: 656252 Delivered-To: patch@linaro.org Received: by 2002:adf:a3c6:0:0:0:0:0 with SMTP id m6csp951920wrb; Fri, 24 Feb 2023 07:21:19 -0800 (PST) X-Google-Smtp-Source: AK7set+0ZR5Wwd45R8S+N/kCBd+VvDPstiy3d0PoYH0j8Tuz9SJsr0tkgvSHrfokq7Um00gOIYp8 X-Received: by 2002:ad4:5cac:0:b0:56f:225:8e2a with SMTP id q12-20020ad45cac000000b0056f02258e2amr32784883qvh.17.1677252079321; Fri, 24 Feb 2023 07:21:19 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1677252079; cv=none; d=google.com; s=arc-20160816; b=xLb4LWrftVYy4xdA6B/Jj+JDQJQ80CRSFzVU2SiwOBHjGLZkYp04eO7J+XgSy/LXRJ mxezMjc+zA8ru87ET9xoUOAYWXf4CXPMvw4pogOLHge9T/7Tgj6bonvOWPCMgAOkiao9 6iiZGKguIQaK/aETF+vQgusNw1z2CD54ln8p4WwLAmTY6lulzvYrhLpaOhr3Xkl+GVqL LgYBdTu8QqEOr0fESxROscnVu8S/wCBYItSSiE1fR/lgaXcgQmsjezgqUADUsas977iR 41Iaecdx8pAzSmDvy8SfRTvMY02sntGNgghm0MOt3S+TMc4m0kBxgbdJhHmVa1IDiz1D mEXA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:content-transfer-encoding :mime-version:message-id:date:subject:cc:to:from:dkim-signature; bh=NW2hSLPKQjHfo4qS9sp+ojGRK3AOhAw5hNSXEkYXyn8=; b=d6g3ihrfW3IfY3yu36cY1881M41/H94DJ9RBkWL8arkB+zYHJg+maZXOF/YzgmVGyO 1SfRfxxcbHReRy0s9b6SFcuZbSDrCveWf+DGTYQOrjZyjuJf8RO1aF0SM5WnyyHV914U F19268N4MQlJT2vlzYJ/rwlTRHsmJ2ghjmbw9IBpsw36kKfIvd05UUV3zJn2a6SkDLP+ svLrYfYJw9ntsiWWL41E+T32qi1XU3q64apPhohYH3KZnzsHJ9+Qqz+xAWl7RmoBgs5l 51ru2orDaxqEu4ciubjvqcvF8ZLB5l8YY2Jk2AnAyIgfnLBKZ25Xa+VWjw6af1WhxqcW c2gw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=oZG+IjZg; 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 Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id 201-20020a3706d2000000b00742335f6e1esi7391346qkg.520.2023.02.24.07.21.19 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Fri, 24 Feb 2023 07:21:19 -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; dkim=pass header.i=@linaro.org header.s=google header.b=oZG+IjZg; 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 Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pVZsM-0004vM-Ei; Fri, 24 Feb 2023 10:20:48 -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 1pVZsJ-0004v3-7O for qemu-devel@nongnu.org; Fri, 24 Feb 2023 10:20:43 -0500 Received: from mail-wr1-x429.google.com ([2a00:1450:4864:20::429]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1pVZrz-0003sw-NP for qemu-devel@nongnu.org; Fri, 24 Feb 2023 10:20:26 -0500 Received: by mail-wr1-x429.google.com with SMTP id h14so5606765wru.4 for ; Fri, 24 Feb 2023 07:20:23 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:from:to:cc:subject:date:message-id:reply-to; bh=NW2hSLPKQjHfo4qS9sp+ojGRK3AOhAw5hNSXEkYXyn8=; b=oZG+IjZgSkQY9wZ08Mw+PuFjkYzGcb96B/mZGyhBal81HqtMqH9ty1rjSqeIxbO3s0 YV9xLr2lCkE+ywl8CrLz9m1Q5Y/WdHlRKLkacLGIQUAtZ2RILQS1+AtK4iuONa+h9YlE PYHgIqbPNGp3vY3TwnO7nFdxEhD6b+nySYB1vU9jiQvm72mh3xvbQDLv+wECEToHweyM YXUdXLclc0NPswog2kKqp7x70NzAN0ofB1dFMgNO7YqlPqL8c7Bm8pOdyNZw/LMvAeVo Lq/4A3rJA4M6KdK91gdP8Zx+0fVrfliQ0HMjkSzNsY0Cz4Bj0+baje5GpfruthZvARdl wK7w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=NW2hSLPKQjHfo4qS9sp+ojGRK3AOhAw5hNSXEkYXyn8=; b=eo6wGN60TT455U0XJCQlG6/oqNA4e0GbCkLNftZqEx/xkS/aCDKFEyB2GW1ibglRyH QMEwB76srK7ThqoX9FMsoRS2GH+Sm7SkcciW7jnNZwd0gVG4xKJs5NNVk5CXZ9D2TukI Xrc0bOrL8mHe1W/iItURabvIE8e0y4FldsyqZkXLqSbCcMaVbpGMGzCo+XAq2fLs/lVY Zf5dInwt48L8GvTJFa6QfejvMyGj2SBnRMd5pIz/1LORzfebPID5wTpOMu4lPLhIYRt6 lwkcnwu1IrQBYEV4WAu/P2A/Rgvd7ChlV1eYmkFRh65st3m6BqL6YRWaiPZsV4MpJZHF 7ykw== X-Gm-Message-State: AO0yUKVdER3rhxKvdJNa09jWbSOzAswUjz+XQVk6S85AFUoCaWeCYma3 WEQeZNFQnzKRa7ZkSfvHJ0pwBWUUSYRjOImE X-Received: by 2002:a5d:59c2:0:b0:2c5:4c5e:412b with SMTP id v2-20020a5d59c2000000b002c54c5e412bmr24925wry.23.1677252021835; Fri, 24 Feb 2023 07:20:21 -0800 (PST) Received: from localhost.localdomain ([81.0.6.76]) by smtp.gmail.com with ESMTPSA id d9-20020a056000114900b002c5584d0e3dsm13319916wrx.24.2023.02.24.07.20.20 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Fri, 24 Feb 2023 07:20:21 -0800 (PST) From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: qemu-block@nongnu.org, Hanna Reitz , Vladimir Sementsov-Ogievskiy , Kevin Wolf , Markus Armbruster , Eric Blake , John Snow , =?utf-8?q?Phi?= =?utf-8?q?lippe_Mathieu-Daud=C3=A9?= Subject: [PATCH 0/2] block/qcow2: QAPI'fy Qcow2DiscardType Date: Fri, 24 Feb 2023 16:20:17 +0100 Message-Id: <20230224152019.19278-1-philmd@linaro.org> X-Mailer: git-send-email 2.38.1 MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::429; envelope-from=philmd@linaro.org; helo=mail-wr1-x429.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=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: 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 QAPI seems designed to maintain such enums, so convert Qcow2DiscardType to be QAPI generated. Besides, this is how Qcow2CompressionType is maintained. Philippe Mathieu-Daudé (2): block/qcow2: Rename QCOW2_DISCARD_TYPE enum definitions block/qcow2: QAPI'fy Qcow2DiscardType block/qcow2-bitmap.c | 12 ++++++------ block/qcow2-cluster.c | 32 ++++++++++++++++---------------- block/qcow2-refcount.c | 36 ++++++++++++++++++------------------ block/qcow2-snapshot.c | 8 ++++---- block/qcow2.c | 26 +++++++++++++------------- block/qcow2.h | 19 +++++-------------- qapi/block-core.json | 10 ++++++++++ 7 files changed, 72 insertions(+), 71 deletions(-) Reviewed-by: Richard Henderson