From nobody Sat Feb 7 07:25:53 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of redhat.com designates 209.132.183.28 as permitted sender) client-ip=209.132.183.28; envelope-from=libvir-list-bounces@redhat.com; helo=mx1.redhat.com; Authentication-Results: mx.zohomail.com; spf=pass (zoho.com: domain of redhat.com designates 209.132.183.28 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass(p=none dis=none) header.from=redhat.com Return-Path: Received: from mx1.redhat.com (mx1.redhat.com [209.132.183.28]) by mx.zohomail.com with SMTPS id 1518798521752754.9590220011129; Fri, 16 Feb 2018 08:28:41 -0800 (PST) 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 mx1.redhat.com (Postfix) with ESMTPS id 2F694C0568E3; Fri, 16 Feb 2018 16:28:40 +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 0B867620DB; Fri, 16 Feb 2018 16:28:40 +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 BC31C4A473; Fri, 16 Feb 2018 16:28:39 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.rdu2.redhat.com [10.11.54.5]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id w1GGSLhF021792 for ; Fri, 16 Feb 2018 11:28:21 -0500 Received: by smtp.corp.redhat.com (Postfix) id 6E8E0B07AA; Fri, 16 Feb 2018 16:28:21 +0000 (UTC) Received: from inaba.usersys.redhat.com (unknown [10.43.2.98]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 1772EAF027 for ; Fri, 16 Feb 2018 16:28:20 +0000 (UTC) From: Andrea Bolognani To: libvir-list@redhat.com Date: Fri, 16 Feb 2018 17:28:01 +0100 Message-Id: <20180216162812.31121-5-abologna@redhat.com> In-Reply-To: <20180216162812.31121-1-abologna@redhat.com> References: <20180216162812.31121-1-abologna@redhat.com> X-Scanned-By: MIMEDefang 2.79 on 10.11.54.5 X-loop: libvir-list@redhat.com Subject: [libvirt] [PATCH v2 04/15] qemu: Restrict scope in qemuBuildControllerDevStr() 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: , MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Sender: libvir-list-bounces@redhat.com Errors-To: libvir-list-bounces@redhat.com X-Scanned-By: MIMEDefang 2.79 on 10.5.11.11 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.32]); Fri, 16 Feb 2018 16:28:40 +0000 (UTC) X-ZohoMail: RSF_0 Z_629925259 SPT_0 Content-Type: text/plain; charset="utf-8" Some variables are only used for PCI controllers, and we're going to add more soon. We can declare them in the 'case' scope rather than in the function scope to make it a bit nicer. Signed-off-by: Andrea Bolognani --- src/qemu/qemu_command.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c index 5e4dfcf75..2291bf5da 100644 --- a/src/qemu/qemu_command.c +++ b/src/qemu/qemu_command.c @@ -2625,8 +2625,6 @@ qemuBuildControllerDevStr(const virDomainDef *domainD= ef, { virBuffer buf =3D VIR_BUFFER_INITIALIZER; int address_type =3D def->info.type; - const virDomainPCIControllerOpts *pciopts; - const char *modelName =3D NULL; =20 *devstr =3D NULL; =20 @@ -2726,7 +2724,10 @@ qemuBuildControllerDevStr(const virDomainDef *domain= Def, =20 break; =20 - case VIR_DOMAIN_CONTROLLER_TYPE_PCI: + case VIR_DOMAIN_CONTROLLER_TYPE_PCI: { + const virDomainPCIControllerOpts *pciopts; + const char *modelName =3D NULL; + pciopts =3D &def->opts.pciopts; if (def->model !=3D VIR_DOMAIN_CONTROLLER_MODEL_PCIE_ROOT && def->model !=3D VIR_DOMAIN_CONTROLLER_MODEL_PCI_LAST) @@ -2781,6 +2782,7 @@ qemuBuildControllerDevStr(const virDomainDef *domainD= ef, goto error; } break; + } =20 case VIR_DOMAIN_CONTROLLER_TYPE_IDE: case VIR_DOMAIN_CONTROLLER_TYPE_FDC: --=20 2.14.3 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list