This patch provides the file ioapic-kvm.c, which implements a schim over
the kvm in-kernel IO APIC.
Signed-off-by: Glauber Costa <glommer@xxxxxxxxxx>
---
Makefile.target | 2 +
hw/ioapic-kvm.c | 89 +++++++++++++++++++++++++++++++++++++++++++++++++++++++
hw/pc.c | 7 ++++-
hw/pc.h | 2 +
kvm-all.c | 18 +++++++++++
kvm.h | 4 ++
6 files changed, 121 insertions(+), 1 deletions(-)
create mode 100644 hw/ioapic-kvm.c
diff --git a/Makefile.target b/Makefile.target
index 4c4d397..78aff3c 100644
--- a/Makefile.target
+++ b/Makefile.target
@@ -213,6 +213,8 @@ obj-i386-y += usb-uhci.o vmmouse.o vmport.o vmware_vga.o hpet.o
obj-i386-y += device-hotplug.o pci-hotplug.o smbios.o wdt_ib700.o
obj-i386-y += ne2000-isa.o debugcon.o multiboot.o
+obj-i386-$(CONFIG_KVM) += ioapic-kvm.o
+
# shared objects
obj-ppc-y = ppc.o ide/core.o ide/qdev.o ide/isa.o ide/pci.o ide/macio.o
obj-ppc-y += ide/cmd646.o
diff --git a/hw/ioapic-kvm.c b/hw/ioapic-kvm.c
new file mode 100644
index 0000000..78e0984
--- /dev/null
+++ b/hw/ioapic-kvm.c
@@ -0,0 +1,89 @@
+#include "hw.h"
+#include "pc.h"
+#include "qemu-timer.h"
+#include "host-utils.h"
+#include "kvm.h"
+
+#define IOAPIC_NUM_PINS 0x18
+#define IOAPIC_DEFAULT_BASE_ADDRESS 0xfec00000
+
+static void ioapic_reset(void *opaque)
+{
+ struct kvm_ioapic_state *s = opaque;
+ struct kvm_irqchip *chip;
+ int i;
+
+ chip = container_of(s, struct kvm_irqchip, chip.ioapic);
+
+ chip->chip_id = KVM_IRQCHIP_IOAPIC;
+
+ memset(s, 0, sizeof(*s));
+ s->base_address = IOAPIC_DEFAULT_BASE_ADDRESS;
+ for(i = 0; i < IOAPIC_NUM_PINS; i++)
+ s->redirtbl[i].bits = 1 << 16; /* mask LVT */
+
+ kvm_set_irqchip(chip);
+}
+
+static void ioapic_pre_save(void *opaque)
+{
+ struct kvm_ioapic_state *s = opaque;
+ struct kvm_irqchip *chip;
+
+ chip = container_of(s, struct kvm_irqchip, chip.ioapic);
+
+ kvm_get_irqchip(chip);
+}
+
+static int ioapic_post_load(void *opaque, int version_id)
+{
+ struct kvm_ioapic_state *s = opaque;
+ struct kvm_irqchip *chip;
+
+ chip = container_of(s, struct kvm_irqchip, chip.ioapic);
+
+ return kvm_set_irqchip(chip);
+}
+
+static const VMStateDescription vmstate_kvm_ioapic = {
+ .name = "ioapic-kvm",
+ .version_id = 1,
+ .minimum_version_id = 1,
+ .post_load = ioapic_post_load,
+ .pre_save = ioapic_pre_save,
+ .fields = (VMStateField []) {
+ /* Linux does not define __u64 the same as uint64_t */
+ VMSTATE_U64(base_address, struct kvm_ioapic_state),
+ VMSTATE_UINT32(id, struct kvm_ioapic_state),
+ VMSTATE_UINT32(ioregsel, struct kvm_ioapic_state),
+ VMSTATE_UINT32(irr, struct kvm_ioapic_state),
+ VMSTATE_ARRAY_UNSAFE(redirtbl, struct kvm_ioapic_state, IOAPIC_NUM_PINS, 0, vmstate_info_u64, __u64),
+ VMSTATE_END_OF_LIST()
+ }
+};
+
+
+static void kvm_ioapic_set_irq(void *opaque, int vector, int level)
+{
+/*
+ int pic_ret;
+
+ if (kvm_set_irq(vector, level, &pic_ret)) {
+ if (pic_ret != 0)
+ apic_set_irq_delivered();
+ return;
+ }
+*/
+}
+
+qemu_irq *kvm_ioapic_init(void)
+{
+ struct kvm_irqchip *s;
+
+ s = qemu_mallocz(sizeof(*s));
+
+ vmstate_register(0, &vmstate_kvm_ioapic, &s->chip.ioapic);
+ qemu_register_reset(ioapic_reset, &s->chip.ioapic);
+
+ return qemu_allocate_irqs(kvm_ioapic_set_irq, &s->chip.ioapic, IOAPIC_NUM_PINS);
+}
diff --git a/hw/pc.c b/hw/pc.c
index bdc297f..ce9e832 100644
--- a/hw/pc.c
+++ b/hw/pc.c
@@ -45,6 +45,7 @@
#include "loader.h"
#include "elf.h"
#include "multiboot.h"
+#include "kvm.h"
/* output Bochs bios info messages */
//#define DEBUG_BIOS
@@ -949,7 +950,11 @@ static void pc_init1(ram_addr_t ram_size,
register_ioport_write(0x92, 1, 1, ioport92_write, NULL);
if (pci_enabled) {
- isa_irq_state->ioapic = ioapic_init();
+ if (kvm_enabled() && kvm_irqchip_in_kernel()) {
+ isa_irq_state->ioapic = kvm_ioapic_init();
+ } else {
+ isa_irq_state->ioapic = ioapic_init();
+ }
}
pit = pit_init(0x40, isa_reserve_irq(0));
pcspk_init(pit);
diff --git a/hw/pc.h b/hw/pc.h
index 92f8563..8ccdf63 100644
--- a/hw/pc.h
+++ b/hw/pc.h
@@ -49,6 +49,8 @@ void ioapic_set_irq(void *opaque, int vector, int level);
void apic_reset_irq_delivered(void);
int apic_get_irq_delivered(void);
+qemu_irq *kvm_ioapic_init(void);
+
/* i8254.c */
#define PIT_FREQ 1193182
diff --git a/kvm-all.c b/kvm-all.c
index 1a02076..6417183 100644
--- a/kvm-all.c
+++ b/kvm-all.c
@@ -568,6 +568,24 @@ static CPUPhysMemoryClient kvm_cpu_phys_memory_client = {
.migration_log = kvm_client_migration_log,
};
+int kvm_set_irqchip(struct kvm_irqchip *chip)
+{
+ if (!kvm_state->irqchip_in_kernel) {
+ return 0;
+ }
+
+ return kvm_vm_ioctl(kvm_state, KVM_SET_IRQCHIP, chip);
+}
+
+int kvm_get_irqchip(struct kvm_irqchip *chip)
+{
+ if (!kvm_state->irqchip_in_kernel) {
+ return 0;
+ }
+
+ return kvm_vm_ioctl(kvm_state, KVM_GET_IRQCHIP, chip);
+}
+
int kvm_init(int smp_cpus)
{
static const char upgrade_note[] =
diff --git a/kvm.h b/kvm.h
index a74dfcb..812856e 100644
--- a/kvm.h
+++ b/kvm.h
@@ -16,6 +16,7 @@
#include "config.h"
#include "qemu-queue.h"
+#include <linux/kvm.h>
#ifdef CONFIG_KVM
extern int kvm_allowed;
@@ -60,6 +61,9 @@ int kvm_set_signal_mask(CPUState *env, const sigset_t *sigset);
int kvm_pit_in_kernel(void);
int kvm_irqchip_in_kernel(void);
+int kvm_set_irqchip(struct kvm_irqchip *chip);
+int kvm_get_irqchip(struct kvm_irqchip *chip);
+
/* internal API */
struct KVMState;
--
1.6.6
--
To unsubscribe from this list: send the line "unsubscribe kvm" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
