From nobody Mon Feb 9 05:25:06 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 1726646400093231.70790584627696; Wed, 18 Sep 2024 01:00:00 -0700 (PDT) Received: by lists.libvirt.org (Postfix, from userid 996) id F184F11D1; Wed, 18 Sep 2024 03:59:58 -0400 (EDT) Received: from lists.libvirt.org (localhost [IPv6:::1]) by lists.libvirt.org (Postfix) with ESMTP id EB2C51A50; Wed, 18 Sep 2024 03:55:50 -0400 (EDT) Received: by lists.libvirt.org (Postfix, from userid 996) id 0EB9C1AC6; 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 1AC791A98 for ; Wed, 18 Sep 2024 03:55:34 -0400 (EDT) Received: from mx-prod-mc-01.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-118-GUfUFlybNwG5zjWHPuyrXw-1; Wed, 18 Sep 2024 03:55:31 -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-01.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id 3B62A1955D45 for ; Wed, 18 Sep 2024 07:55:30 +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 551A819560A3 for ; Wed, 18 Sep 2024 07:55:29 +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=1726646133; 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=EBqjDDHM4VrffsgsKPvEvoi9h26+mXmu9cGf9zLJcFE=; b=WID2x5WmpoGDZ29B61G8CMz+jIq/ExoVyTLwqiLymQDpG9DHykT9EUvPry4gUzHk+5b0UH Q3Ejw+nuSXoZvWRqNwAysGWwj9H/XLzS5vHSf3yACZQejWtf4VJ14aKb4vO3NbWB17NkQa iwtd+yKWCamFwRzZx57DYLZg4yxrLno= X-MC-Unique: GUfUFlybNwG5zjWHPuyrXw-1 From: Peter Krempa To: devel@lists.libvirt.org Subject: [PATCH 6/8] qemu: Move check for chardev backends which can't be hotplugged out of the monitor Date: Wed, 18 Sep 2024 09:55:16 +0200 Message-ID: <9c813c48074a7fc25c03d5db416a09754f545aae.1726646064.git.pkrempa@redhat.com> 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: TZ44XRQWSIOIUMNTW2RE6AKI5BED2FE6 X-Message-ID-Hash: TZ44XRQWSIOIUMNTW2RE6AKI5BED2FE6 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: 1726646400977116600 Content-Type: text/plain; charset="utf-8" The upcoming refactor of the monitor code will make the hotplug code paths use the same generator we have for commandline -chardev backends which doesn't refuse to format certain backends which can't be hotplugged. To prepare for this we add a check to qemuHotplugChardevAttach() refusing such hotplug and remove 'qemumonitorjsontest' test cases which will not make sense any more. Signed-off-by: Peter Krempa Reviewed-by: J=C3=A1n Tomko --- src/qemu/qemu_hotplug.c | 29 +++++++++++++++++++++++++++++ tests/qemumonitorjsontest.c | 6 ------ 2 files changed, 29 insertions(+), 6 deletions(-) diff --git a/src/qemu/qemu_hotplug.c b/src/qemu/qemu_hotplug.c index 75b97cf736..a58c1446e9 100644 --- a/src/qemu/qemu_hotplug.c +++ b/src/qemu/qemu_hotplug.c @@ -243,6 +243,35 @@ qemuHotplugChardevAttach(qemuMonitor *mon, const char *alias, virDomainChrSourceDef *def) { + switch ((virDomainChrType) def->type) { + case VIR_DOMAIN_CHR_TYPE_NULL: + case VIR_DOMAIN_CHR_TYPE_VC: + case VIR_DOMAIN_CHR_TYPE_PTY: + case VIR_DOMAIN_CHR_TYPE_FILE: + case VIR_DOMAIN_CHR_TYPE_DEV: + case VIR_DOMAIN_CHR_TYPE_UNIX: + case VIR_DOMAIN_CHR_TYPE_TCP: + case VIR_DOMAIN_CHR_TYPE_UDP: + case VIR_DOMAIN_CHR_TYPE_SPICEVMC: + case VIR_DOMAIN_CHR_TYPE_QEMU_VDAGENT: + case VIR_DOMAIN_CHR_TYPE_DBUS: + 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(def->type)); + return -1; + + case VIR_DOMAIN_CHR_TYPE_LAST: + default: + virReportEnumRangeError(virDomainChrType, def->type); + return -1; + } + return qemuMonitorAttachCharDev(mon, alias, def); } diff --git a/tests/qemumonitorjsontest.c b/tests/qemumonitorjsontest.c index 66d0c127ca..2249787ba7 100644 --- a/tests/qemumonitorjsontest.c +++ b/tests/qemumonitorjsontest.c @@ -652,12 +652,6 @@ qemuMonitorJSONTestAttachChardev(virDomainXMLOption *x= mlopt, "{'id':'alias','backend':{'type':'spicevmc'," "'data':{'type':'vdagent'}}}"); - chr->type =3D VIR_DOMAIN_CHR_TYPE_PIPE; - CHECK("pipe", true, NULL); - - chr->type =3D VIR_DOMAIN_CHR_TYPE_STDIO; - CHECK("stdio", true, NULL); - chr->type =3D VIR_DOMAIN_CHR_TYPE_PTY; CHECK("pty missing path", true, "{'id':'alias','backend':{'type':'pty','data':{}}}"); --=20 2.46.0