From 777eb71f932434647e5359e3a5fb89e7259a2aa2 Mon Sep 17 00:00:00 2001 From: Weidong Han <weidong.han@intel.com> Date: Fri, 6 Feb 2009 15:46:24 +0800 Subject: [PATCH 3/4] [backport] kvm: qemu: remove the useless parameter should pass &assigned_dev->dev to ipf_map_irq in while loop, the parameter PCIDevice *d is useless. And rename assign_dev_update_irq to assigned_dev_update_irqs() because it updates irq on all assigned devices. [ehabkost: changed prototype at hw/pci.c instead of hw/device-assignment.h] Signed-off-by: Weidong Han <weidong.han@intel.com> Signed-off-by: Avi Kivity <avi@redhat.com> Signed-off-by: Eduardo Habkost <ehabkost@redhat.com> Acked-by: Mark McLoughlin <markmc@redhat.com> Acked-by: Donald Dutile <ddutile@redhat.com> Bugzilla: 485318 --- qemu/hw/device-assignment.c | 4 ++-- qemu/hw/pci.c | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/qemu/hw/device-assignment.c b/qemu/hw/device-assignment.c index 916029b..8b9767a 100644 --- a/qemu/hw/device-assignment.c +++ b/qemu/hw/device-assignment.c @@ -493,7 +493,7 @@ static uint32_t calc_assigned_dev_id(uint8_t bus, uint8_t devfn) /* The pci config space got updated. Check if irq numbers have changed * for our devices */ -void assigned_dev_update_irq(PCIDevice *d) +void assigned_dev_update_irqs() { AssignedDevInfo *adev; @@ -507,7 +507,7 @@ void assigned_dev_update_irq(PCIDevice *d) irq = piix_get_irq(irq); #ifdef TARGET_IA64 - irq = ipf_map_irq(d, irq); + irq = ipf_map_irq(&assigned_dev->dev, irq); #endif if (irq != assigned_dev->girq) { diff --git a/qemu/hw/pci.c b/qemu/hw/pci.c index 4abf11b..5910c8a 100644 --- a/qemu/hw/pci.c +++ b/qemu/hw/pci.c @@ -51,7 +51,7 @@ struct PCIBus { static void pci_update_mappings(PCIDevice *d); static void pci_set_irq(void *opaque, int irq_num, int level); -void assigned_dev_update_irq(PCIDevice *d); +void assigned_dev_update_irqs(void); target_phys_addr_t pci_mem_base; static uint16_t pci_default_sub_vendor_id = PCI_SUBVENDOR_ID_REDHAT_QUMRANET; @@ -484,7 +484,7 @@ void pci_default_write_config(PCIDevice *d, if (kvm_enabled() && qemu_kvm_irqchip_in_kernel() && address >= PIIX_CONFIG_IRQ_ROUTE && address < PIIX_CONFIG_IRQ_ROUTE + 4) - assigned_dev_update_irq(d); + assigned_dev_update_irqs(); #endif /* USE_KVM_DEVICE_ASSIGNMENT */ end = address + len; -- 1.6.1