From nobody Mon Sep 8 21:39:50 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=pass(p=reject dis=none) header.from=lists.libvirt.org ARC-Seal: i=1; a=rsa-sha256; t=1747814855; cv=none; d=zohomail.com; s=zohoarc; b=hrbRajGpHMURV9y2OsRu5dGNF/LxdX/Yd2fTIFhFVmGc3vk4a/oC5036uidfYMACLR99n0AJJYmJXiDbFo8UfnJghnJZWvnaI0fb2jsTI416kAAQNv9lJ3kCLKSg3inNg6/1HG8zZU3fkcvo3PiLPmdSwTklVVAn4I8B1LyAnQM= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1747814855; h=Content-Type:Content-Transfer-Encoding:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:Reply-To:Reply-To:References:Subject:Subject:To:To:Message-Id:Cc; bh=EElXB6k0Xg6ToahY2tnnSxrTItYhXFzRAwHmGZGYe3Q=; b=i9tBeJFs8sz9MlRww4zD07EoDV0H99BEXfCxkvwXFgVzw2BQw4WIN7pXBJRk3+UaiuNnOqSO4CImXfJoOExKFDfslg7eZtc0JwFyjyRCpq8xDTqeXdhANTa07hY6gEzlRuvRCn6XaJY6FF//2vo/D09ksnlgMH07zgIhp6IPI6M= ARC-Authentication-Results: i=1; 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=pass header.from= (p=reject dis=none) Return-Path: Received: from lists.libvirt.org (lists.libvirt.org [8.43.85.245]) by mx.zohomail.com with SMTPS id 1747814850496541.6336149714774; Wed, 21 May 2025 01:07:30 -0700 (PDT) Received: by lists.libvirt.org (Postfix, from userid 996) id 9E613162D; Wed, 21 May 2025 04:07:24 -0400 (EDT) Received: from lists.libvirt.org (localhost [IPv6:::1]) by lists.libvirt.org (Postfix) with ESMTP id F3C1C15EC; Wed, 21 May 2025 04:06:45 -0400 (EDT) Received: by lists.libvirt.org (Postfix, from userid 996) id 8B86B1439; Wed, 21 May 2025 04:06:39 -0400 (EDT) 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 0D8E71439 for ; Wed, 21 May 2025 04:06:39 -0400 (EDT) Received: from mx-prod-mc-04.mail-002.prod.us-west-2.aws.redhat.com (ec2-54-186-198-63.us-west-2.compute.amazonaws.com [54.186.198.63]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-679-_2_W2EeQP8qTcaX2nQXOVA-1; Wed, 21 May 2025 04:06:36 -0400 Received: from mx-prod-int-06.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-06.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.93]) (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-04.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id 053BD1955DB5 for ; Wed, 21 May 2025 08:06:36 +0000 (UTC) Received: from speedmetal.lan (unknown [10.44.22.37]) by mx-prod-int-06.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id 3486C180049D for ; Wed, 21 May 2025 08:06: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=DKIM_INVALID,DKIM_SIGNED, 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,WEIRD_PORT 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=1747814798; 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=AcsvRhZs77/zo7L2ukcfYZ944/3hkG6zUmdt0w1rwWA=; b=abw6pvl5zF9AgkzaWWoGoe/oKotzaqes6t7RavRfJDkc//kN+YLtQC3Nak0KQ5VCYPHGWA Xsb8fTPl39WC4ycIOjfJmxiExnxOnV2EJhAyxvd3RLaNMOjnuYvYwt0te85/Pci3KtknG2 87ld668axqBJq7GXwbdBDEGPN2qsxRM= X-MC-Unique: _2_W2EeQP8qTcaX2nQXOVA-1 X-Mimecast-MFC-AGG-ID: _2_W2EeQP8qTcaX2nQXOVA_1747814796 To: devel@lists.libvirt.org Subject: [PATCH 1/2] qemuMonitorDumpToFd: Drop 'detach' argument Date: Wed, 21 May 2025 10:06:31 +0200 Message-ID: In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.4.1 on 10.30.177.93 X-Mimecast-Spam-Score: 0 X-Mimecast-MFC-PROC-ID: YCcAEjhUF9GKlv1Ws6Uug6OABGkoNgbsEXun3I17XGk_1747814796 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable Message-ID-Hash: FSOLTMQIJTYS77KIKNHYQ3TBQAKYOLK2 X-Message-ID-Hash: FSOLTMQIJTYS77KIKNHYQ3TBQAKYOLK2 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: From: Peter Krempa via Devel Reply-To: Peter Krempa X-ZohoMail-DKIM: fail (Header signature does not verify) X-ZM-MESSAGEID: 1747814856097116600 Content-Type: text/plain; charset="utf-8" From: Peter Krempa The only caller always passes 'true'. We also don't want to ever use the blocking variant as it blocks the whole monitor until dump finishes. Hardcode it to 'true' in the monitor code. Signed-off-by: Peter Krempa Reviewed-by: Michal Privoznik --- src/qemu/qemu_driver.c | 2 +- src/qemu/qemu_monitor.c | 5 ++--- src/qemu/qemu_monitor.h | 3 +-- src/qemu/qemu_monitor_json.c | 5 ++--- src/qemu/qemu_monitor_json.h | 3 +-- tests/qemumonitorjsontest.c | 3 +-- 6 files changed, 8 insertions(+), 13 deletions(-) diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index 893fa0c66c..aef313ae9c 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -3045,7 +3045,7 @@ qemuDumpToFd(virQEMUDriver *driver, } } - rc =3D qemuMonitorDumpToFd(priv->mon, fd, dumpformat, true); + rc =3D qemuMonitorDumpToFd(priv->mon, fd, dumpformat); qemuDomainObjExitMonitor(vm); if (rc < 0) diff --git a/src/qemu/qemu_monitor.c b/src/qemu/qemu_monitor.c index 981975cdd2..d508f50ed6 100644 --- a/src/qemu/qemu_monitor.c +++ b/src/qemu/qemu_monitor.c @@ -2362,8 +2362,7 @@ qemuMonitorGetDumpGuestMemoryCapability(qemuMonitor *= mon, int qemuMonitorDumpToFd(qemuMonitor *mon, int fd, - const char *dumpformat, - bool detach) + const char *dumpformat) { int ret; VIR_DEBUG("fd=3D%d dumpformat=3D%s", fd, dumpformat); @@ -2373,7 +2372,7 @@ qemuMonitorDumpToFd(qemuMonitor *mon, if (qemuMonitorSendFileHandle(mon, "dump", fd) < 0) return -1; - ret =3D qemuMonitorJSONDump(mon, "fd:dump", dumpformat, detach); + ret =3D qemuMonitorJSONDump(mon, "fd:dump", dumpformat); if (ret < 0) { if (qemuMonitorCloseFileHandle(mon, "dump") < 0) diff --git a/src/qemu/qemu_monitor.h b/src/qemu/qemu_monitor.h index 58d84d424b..51b65b4019 100644 --- a/src/qemu/qemu_monitor.h +++ b/src/qemu/qemu_monitor.h @@ -893,8 +893,7 @@ int qemuMonitorQueryDump(qemuMonitor *mon, int qemuMonitorDumpToFd(qemuMonitor *mon, int fd, - const char *dumpformat, - bool detach); + const char *dumpformat); int qemuMonitorGraphicsRelocate(qemuMonitor *mon, int type, diff --git a/src/qemu/qemu_monitor_json.c b/src/qemu/qemu_monitor_json.c index dc2eaace96..3c2b35575e 100644 --- a/src/qemu/qemu_monitor_json.c +++ b/src/qemu/qemu_monitor_json.c @@ -3371,8 +3371,7 @@ qemuMonitorJSONGetDumpGuestMemoryCapability(qemuMonit= or *mon, int qemuMonitorJSONDump(qemuMonitor *mon, const char *protocol, - const char *dumpformat, - bool detach) + const char *dumpformat) { g_autoptr(virJSONValue) cmd =3D NULL; g_autoptr(virJSONValue) reply =3D NULL; @@ -3381,7 +3380,7 @@ qemuMonitorJSONDump(qemuMonitor *mon, "b:paging", false, "s:protocol", protocol, "S:format", dumpformat, - "B:detach", detach, + "b:detach", true, NULL); if (!cmd) return -1; diff --git a/src/qemu/qemu_monitor_json.h b/src/qemu/qemu_monitor_json.h index ba278af98a..7f07e55e06 100644 --- a/src/qemu/qemu_monitor_json.h +++ b/src/qemu/qemu_monitor_json.h @@ -193,8 +193,7 @@ qemuMonitorJSONGetDumpGuestMemoryCapability(qemuMonitor= *mon, int qemuMonitorJSONDump(qemuMonitor *mon, const char *protocol, - const char *dumpformat, - bool detach); + const char *dumpformat); int qemuMonitorJSONGraphicsRelocate(qemuMonitor *mon, diff --git a/tests/qemumonitorjsontest.c b/tests/qemumonitorjsontest.c index 7485f683fb..a18872db60 100644 --- a/tests/qemumonitorjsontest.c +++ b/tests/qemumonitorjsontest.c @@ -1149,8 +1149,7 @@ GEN_TEST_FUNC(qemuMonitorJSONSaveVirtualMemory, 0, 10= 24, "/foo/bar") GEN_TEST_FUNC(qemuMonitorJSONSavePhysicalMemory, 0, 1024, "/foo/bar") GEN_TEST_FUNC(qemuMonitorJSONMigrate, 0, "tcp:localhost:12345") GEN_TEST_FUNC(qemuMonitorJSONMigrateRecover, "tcp://destination.host:54321= "); -GEN_TEST_FUNC(qemuMonitorJSONDump, "dummy_protocol", "elf", - true) +GEN_TEST_FUNC(qemuMonitorJSONDump, "dummy_protocol", "elf") GEN_TEST_FUNC(qemuMonitorJSONGraphicsRelocate, VIR_DOMAIN_GRAPHICS_TYPE_SP= ICE, "localhost", 12345, 12346, "certsubjectval") GEN_TEST_FUNC(qemuMonitorJSONRemoveNetdev, "net0") --=20 2.49.0 From nobody Mon Sep 8 21:39:50 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=pass(p=reject dis=none) header.from=lists.libvirt.org ARC-Seal: i=1; a=rsa-sha256; t=1747814861; cv=none; d=zohomail.com; s=zohoarc; b=gCSZE7E/llZhrNlkaygML5ux4VPZhIxyY1uylF87mYdzxlR14hQ0lNTPN7vxOACFQTEsOib5g5G4TjWgr06jhtpb4xkeOvU3wE9vgshs5l3qDxIGzVqRVGwFkTQaLEGhsAU/EkyxWqjAGPmdyUETtRPh0llERJZhNlO5BPEn7V4= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1747814861; h=Content-Type:Content-Transfer-Encoding:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:Reply-To:Reply-To:References:Subject:Subject:To:To:Message-Id:Cc; bh=HJi9TshpQ8eBD21x04lDcVKzwm4s97b6eQnvaB9NVyI=; b=BjF2FbaOhlpd0ANcpCK7nFlVlp5am/aqfrxqoBiXX0rDvsN1t884aBk3IkYIKOWSTp+Q8WTFgBgFps+00RQT+8ZUfwHa8E/qNXoK8m3k/hV7bc+98kmJPUD1wCT6At+N4vo10wFXnnS+ueDiDqv7RCdYL1ay3a1tr/V+Jbv6jjo= ARC-Authentication-Results: i=1; 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=pass header.from= (p=reject dis=none) Return-Path: Received: from lists.libvirt.org (lists.libvirt.org [8.43.85.245]) by mx.zohomail.com with SMTPS id 1747814861579301.1179852338395; Wed, 21 May 2025 01:07:41 -0700 (PDT) Received: by lists.libvirt.org (Postfix, from userid 996) id 9169F145C; Wed, 21 May 2025 04:07:40 -0400 (EDT) Received: from lists.libvirt.org (localhost [IPv6:::1]) by lists.libvirt.org (Postfix) with ESMTP id 96FC71878; Wed, 21 May 2025 04:06:47 -0400 (EDT) Received: by lists.libvirt.org (Postfix, from userid 996) id DBC0E1413; Wed, 21 May 2025 04:06:39 -0400 (EDT) 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 82A701458 for ; Wed, 21 May 2025 04:06:39 -0400 (EDT) Received: from mx-prod-mc-03.mail-002.prod.us-west-2.aws.redhat.com (ec2-54-186-198-63.us-west-2.compute.amazonaws.com [54.186.198.63]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-687-OFrdbXvkN9ykORTxiULvFQ-1; Wed, 21 May 2025 04:06:38 -0400 Received: from mx-prod-int-06.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-06.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.93]) (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-03.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id 57C571956046 for ; Wed, 21 May 2025 08:06:37 +0000 (UTC) Received: from speedmetal.lan (unknown [10.44.22.37]) by mx-prod-int-06.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id 86DEA180049D for ; Wed, 21 May 2025 08:06:36 +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, 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=1747814799; 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=sT2uCY9XpUJ4L16zqrClXFK3B49llgmaVq3RBrmqjAw=; b=PsYJFEuom6z2bP3cg27Cdjd28x0u+v73uJpTU/GaO19Vsw4X9Aj+hylk8GUcBmP04Au7j7 sl5ZhoDbeXetqkHjEbniru6KD+HbPkXF98n2tyVaxQXJuooxszXrCvxzSok/BjP4MZeFG4 u5wZ9NXAwbUZepEh9YmWajg1E4gRNU4= X-MC-Unique: OFrdbXvkN9ykORTxiULvFQ-1 X-Mimecast-MFC-AGG-ID: OFrdbXvkN9ykORTxiULvFQ_1747814797 To: devel@lists.libvirt.org Subject: [PATCH 2/2] qemuMonitorJSONMigrate: Drop 'detach' QMP option Date: Wed, 21 May 2025 10:06:32 +0200 Message-ID: In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.4.1 on 10.30.177.93 X-Mimecast-Spam-Score: 0 X-Mimecast-MFC-PROC-ID: SWB6TN8iJzgE-kAVlEGR1DyF-BTWAykvcvEL0zSu72A_1747814797 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable Message-ID-Hash: ZRXCWIFGMMTB2CGFN7AETVPWKNR4XG3B X-Message-ID-Hash: ZRXCWIFGMMTB2CGFN7AETVPWKNR4XG3B 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: From: Peter Krempa via Devel Reply-To: Peter Krempa X-ZohoMail-DKIM: fail (Header signature does not verify) X-ZM-MESSAGEID: 1747814861916116600 Content-Type: text/plain; charset="utf-8" From: Peter Krempa The argument was always ignored by qemu [1], as of qemu-10.1 it will be deprecated. As it was always unused/ignored we can drop it without any extra logic. [1] qemu docs state: 3. The user Monitor's "detach" argument is invalid in QMP and should not be used. Signed-off-by: Peter Krempa Reviewed-by: Michal Privoznik --- src/qemu/qemu_monitor_json.c | 1 - 1 file changed, 1 deletion(-) diff --git a/src/qemu/qemu_monitor_json.c b/src/qemu/qemu_monitor_json.c index 3c2b35575e..a6fb2a2013 100644 --- a/src/qemu/qemu_monitor_json.c +++ b/src/qemu/qemu_monitor_json.c @@ -3198,7 +3198,6 @@ int qemuMonitorJSONMigrate(qemuMonitor *mon, { bool resume =3D !!(flags & QEMU_MONITOR_MIGRATE_RESUME); g_autoptr(virJSONValue) cmd =3D qemuMonitorJSONMakeCommand("migrate", - "b:detach", t= rue, "b:resume", r= esume, "s:uri", uri, NULL); --=20 2.49.0