From nobody Sun Apr 28 12:17:51 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of redhat.com designates 209.132.183.39 as permitted sender) client-ip=209.132.183.39; envelope-from=libvir-list-bounces@redhat.com; helo=mx6-phx2.redhat.com; Authentication-Results: mx.zoho.com; spf=pass (zoho.com: domain of redhat.com designates 209.132.183.39 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; Return-Path: Received: from mx6-phx2.redhat.com (mx6-phx2.redhat.com [209.132.183.39]) by mx.zohomail.com with SMTPS id 148864260849324.320023396145416; Sat, 4 Mar 2017 07:50:08 -0800 (PST) Received: from lists01.pubmisc.prod.ext.phx2.redhat.com (lists01.pubmisc.prod.ext.phx2.redhat.com [10.5.19.33]) by mx6-phx2.redhat.com (8.14.4/8.14.4) with ESMTP id v24FkfSo020736; Sat, 4 Mar 2017 10:46:41 -0500 Received: from int-mx11.intmail.prod.int.phx2.redhat.com (int-mx11.intmail.prod.int.phx2.redhat.com [10.5.11.24]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id v24Fkdvk015665 for ; Sat, 4 Mar 2017 10:46:39 -0500 Received: from localhost.localdomain.com (ovpn-116-78.phx2.redhat.com [10.3.116.78]) by int-mx11.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id v24Fkc9c019549 for ; Sat, 4 Mar 2017 10:46:39 -0500 From: John Ferlan To: libvir-list@redhat.com Date: Sat, 4 Mar 2017 10:46:34 -0500 Message-Id: <20170304154634.27801-1-jferlan@redhat.com> X-Scanned-By: MIMEDefang 2.68 on 10.5.11.24 X-loop: libvir-list@redhat.com Subject: [libvirt] [PATCH] node: Replace variable named 'system' with 'syscap' 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-ZohoMail: RSF_0 Z_629925259 SPT_0 Content-Type: text/plain; charset="utf-8" Changes in commit id 'dec6d9df' caused a compilation failure on a RHEL6 CI build environment. So just replace 'system' with 'syscap' as a name. cc1: warnings being treated as errors ../../src/conf/node_device_conf.c: In function 'virNodeDevCapSystemParseXML= ': ../../src/conf/node_device_conf.c:1415: error: declaration of 'system' shad= ows a global declaration [-Wshadow] Signed-off-by: John Ferlan --- Pushed as a build breaker src/conf/node_device_conf.c | 8 ++++---- src/node_device/node_device_udev.c | 8 ++++---- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/src/conf/node_device_conf.c b/src/conf/node_device_conf.c index d60f69d..3565aec 100644 --- a/src/conf/node_device_conf.c +++ b/src/conf/node_device_conf.c @@ -1412,10 +1412,10 @@ static int virNodeDevCapSystemParseXML(xmlXPathContextPtr ctxt, virNodeDeviceDefPtr def, xmlNodePtr node, - virNodeDevCapSystemPtr system) + virNodeDevCapSystemPtr syscap) { - virNodeDevCapSystemHardwarePtr hardware =3D &system->hardware; - virNodeDevCapSystemFirmwarePtr firmware =3D &system->firmware; + virNodeDevCapSystemHardwarePtr hardware =3D &syscap->hardware; + virNodeDevCapSystemFirmwarePtr firmware =3D &syscap->firmware; xmlNodePtr orignode; int ret =3D -1; char *tmp; @@ -1423,7 +1423,7 @@ virNodeDevCapSystemParseXML(xmlXPathContextPtr ctxt, orignode =3D ctxt->node; ctxt->node =3D node; =20 - system->product_name =3D virXPathString("string(./product[1])", ctxt); + syscap->product_name =3D virXPathString("string(./product[1])", ctxt); =20 hardware->vendor_name =3D virXPathString("string(./hardware/vendor[1])= ", ctxt); hardware->version =3D virXPathString("string(./hardware/version[1]= )", ctxt); diff --git a/src/node_device/node_device_udev.c b/src/node_device/node_devi= ce_udev.c index af44604..bcae444 100644 --- a/src/node_device/node_device_udev.c +++ b/src/node_device/node_device_udev.c @@ -1420,12 +1420,12 @@ static void udevEventHandleCallback(int watch ATTRI= BUTE_UNUSED, /* DMI is intel-compatible specific */ #if defined(__x86_64__) || defined(__i386__) || defined(__amd64__) static void -udevGetDMIData(virNodeDevCapSystemPtr system) +udevGetDMIData(virNodeDevCapSystemPtr syscap) { struct udev *udev =3D NULL; struct udev_device *device =3D NULL; - virNodeDevCapSystemHardwarePtr hardware =3D &system->hardware; - virNodeDevCapSystemFirmwarePtr firmware =3D &system->firmware; + virNodeDevCapSystemHardwarePtr hardware =3D &syscap->hardware; + virNodeDevCapSystemFirmwarePtr firmware =3D &syscap->firmware; =20 udev =3D udev_monitor_get_udev(DRV_STATE_UDEV_MONITOR(driver)); =20 @@ -1441,7 +1441,7 @@ udevGetDMIData(virNodeDevCapSystemPtr system) } =20 if (udevGetStringSysfsAttr(device, "product_name", - &system->product_name) < 0) + &syscap->product_name) < 0) goto cleanup; if (udevGetStringSysfsAttr(device, "sys_vendor", &hardware->vendor_name) < 0) --=20 2.9.3 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list