[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH v3 8/9] device-assignment: Make use of config_map
From: |
Alex Williamson |
Subject: |
[Qemu-devel] [PATCH v3 8/9] device-assignment: Make use of config_map |
Date: |
Fri, 19 Nov 2010 16:20:56 -0700 |
User-agent: |
StGIT/0.14.3 |
We can figure out the capability being touched much more quickly
and efficiently with the config_map. Use it.
Signed-off-by: Alex Williamson <address@hidden>
---
hw/device-assignment.c | 32 +++++++++++++++++++-------------
1 files changed, 19 insertions(+), 13 deletions(-)
diff --git a/hw/device-assignment.c b/hw/device-assignment.c
index 970ffa1..832c236 100644
--- a/hw/device-assignment.c
+++ b/hw/device-assignment.c
@@ -1254,28 +1254,34 @@ static void assigned_dev_update_msix(PCIDevice
*pci_dev, unsigned int ctrl_pos)
static void assigned_device_pci_cap_write_config(PCIDevice *pci_dev, uint32_t
address,
uint32_t val, int len)
{
- AssignedDevice *assigned_dev = container_of(pci_dev, AssignedDevice, dev);
+ uint8_t cap_id = pci_dev->config_map[address];
pci_default_write_config(pci_dev, address, val, len);
+ switch (cap_id) {
#ifdef KVM_CAP_IRQ_ROUTING
+ case PCI_CAP_ID_MSI:
#ifdef KVM_CAP_DEVICE_MSI
- if (assigned_dev->cap.available & ASSIGNED_DEVICE_CAP_MSI) {
- int pos = pci_find_capability(pci_dev, PCI_CAP_ID_MSI);
- if (ranges_overlap(address, len, pos + PCI_MSI_FLAGS, 1)) {
- assigned_dev_update_msi(pci_dev, pos + PCI_MSI_FLAGS);
+ {
+ uint8_t cap = pci_find_capability(pci_dev, cap_id);
+ if (ranges_overlap(address - cap, len, PCI_MSI_FLAGS, 1)) {
+ assigned_dev_update_msi(pci_dev, cap + PCI_MSI_FLAGS);
+ }
}
- }
#endif
+ break;
+
+ case PCI_CAP_ID_MSIX:
#ifdef KVM_CAP_DEVICE_MSIX
- if (assigned_dev->cap.available & ASSIGNED_DEVICE_CAP_MSIX) {
- int pos = pci_find_capability(pci_dev, PCI_CAP_ID_MSIX);
- if (ranges_overlap(address, len, pos + PCI_MSIX_FLAGS + 1, 1)) {
- assigned_dev_update_msix(pci_dev, pos + PCI_MSIX_FLAGS);
- }
- }
+ {
+ uint8_t cap = pci_find_capability(pci_dev, cap_id);
+ if (ranges_overlap(address - cap, len, PCI_MSIX_FLAGS + 1, 1)) {
+ assigned_dev_update_msix(pci_dev, cap + PCI_MSIX_FLAGS);
+ }
+ }
#endif
+ break;
#endif
- return;
+ }
}
static int assigned_device_pci_cap_init(PCIDevice *pci_dev)
- [Qemu-devel] [PATCH v3 0/9] PCI capability and device assignment improvements, Alex Williamson, 2010/11/19
- [Qemu-devel] [PATCH v3 1/9] pci: pci_default_cap_write_config ignores wmask, Alex Williamson, 2010/11/19
- [Qemu-devel] [PATCH v3 2/9] pci: Remove pci_enable_capability_support(), Alex Williamson, 2010/11/19
- [Qemu-devel] [PATCH v3 3/9] device-assignment: Use PCI capabilities support, Alex Williamson, 2010/11/19
- [Qemu-devel] [PATCH v3 4/9] pci: Replace used bitmap with config byte map, Alex Williamson, 2010/11/19
- [Qemu-devel] [PATCH v3 5/9] pci: Remove cap.length, cap.start, cap.supported, Alex Williamson, 2010/11/19
- [Qemu-devel] [PATCH v3 6/9] device-assignment: Move PCI capabilities to match physical hardware, Alex Williamson, 2010/11/19
- [Qemu-devel] [PATCH v3 7/9] pci: Remove capability specific handlers, Alex Williamson, 2010/11/19
- [Qemu-devel] [PATCH v3 8/9] device-assignment: Make use of config_map,
Alex Williamson <=
- [Qemu-devel] [PATCH v3 9/9] device-assignment: pass through and stub more PCI caps, Alex Williamson, 2010/11/19
- [Qemu-devel] Re: [PATCH v3 0/9] PCI capability and device assignment improvements, Marcelo Tosatti, 2010/11/30