From 99d6e585429d397a266ae85f7d49821fe8ba116b Mon Sep 17 00:00:00 2001 From: Mark McLoughlin <markmc@redhat.com> Date: Thu, 21 May 2009 17:08:33 -0700 Subject: [PATCH 04/15] kvm: qemu: device-assignment: add assigned_dev_update_irq() prototype MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit Fixes: qemu/hw/device-assignment.c:494: warning: no previous prototype for ‘assigned_dev_update_irq’ [chrisw: rectify against 777eb71f: [backport] kvm: qemu: remove the useless parameter] Signed-off-by: Mark McLoughlin <markmc@redhat.com> Signed-off-by: Avi Kivity <avi@redhat.com> (cherry picked from commit 855a58d22caae24c4775e9742ce6b449a44675ef) Signed-off-by: Chris Wright <chrisw@redhat.com> Bugzilla: 498084 Message-Id: <1242950924-30161-3-git-send-email-chrisw@redhat.com> Signed-off-by: Eduardo Habkost <ehabkost@redhat.com> RH-Upstream-status: applied Acked-by: Juan Quintela <quintela@redhat.com> Acked-by: Marcelo Tosatti <mtosatti@redhat.com> Acked-by: Don Dutile <ddutile@redhat.com> --- qemu/hw/device-assignment.h | 1 + qemu/hw/pci.c | 4 ++-- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/qemu/hw/device-assignment.h b/qemu/hw/device-assignment.h index a565948..f216bb0 100644 --- a/qemu/hw/device-assignment.h +++ b/qemu/hw/device-assignment.h @@ -99,6 +99,7 @@ PCIDevice *init_assigned_device(AssignedDevInfo *adev, PCIBus *bus); AssignedDevInfo *add_assigned_device(const char *arg); void add_assigned_devices(PCIBus *bus, const char **devices, int n_devices); ram_addr_t assigned_dev_load_option_roms(ram_addr_t rom_base_offset); +void assigned_dev_update_irqs(void); #define MAX_DEV_ASSIGN_CMDLINE 8 diff --git a/qemu/hw/pci.c b/qemu/hw/pci.c index a7afb73..f4aed9e 100644 --- a/qemu/hw/pci.c +++ b/qemu/hw/pci.c @@ -26,9 +26,10 @@ #include "console.h" #include "net.h" #include "virtio-net.h" +#include "sysemu.h" #include "pc.h" #include "qemu-kvm.h" -#include "sysemu.h" +#include "device-assignment.h" //#define DEBUG_PCI @@ -52,7 +53,6 @@ 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_irqs(void); target_phys_addr_t pci_mem_base; static uint16_t pci_default_sub_vendor_id = PCI_SUBVENDOR_ID_REDHAT_QUMRANET; -- 1.6.3.rc4.29.g8146