From nobody Sat Feb 7 01:41:59 2026 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 1728653860697876.2949016622599; Fri, 11 Oct 2024 06:37:40 -0700 (PDT) Received: by lists.libvirt.org (Postfix, from userid 996) id 89C9D12D7; Fri, 11 Oct 2024 09:37:39 -0400 (EDT) Received: from lists.libvirt.org (localhost [IPv6:::1]) by lists.libvirt.org (Postfix) with ESMTP id 80CAB1738; Fri, 11 Oct 2024 09:33:45 -0400 (EDT) Received: by lists.libvirt.org (Postfix, from userid 996) id CC70813BA; Fri, 11 Oct 2024 09:33: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 0DA851321 for ; Fri, 11 Oct 2024 09:33:19 -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-645-hDHiIn4ePny6TH7ipJxh9g-1; Fri, 11 Oct 2024 09:33:17 -0400 Received: from mx-prod-int-04.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-04.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.40]) (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 C570619560BC for ; Fri, 11 Oct 2024 13:33:16 +0000 (UTC) Received: from speedmetal.lan (unknown [10.45.242.12]) by mx-prod-int-04.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id 0683A19560AD for ; Fri, 11 Oct 2024 13:33:15 +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.5 required=5.0 tests=DKIM_INVALID,DKIM_SIGNED, HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI,RCVD_IN_DNSWL_NONE, RCVD_IN_MSPIKE_H3,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=1728653598; 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=pVG8FUAwMJEOR4OQfc6iiErV5eZPnz/JdMVJFVFbOxg=; b=PC0LLXOENqAYNdB1ZggHeEOqpaIAkdy3lVWs/K6ttIDPu2lRE+egPH2SZaBkqO3dD4OAdi f/CsEkxfV5SyfWZTfbjDOKEyuBMEFHuslVSe/M9FXVilpPs+e39zNiXXtS5XaFZcPzJvEZ sBRP7foyVgExa3PqeeSJXj4IM8no57w= X-MC-Unique: hDHiIn4ePny6TH7ipJxh9g-1 From: Peter Krempa To: devel@lists.libvirt.org Subject: [PATCH 08/10] qemu: chardev: Use 'reconnect-ms' instead of deprecated 'reconnect' Date: Fri, 11 Oct 2024 15:33:01 +0200 Message-ID: <165038e4e47165b1d50a8e73057c94f3dd851d4c.1728653516.git.pkrempa@redhat.com> In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.0 on 10.30.177.40 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable Message-ID-Hash: E2LHD6SSMAOJV7NSMOGXRBJVVVCFQNZG X-Message-ID-Hash: E2LHD6SSMAOJV7NSMOGXRBJVVVCFQNZG 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: 1728653862403116600 Content-Type: text/plain; charset="utf-8" qemu-9.2 will deprecate the 'reconnect' field in favor of 'reconnect-ms'. As libvirt currently doesn't track the timeouts in milliseconds we simply convert them to avoid use of the deprecated field. Quite a lot of churn is caused by the need to plumb 'qemuCaps' into the chardev props generator. Signed-off-by: Peter Krempa --- src/qemu/qemu_block.c | 2 +- src/qemu/qemu_block.h | 1 + src/qemu/qemu_chardev.c | 20 +++++++++++++++++++- src/qemu/qemu_chardev.h | 1 + src/qemu/qemu_command.c | 12 ++++++++---- src/qemu/qemu_command.h | 3 ++- src/qemu/qemu_hotplug.c | 19 ++++++++++--------- tests/qemumonitorjsontest.c | 2 +- 8 files changed, 43 insertions(+), 17 deletions(-) diff --git a/src/qemu/qemu_block.c b/src/qemu/qemu_block.c index e739c097ca..692b4d350e 100644 --- a/src/qemu/qemu_block.c +++ b/src/qemu/qemu_block.c @@ -1685,7 +1685,7 @@ qemuBlockStorageSourceAttachApply(qemuMonitor *mon, if (data->chardevDef) { g_autoptr(virJSONValue) props =3D NULL; - if (qemuChardevGetBackendProps(data->chardevDef, false, + if (qemuChardevGetBackendProps(data->chardevDef, false, data->qemu= Caps, data->chardevAlias, NULL, &props) <= 0) return -1; diff --git a/src/qemu/qemu_block.h b/src/qemu/qemu_block.h index f9e961d85d..f13a4a4a9a 100644 --- a/src/qemu/qemu_block.h +++ b/src/qemu/qemu_block.h @@ -105,6 +105,7 @@ struct qemuBlockStorageSourceAttachData { char *driveCmd; + virQEMUCaps *qemuCaps; /* borrowed from VM, valid only for chardev-bac= ked source */ virDomainChrSourceDef *chardevDef; char *chardevAlias; bool chardevAdded; diff --git a/src/qemu/qemu_chardev.c b/src/qemu/qemu_chardev.c index b3ed11233b..b6828b6752 100644 --- a/src/qemu/qemu_chardev.c +++ b/src/qemu/qemu_chardev.c @@ -143,6 +143,7 @@ qemuChardevBackendAddSocketAddressUNIX(virJSONValue **b= ackendData, int qemuChardevGetBackendProps(const virDomainChrSourceDef *chr, bool commandline, + virQEMUCaps *qemuCaps, const char *alias, const char **backendType, virJSONValue **props) @@ -213,6 +214,7 @@ qemuChardevGetBackendProps(const virDomainChrSourceDef = *chr, virTristateBool waitval =3D VIR_TRISTATE_BOOL_ABSENT; virTristateBool server =3D VIR_TRISTATE_BOOL_ABSENT; int reconnect =3D -1; + long long reconnect_ms =3D -1; *backendType =3D "socket"; @@ -243,10 +245,17 @@ qemuChardevGetBackendProps(const virDomainChrSourceDe= f *chr, reconnect =3D 0; } + if (reconnect !=3D -1 && + virQEMUCapsGet(qemuCaps, QEMU_CAPS_CHARDEV_RECONNECT_MILISECON= DS)) { + reconnect_ms =3D reconnect * 1000; + reconnect =3D -1; + } + if (virJSONValueObjectAdd(props, "T:server", server, "T:wait", waitval, "k:reconnect", reconnect, + "K:reconnect-ms", reconnect_ms, NULL) < 0) return -1; } @@ -257,6 +266,7 @@ qemuChardevGetBackendProps(const virDomainChrSourceDef = *chr, virTristateBool telnet =3D VIR_TRISTATE_BOOL_ABSENT; virTristateBool server =3D VIR_TRISTATE_BOOL_ABSENT; int reconnect =3D -1; + long long reconnect_ms =3D -1; *backendType =3D "socket"; @@ -280,6 +290,12 @@ qemuChardevGetBackendProps(const virDomainChrSourceDef= *chr, else if (chr->data.tcp.reconnect.enabled =3D=3D VIR_TRISTATE_BOOL_= NO) reconnect =3D 0; + if (reconnect !=3D -1 && + virQEMUCapsGet(qemuCaps, QEMU_CAPS_CHARDEV_RECONNECT_MILISECON= DS)) { + reconnect_ms =3D reconnect * 1000; + reconnect =3D -1; + } + if (qemuChardevBackendAddSocketAddressInet(props, "addr", commandline, NULL, chr->data.tcp.host, @@ -291,6 +307,7 @@ qemuChardevGetBackendProps(const virDomainChrSourceDef = *chr, "T:server", server, "T:wait", waitval, "k:reconnect", reconnect, + "K:reconnect-ms", reconnect_ms, "S:tls-creds", chrSourcePriv->tlsCredsAl= ias, NULL) < 0) return -1; @@ -462,7 +479,8 @@ qemuChardevBuildCommandline(virCommand *cmd, bool useJSON =3D virQEMUCapsGet(qemuCaps, QEMU_CAPS_CHARDEV_JSON); const char *backendType =3D NULL; - if (qemuChardevGetBackendProps(dev, !useJSON, charAlias, &backendType,= &props) < 0) + if (qemuChardevGetBackendProps(dev, !useJSON, qemuCaps, charAlias, + &backendType, &props) < 0) return -1; if (useJSON) { diff --git a/src/qemu/qemu_chardev.h b/src/qemu/qemu_chardev.h index 0381e0df65..59f258cbe3 100644 --- a/src/qemu/qemu_chardev.h +++ b/src/qemu/qemu_chardev.h @@ -17,6 +17,7 @@ qemuChardevBuildCommandline(virCommand *cmd, int qemuChardevGetBackendProps(const virDomainChrSourceDef *chr, bool commandline, + virQEMUCaps *qemuCaps, const char *alias, const char **backendType, virJSONValue **props); diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c index b4888a5822..c7055ef196 100644 --- a/src/qemu/qemu_command.c +++ b/src/qemu/qemu_command.c @@ -2027,7 +2027,7 @@ qemuBuildDiskSourceCommandLine(virCommand *cmd, size_t i; if (virStorageSourceGetActualType(disk->src) =3D=3D VIR_STORAGE_TYPE_V= HOST_USER) { - if (!(data =3D qemuBuildStorageSourceChainAttachPrepareChardev(dis= k))) + if (!(data =3D qemuBuildStorageSourceChainAttachPrepareChardev(dis= k, qemuCaps))) return -1; } else if (!qemuDiskBusIsSD(disk->bus)) { if (virStorageSourceIsEmpty(disk->src)) @@ -10824,18 +10824,21 @@ qemuBuildStorageSourceAttachPrepareDrive(virDomai= nDiskDef *disk) /** * qemuBuildStorageSourceAttachPrepareChardev: * @src: disk source to prepare + * @qemuCaps: qemu capabilities object borrowed for chardev backend genera= tion * * Prepare qemuBlockStorageSourceAttachData *for vhost-user disk * to be used with -chardev. */ static qemuBlockStorageSourceAttachData * -qemuBuildStorageSourceAttachPrepareChardev(virDomainDiskDef *disk) +qemuBuildStorageSourceAttachPrepareChardev(virDomainDiskDef *disk, + virQEMUCaps *qemuCaps) { g_autoptr(qemuBlockStorageSourceAttachData) data =3D NULL; data =3D g_new0(qemuBlockStorageSourceAttachData, 1); data->chardevDef =3D disk->src->vhostuser; + data->qemuCaps =3D qemuCaps; data->chardevAlias =3D qemuDomainGetVhostUserChrAlias(disk->info.alias= ); return g_steal_pointer(&data); @@ -10937,14 +10940,15 @@ qemuBuildStorageSourceChainAttachPrepareDrive(vir= DomainDiskDef *disk) * disk's backend via -chardev. */ qemuBlockStorageSourceChainData * -qemuBuildStorageSourceChainAttachPrepareChardev(virDomainDiskDef *disk) +qemuBuildStorageSourceChainAttachPrepareChardev(virDomainDiskDef *disk, + virQEMUCaps *qemuCaps) { g_autoptr(qemuBlockStorageSourceAttachData) elem =3D NULL; g_autoptr(qemuBlockStorageSourceChainData) data =3D NULL; data =3D g_new0(qemuBlockStorageSourceChainData, 1); - if (!(elem =3D qemuBuildStorageSourceAttachPrepareChardev(disk))) + if (!(elem =3D qemuBuildStorageSourceAttachPrepareChardev(disk, qemuCa= ps))) return NULL; VIR_APPEND_ELEMENT(data->srcdata, data->nsrcdata, elem); diff --git a/src/qemu/qemu_command.h b/src/qemu/qemu_command.h index dca8877703..309e566f6c 100644 --- a/src/qemu/qemu_command.h +++ b/src/qemu/qemu_command.h @@ -106,7 +106,8 @@ qemuBuildStorageSourceChainAttachPrepareDrive(virDomain= DiskDef *disk); qemuBlockStorageSourceChainData * -qemuBuildStorageSourceChainAttachPrepareChardev(virDomainDiskDef *disk); +qemuBuildStorageSourceChainAttachPrepareChardev(virDomainDiskDef *disk, + virQEMUCaps *qemuCaps); qemuBlockStorageSourceChainData * diff --git a/src/qemu/qemu_hotplug.c b/src/qemu/qemu_hotplug.c index 4d4bcde1bc..1a7b69e5bb 100644 --- a/src/qemu/qemu_hotplug.c +++ b/src/qemu/qemu_hotplug.c @@ -243,7 +243,8 @@ qemuDomainDetachExtensionDevice(qemuMonitor *mon, static int qemuHotplugChardevAttach(qemuMonitor *mon, const char *alias, - virDomainChrSourceDef *def) + virDomainChrSourceDef *def, + virQEMUCaps *qemuCaps) { g_autoptr(virJSONValue) props =3D NULL; g_autofree char *ptypath =3D NULL; @@ -277,7 +278,7 @@ qemuHotplugChardevAttach(qemuMonitor *mon, return -1; } - if (qemuChardevGetBackendProps(def, false, alias, NULL, &props) < 0) + if (qemuChardevGetBackendProps(def, false, qemuCaps, alias, NULL, &pro= ps) < 0) return -1; if (qemuMonitorAttachCharDev(mon, &props, &ptypath) < 0) @@ -719,7 +720,7 @@ qemuDomainAttachDiskGeneric(virDomainObj *vm, disk->src->readonly =3D true; if (virStorageSourceGetActualType(disk->src) =3D=3D VIR_STORAGE_TY= PE_VHOST_USER) { - if (!(data =3D qemuBuildStorageSourceChainAttachPrepareChardev= (disk))) + if (!(data =3D qemuBuildStorageSourceChainAttachPrepareChardev= (disk, priv->qemuCaps))) return -1; } else { if (!(data =3D qemuBuildStorageSourceChainAttachPrepareBlockde= v(disk->src))) @@ -1370,7 +1371,7 @@ qemuDomainAttachNetDevice(virQEMUDriver *driver, } if (actualType =3D=3D VIR_DOMAIN_NET_TYPE_VHOSTUSER) { - if (qemuHotplugChardevAttach(priv->mon, charDevAlias, net->data.vh= ostuser) < 0) { + if (qemuHotplugChardevAttach(priv->mon, charDevAlias, net->data.vh= ostuser, priv->qemuCaps) < 0) { qemuDomainObjExitMonitor(vm); virDomainAuditNet(vm, NULL, net, "attach", false); goto cleanup; @@ -1846,7 +1847,7 @@ qemuDomainAttachRedirdevDevice(virQEMUDriver *driver, qemuDomainObjEnterMonitor(vm); - if (qemuHotplugChardevAttach(priv->mon, charAlias, redirdev->source) <= 0) + if (qemuHotplugChardevAttach(priv->mon, charAlias, redirdev->source, p= riv->qemuCaps) < 0) goto exit_monitor; chardevAdded =3D true; @@ -2115,7 +2116,7 @@ qemuDomainAttachChrDevice(virQEMUDriver *driver, qemuFDPassDirectTransferMonitor(charpriv->directfd, priv->mon) < 0) goto exit_monitor; - if (qemuHotplugChardevAttach(priv->mon, charAlias, chr->source) < 0) + if (qemuHotplugChardevAttach(priv->mon, charAlias, chr->source, priv->= qemuCaps) < 0) goto exit_monitor; chardevAttached =3D true; @@ -2225,7 +2226,7 @@ qemuDomainAttachRNGDevice(virQEMUDriver *driver, qemuDomainObjEnterMonitor(vm); if (rng->backend =3D=3D VIR_DOMAIN_RNG_BACKEND_EGD && - qemuHotplugChardevAttach(priv->mon, charAlias, rng->source.chardev= ) < 0) + qemuHotplugChardevAttach(priv->mon, charAlias, rng->source.chardev= , priv->qemuCaps) < 0) goto exit_monitor; chardevAdded =3D true; @@ -2899,7 +2900,7 @@ qemuDomainAttachShmemDevice(virDomainObj *vm, qemuDomainObjEnterMonitor(vm); if (shmem->server.enabled) { - if (qemuHotplugChardevAttach(priv->mon, charAlias, shmem->server.c= hr) < 0) + if (qemuHotplugChardevAttach(priv->mon, charAlias, shmem->server.c= hr, priv->qemuCaps) < 0) goto exit_monitor; } else { if (qemuMonitorAddObject(priv->mon, &props, &memAlias) < 0) @@ -3296,7 +3297,7 @@ qemuDomainAttachFSDevice(virQEMUDriver *driver, qemuDomainObjEnterMonitor(vm); - if (qemuHotplugChardevAttach(priv->mon, charAlias, chardev) < 0) + if (qemuHotplugChardevAttach(priv->mon, charAlias, chardev, priv->qemu= Caps) < 0) goto exit_monitor; chardevAdded =3D true; diff --git a/tests/qemumonitorjsontest.c b/tests/qemumonitorjsontest.c index fca4890746..f7fe0fb6f4 100644 --- a/tests/qemumonitorjsontest.c +++ b/tests/qemumonitorjsontest.c @@ -578,7 +578,7 @@ testQemuMonitorJSONAttachChardev(const void *opaque) return -1; } - if (qemuChardevGetBackendProps(data->chr, false, "alias", NULL, &props= ) < 0) + if (qemuChardevGetBackendProps(data->chr, false, NULL, "alias", NULL, = &props) < 0) return -1; if ((rc =3D qemuMonitorAttachCharDev(qemuMonitorTestGetMonitor(test), = &props, &ptypath)) < 0) --=20 2.46.2