From nobody Sun May 5 04:43:59 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 216.205.24.124 as permitted sender) client-ip=216.205.24.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 216.205.24.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=1624261336; cv=none; d=zohomail.com; s=zohoarc; b=CarDzTKGasDDNDqDHBJ3iRXfbS7z+wAgPcyBBAp54g0Zhvy23kecYXvLj4LaPhS12usZeysosq9VM51fJJRtUgeFydSWgUEzzHkmZ09fLR5jSu0YNeb5rAFgB/ISfr6QIa4tpcgWP2foy0Rn0nE3M/Mc+D6bkKnoLJnLQZdYI0Y= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1624261336; h=Content-Type:Content-Transfer-Encoding:Date:From:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:Sender:Subject:To; bh=h9/PhVxXFEKJfLeCi/aS6Kv0KihvxsgHasc0yAZpooA=; b=bTNPbSPaIjFPX9r9Ts9hjja2gY92JnmppzwXb3JmYAA7BTBV10UyRfAyYTZC1ciru5XKZCeammNAAZ3MDO6HYaZUDJQ9I1Fo/9uURl7b3GXj4c8C/cUtrCXwxEaSBc0RBN9D3Pu7ZtdWLr/N/seXZ/Oq7fPX1ZYxb0m6n4GiuKI= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 216.205.24.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 [216.205.24.124]) by mx.zohomail.com with SMTPS id 1624261336963224.00577653664755; Mon, 21 Jun 2021 00:42:16 -0700 (PDT) Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-351-G4LlWx9ANEKrxRDqmEX5Uw-1; Mon, 21 Jun 2021 03:42:14 -0400 Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.phx2.redhat.com [10.5.11.15]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 69AA4101872D; Mon, 21 Jun 2021 07:42:08 +0000 (UTC) Received: from colo-mx.corp.redhat.com (colo-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.21]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 712A85D741; Mon, 21 Jun 2021 07:42:07 +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 7A4EE4EA2A; Mon, 21 Jun 2021 07:42:04 +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 15L7g261018025 for ; Mon, 21 Jun 2021 03:42:02 -0400 Received: by smtp.corp.redhat.com (Postfix) id D404360861; Mon, 21 Jun 2021 07:42:02 +0000 (UTC) Received: from speedmetal.redhat.com (unknown [10.40.208.13]) by smtp.corp.redhat.com (Postfix) with ESMTP id 3BE4260843 for ; Mon, 21 Jun 2021 07:41:58 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1624261336; 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:list-id:list-help: list-unsubscribe:list-subscribe:list-post; bh=h9/PhVxXFEKJfLeCi/aS6Kv0KihvxsgHasc0yAZpooA=; b=C882aej0F+JMWl/7HsU2tIPqiDdM49qX7Xnf7szmFBE2K17+WLEytwDwNQ9esX1cgT74E/ o62t11/AYAghVVNtP9nlOTqFdJftxLKdP8CS9fcBZragGGD5CNA4cOK/p/MRgM+2flllYY 7SJj2JJIIXdKfIl4yj2VD1/T2cj5gNU= X-MC-Unique: G4LlWx9ANEKrxRDqmEX5Uw-1 From: Peter Krempa To: libvir-list@redhat.com Subject: [PATCH] chValidateDomainDeviceDef: Remove per-device-type error messages Date: Mon, 21 Jun 2021 09:41:57 +0200 Message-Id: <345d6b420c64b7ac1a928b22c1f9fbe74002a91d.1624261317.git.pkrempa@redhat.com> 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.15 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) Content-Type: text/plain; charset="utf-8" Vast majority of device types is not supported by the Cloud-Hypervisor driver. Simplify the error reporting by using virDomainDeviceTypeToString. Signed-off-by: Peter Krempa Reviewed-by: Pavel Hrdina --- src/ch/ch_domain.c | 90 +++++++--------------------------------------- 1 file changed, 12 insertions(+), 78 deletions(-) diff --git a/src/ch/ch_domain.c b/src/ch/ch_domain.c index 3495ee22ff..780a46ba00 100644 --- a/src/ch/ch_domain.c +++ b/src/ch/ch_domain.c @@ -203,117 +203,51 @@ chValidateDomainDeviceDef(const virDomainDeviceDef *= dev, void *opaque G_GNUC_UNUSED, void *parseOpaque G_GNUC_UNUSED) { - int ret =3D -1; - switch ((virDomainDeviceType)dev->type) { case VIR_DOMAIN_DEVICE_DISK: - ret =3D 0; + case VIR_DOMAIN_DEVICE_NET: + case VIR_DOMAIN_DEVICE_MEMORY: + case VIR_DOMAIN_DEVICE_VSOCK: break; + case VIR_DOMAIN_DEVICE_LEASE: - virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", - _("Cloud-Hypervisor doesn't support lease")); - break; case VIR_DOMAIN_DEVICE_FS: - virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", - _("Cloud-Hypervisor doesn't support fs")); - break; - case VIR_DOMAIN_DEVICE_NET: - ret =3D 0; - break; case VIR_DOMAIN_DEVICE_INPUT: - virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", - _("Cloud-Hypervisor doesn't support input")); - break; case VIR_DOMAIN_DEVICE_SOUND: - virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", - _("Cloud-Hypervisor doesn't support sound")); - break; case VIR_DOMAIN_DEVICE_VIDEO: - virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", - _("Cloud-Hypervisor doesn't support video")); - break; case VIR_DOMAIN_DEVICE_HOSTDEV: - virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", - _("Cloud-Hypervisor doesn't support hostdev")); - break; case VIR_DOMAIN_DEVICE_WATCHDOG: - virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", - _("Cloud-Hypervisor doesn't support watchdog")); - break; case VIR_DOMAIN_DEVICE_CONTROLLER: - virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", - _("Cloud-Hypervisor doesn't support controller")); - break; case VIR_DOMAIN_DEVICE_GRAPHICS: - virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", - _("Cloud-Hypervisor doesn't support graphics")); - break; case VIR_DOMAIN_DEVICE_HUB: - virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", - _("Cloud-Hypervisor doesn't support hub")); - break; case VIR_DOMAIN_DEVICE_REDIRDEV: - virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", - _("Cloud-Hypervisor doesn't support redirdev")); - break; case VIR_DOMAIN_DEVICE_SMARTCARD: - virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", - _("Cloud-Hypervisor doesn't support smartcard")); - break; case VIR_DOMAIN_DEVICE_CHR: - virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", - _("Cloud-Hypervisor doesn't support chr")); - break; case VIR_DOMAIN_DEVICE_MEMBALLOON: - virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", - _("Cloud-Hypervisor doesn't support memballoon")); - break; case VIR_DOMAIN_DEVICE_NVRAM: - virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", - _("Cloud-Hypervisor doesn't support nvram")); - break; case VIR_DOMAIN_DEVICE_RNG: - virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", - _("Cloud-Hypervisor doesn't support rng")); - break; case VIR_DOMAIN_DEVICE_SHMEM: - virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", - _("Cloud-Hypervisor doesn't support shmem")); - break; case VIR_DOMAIN_DEVICE_TPM: - virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", - _("Cloud-Hypervisor doesn't support tpm")); - break; case VIR_DOMAIN_DEVICE_PANIC: - virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", - _("Cloud-Hypervisor doesn't support panic")); - break; - case VIR_DOMAIN_DEVICE_MEMORY: - ret =3D 0; - break; case VIR_DOMAIN_DEVICE_IOMMU: - virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", - _("Cloud-Hypervisor doesn't support iommu")); - break; - case VIR_DOMAIN_DEVICE_VSOCK: - ret =3D 0; - break; case VIR_DOMAIN_DEVICE_AUDIO: - virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", - _("Cloud-Hypervisor doesn't support audio")); - break; + virReportError(VIR_ERR_CONFIG_UNSUPPORTED, + _("Cloud-Hypervisor doesn't support '%s' device"), + virDomainDeviceTypeToString(dev->type)); + return -1; + case VIR_DOMAIN_DEVICE_NONE: virReportError(VIR_ERR_INTERNAL_ERROR, "%s", _("unexpected VIR_DOMAIN_DEVICE_NONE")); - break; + return -1; case VIR_DOMAIN_DEVICE_LAST: default: virReportEnumRangeError(virDomainDeviceType, dev->type); - break; + return -1; } - return ret; + return 0; } virDomainDefParserConfig virCHDriverDomainDefParserConfig =3D { --=20 2.31.1