From nobody Mon Feb 9 00:06:56 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 170.10.133.124 as permitted sender) client-ip=170.10.133.124; envelope-from=libvir-list-bounces@redhat.com; helo=us-smtp-delivery-124.mimecast.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 170.10.133.124 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1637253251; cv=none; d=zohomail.com; s=zohoarc; b=autXiY3e+4la/Lxq1oqFjZu1jhacWBbU0hoIzgmA9Zs6tWb+4b3fXUfZlluJstmH5Gc4VssP7q6YP+mJTjT4klc8PaymCgcBXJ5Q8sEYWxpeVj2GeYQ6pKT4M2p6PwUwZh9N05ke278edt2k1TwkJx2IDuBdBG1z67i+KbOCJGU= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1637253251; h=Content-Type:Content-Transfer-Encoding:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=u7XGDcpPtjSEapJv447yqknBeTpaaeQMt6YFi71cbJs=; b=R7ljJiKrhHY58pzt2uIMLUGqYo8r0aAynb9/n0f8fb0HJs/KipaKEdlUu2NXsm3rb5qtVxsNY7JiuhB6gjyWRU2/6Num3Cfnf7yopx25ouwIhMDoa7/azVc+sMoQ4HzYyQq/dssbR9+mAyoj0iPSHabJre0rMkvQNn60VH0c9OM= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 170.10.133.124 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) by mx.zohomail.com with SMTPS id 1637253251611386.2282584937799; Thu, 18 Nov 2021 08:34:11 -0800 (PST) Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-92-mV0CG-u-M5yzAN_J16sDCA-1; Thu, 18 Nov 2021 11:34:09 -0500 Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.phx2.redhat.com [10.5.11.13]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 6DE831922966; Thu, 18 Nov 2021 16:33:56 +0000 (UTC) Received: from colo-mx.corp.redhat.com (colo-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.20]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 1A0325BAE0; Thu, 18 Nov 2021 16:34:04 +0000 (UTC) Received: from lists01.pubmisc.prod.ext.phx2.redhat.com (lists01.pubmisc.prod.ext.phx2.redhat.com [10.5.19.33]) by colo-mx.corp.redhat.com (Postfix) with ESMTP id D11C0180BAD1; Thu, 18 Nov 2021 16:34:03 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.phx2.redhat.com [10.5.11.13]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id 1AIGXqAq028058 for ; Thu, 18 Nov 2021 11:33:52 -0500 Received: by smtp.corp.redhat.com (Postfix) id 55FB81B5C0; Thu, 18 Nov 2021 16:33:52 +0000 (UTC) Received: from speedmetal.lan (unknown [10.40.208.20]) by smtp.corp.redhat.com (Postfix) with ESMTP id A1BFF608BA for ; Thu, 18 Nov 2021 16:33:51 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1637253250; h=from:from:sender:sender: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:list-id:list-help: list-unsubscribe:list-subscribe:list-post; bh=u7XGDcpPtjSEapJv447yqknBeTpaaeQMt6YFi71cbJs=; b=NCwxCJM9AeDHjPEl9y2R3wDlT1qyBnoiscwah0jsYUU1ZjO1fRLC4rZoD4Fhpb/udY5R1R JunNbdZn5bTkg/E2vYkzxEQWOCqW/Ex7XFEm4FlqCpq8Nxz8WonZZ6pVFNTP+9xkyyGUe9 mfvkf84HOgIlxRuyS3lrYb2uKItT+78= X-MC-Unique: mV0CG-u-M5yzAN_J16sDCA-1 From: Peter Krempa To: libvir-list@redhat.com Subject: [PATCH 05/16] qemuMonitorJSONAttachCharDevGetProps: Simplify handling of unsupported types Date: Thu, 18 Nov 2021 17:33:30 +0100 Message-Id: In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.13 X-loop: libvir-list@redhat.com X-BeenThere: libvir-list@redhat.com X-Mailman-Version: 2.1.12 Precedence: junk List-Id: Development discussions about the libvirt library & tools List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: libvir-list-bounces@redhat.com Errors-To: libvir-list-bounces@redhat.com X-Scanned-By: MIMEDefang 2.79 on 10.5.11.13 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=libvir-list-bounces@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1637253252820100001 Content-Type: text/plain; charset="utf-8" Use 'virReportEnumRangeError' for the invalid cases and keep the original error for known but unsupported chardevs. Signed-off-by: Peter Krempa --- src/qemu/qemu_monitor_json.c | 16 +++++++--------- 1 file changed, 7 insertions(+), 9 deletions(-) diff --git a/src/qemu/qemu_monitor_json.c b/src/qemu/qemu_monitor_json.c index b036cc4112..1ced942161 100644 --- a/src/qemu/qemu_monitor_json.c +++ b/src/qemu/qemu_monitor_json.c @@ -6737,16 +6737,14 @@ qemuMonitorJSONAttachCharDevGetProps(const char *ch= rID, 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 '%s'"), + virDomainChrTypeToString(chr->type)); + return NULL; + case VIR_DOMAIN_CHR_TYPE_LAST: - if (virDomainChrTypeToString(chr->type)) { - virReportError(VIR_ERR_OPERATION_FAILED, - _("Hotplug unsupported for char device type '%s= '"), - virDomainChrTypeToString(chr->type)); - } else { - virReportError(VIR_ERR_OPERATION_FAILED, - _("Hotplug unsupported for char device type '%d= '"), - chr->type); - } + default: + virReportEnumRangeError(virDomainChrType, chr->type); return NULL; } --=20 2.31.1