From nobody Mon Sep 16 19:22:15 2024 Delivered-To: importer@patchew.org Received-SPF: none (zohomail.com: 8.43.85.245 is neither permitted nor denied by domain of lists.libvirt.org) client-ip=8.43.85.245; envelope-from=devel-bounces@lists.libvirt.org; helo=lists.libvirt.org; Authentication-Results: mx.zohomail.com; spf=none (zohomail.com: 8.43.85.245 is neither permitted nor denied by domain of lists.libvirt.org) smtp.mailfrom=devel-bounces@lists.libvirt.org; dmarc=fail(p=none dis=none) header.from=redhat.com Return-Path: Received: from lists.libvirt.org (lists.libvirt.org [8.43.85.245]) by mx.zohomail.com with SMTPS id 1706790188180212.60059312322187; Thu, 1 Feb 2024 04:23:08 -0800 (PST) Received: by lists.libvirt.org (Postfix, from userid 996) id 2B9311BC2; Thu, 1 Feb 2024 07:23:07 -0500 (EST) Received: from lists.libvirt.org.85.43.8.in-addr.arpa (localhost [IPv6:::1]) by lists.libvirt.org (Postfix) with ESMTP id 9B8121CE5; Thu, 1 Feb 2024 07:13:51 -0500 (EST) Received: by lists.libvirt.org (Postfix, from userid 996) id 547D719BF; Thu, 1 Feb 2024 07:13:38 -0500 (EST) Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by lists.libvirt.org (Postfix) with ESMTPS id 6BC271A6E for ; Thu, 1 Feb 2024 07:13:37 -0500 (EST) Received: from mimecast-mx02.redhat.com (mimecast-mx02.redhat.com [66.187.233.88]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-643-d1ahLwtmOlWX_PFisnB6dg-1; Thu, 01 Feb 2024 07:13:35 -0500 Received: from smtp.corp.redhat.com (int-mx08.intmail.prod.int.rdu2.redhat.com [10.11.54.8]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 6FCDA811E81 for ; Thu, 1 Feb 2024 12:13:35 +0000 (UTC) Received: from speedmetal.redhat.com (unknown [10.45.242.16]) by smtp.corp.redhat.com (Postfix) with ESMTP id DDE4DC0FDEF for ; Thu, 1 Feb 2024 12:13:34 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.4.4 (2020-01-24) on lists.libvirt.org X-Spam-Level: X-Spam-Status: No, score=-0.8 required=5.0 tests=HEADER_FROM_DIFFERENT_DOMAINS, MAILING_LIST_MULTI,RCVD_IN_DNSWL_NONE,RCVD_IN_MSPIKE_H2,SPF_HELO_NONE, T_SCC_BODY_TEXT_LINE autolearn=unavailable autolearn_force=no version=3.4.4 X-MC-Unique: d1ahLwtmOlWX_PFisnB6dg-1 From: Peter Krempa To: devel@lists.libvirt.org Subject: [PATCH 2/4] qemu: capabilities: Introduce QEMU_CAPS_BLOCKJOB_BACKING_MASK_PROTOCOL Date: Thu, 1 Feb 2024 13:13:25 +0100 Message-ID: In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.4.1 on 10.11.54.8 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Message-ID-Hash: VNUOFLR3HLIUOXAUKCEDBEVTW5D3RJOH X-Message-ID-Hash: VNUOFLR3HLIUOXAUKCEDBEVTW5D3RJOH X-MailFrom: pkrempa@redhat.com X-Mailman-Rule-Misses: dmarc-mitigation; no-senders; approved; emergency; loop; banned-address; member-moderation; header-match-config-1; header-match-config-2; header-match-config-3; header-match-devel.lists.libvirt.org-0; nonmember-moderation; administrivia; implicit-dest; max-recipients; max-size; news-moderation; no-subject; suspicious-header X-Mailman-Version: 3.2.2 Precedence: list List-Id: Development discussions about the libvirt library & tools Archived-At: List-Archive: List-Help: List-Post: List-Subscribe: List-Unsubscribe: Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-ZM-MESSAGEID: 1706790188911100001 The capability is asserted when both block-stream and block-commit QMP commands support the 'backing-mask-protocol' argument. The argument causes qemu to record 'raw' as the backing file format in case when a protocol node is used directly. This is needed to preserve compatibility of images after a block-commit or block-pull libvirt operation with older libvirt versions in case when we'll want to remove the unneded 'raw' format drivers from the block graph. Signed-off-by: Peter Krempa --- src/qemu/qemu_capabilities.c | 7 +++++++ src/qemu/qemu_capabilities.h | 3 +++ tests/qemucapabilitiesdata/caps_9.0.0_x86_64.xml | 1 + 3 files changed, 11 insertions(+) diff --git a/src/qemu/qemu_capabilities.c b/src/qemu/qemu_capabilities.c index f4b4f05479..e383d85920 100644 --- a/src/qemu/qemu_capabilities.c +++ b/src/qemu/qemu_capabilities.c @@ -701,6 +701,9 @@ VIR_ENUM_IMPL(virQEMUCaps, "virtio-blk.iothread-mapping", /* QEMU_CAPS_VIRTIO_BLK_IOTHR= EAD_MAPPING */ "smp-clusters", /* QEMU_CAPS_SMP_CLUSTERS */ "virtio-mem-pci.dynamic-memslots", /* QEMU_CAPS_DEVICE_VIRTI= O_MEM_PCI_DYNAMIC_MEMSLOTS */ + + /* 455 */ + "blockjob.backing-mask-protocol", /* QEMU_CAPS_BLOCKJOB_BACK= ING_MASK_PROTOCOL */ ); @@ -5425,6 +5428,10 @@ virQEMUCapsProbeQMPSchemaCapabilities(virQEMUCaps *q= emuCaps, virQEMUCapsSet(qemuCaps, cmd->flag); } + if (virQEMUQAPISchemaPathExists("block-commit/arg-type/backing-mask-pr= otocol", schema) && + virQEMUQAPISchemaPathExists("block-stream/arg-type/backing-mask-pr= otocol", schema)) + virQEMUCapsSet(qemuCaps, QEMU_CAPS_BLOCKJOB_BACKING_MASK_PROTOCOL); + return 0; } diff --git a/src/qemu/qemu_capabilities.h b/src/qemu/qemu_capabilities.h index 1b5130a1d3..486a4a6f63 100644 --- a/src/qemu/qemu_capabilities.h +++ b/src/qemu/qemu_capabilities.h @@ -681,6 +681,9 @@ typedef enum { /* virQEMUCapsFlags grouping marker for = syntax-check */ QEMU_CAPS_SMP_CLUSTERS, /* -smp clusters=3D */ QEMU_CAPS_DEVICE_VIRTIO_MEM_PCI_DYNAMIC_MEMSLOTS, /* -device virtio-me= m-pci.dynamic-memslots=3D */ + /* 455 */ + QEMU_CAPS_BLOCKJOB_BACKING_MASK_PROTOCOL, /* backing-mask-protocol of = block-commit/block-stream */ + QEMU_CAPS_LAST /* this must always be the last item */ } virQEMUCapsFlags; diff --git a/tests/qemucapabilitiesdata/caps_9.0.0_x86_64.xml b/tests/qemuc= apabilitiesdata/caps_9.0.0_x86_64.xml index a1859fbf6d..7bf13da1db 100644 --- a/tests/qemucapabilitiesdata/caps_9.0.0_x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_9.0.0_x86_64.xml @@ -201,6 +201,7 @@ + 8002050 43100245 v8.2.0-952-g14639717bf --=20 2.43.0 _______________________________________________ Devel mailing list -- devel@lists.libvirt.org To unsubscribe send an email to devel-leave@lists.libvirt.org