From patchwork Wed Jan 7 10:49:29 2009 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sheng Yang X-Patchwork-Id: 1140 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 n07Ak8QJ030323 for ; Wed, 7 Jan 2009 02:46:10 -0800 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751992AbZAGKtn (ORCPT ); Wed, 7 Jan 2009 05:49:43 -0500 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1751903AbZAGKtn (ORCPT ); Wed, 7 Jan 2009 05:49:43 -0500 Received: from mga11.intel.com ([192.55.52.93]:44087 "EHLO mga11.intel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752003AbZAGKtk (ORCPT ); Wed, 7 Jan 2009 05:49:40 -0500 Received: from fmsmga001.fm.intel.com ([10.253.24.23]) by fmsmga102.fm.intel.com with ESMTP; 07 Jan 2009 02:41:33 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="4.36,339,1228118400"; d="scan'208";a="655209514" Received: from syang10-desktop.sh.intel.com (HELO syang10-desktop) ([10.239.13.47]) by fmsmga001.fm.intel.com with ESMTP; 07 Jan 2009 02:50:03 -0800 Received: from yasker by syang10-desktop with local (Exim 4.69) (envelope-from ) id 1LKVyd-0005xp-NX; Wed, 07 Jan 2009 18:49:31 +0800 From: Sheng Yang To: Avi Kivity Cc: Anthony Liguori , kvm@vger.kernel.org, Sheng Yang , Allen Kay Subject: [PATCH 4/6] Figure out device capability Date: Wed, 7 Jan 2009 18:49:29 +0800 Message-Id: <1231325371-22896-5-git-send-email-sheng@linux.intel.com> X-Mailer: git-send-email 1.5.6.3 In-Reply-To: <1231325371-22896-1-git-send-email-sheng@linux.intel.com> References: <1231325371-22896-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 Try to figure out device capability in update_dev_cap(). Now we are only care about MSI capability. The function pci_find_cap_offset original function wrote by Allen for Xen. Notice the function need root privilege to work. This depends on libpci to work. Signed-off-by: Allen Kay Signed-off-by: Sheng Yang --- qemu/hw/device-assignment.c | 29 +++++++++++++++++++++++++++++ qemu/hw/device-assignment.h | 1 + 2 files changed, 30 insertions(+), 0 deletions(-) diff --git a/qemu/hw/device-assignment.c b/qemu/hw/device-assignment.c index f357d17..169357f 100644 --- a/qemu/hw/device-assignment.c +++ b/qemu/hw/device-assignment.c @@ -222,6 +222,35 @@ static void assigned_dev_ioport_map(PCIDevice *pci_dev, int region_num, (r_dev->v_addrs + region_num)); } +static uint8_t pci_find_cap_offset(struct pci_dev *pci_dev, uint8_t cap) +{ + int id; + int max_cap = 48; + int pos = PCI_CAPABILITY_LIST; + int status; + + status = pci_read_byte(pci_dev, PCI_STATUS); + if ((status & PCI_STATUS_CAP_LIST) == 0) + return 0; + + while (max_cap--) { + pos = pci_read_byte(pci_dev, pos); + if (pos < 0x40) + break; + + pos &= ~3; + id = pci_read_byte(pci_dev, pos + PCI_CAP_LIST_ID); + + if (id == 0xff) + break; + if (id == cap) + return pos; + + pos += PCI_CAP_LIST_NEXT; + } + return 0; +} + static void assigned_dev_pci_write_config(PCIDevice *d, uint32_t address, uint32_t val, int len) { diff --git a/qemu/hw/device-assignment.h b/qemu/hw/device-assignment.h index a565948..2d83566 100644 --- a/qemu/hw/device-assignment.h +++ b/qemu/hw/device-assignment.h @@ -29,6 +29,7 @@ #define __DEVICE_ASSIGNMENT_H__ #include +#include #include "qemu-common.h" #include "sys-queue.h" #include "pci.h"