From nobody Tue Dec 16 12:38:42 2025 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of lists.libvirt.org designates 8.43.85.245 as permitted sender) client-ip=8.43.85.245; envelope-from=devel-bounces@lists.libvirt.org; helo=lists.libvirt.org; Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of lists.libvirt.org designates 8.43.85.245 as permitted sender) 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 1739280131132976.0298182501215; Tue, 11 Feb 2025 05:22:11 -0800 (PST) Received: by lists.libvirt.org (Postfix, from userid 996) id 2A2A8154C; Tue, 11 Feb 2025 08:22:10 -0500 (EST) Received: from lists.libvirt.org (localhost [IPv6:::1]) by lists.libvirt.org (Postfix) with ESMTP id 2BD96164F; Tue, 11 Feb 2025 08:20:53 -0500 (EST) Received: by lists.libvirt.org (Postfix, from userid 996) id 3691A150B; Tue, 11 Feb 2025 08:20:47 -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 24684163A for ; Tue, 11 Feb 2025 08:20:39 -0500 (EST) Received: from mx-prod-mc-06.mail-002.prod.us-west-2.aws.redhat.com (ec2-35-165-154-97.us-west-2.compute.amazonaws.com [35.165.154.97]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-575-kIDCopbQOLWIiYBVSlF9UQ-1; Tue, 11 Feb 2025 08:20:37 -0500 Received: from mx-prod-int-08.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-08.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.111]) (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 mx-prod-mc-06.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id 9001B1800997 for ; Tue, 11 Feb 2025 13:20:36 +0000 (UTC) Received: from speedmetal.lan (unknown [10.45.242.9]) by mx-prod-int-08.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id CF09E18004A7 for ; Tue, 11 Feb 2025 13:20: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=DKIM_INVALID,DKIM_SIGNED, HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI,RCVD_IN_DNSWL_NONE, RCVD_IN_MSPIKE_H5,RCVD_IN_MSPIKE_WL,RCVD_IN_VALIDITY_RPBL_BLOCKED, RCVD_IN_VALIDITY_SAFE_BLOCKED,SPF_HELO_NONE autolearn=unavailable autolearn_force=no version=3.4.4 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1739280038; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=g0NtIRa3trRKihExcX01K2SNC/dAcCSr//65g5x/9bw=; b=XgqjiU6I/Bh5pQS04L4HwwSvArTjQe0pAvGClPNP1u2hKAi0wbKphdCzMzYArJcQCeMByR 6leWqRIcPseI0ijqIONmNOX/csoFr9fRrAgTMeJ79i6RILSS+umOu4isQrPpGLhZFqYxAC 4tEJEzbjlLhjMvA7i6JZNoDpa89kijM= X-MC-Unique: kIDCopbQOLWIiYBVSlF9UQ-1 X-Mimecast-MFC-AGG-ID: kIDCopbQOLWIiYBVSlF9UQ From: Peter Krempa To: devel@lists.libvirt.org Subject: [PATCH 4/5] qemu: monitor: Add monitor backend for 'blockdev-set-active' Date: Tue, 11 Feb 2025 14:20:26 +0100 Message-ID: In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.4.1 on 10.30.177.111 X-Mimecast-Spam-Score: 0 X-Mimecast-MFC-PROC-ID: pHpfCxI6WuYbRR1A16i4D6uDud408qc10AgRmfw_lVI_1739280036 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable Message-ID-Hash: YRJJIW25MJDJS225DLNJD33UIO7GR3UN X-Message-ID-Hash: YRJJIW25MJDJS225DLNJD33UIO7GR3UN 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: X-ZohoMail-DKIM: fail (Header signature does not verify) X-ZM-MESSAGEID: 1739280133240019100 Content-Type: text/plain; charset="utf-8" The command will be used to re-activate block nodes after migration when we're leaving the VM paused so that blockjobs can be used. As the 'node-name' field is optional the 'qemumonitorjsontest' case tests both variants. Signed-off-by: Peter Krempa Reviewed-by: Jiri Denemark --- src/qemu/qemu_monitor.c | 21 +++++++++++++++++++++ src/qemu/qemu_monitor.h | 5 +++++ src/qemu/qemu_monitor_json.c | 21 +++++++++++++++++++++ src/qemu/qemu_monitor_json.h | 5 +++++ tests/qemumonitorjsontest.c | 31 +++++++++++++++++++++++++++++++ 5 files changed, 83 insertions(+) diff --git a/src/qemu/qemu_monitor.c b/src/qemu/qemu_monitor.c index 830ecbad1c..c069d17265 100644 --- a/src/qemu/qemu_monitor.c +++ b/src/qemu/qemu_monitor.c @@ -4552,3 +4552,24 @@ qemuMonitorDisplayReload(qemuMonitor *mon, return qemuMonitorJSONDisplayReload(mon, type, tlsCerts); } + + +/** + * qemuMonitorBlockdevSetActive: + * @mon: monitor object + * @nodename: optional nodename to (de)activate + * @active: requested state + * + * Activate or deactivate @nodename based on @active. If @nodename is NULL, + * qemu will act on all block nodes. + */ +int +qemuMonitorBlockdevSetActive(qemuMonitor *mon, + const char *nodename, + bool active) +{ + QEMU_CHECK_MONITOR(mon); + VIR_DEBUG("nodename=3D'%s', active=3D'%d'", NULLSTR(nodename), active); + + return qemuMonitorJSONBlockdevSetActive(mon, nodename, active); +} diff --git a/src/qemu/qemu_monitor.h b/src/qemu/qemu_monitor.h index 072f452e79..f7b9263b64 100644 --- a/src/qemu/qemu_monitor.h +++ b/src/qemu/qemu_monitor.h @@ -1651,3 +1651,8 @@ qemuMonitorSnapshotDelete(qemuMonitor *mon, const char *jobname, const char *snapshotname, const char **disks); + +int +qemuMonitorBlockdevSetActive(qemuMonitor *mon, + const char *nodename, + bool active); diff --git a/src/qemu/qemu_monitor_json.c b/src/qemu/qemu_monitor_json.c index 890d9b7dfd..554572b13d 100644 --- a/src/qemu/qemu_monitor_json.c +++ b/src/qemu/qemu_monitor_json.c @@ -8883,3 +8883,24 @@ qemuMonitorJSONSnapshotDelete(qemuMonitor *mon, return qemuMonitorJSONCheckError(cmd, reply); } + + +int +qemuMonitorJSONBlockdevSetActive(qemuMonitor *mon, + const char *nodename, + bool active) +{ + g_autoptr(virJSONValue) cmd =3D NULL; + g_autoptr(virJSONValue) reply =3D NULL; + + if (!(cmd =3D qemuMonitorJSONMakeCommand("blockdev-set-active", + "S:node-name", nodename, + "b:active", active, + NULL))) + return -1; + + if (qemuMonitorJSONCommand(mon, cmd, &reply) < 0) + return -1; + + return qemuMonitorJSONCheckError(cmd, reply); +} diff --git a/src/qemu/qemu_monitor_json.h b/src/qemu/qemu_monitor_json.h index 2f5a021f56..25e3ae2cbb 100644 --- a/src/qemu/qemu_monitor_json.h +++ b/src/qemu/qemu_monitor_json.h @@ -817,3 +817,8 @@ qemuMonitorJSONSnapshotDelete(qemuMonitor *mon, const char *jobname, const char *snapshotname, const char **disks); + +int +qemuMonitorJSONBlockdevSetActive(qemuMonitor *mon, + const char *nodename, + bool active); diff --git a/tests/qemumonitorjsontest.c b/tests/qemumonitorjsontest.c index f7fe0fb6f4..f0f6a329c8 100644 --- a/tests/qemumonitorjsontest.c +++ b/tests/qemumonitorjsontest.c @@ -1249,6 +1249,36 @@ testQemuMonitorJSONqemuMonitorJSONSnapshot(const voi= d *opaque) } +static int +testQemuMonitorJSONqemuMonitorJSONBlockdevSetActive(const void *opaque) +{ + const testGenericData *data =3D opaque; + virDomainXMLOption *xmlopt =3D data->xmlopt; + g_autoptr(qemuMonitorTest) test =3D NULL; + + if (!(test =3D qemuMonitorTestNewSchema(xmlopt, data->schema))) + return -1; + + if (qemuMonitorTestAddItem(test, "blockdev-set-active", + "{\"return\":{}}") < 0) + return -1; + + if (qemuMonitorTestAddItem(test, "blockdev-set-active", + "{\"return\":{}}") < 0) + return -1; + + if (qemuMonitorJSONBlockdevSetActive(qemuMonitorTestGetMonitor(test), + NULL, true) < 0) + return -1; + + if (qemuMonitorJSONBlockdevSetActive(qemuMonitorTestGetMonitor(test), + "testnode", false) < 0) + return -1; + + return 0; +} + + static bool testQemuMonitorJSONqemuMonitorJSONQueryCPUsEqual(struct qemuMonitorQueryCp= usEntry *a, struct qemuMonitorQueryCp= usEntry *b) @@ -2989,6 +3019,7 @@ mymain(void) DO_TEST(qemuMonitorJSONSendKeyHoldtime); DO_TEST(qemuMonitorJSONNBDServerStart); DO_TEST(qemuMonitorJSONSnapshot); + DO_TEST(qemuMonitorJSONBlockdevSetActive); DO_TEST_CPU_DATA("host"); DO_TEST_CPU_DATA("full"); --=20 2.48.1