From nobody Sun Feb 8 15:29:09 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 63.128.21.124 as permitted sender) client-ip=63.128.21.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 63.128.21.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=1617723136; cv=none; d=zohomail.com; s=zohoarc; b=bW2J1zlwJl+qdG97ts9bUd7yqGcEynOiYhZRKo2YjiFW6HFn1qKsCruxe4NWDxOChi+qwQ6Mj/A7gYxE+ytcYeDKC2Cwj2ltR5XkC/jpvKAAYq5hp9ncW6T5jFc5wZSsp1E0oHb1xHfmG8R9pCUS1WdnkLbOJc9YW+ognnWyPms= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1617723136; 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=sguUPuPkvWrLNM9Uzc8hFSDqeWwM9nQFgfY4hNhNOHc=; b=MucWG5f+IzD7rQ9kSifKn7xLE1lAHdGSCmY+ZX6jeP7i2oEs2NDH5jfRbT5mC58/6uWdjbR+25Qx0BOt7Lr2A9G5+TNs37LlsuyqZ8/SjebzVAQB2kfisp3FxnT9QOz7gTvPRaQE2eQI/bQwJ2Zb6BFyESdLoMszsDMWCG+T7yg= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 63.128.21.124 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass header.from= (p=none dis=none) header.from= Return-Path: Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [63.128.21.124]) by mx.zohomail.com with SMTPS id 1617723136016730.6044512360503; Tue, 6 Apr 2021 08:32: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-518-oiWalvzEPGiK6hq_qh3feA-1; Tue, 06 Apr 2021 11:32:12 -0400 Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id C6ECE1018F8E; Tue, 6 Apr 2021 15:32:02 +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 694A076C27; Tue, 6 Apr 2021 15:32:02 +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 ED61F4A7CA; Tue, 6 Apr 2021 15:32:01 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.phx2.redhat.com [10.5.11.14]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id 136FVkDA023734 for ; Tue, 6 Apr 2021 11:31:46 -0400 Received: by smtp.corp.redhat.com (Postfix) id BE05A5DAA5; Tue, 6 Apr 2021 15:31:46 +0000 (UTC) Received: from localhost.localdomain.com (ovpn-114-172.ams2.redhat.com [10.36.114.172]) by smtp.corp.redhat.com (Postfix) with ESMTP id 00DAA5D9D0; Tue, 6 Apr 2021 15:31:45 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1617723134; 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=sguUPuPkvWrLNM9Uzc8hFSDqeWwM9nQFgfY4hNhNOHc=; b=EuSj5USqoanSAPP+GqN3Znl8rriGHPPSbbDhW9PzfMO+MdhILuye0en9NqX3RDUbKIHm1Z H43N9OBJzhgVLA0ouu4cEqu4tjsiCnmOFz6ltRXeboBoOJ4AvZ0pKK51rNhYoUEQm0nIYy /wIAFikYxK1HdwjxH2J61xUQ6/H61FM= X-MC-Unique: oiWalvzEPGiK6hq_qh3feA-1 From: =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= To: libvir-list@redhat.com Subject: [libvirt PATCH 4/6] qemu: use a switch when building device addresses Date: Tue, 6 Apr 2021 16:31:35 +0100 Message-Id: <20210406153137.314183-5-berrange@redhat.com> In-Reply-To: <20210406153137.314183-1-berrange@redhat.com> References: <20210406153137.314183-1-berrange@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.14 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.11 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-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) The compiler can more easily optimize a switch, and more importantly can also warn when new address types are added which are not handled. Signed-off-by: Daniel P. Berrang=C3=A9 Reviewed-by: Peter Krempa --- src/qemu/qemu_command.c | 37 +++++++++++++++++++++++++++++++------ 1 file changed, 31 insertions(+), 6 deletions(-) diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c index d3fcca699a..bf60289786 100644 --- a/src/qemu/qemu_command.c +++ b/src/qemu/qemu_command.c @@ -351,7 +351,8 @@ qemuBuildDeviceAddressStr(virBufferPtr buf, bool contIsPHB =3D false; int contTargetIndex =3D 0; =20 - if (info->type =3D=3D VIR_DOMAIN_DEVICE_ADDRESS_TYPE_PCI) { + switch ((virDomainDeviceAddressType)info->type) { + case VIR_DOMAIN_DEVICE_ADDRESS_TYPE_PCI: { size_t i; =20 if (!(devStr =3D virPCIDeviceAddressAsString(&info->addr.pci))) @@ -419,7 +420,9 @@ qemuBuildDeviceAddressStr(virBufferPtr buf, virBufferAsprintf(buf, ",addr=3D0x%x", info->addr.pci.slot); if (info->addr.pci.function !=3D 0) virBufferAsprintf(buf, ".0x%x", info->addr.pci.function); - } else if (info->type =3D=3D VIR_DOMAIN_DEVICE_ADDRESS_TYPE_USB) { + } break; + + case VIR_DOMAIN_DEVICE_ADDRESS_TYPE_USB: if (!(contAlias =3D virDomainControllerAliasFind(domainDef, VIR_DOMAIN_CONTROLL= ER_TYPE_USB, info->addr.usb.bus)= )) @@ -429,23 +432,45 @@ qemuBuildDeviceAddressStr(virBufferPtr buf, virBufferAddLit(buf, ",port=3D"); virDomainUSBAddressPortFormatBuf(buf, info->addr.usb.port); } - } else if (info->type =3D=3D VIR_DOMAIN_DEVICE_ADDRESS_TYPE_SPAPRVIO) { + break; + + case VIR_DOMAIN_DEVICE_ADDRESS_TYPE_SPAPRVIO: if (info->addr.spaprvio.has_reg) virBufferAsprintf(buf, ",reg=3D0x%08llx", info->addr.spaprvio.= reg); - } else if (info->type =3D=3D VIR_DOMAIN_DEVICE_ADDRESS_TYPE_CCW) { + break; + + case VIR_DOMAIN_DEVICE_ADDRESS_TYPE_CCW: if (info->addr.ccw.assigned) virBufferAsprintf(buf, ",devno=3D%x.%x.%04x", info->addr.ccw.cssid, info->addr.ccw.ssid, info->addr.ccw.devno); - } else if (info->type =3D=3D VIR_DOMAIN_DEVICE_ADDRESS_TYPE_ISA) { + break; + + case VIR_DOMAIN_DEVICE_ADDRESS_TYPE_ISA: virBufferAsprintf(buf, ",iobase=3D0x%x,irq=3D0x%x", info->addr.isa.iobase, info->addr.isa.irq); - } else if (info->type =3D=3D VIR_DOMAIN_DEVICE_ADDRESS_TYPE_DIMM) { + break; + + case VIR_DOMAIN_DEVICE_ADDRESS_TYPE_DIMM: virBufferAsprintf(buf, ",slot=3D%d", info->addr.dimm.slot); if (info->addr.dimm.base) virBufferAsprintf(buf, ",addr=3D%llu", info->addr.dimm.base); + break; + + case VIR_DOMAIN_DEVICE_ADDRESS_TYPE_NONE: + case VIR_DOMAIN_DEVICE_ADDRESS_TYPE_DRIVE: + case VIR_DOMAIN_DEVICE_ADDRESS_TYPE_VIRTIO_SERIAL: + case VIR_DOMAIN_DEVICE_ADDRESS_TYPE_CCID: + case VIR_DOMAIN_DEVICE_ADDRESS_TYPE_VIRTIO_S390: + case VIR_DOMAIN_DEVICE_ADDRESS_TYPE_VIRTIO_MMIO: + case VIR_DOMAIN_DEVICE_ADDRESS_TYPE_UNASSIGNED: + break; + + case VIR_DOMAIN_DEVICE_ADDRESS_TYPE_LAST: + virReportEnumRangeError(virDomainDeviceAddressType, info->type); + return -1; } =20 return 0; --=20 2.30.2