From patchwork Thu Mar 12 13:36:58 2009 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sheng Yang X-Patchwork-Id: 11366 Received: from vger.kernel.org (vger.kernel.org [209.132.176.167]) by demeter.kernel.org (8.14.2/8.14.2) with ESMTP id n2CDc9B1026123 for ; Thu, 12 Mar 2009 13:38:10 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1756631AbZCLNhU (ORCPT ); Thu, 12 Mar 2009 09:37:20 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1756475AbZCLNhT (ORCPT ); Thu, 12 Mar 2009 09:37:19 -0400 Received: from mga01.intel.com ([192.55.52.88]:37385 "EHLO mga01.intel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1756527AbZCLNhF (ORCPT ); Thu, 12 Mar 2009 09:37:05 -0400 Received: from fmsmga001.fm.intel.com ([10.253.24.23]) by fmsmga101.fm.intel.com with ESMTP; 12 Mar 2009 06:29:27 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="4.38,350,1233561600"; d="scan'208";a="672385957" Received: from syang10-desktop.sh.intel.com (HELO syang10-desktop) ([10.239.13.189]) by fmsmga001.fm.intel.com with ESMTP; 12 Mar 2009 06:40:50 -0700 Received: from yasker by syang10-desktop with local (Exim 4.69) (envelope-from ) id 1Lhl5o-0007u7-Iy; Thu, 12 Mar 2009 21:37:00 +0800 From: Sheng Yang To: Avi Kivity , Marcelo Tosatti , Anthony Liguori Cc: kvm@vger.kernel.org, Sheng Yang Subject: [PATCH 15/16] KVM: Fill config with correct VID/DID Date: Thu, 12 Mar 2009 21:36:58 +0800 Message-Id: <1236865019-30321-16-git-send-email-sheng@linux.intel.com> X-Mailer: git-send-email 1.5.6.3 In-Reply-To: <1236865019-30321-1-git-send-email-sheng@linux.intel.com> References: <1236865019-30321-1-git-send-email-sheng@linux.intel.com> Sender: kvm-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: kvm@vger.kernel.org SRIOV's virtual function didn't show correct Vendor ID/Device ID in config, so we have to fill them manually according to device/vendor file in sysfs. Signed-off-by: Sheng Yang --- qemu/hw/device-assignment.c | 31 ++++++++++++++++++++++++++++++- 1 files changed, 30 insertions(+), 1 deletions(-) diff --git a/qemu/hw/device-assignment.c b/qemu/hw/device-assignment.c index 69f8e3a..ea67ce9 100644 --- a/qemu/hw/device-assignment.c +++ b/qemu/hw/device-assignment.c @@ -317,7 +317,8 @@ static uint32_t assigned_dev_pci_read_config(PCIDevice *d, uint32_t address, ssize_t ret; AssignedDevice *pci_dev = container_of(d, AssignedDevice, dev); - if ((address >= 0x10 && address <= 0x24) || address == 0x34 || + if (address < 0x4 || + (address >= 0x10 && address <= 0x24) || address == 0x34 || address == 0x3c || address == 0x3d || pci_access_cap_config(d, address, len)) { val = pci_default_read_config(d, address, len); @@ -429,6 +430,7 @@ static int get_real_device(AssignedDevice *pci_dev, uint8_t r_bus, int fd, r = 0; FILE *f; unsigned long long start, end, size, flags; + unsigned long id; PCIRegion *rp; PCIDevRegions *dev = &pci_dev->real_device; @@ -488,6 +490,33 @@ again: DEBUG("region %d size %d start 0x%llx type %d resource_fd %d\n", r, rp->size, start, rp->type, rp->resource_fd); } + + fclose(f); + + /* read and fill device ID */ + snprintf(name, sizeof(name), "%svendor", dir); + f = fopen(name, "r"); + if (f == NULL) { + fprintf(stderr, "%s: %s: %m\n", __func__, name); + return 1; + } + if (fscanf(f, "%li\n", &id) == 1) { + pci_dev->dev.config[0] = id & 0xff; + pci_dev->dev.config[1] = (id & 0xff00) >> 8; + } + fclose(f); + + /* read and fill vendor ID */ + snprintf(name, sizeof(name), "%sdevice", dir); + f = fopen(name, "r"); + if (f == NULL) { + fprintf(stderr, "%s: %s: %m\n", __func__, name); + return 1; + } + if (fscanf(f, "%li\n", &id) == 1) { + pci_dev->dev.config[2] = id & 0xff; + pci_dev->dev.config[3] = (id & 0xff00) >> 8; + } fclose(f); dev->region_number = r;