From nobody Sun Feb 8 20:42:50 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 1726646433254775.9429252006136; Wed, 18 Sep 2024 01:00:33 -0700 (PDT) Received: by lists.libvirt.org (Postfix, from userid 996) id 3F50311D1; Wed, 18 Sep 2024 04:00:32 -0400 (EDT) Received: from lists.libvirt.org (localhost [IPv6:::1]) by lists.libvirt.org (Postfix) with ESMTP id 2E4BF1B39; Wed, 18 Sep 2024 03:55:53 -0400 (EDT) Received: by lists.libvirt.org (Postfix, from userid 996) id D89E51527; Wed, 18 Sep 2024 03:55:45 -0400 (EDT) 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 2EEC81A50 for ; Wed, 18 Sep 2024 03:55:35 -0400 (EDT) Received: from mx-prod-mc-02.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-246-53AalXdMOQ2PcuaAxLPBpA-1; Wed, 18 Sep 2024 03:55:33 -0400 Received: from mx-prod-int-05.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-05.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.17]) (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-02.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id C2B571953941 for ; Wed, 18 Sep 2024 07:55:32 +0000 (UTC) Received: from speedmetal.lan (unknown [10.45.242.5]) by mx-prod-int-05.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id DA92519560A3 for ; Wed, 18 Sep 2024 07:55:31 +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,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=1726646134; 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=zaMVzzg64PoIuE1+EfF8TKxpv+Dvmulvyc+MmGGNJRY=; b=gEHioAkZeOip0YqGTlkEyygDIjB+EGmlT0UWAWnK2UYsIdISK6/bCdT15dyke6OqWYyoUJ 1cfP4ZIPkgvn6lwU2cAgOC9Y6CWF2rWbIND+nnLx8BUuAF177E/28TzA+kPmKyV05/JmJQ OifFMXEAQpsC/fEiWHFRbwXeVA5ys3A= X-MC-Unique: 53AalXdMOQ2PcuaAxLPBpA-1 From: Peter Krempa To: devel@lists.libvirt.org Subject: [PATCH 8/8] qemu: monitor: Remove the old chardev backend generator Date: Wed, 18 Sep 2024 09:55:18 +0200 Message-ID: In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.0 on 10.30.177.17 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable Message-ID-Hash: EJMYZHDUKUPQE6KQIOJY5QDXDLC5RZNF X-Message-ID-Hash: EJMYZHDUKUPQE6KQIOJY5QDXDLC5RZNF 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: 1726646435304116600 Content-Type: text/plain; charset="utf-8" Signed-off-by: Peter Krempa Reviewed-by: J=C3=A1n Tomko --- src/qemu/qemu_monitor_json.c | 243 ----------------------------------- 1 file changed, 243 deletions(-) diff --git a/src/qemu/qemu_monitor_json.c b/src/qemu/qemu_monitor_json.c index f3a353a13b..75a5b03024 100644 --- a/src/qemu/qemu_monitor_json.c +++ b/src/qemu/qemu_monitor_json.c @@ -6173,22 +6173,6 @@ qemuMonitorJSONBuildUnixSocketAddress(const char *pa= th) } -static virJSONValue * -qemuMonitorJSONBuildFDSocketAddress(const char *fdname) -{ - g_autoptr(virJSONValue) addr =3D NULL; - g_autoptr(virJSONValue) data =3D NULL; - - if (virJSONValueObjectAdd(&data, "s:str", fdname, NULL) < 0) - return NULL; - - if (virJSONValueObjectAdd(&addr, - "s:type", "fd", - "a:data", &data, NULL) < 0) - return NULL; - - return g_steal_pointer(&addr); -} int qemuMonitorJSONNBDServerStart(qemuMonitor *mon, const virStorageNetHostDef *server, @@ -6342,233 +6326,6 @@ int qemuMonitorJSONGetTPMTypes(qemuMonitor *mon, } -static G_GNUC_UNUSED virJSONValue * -qemuMonitorJSONAttachCharDevGetProps(const char *chrID, - const virDomainChrSourceDef *chr) -{ - qemuDomainChrSourcePrivate *chrSourcePriv =3D QEMU_DOMAIN_CHR_SOURCE_P= RIVATE(chr); - g_autoptr(virJSONValue) props =3D NULL; - g_autoptr(virJSONValue) backend =3D NULL; - g_autoptr(virJSONValue) backendData =3D virJSONValueNewObject(); - const char *backendType =3D NULL; - - switch ((virDomainChrType)chr->type) { - case VIR_DOMAIN_CHR_TYPE_NULL: - case VIR_DOMAIN_CHR_TYPE_VC: - case VIR_DOMAIN_CHR_TYPE_PTY: - backendType =3D virDomainChrTypeToString(chr->type); - break; - - case VIR_DOMAIN_CHR_TYPE_FILE: { - const char *path =3D chr->data.file.path; - virTristateSwitch append =3D chr->data.file.append; - backendType =3D "file"; - - if (chrSourcePriv->sourcefd) { - path =3D qemuFDPassGetPath(chrSourcePriv->sourcefd); - append =3D VIR_TRISTATE_SWITCH_ON; - } - - if (virJSONValueObjectAdd(&backendData, - "s:out", path, - "T:append", append, - NULL) < 0) - return NULL; - } - break; - - case VIR_DOMAIN_CHR_TYPE_DEV: - if (STRPREFIX(chrID, "parallel")) - backendType =3D "parallel"; - else - backendType =3D "serial"; - - if (virJSONValueObjectAdd(&backendData, - "s:device", chr->data.file.path, - NULL) < 0) - return NULL; - - break; - - case VIR_DOMAIN_CHR_TYPE_UNIX: - case VIR_DOMAIN_CHR_TYPE_TCP: { - const char *tlsalias =3D NULL; - g_autoptr(virJSONValue) addr =3D NULL; - virTristateBool waitval =3D VIR_TRISTATE_BOOL_ABSENT; - virTristateBool telnet =3D VIR_TRISTATE_BOOL_ABSENT; - bool server =3D false; - int reconnect =3D -1; - - backendType =3D "socket"; - - if (chr->type =3D=3D VIR_DOMAIN_CHR_TYPE_TCP) { - telnet =3D virTristateBoolFromBool(chr->data.tcp.protocol =3D= =3D VIR_DOMAIN_CHR_TCP_PROTOCOL_TELNET); - - if (chr->data.tcp.listen) { - server =3D true; - waitval =3D VIR_TRISTATE_BOOL_NO; - } - - tlsalias =3D chrSourcePriv->tlsCredsAlias; - - if (!(addr =3D qemuMonitorJSONBuildInetSocketAddress(chr->data= .tcp.host, - chr->data.t= cp.service))) - return NULL; - - if (chr->data.tcp.reconnect.enabled =3D=3D VIR_TRISTATE_BOOL_Y= ES) - reconnect =3D chr->data.tcp.reconnect.timeout; - else if (chr->data.tcp.reconnect.enabled =3D=3D VIR_TRISTATE_B= OOL_NO) - reconnect =3D 0; - } else { - if (chr->data.nix.listen) { - server =3D true; - waitval =3D VIR_TRISTATE_BOOL_NO; - } - - if (chrSourcePriv->directfd) { - if (!(addr =3D qemuMonitorJSONBuildFDSocketAddress(qemuFDP= assDirectGetPath(chrSourcePriv->directfd)))) - return NULL; - } else { - if (!(addr =3D qemuMonitorJSONBuildUnixSocketAddress(chr->= data.nix.path))) - return NULL; - - if (chr->data.nix.reconnect.enabled =3D=3D VIR_TRISTATE_BO= OL_YES) - reconnect =3D chr->data.nix.reconnect.timeout; - else if (chr->data.nix.reconnect.enabled =3D=3D VIR_TRISTA= TE_BOOL_NO) - reconnect =3D 0; - } - } - - if (virJSONValueObjectAdd(&backendData, - "a:addr", &addr, - "T:wait", waitval, - "T:telnet", telnet, - "b:server", server, - "S:tls-creds", tlsalias, - "k:reconnect", reconnect, - NULL) < 0) - return NULL; - } - break; - - case VIR_DOMAIN_CHR_TYPE_UDP: { - g_autoptr(virJSONValue) local =3D NULL; - g_autoptr(virJSONValue) remote =3D NULL; - - backendType =3D "udp"; - - if (!(remote =3D qemuMonitorJSONBuildInetSocketAddress(NULLSTR_EMP= TY(chr->data.udp.connectHost), - chr->data.udp= .connectService))) - return NULL; - - if (chr->data.udp.bindHost || chr->data.udp.bindService) { - if (!(local =3D qemuMonitorJSONBuildInetSocketAddress(NULLSTR_= EMPTY(chr->data.udp.bindHost), - NULLSTR_EM= PTY(chr->data.udp.bindService)))) - return NULL; - } - - if (virJSONValueObjectAdd(&backendData, - "a:remote", &remote, - "A:local", &local, - NULL) < 0) - return NULL; - } - break; - - case VIR_DOMAIN_CHR_TYPE_SPICEVMC: - backendType =3D "spicevmc"; - - if (virJSONValueObjectAdd(&backendData, - "s:type", virDomainChrSpicevmcTypeToStri= ng(chr->data.spicevmc), - NULL) < 0) - return NULL; - - break; - - case VIR_DOMAIN_CHR_TYPE_QEMU_VDAGENT: { - virTristateBool mouse =3D VIR_TRISTATE_BOOL_ABSENT; - switch (chr->data.qemuVdagent.mouse) { - case VIR_DOMAIN_MOUSE_MODE_CLIENT: - mouse =3D VIR_TRISTATE_BOOL_YES; - break; - case VIR_DOMAIN_MOUSE_MODE_SERVER: - mouse =3D VIR_TRISTATE_BOOL_NO; - break; - case VIR_DOMAIN_MOUSE_MODE_DEFAULT: - break; - case VIR_DOMAIN_MOUSE_MODE_LAST: - default: - virReportEnumRangeError(virDomainMouseMode, - chr->data.qemuVdagent.mouse); - return NULL; - } - backendType =3D "qemu-vdagent"; - - if (virJSONValueObjectAdd(&backendData, - "T:clipboard", chr->data.qemuVdagent.cli= pboard, - "T:mouse", mouse, - NULL) < 0) - return NULL; - break; - } - - case VIR_DOMAIN_CHR_TYPE_DBUS: - backendType =3D "dbus"; - - if (virJSONValueObjectAdd(&backendData, - "s:name", chr->data.dbus.channel, - NULL) < 0) - return NULL; - - break; - - case VIR_DOMAIN_CHR_TYPE_SPICEPORT: - case VIR_DOMAIN_CHR_TYPE_PIPE: - case VIR_DOMAIN_CHR_TYPE_STDIO: - case VIR_DOMAIN_CHR_TYPE_NMDM: - virReportError(VIR_ERR_OPERATION_FAILED, - _("Hotplug unsupported for char device type '%1$s'"= ), - virDomainChrTypeToString(chr->type)); - return NULL; - - case VIR_DOMAIN_CHR_TYPE_LAST: - default: - virReportEnumRangeError(virDomainChrType, chr->type); - return NULL; - } - - if (chr->logfile) { - const char *path =3D chr->logfile; - virTristateSwitch append =3D chr->logappend; - - if (chrSourcePriv->logfd) { - path =3D qemuFDPassGetPath(chrSourcePriv->logfd); - append =3D VIR_TRISTATE_SWITCH_ON; - } - - if (virJSONValueObjectAdd(&backendData, - "s:logfile", path, - "T:logappend", append, - NULL) < 0) - return NULL; - } - - if (virJSONValueObjectAdd(&backend, - "s:type", backendType, - "A:data", &backendData, - NULL) < 0) - return NULL; - - if (virJSONValueObjectAdd(&props, - "s:id", chrID, - "a:backend", &backend, - NULL) < 0) - return NULL; - - return g_steal_pointer(&props); -} - - int qemuMonitorJSONAttachCharDev(qemuMonitor *mon, virJSONValue **props, --=20 2.46.0