From nobody Sun Feb 8 20:53:41 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=1658403103; cv=none; d=zohomail.com; s=zohoarc; b=i3shaDKsr394eUmql8Y7/xDRwS5FoC/KxmltvUv82cDocyN8Xs4fG1gyc1oehXXXJyv1s2aakhRj/8WV4xdG/C+3iMzQocC8s/7SFeb/0ueE7YE9I4Vxeym6tx37ZJibt5EpWiHIaNcKla2FrL1doXQVxy1mSa6IbzrOufnCTLk= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1658403103; 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=yx3V23352EfvLnleshj/wBJ4oQaXEujR3p5U7s3zcWA=; b=GNL1+alOaLL3EMSfr2b73UAFOoB5WYyA5D63LdSkMA4ufTaUX0mDoyUI2j+D54lNblhElgvtQwM6imis0XsqfrdSWKGJdbWxUXPVRcwdkgvtW0Df5SJOe0sa9UCn57gb+dhAZt/brVV4WETb4Va6kTjdLJbu2H6D1j8VIjK62ZU= 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 165840310396491.45345160401246; Thu, 21 Jul 2022 04:31:43 -0700 (PDT) Received: from mimecast-mx02.redhat.com (mimecast-mx02.redhat.com [66.187.233.88]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-418-iImls1tNPVeAO8CXWz_Zww-1; Thu, 21 Jul 2022 07:31:28 -0400 Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.rdu2.redhat.com [10.11.54.1]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 2A0998060A1; Thu, 21 Jul 2022 11:31:25 +0000 (UTC) Received: from mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (unknown [10.30.29.100]) by smtp.corp.redhat.com (Postfix) with ESMTP id 148BD40D0166; Thu, 21 Jul 2022 11:31:25 +0000 (UTC) Received: from mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (localhost [IPv6:::1]) by mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (Postfix) with ESMTP id 03E90194034C; Thu, 21 Jul 2022 11:31:24 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.rdu2.redhat.com [10.11.54.1]) by mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (Postfix) with ESMTP id C8FA51947040 for ; Thu, 21 Jul 2022 11:31:22 +0000 (UTC) Received: by smtp.corp.redhat.com (Postfix) id AC7D340D0172; Thu, 21 Jul 2022 11:31:22 +0000 (UTC) Received: from fedora.redhat.com (unknown [10.43.2.166]) by smtp.corp.redhat.com (Postfix) with ESMTP id 513CE40D0160 for ; Thu, 21 Jul 2022 11:31:22 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1658403103; 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=yx3V23352EfvLnleshj/wBJ4oQaXEujR3p5U7s3zcWA=; b=TT+koDNn+fkykuyvRl5nKcUpSg3BI8bQOgKBVdtkotgMFwMNAn0DPL9MBBm5jQeUX4Jnji 9lmMsRYVtsAWom+TlVc/jcWvbSOuVp0cqrROSt44lU8pxtkRV3/PtRb/2ZsrCqrck9EC36 MSUipgD+1etmFwcY92DbnReI7CSuXlQ= X-MC-Unique: iImls1tNPVeAO8CXWz_Zww-1 X-Original-To: libvir-list@listman.corp.redhat.com From: Kristina Hanicova To: libvir-list@redhat.com Subject: [PATCH v2 2/2] domain_conf: rewrite if else functions to switch Date: Thu, 21 Jul 2022 13:30:45 +0200 Message-Id: In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.84 on 10.11.54.1 X-BeenThere: libvir-list@redhat.com X-Mailman-Version: 2.1.29 Precedence: list List-Id: Development discussions about the libvirt library & tools List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: libvir-list-bounces@redhat.com Sender: "libvir-list" X-Scanned-By: MIMEDefang 2.84 on 10.11.54.1 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: 1658403104377100001 Content-Type: text/plain; charset="utf-8"; x-default="true" Pattern of using switch instead of a long if else construction is used everywhere, so I used it here as well to make the code more consistent (and remove that else after return). I also included all the values from the enum. Signed-off-by: Kristina Hanicova Reviewed-by: Martin Kletzander --- src/conf/domain_conf.c | 42 ++++++++++++++++++++++++++++-------------- 1 file changed, 28 insertions(+), 14 deletions(-) diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index 41d23cfe2a..a4b3a49086 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -8055,19 +8055,26 @@ static int virDomainControllerModelTypeFromString(const virDomainControllerDef *def, const char *model) { - if (def->type =3D=3D VIR_DOMAIN_CONTROLLER_TYPE_SCSI) + switch ((virDomainControllerType)def->type) { + case VIR_DOMAIN_CONTROLLER_TYPE_SCSI: return virDomainControllerModelSCSITypeFromString(model); - else if (def->type =3D=3D VIR_DOMAIN_CONTROLLER_TYPE_USB) + case VIR_DOMAIN_CONTROLLER_TYPE_USB: return virDomainControllerModelUSBTypeFromString(model); - else if (def->type =3D=3D VIR_DOMAIN_CONTROLLER_TYPE_PCI) + case VIR_DOMAIN_CONTROLLER_TYPE_PCI: return virDomainControllerModelPCITypeFromString(model); - else if (def->type =3D=3D VIR_DOMAIN_CONTROLLER_TYPE_IDE) + case VIR_DOMAIN_CONTROLLER_TYPE_IDE: return virDomainControllerModelIDETypeFromString(model); - else if (def->type =3D=3D VIR_DOMAIN_CONTROLLER_TYPE_VIRTIO_SERIAL) + case VIR_DOMAIN_CONTROLLER_TYPE_VIRTIO_SERIAL: return virDomainControllerModelVirtioSerialTypeFromString(model); - else if (def->type =3D=3D VIR_DOMAIN_CONTROLLER_TYPE_ISA) + case VIR_DOMAIN_CONTROLLER_TYPE_ISA: return virDomainControllerModelISATypeFromString(model); - + case VIR_DOMAIN_CONTROLLER_TYPE_FDC: + case VIR_DOMAIN_CONTROLLER_TYPE_SATA: + case VIR_DOMAIN_CONTROLLER_TYPE_CCID: + case VIR_DOMAIN_CONTROLLER_TYPE_XENBUS: + case VIR_DOMAIN_CONTROLLER_TYPE_LAST: + return -1; + } return -1; } =20 @@ -8076,19 +8083,26 @@ static const char * virDomainControllerModelTypeToString(virDomainControllerDef *def, int model) { - if (def->type =3D=3D VIR_DOMAIN_CONTROLLER_TYPE_SCSI) + switch ((virDomainControllerType)def->type) { + case VIR_DOMAIN_CONTROLLER_TYPE_SCSI: return virDomainControllerModelSCSITypeToString(model); - else if (def->type =3D=3D VIR_DOMAIN_CONTROLLER_TYPE_USB) + case VIR_DOMAIN_CONTROLLER_TYPE_USB: return virDomainControllerModelUSBTypeToString(model); - else if (def->type =3D=3D VIR_DOMAIN_CONTROLLER_TYPE_PCI) + case VIR_DOMAIN_CONTROLLER_TYPE_PCI: return virDomainControllerModelPCITypeToString(model); - else if (def->type =3D=3D VIR_DOMAIN_CONTROLLER_TYPE_IDE) + case VIR_DOMAIN_CONTROLLER_TYPE_IDE: return virDomainControllerModelIDETypeToString(model); - else if (def->type =3D=3D VIR_DOMAIN_CONTROLLER_TYPE_VIRTIO_SERIAL) + case VIR_DOMAIN_CONTROLLER_TYPE_VIRTIO_SERIAL: return virDomainControllerModelVirtioSerialTypeToString(model); - else if (def->type =3D=3D VIR_DOMAIN_CONTROLLER_TYPE_ISA) + case VIR_DOMAIN_CONTROLLER_TYPE_ISA: return virDomainControllerModelISATypeToString(model); - + case VIR_DOMAIN_CONTROLLER_TYPE_FDC: + case VIR_DOMAIN_CONTROLLER_TYPE_SATA: + case VIR_DOMAIN_CONTROLLER_TYPE_CCID: + case VIR_DOMAIN_CONTROLLER_TYPE_XENBUS: + case VIR_DOMAIN_CONTROLLER_TYPE_LAST: + return NULL; + } return NULL; } =20 --=20 2.35.3