| Message ID | 1235982573-6932-4-git-send-email-sheng@linux.intel.com (mailing list archive) |
|---|---|
| State | Accepted |
| Headers | show |
On Mon, Mar 02, 2009 at 04:29:26PM +0800, Sheng Yang wrote: > 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 <allen.m.kay@intel.com> > Signed-off-by: Sheng Yang <sheng@linux.intel.com> > --- > 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 c9a3b8e..fc05ac7 100644 > --- a/qemu/hw/device-assignment.c > +++ b/qemu/hw/device-assignment.c > @@ -219,6 +219,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; Don't you need to handle cardbus capability list offset? -- To unsubscribe from this list: send the line "unsubscribe kvm" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
On Tuesday 03 March 2009 20:50:16 Marcelo Tosatti wrote: > On Mon, Mar 02, 2009 at 04:29:26PM +0800, Sheng Yang wrote: > > 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 <allen.m.kay@intel.com> > > Signed-off-by: Sheng Yang <sheng@linux.intel.com> > > --- > > 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 c9a3b8e..fc05ac7 100644 > > --- a/qemu/hw/device-assignment.c > > +++ b/qemu/hw/device-assignment.c > > @@ -219,6 +219,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; > > Don't you need to handle cardbus capability list offset? I think cardbus and PCI bridge are out of our scope for now... Maybe we should prohibit from assigning them.
diff --git a/qemu/hw/device-assignment.c b/qemu/hw/device-assignment.c index c9a3b8e..fc05ac7 100644 --- a/qemu/hw/device-assignment.c +++ b/qemu/hw/device-assignment.c @@ -219,6 +219,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 da775d7..0fd78de 100644 --- a/qemu/hw/device-assignment.h +++ b/qemu/hw/device-assignment.h @@ -29,6 +29,7 @@ #define __DEVICE_ASSIGNMENT_H__ #include <sys/mman.h> +#include <pci/pci.h> #include "qemu-common.h" #include "sys-queue.h" #include "pci.h"