@@ -11,7 +11,7 @@
*/
#include "hw/isa/i8259_internal.h"
#include "hw/i386/apic_internal.h"
-#include "sysemu/kvm.h"
+#include "kvm_i386.h"
#define TYPE_KVM_I8259 "kvm-i8259"
#define KVM_PIC_CLASS(class) \
@@ -13,7 +13,7 @@
#include "hw/i386/pc.h"
#include "hw/i386/ioapic_internal.h"
#include "hw/i386/apic_internal.h"
-#include "sysemu/kvm.h"
+#include "kvm_i386.h"
/* PC Utility function */
void kvm_pc_setup_irq_routing(bool pci_enabled)
@@ -35,7 +35,7 @@
#include "net/net.h"
#include "hw/boards.h"
#include "hw/ide.h"
-#include "sysemu/kvm.h"
+#include "kvm_i386.h"
#include "hw/kvm/clock.h"
#include "sysemu/sysemu.h"
#include "hw/sysbus.h"
@@ -34,7 +34,7 @@
#include "hw/boards.h"
#include "hw/timer/mc146818rtc.h"
#include "hw/xen/xen.h"
-#include "sysemu/kvm.h"
+#include "kvm_i386.h"
#include "hw/kvm/clock.h"
#include "hw/pci-host/q35.h"
#include "exec/address-spaces.h"
@@ -72,7 +72,6 @@ bool parallel_mm_init(MemoryRegion *address_space,
extern DeviceState *isa_pic;
qemu_irq *i8259_init(ISABus *bus, qemu_irq parent_irq);
-qemu_irq *kvm_i8259_init(ISABus *bus);
int pic_read_irq(DeviceState *d);
int pic_get_output(DeviceState *d);
void pic_info(Monitor *mon, const QDict *qdict);
@@ -322,8 +322,6 @@ void kvm_irqchip_release_virq(KVMState *s, int virq);
int kvm_irqchip_add_irqfd_notifier(KVMState *s, EventNotifier *n,
EventNotifier *rn, int virq);
int kvm_irqchip_remove_irqfd_notifier(KVMState *s, EventNotifier *n, int virq);
-void kvm_pc_gsi_handler(void *opaque, int n, int level);
-void kvm_pc_setup_irq_routing(bool pci_enabled);
void kvm_init_irq_routing(KVMState *s);
/**
@@ -51,9 +51,15 @@ int kvm_device_msix_assign(KVMState *s, uint32_t dev_id);
int kvm_device_msix_deassign(KVMState *s, uint32_t dev_id);
#if defined(CONFIG_KVM)
+void kvm_pc_gsi_handler(void *opaque, int n, int level);
+void kvm_pc_setup_irq_routing(bool pci_enabled);
+qemu_irq *kvm_i8259_init(ISABus *bus);
uint32_t kvm_arch_get_supported_cpuid(KVMState *env, uint32_t function,
uint32_t index, int reg);
#else
+static inline void kvm_pc_gsi_handler(void *opaque, int n, int level) {}
+static inline void kvm_pc_setup_irq_routing(bool pci_enabled) {}
+static inline qemu_irq *kvm_i8259_init(ISABus *bus) {return NULL;}
static inline uint32_t kvm_arch_get_supported_cpuid(KVMState *env, uint32_t function,
uint32_t index, int reg)
{
Probably no one uses disable-kvm for x86_64. Also move 3 kvm-i386 function declarations from sysemu/kvm.h => target-i386/kvm_i386.h - kvm_pc_gsi_handler() - kvm_pc_setup_irq_routing() - kvm_i8259_init() Signed-off-by: Xuebing Wang <xbing6@gmail.com> --- hw/i386/kvm/i8259.c | 2 +- hw/i386/kvm/ioapic.c | 2 +- hw/i386/pc_piix.c | 2 +- hw/i386/pc_q35.c | 2 +- include/hw/i386/pc.h | 1 - include/sysemu/kvm.h | 2 -- target-i386/kvm_i386.h | 6 ++++++ 7 files changed, 10 insertions(+), 7 deletions(-)