This device represents the KVM in-kernel PIC for an x86 machine.
Signed-off-by: Mark Cave-Ayland <[email protected]>
---
hw/i386/kvm/i8259.c | 91 +++++++++++++++++++++++++++++++++++++++++++--
1 file changed, 88 insertions(+), 3 deletions(-)
diff --git a/hw/i386/kvm/i8259.c b/hw/i386/kvm/i8259.c
index 9ee23b5695..c51738dd44 100644
--- a/hw/i386/kvm/i8259.c
+++ b/hw/i386/kvm/i8259.c
@@ -16,7 +16,9 @@
#include "qemu/module.h"
#include "hw/intc/kvm_irqcount.h"
#include "hw/core/irq.h"
+#include "hw/core/qdev-properties.h"
#include "system/kvm.h"
+#include "qapi/error.h"
#include "qom/object.h"
#define TYPE_KVM_I8259 "kvm-i8259"
@@ -36,6 +38,18 @@ struct KVMI8259Class {
DeviceRealize parent_realize;
};
+#define TYPE_KVM_I8259_PIC "kvm-i8259-pic"
+
+struct KVMI8259PICState {
+ DeviceState parent_obj;
+
+ ISABus *isabus;
+ KVMI8259State i8259[2];
+};
+
+OBJECT_DECLARE_SIMPLE_TYPE(KVMI8259PICState, KVM_I8259_PIC)
+
+
static void kvm_i8259_get(I8259CommonState *cs)
{
struct kvm_irqchip chip;
@@ -135,10 +149,21 @@ static void kvm_i8259_realize(DeviceState *dev, Error
**errp)
qemu_irq *kvm_i8259_init(ISABus *bus)
{
- i8259_init_chip(TYPE_KVM_I8259, bus, true);
- i8259_init_chip(TYPE_KVM_I8259, bus, false);
+ qemu_irq *irq_set;
+ DeviceState *dev;
+ int i;
+
+ irq_set = g_new0(qemu_irq, ISA_NUM_IRQS);
+
+ dev = qdev_new(TYPE_KVM_I8259_PIC);
+ object_property_set_link(OBJECT(dev), "bus", OBJECT(bus), &error_fatal);
+ qdev_realize_and_unref(dev, NULL, &error_fatal);
- return qemu_allocate_irqs(kvm_pic_set_irq, NULL, ISA_NUM_IRQS);
+ for (i = 0 ; i < ISA_NUM_IRQS; i++) {
+ irq_set[i] = qdev_get_gpio_in(dev, i);
+ }
+
+ return irq_set;
}
static void kvm_i8259_class_init(ObjectClass *klass, const void *data)
@@ -154,6 +179,59 @@ static void kvm_i8259_class_init(ObjectClass *klass, const
void *data)
k->post_load = kvm_i8259_put;
}
+
+static void kvm_i8259_pic_init(Object *obj)
+{
+ KVMI8259PICState *s = KVM_I8259_PIC(obj);
+
+ object_initialize_child(obj, "primary", &s->i8259[0], TYPE_KVM_I8259);
+ object_initialize_child(obj, "secondary", &s->i8259[1], TYPE_KVM_I8259);
+
+ qdev_init_gpio_in(DEVICE(obj), kvm_pic_set_irq, ISA_NUM_IRQS);
+}
+
+static void kvm_i8259_pic_realize(DeviceState *dev, Error **errp)
+{
+ KVMI8259PICState *s = KVM_I8259_PIC(dev);
+ DeviceState *pri_dev, *sec_dev;
+
+ /* Primary */
+ pri_dev = DEVICE(&s->i8259[0]);
+ qdev_prop_set_uint32(pri_dev, "iobase", 0x20);
+ qdev_prop_set_uint32(pri_dev, "elcr_addr", 0x4d0);
+ qdev_prop_set_uint8(pri_dev, "elcr_mask", 0xf8);
+ qdev_prop_set_bit(pri_dev, "master", 1);
+ if (!isa_realize_and_unref(ISA_DEVICE(pri_dev), s->isabus, errp)) {
+ return;
+ }
+
+ /* Secondary */
+ sec_dev = DEVICE(&s->i8259[1]);
+ qdev_prop_set_uint32(sec_dev, "iobase", 0xa0);
+ qdev_prop_set_uint32(sec_dev, "elcr_addr", 0x4d1);
+ qdev_prop_set_uint8(sec_dev, "elcr_mask", 0xde);
+ if (!isa_realize_and_unref(ISA_DEVICE(sec_dev), s->isabus, errp)) {
+ return;
+ }
+}
+
+static const Property kvm_i8259_pic_properties[] = {
+ DEFINE_PROP_LINK("bus", KVMI8259PICState, isabus, TYPE_ISA_BUS,
+ ISABus *),
+};
+
+static void kvm_i8259_pic_class_init(ObjectClass *klass, const void *data)
+{
+ DeviceClass *dc = DEVICE_CLASS(klass);
+
+ dc->realize = kvm_i8259_pic_realize;
+ device_class_set_props(dc, kvm_i8259_pic_properties);
+ /*
+ * Reason: must be wired to the ISA bus via the "bus" property
+ */
+ dc->user_creatable = false;
+}
+
static const TypeInfo kvm_i8259_type_infos[] = {
{
.name = TYPE_KVM_I8259,
@@ -162,6 +240,13 @@ static const TypeInfo kvm_i8259_type_infos[] = {
.class_init = kvm_i8259_class_init,
.class_size = sizeof(KVMI8259Class),
},
+ {
+ .name = TYPE_KVM_I8259_PIC,
+ .parent = TYPE_DEVICE,
+ .class_init = kvm_i8259_pic_class_init,
+ .instance_init = kvm_i8259_pic_init,
+ .instance_size = sizeof(KVMI8259PICState),
+ },
};
DEFINE_TYPES(kvm_i8259_type_infos)
--
2.43.0
