From patchwork Sun Jul 2 19:25:52 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Zhang, Xiong Y" X-Patchwork-Id: 9821877 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id F287B6035F for ; Mon, 3 Jul 2017 02:27:45 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id DCE9F22B27 for ; Mon, 3 Jul 2017 02:27:45 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id CDF58252D5; Mon, 3 Jul 2017 02:27:45 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-2.7 required=2.0 tests=BAYES_00, DATE_IN_PAST_06_12, RCVD_IN_DNSWL_MED autolearn=ham version=3.3.1 Received: from lists.xenproject.org (lists.xenproject.org [192.237.175.120]) (using TLSv1.2 with cipher AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 382BD22B27 for ; Mon, 3 Jul 2017 02:27:44 +0000 (UTC) Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.84_2) (envelope-from ) id 1dRr3Q-0000RP-6w; Mon, 03 Jul 2017 02:25:36 +0000 Received: from mail6.bemta6.messagelabs.com ([193.109.254.103]) by lists.xenproject.org with esmtp (Exim 4.84_2) (envelope-from ) id 1dRr3O-0000RJ-Rr for xen-devel@lists.xensource.com; Mon, 03 Jul 2017 02:25:34 +0000 Received: from [85.158.143.35] by server-11.bemta-6.messagelabs.com id 95/84-03612-E1BA9595; Mon, 03 Jul 2017 02:25:34 +0000 X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFvrJLMWRWlGSWpSXmKPExsXS1tYhoSu7OjL S4PNGJYt7U96zOzB6bO/bxR7AGMWamZeUX5HAmrGwYyFTwWOxiq+/FrA2MJ4X6GLk4hASmM4o sfR7M1sXIyeHhACvxJFlM1ghbH+JhesmA8U5gIqqJO5+FwcJswloS6z9ewqsXERAUWLd6ncsI DazQLTEnbmr2UFsYYFiiU+L5oLFWQRUJZ4f3w4W5xVwlzjydQk7xHg5iZvnOplBbE4BD4kVK/ 8ygdhCQDUvJ69im8DIu4CRYRWjRnFqUVlqka6RuV5SUWZ6RkluYmaOrqGBmV5uanFxYnpqTmJ SsV5yfu4mRmAwMADBDsbFawMPMUpyMCmJ8q68FhopxJeUn1KZkVicEV9UmpNafIhRhoNDSYL3 2crISCHBotT01Iq0zBxgWMKkJTh4lER4r/kApXmLCxJzizPTIVKnGHU5Xk34/41JiCUvPy9VS pz3PMgMAZCijNI8uBGwGLnEKCslzMsIdJQQT0FqUW5mCar8K0ZxDkYlYd5okCk8mXklcJteAR 3BBHREQ08EyBEliQgpqQbG3iIzhYqiAyWxQpo9/KoiR7v2+yU/Zpu5dOM3uTOLbz4XqLkosHX 5t5UHF1w4fHHS9bRHuhNaOA/Nr5fwnrGQ3fTw1M/Ji/b/zqkRuDV1980T+wz2NW/bZhw3d0pv Xg+7ml73Sx13B8kLU6rPc9cxfg3a234k323fFv3/zrmfDAqN3oSfYNzHrMRSnJFoqMVcVJwIA HrVtveMAgAA X-Env-Sender: xiong.y.zhang@intel.com X-Msg-Ref: server-6.tower-21.messagelabs.com!1499048731!48290330!1 X-Originating-IP: [134.134.136.24] X-SpamReason: No, hits=0.0 required=7.0 tests=sa_preprocessor: VHJ1c3RlZCBJUDogMTM0LjEzNC4xMzYuMjQgPT4gMzkwOTcx\n X-StarScan-Received: X-StarScan-Version: 9.4.25; banners=-,-,- X-VirusChecked: Checked Received: (qmail 52928 invoked from network); 3 Jul 2017 02:25:33 -0000 Received: from mga09.intel.com (HELO mga09.intel.com) (134.134.136.24) by server-6.tower-21.messagelabs.com with DHE-RSA-AES256-GCM-SHA384 encrypted SMTP; 3 Jul 2017 02:25:33 -0000 Received: from fmsmga005.fm.intel.com ([10.253.24.32]) by orsmga102.jf.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 02 Jul 2017 19:25:30 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.40,300,1496127600"; d="scan'208";a="121599786" Received: from test-kbl.bj.intel.com ([10.238.158.145]) by fmsmga005.fm.intel.com with ESMTP; 02 Jul 2017 19:25:28 -0700 From: Xiong Zhang To: xen-devel@lists.xensource.com Date: Mon, 3 Jul 2017 03:25:52 +0800 Message-Id: <1499023553-30703-1-git-send-email-xiong.y.zhang@intel.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1498795887-23149-1-git-send-email-xiong.y.zhang@intel.com> References: <1498795887-23149-1-git-send-email-xiong.y.zhang@intel.com> Cc: Xiong Zhang , ian.jackson@eu.citrix.com, wei.liu2@citrix.com Subject: [Xen-devel] [PATCH v2 1/2] tools/libxl/libxl_pci.c: Extract sysfs_dev_get_class from libxl__grant_vga_iomem_permission X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: xen-devel-bounces@lists.xen.org Sender: "Xen-devel" X-Virus-Scanned: ClamAV using ClamSMTP No functional change. Just extract this function for next patch and avoid code repetition. Signed-off-by: Xiong Zhang Acked-by: Wei Liu --- Changes in v2: -Add No functional change in commit message -Use 'goto out' style error handling --- tools/libxl/libxl_pci.c | 47 +++++++++++++++++++++++++++++------------------ 1 file changed, 29 insertions(+), 18 deletions(-) diff --git a/tools/libxl/libxl_pci.c b/tools/libxl/libxl_pci.c index b14df16..d109930 100644 --- a/tools/libxl/libxl_pci.c +++ b/tools/libxl/libxl_pci.c @@ -531,6 +531,34 @@ static uint16_t sysfs_dev_get_device(libxl__gc *gc, libxl_device_pci *pcidev) return pci_device_device; } +static int sysfs_dev_get_class(libxl__gc *gc, libxl_device_pci *pcidev, + unsigned long *class) +{ + char *pci_device_class_path = GCSPRINTF(SYSFS_PCI_DEV"/"PCI_BDF"/class", + pcidev->domain, pcidev->bus, pcidev->dev, pcidev->func); + int read_items, ret = 0; + + FILE *f = fopen(pci_device_class_path, "r"); + if (!f) { + LOGE(ERROR, + "pci device "PCI_BDF" does not have class attribute", + pcidev->domain, pcidev->bus, pcidev->dev, pcidev->func); + ret = ERROR_FAIL; + goto out; + } + read_items = fscanf(f, "0x%lx\n", class); + fclose(f); + if (read_items != 1) { + LOGE(ERROR, + "cannot read class of pci device "PCI_BDF, + pcidev->domain, pcidev->bus, pcidev->dev, pcidev->func); + ret = ERROR_FAIL; + } + +out: + return ret; +} + typedef struct { uint16_t vendor; uint16_t device; @@ -1652,27 +1680,10 @@ int libxl__grant_vga_iomem_permission(libxl__gc *gc, const uint32_t domid, uint64_t vga_iomem_start = 0xa0000 >> XC_PAGE_SHIFT; uint32_t stubdom_domid; libxl_device_pci *pcidev = &d_config->pcidevs[i]; - char *pci_device_class_path = - GCSPRINTF(SYSFS_PCI_DEV"/"PCI_BDF"/class", - pcidev->domain, pcidev->bus, pcidev->dev, pcidev->func); - int read_items; unsigned long pci_device_class; - FILE *f = fopen(pci_device_class_path, "r"); - if (!f) { - LOGED(ERROR, domid, - "pci device "PCI_BDF" does not have class attribute", - pcidev->domain, pcidev->bus, pcidev->dev, pcidev->func); + if (sysfs_dev_get_class(gc, pcidev, &pci_device_class)) continue; - } - read_items = fscanf(f, "0x%lx\n", &pci_device_class); - fclose(f); - if (read_items != 1) { - LOGED(ERROR, domid, - "cannot read class of pci device "PCI_BDF, - pcidev->domain, pcidev->bus, pcidev->dev, pcidev->func); - continue; - } if (pci_device_class != 0x030000) /* VGA class */ continue;