From patchwork Fri Jun 30 04:11:26 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: 9819285 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 ACB90603D7 for ; Fri, 30 Jun 2017 11:13:25 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 9CE0328632 for ; Fri, 30 Jun 2017 11:13:25 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 8D97828634; Fri, 30 Jun 2017 11:13:25 +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 0B07A2861B for ; Fri, 30 Jun 2017 11:13:25 +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 1dQtpa-0000Ab-4G; Fri, 30 Jun 2017 11:11:22 +0000 Received: from mail6.bemta6.messagelabs.com ([193.109.254.103]) by lists.xenproject.org with esmtp (Exim 4.84_2) (envelope-from ) id 1dQtpY-0000AI-FT for xen-devel@lists.xensource.com; Fri, 30 Jun 2017 11:11:20 +0000 Received: from [193.109.254.147] by server-4.bemta-6.messagelabs.com id 0E/5D-02962-7D136595; Fri, 30 Jun 2017 11:11:19 +0000 X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFnrELMWRWlGSWpSXmKPExsXS1tbhqHvNMCz S4PRJdYt7U96zOzB6bO/bxR7AGMWamZeUX5HAmrF3zQrWgtciFceO32JsYJzN38XIxSEkMI1R 4t6BaWxdjJwcEgK8EkeWzWCFsP0l1p37zQRiCwlUSTz8PZcdxGYT0JZY+/cUWL2IgKLEutXvW EBsZoFoiTtzV4PVCAsUSFw4PocZxGYRUJWYM+kB2ExeAXeJ/X/b2CHmy0ncPNfJPIGRewEjwy pGjeLUorLUIl1DA72kosz0jJLcxMwcIM9MLze1uDgxPTUnMalYLzk/dxMj0L8MQLCD8d6ygEO MkhxMSqK8K6+FRgrxJeWnVGYkFmfEF5XmpBYfYpTh4FCS4A02CIsUEixKTU+tSMvMAQYaTFqC g0dJhPfRU6BW3uKCxNzizHSI1ClGXY5jM35+YxJiycvPS5US5+0DmSEAUpRRmgc3Ahb0lxhlp YR5GYGOEuIpSC3KzSxBlX/FKM7BqCTMawmMISGezLwSuE2vgI5gAjpCeEYIyBEliQgpqQbGnV MUw2If1y6fJ2jXK3HJ0Cyq+97vlhtz9vrdPsxlkvD8kNfeZ3N2VAvGqwvumsRedvjt/9INCiv Ce48KtbW5+E93CAnUT9U12TGv/XTr822n5S5oFicKb+9yba/+Ifh0Y0aeBt9mBacZ5UHSRYf7 G8UYxD0nT7vX9TTgEE/T6dmfn7gcqZmsxFKckWioxVxUnAgAWBtWxnUCAAA= X-Env-Sender: xiong.y.zhang@intel.com X-Msg-Ref: server-15.tower-27.messagelabs.com!1498821076!52106899!1 X-Originating-IP: [134.134.136.65] X-SpamReason: No, hits=0.8 required=7.0 tests=DATE_IN_PAST_06_12 X-StarScan-Received: X-StarScan-Version: 9.4.25; banners=-,-,- X-VirusChecked: Checked Received: (qmail 57023 invoked from network); 30 Jun 2017 11:11:18 -0000 Received: from mga03.intel.com (HELO mga03.intel.com) (134.134.136.65) by server-15.tower-27.messagelabs.com with DHE-RSA-AES256-GCM-SHA384 encrypted SMTP; 30 Jun 2017 11:11:18 -0000 Received: from orsmga003.jf.intel.com ([10.7.209.27]) by orsmga103.jf.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 30 Jun 2017 04:10:43 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.40,286,1496127600"; d="scan'208";a="987176515" Received: from test-kbl.bj.intel.com ([10.238.158.145]) by orsmga003.jf.intel.com with ESMTP; 30 Jun 2017 04:10:41 -0700 From: Xiong Zhang To: xen-devel@lists.xensource.com Date: Fri, 30 Jun 2017 12:11:26 +0800 Message-Id: <1498795887-23149-1-git-send-email-xiong.y.zhang@intel.com> X-Mailer: git-send-email 2.7.4 Cc: Xiong Zhang , ian.jackson@eu.citrix.com, wei.liu2@citrix.com Subject: [Xen-devel] [PATCH 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 Signed-off-by: Xiong Zhang --- tools/libxl/libxl_pci.c | 45 +++++++++++++++++++++++++++------------------ 1 file changed, 27 insertions(+), 18 deletions(-) diff --git a/tools/libxl/libxl_pci.c b/tools/libxl/libxl_pci.c index b14df16..cefd7d8 100644 --- a/tools/libxl/libxl_pci.c +++ b/tools/libxl/libxl_pci.c @@ -531,6 +531,32 @@ 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; + + 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); + return ERROR_FAIL; + } + 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); + return ERROR_FAIL; + } + + return 0; +} + typedef struct { uint16_t vendor; uint16_t device; @@ -1652,27 +1678,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); - 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); + if (sysfs_dev_get_class(gc, pcidev, &pci_device_class)) continue; - } if (pci_device_class != 0x030000) /* VGA class */ continue;