From nobody Sat May 4 12:15:22 2024 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.zoho.com; spf=pass (zoho.com: domain of redhat.com designates 209.132.183.28 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; Return-Path: Received: from mx1.redhat.com (mx1.redhat.com [209.132.183.28]) by mx.zohomail.com with SMTPS id 1495629279314775.2010006056827; Wed, 24 May 2017 05:34:39 -0700 (PDT) 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 mx1.redhat.com (Postfix) with ESMTPS id C92B8C04B32C; Wed, 24 May 2017 12:34:37 +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 65D407E487; Wed, 24 May 2017 12:34:37 +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 7EDAC180BAF8; Wed, 24 May 2017 12:34:35 +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 v4OCYYMF002785 for ; Wed, 24 May 2017 08:34:34 -0400 Received: by smtp.corp.redhat.com (Postfix) id 90D897C756; Wed, 24 May 2017 12:34:34 +0000 (UTC) Received: from antique-work.brq.redhat.com (dhcp129-230.brq.redhat.com [10.34.129.230]) by smtp.corp.redhat.com (Postfix) with ESMTP id 1A7937C74C for ; Wed, 24 May 2017 12:34:32 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mx1.redhat.com C92B8C04B32C Authentication-Results: ext-mx07.extmail.prod.ext.phx2.redhat.com; dmarc=none (p=none dis=none) header.from=redhat.com Authentication-Results: ext-mx07.extmail.prod.ext.phx2.redhat.com; spf=pass smtp.mailfrom=libvir-list-bounces@redhat.com DKIM-Filter: OpenDKIM Filter v2.11.0 mx1.redhat.com C92B8C04B32C From: Pavel Hrdina To: libvir-list@redhat.com Date: Wed, 24 May 2017 14:34:31 +0200 Message-Id: <065e89cf8bacd4a86bc1a1f0ee91ce086ed1202e.1495629177.git.phrdina@redhat.com> X-Scanned-By: MIMEDefang 2.79 on 10.5.11.14 X-loop: libvir-list@redhat.com Subject: [libvirt] [PATCH] conf: fix build issue caused by shadowing global declaration 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.13 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.31]); Wed, 24 May 2017 12:34:38 +0000 (UTC) X-ZohoMail: RSF_0 Z_629925259 SPT_0 Content-Type: text/plain; charset="utf-8" Signed-off-by: Pavel Hrdina --- Pushed under build-breaker rule. src/conf/domain_conf.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index 32234e8a54..d3c6e9c0ab 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -3525,12 +3525,12 @@ void virDomainDeviceInfoClear(virDomainDeviceInfoPt= r info) =20 static bool virDomainSkipBackcompatConsole(virDomainDefPtr def, - size_t index, + size_t idx, bool all) { - virDomainChrDefPtr console =3D def->consoles[index]; + virDomainChrDefPtr console =3D def->consoles[idx]; =20 - if (!all && index =3D=3D 0 && + if (!all && idx =3D=3D 0 && (console->targetType =3D=3D VIR_DOMAIN_CHR_CONSOLE_TARGET_TYPE_SER= IAL || console->targetType =3D=3D VIR_DOMAIN_CHR_CONSOLE_TARGET_TYPE_NON= E) && def->os.type =3D=3D VIR_DOMAIN_OSTYPE_HVM) { --=20 2.13.0 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list