From nobody Mon Sep 16 19:31:47 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 1706790290448291.31435847163914; Thu, 1 Feb 2024 04:24:50 -0800 (PST) Received: by lists.libvirt.org (Postfix, from userid 996) id 5DEB01CE5; Thu, 1 Feb 2024 07:24:49 -0500 (EST) Received: from lists.libvirt.org.85.43.8.in-addr.arpa (localhost [IPv6:::1]) by lists.libvirt.org (Postfix) with ESMTP id 939E41CEC; Thu, 1 Feb 2024 07:13:59 -0500 (EST) Received: by lists.libvirt.org (Postfix, from userid 996) id E89791A63; 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.133.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 55E5B1A62 for ; Thu, 1 Feb 2024 07:13:38 -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-182-YqbVYyCCMGW_1jxCG_F-Nw-1; Thu, 01 Feb 2024 07:13:36 -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 5713384C64D for ; Thu, 1 Feb 2024 12:13:36 +0000 (UTC) Received: from speedmetal.redhat.com (unknown [10.45.242.16]) by smtp.corp.redhat.com (Postfix) with ESMTP id C4C7BC0FDEF for ; Thu, 1 Feb 2024 12:13:35 +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_H5, RCVD_IN_MSPIKE_WL,SPF_HELO_NONE,T_SCC_BODY_TEXT_LINE autolearn=unavailable autolearn_force=no version=3.4.4 X-MC-Unique: YqbVYyCCMGW_1jxCG_F-Nw-1 From: Peter Krempa To: devel@lists.libvirt.org Subject: [PATCH 3/4] qemu: monitor: Use 'backing-mask-protocol' for blockjobs when available Date: Thu, 1 Feb 2024 13:13:26 +0100 Message-ID: <433062ae6dc4edd9994c50bbb2bf4b64f2f2e5db.1706789416.git.pkrempa@redhat.com> 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: QPREFNLX5TDZPHPVQIDFCWM23QH7D5NK X-Message-ID-Hash: QPREFNLX5TDZPHPVQIDFCWM23QH7D5NK 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: 1706790291121100001 Store whether qemu supports the appropriate option for block-stream and block-commit commands and always use it if available. Signed-off-by: Peter Krempa --- src/qemu/qemu_monitor.c | 1 + src/qemu/qemu_monitor_json.c | 10 ++++++++++ src/qemu/qemu_monitor_priv.h | 2 ++ 3 files changed, 13 insertions(+) diff --git a/src/qemu/qemu_monitor.c b/src/qemu/qemu_monitor.c index a1773d86d4..7f3e4de329 100644 --- a/src/qemu/qemu_monitor.c +++ b/src/qemu/qemu_monitor.c @@ -624,6 +624,7 @@ qemuMonitorOpenInternal(virDomainObj *vm, if (priv) { mon->objectAddNoWrap =3D virQEMUCapsGet(priv->qemuCaps, QEMU_CAPS_= OBJECT_JSON); mon->queryNamedBlockNodesFlat =3D virQEMUCapsGet(priv->qemuCaps, Q= EMU_CAPS_QMP_QUERY_NAMED_BLOCK_NODES_FLAT); + mon->blockjobMaskProtocol =3D virQEMUCapsGet(priv->qemuCaps, QEMU_= CAPS_BLOCKJOB_BACKING_MASK_PROTOCOL); } if (virSetCloseExec(mon->fd) < 0) { diff --git a/src/qemu/qemu_monitor_json.c b/src/qemu/qemu_monitor_json.c index e114b6bfb1..7aab34c7c4 100644 --- a/src/qemu/qemu_monitor_json.c +++ b/src/qemu/qemu_monitor_json.c @@ -4036,6 +4036,10 @@ qemuMonitorJSONBlockCommit(qemuMonitor *mon, g_autoptr(virJSONValue) cmd =3D NULL; g_autoptr(virJSONValue) reply =3D NULL; virTristateBool autodismiss =3D VIR_TRISTATE_BOOL_NO; + virTristateBool backingProtocol =3D VIR_TRISTATE_BOOL_ABSENT; + + if (mon->blockjobMaskProtocol) + backingProtocol =3D VIR_TRISTATE_BOOL_YES; cmd =3D qemuMonitorJSONMakeCommand("block-commit", "s:device", device, @@ -4046,6 +4050,7 @@ qemuMonitorJSONBlockCommit(qemuMonitor *mon, "S:backing-file", backingName, "T:auto-finalize", autofinalize, "T:auto-dismiss", autodismiss, + "T:backing-mask-protocol", backingPro= tocol, NULL); if (!cmd) return -1; @@ -4315,6 +4320,10 @@ qemuMonitorJSONBlockStream(qemuMonitor *mon, g_autoptr(virJSONValue) reply =3D NULL; virTristateBool autofinalize =3D VIR_TRISTATE_BOOL_YES; virTristateBool autodismiss =3D VIR_TRISTATE_BOOL_NO; + virTristateBool backingProtocol =3D VIR_TRISTATE_BOOL_ABSENT; + + if (mon->blockjobMaskProtocol) + backingProtocol =3D VIR_TRISTATE_BOOL_YES; if (!(cmd =3D qemuMonitorJSONMakeCommand("block-stream", "s:device", device, @@ -4324,6 +4333,7 @@ qemuMonitorJSONBlockStream(qemuMonitor *mon, "S:backing-file", backingName, "T:auto-finalize", autofinalize, "T:auto-dismiss", autodismiss, + "T:backing-mask-protocol", back= ingProtocol, NULL))) return -1; diff --git a/src/qemu/qemu_monitor_priv.h b/src/qemu/qemu_monitor_priv.h index 0826a1da94..0c2098c456 100644 --- a/src/qemu/qemu_monitor_priv.h +++ b/src/qemu/qemu_monitor_priv.h @@ -92,6 +92,8 @@ struct _qemuMonitor { bool objectAddNoWrap; /* query-named-block-nodes supports the 'flat' option */ bool queryNamedBlockNodesFlat; + /* use the backing-mask-protocol flag of block-commit/stream */ + bool blockjobMaskProtocol; }; --=20 2.43.0 _______________________________________________ Devel mailing list -- devel@lists.libvirt.org To unsubscribe send an email to devel-leave@lists.libvirt.org