[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [RFC 19/34] pckbd: QOM'ify
From: |
Andreas Färber |
Subject: |
[Qemu-devel] [RFC 19/34] pckbd: QOM'ify |
Date: |
Mon, 26 Nov 2012 01:12:31 +0100 |
Introduce type constant and cast macro to obsolete DO_UPCAST().
Prepares for ISA realizefn.
Signed-off-by: Andreas Färber <address@hidden>
---
hw/pckbd.c | 18 ++++++++++++------
1 Datei geändert, 12 Zeilen hinzugefügt(+), 6 Zeilen entfernt(-)
diff --git a/hw/pckbd.c b/hw/pckbd.c
index 5bb3e0a..a3291ec 100644
--- a/hw/pckbd.c
+++ b/hw/pckbd.c
@@ -431,8 +431,12 @@ void i8042_mm_init(qemu_irq kbd_irq, qemu_irq mouse_irq,
qemu_register_reset(kbd_reset, s);
}
+#define TYPE_I8042 "i8042"
+#define I8042(obj) OBJECT_CHECK(ISAKBDState, (obj), TYPE_I8042)
+
typedef struct ISAKBDState {
- ISADevice dev;
+ ISADevice parent_obj;
+
KBDState kbd;
MemoryRegion io[2];
} ISAKBDState;
@@ -440,14 +444,16 @@ typedef struct ISAKBDState {
void i8042_isa_mouse_fake_event(void *opaque)
{
ISADevice *dev = opaque;
- KBDState *s = &(DO_UPCAST(ISAKBDState, dev, dev)->kbd);
+ ISAKBDState *isa = I8042(dev);
+ KBDState *s = &isa->kbd;
ps2_mouse_fake_event(s->mouse);
}
void i8042_setup_a20_line(ISADevice *dev, qemu_irq *a20_out)
{
- KBDState *s = &(DO_UPCAST(ISAKBDState, dev, dev)->kbd);
+ ISAKBDState *isa = I8042(dev);
+ KBDState *s = &isa->kbd;
s->a20_out = a20_out;
}
@@ -485,7 +491,7 @@ static const MemoryRegionOps i8042_cmd_ops = {
static int i8042_initfn(ISADevice *dev)
{
- ISAKBDState *isa_s = DO_UPCAST(ISAKBDState, dev, dev);
+ ISAKBDState *isa_s = I8042(dev);
KBDState *s = &isa_s->kbd;
isa_init_irq(dev, &s->irq_kbd, 1);
@@ -512,8 +518,8 @@ static void i8042_class_initfn(ObjectClass *klass, void
*data)
dc->vmsd = &vmstate_kbd_isa;
}
-static TypeInfo i8042_info = {
- .name = "i8042",
+static const TypeInfo i8042_info = {
+ .name = TYPE_I8042,
.parent = TYPE_ISA_DEVICE,
.instance_size = sizeof(ISAKBDState),
.class_init = i8042_class_initfn,
--
1.7.10.4
- [Qemu-devel] [RFC 09/34] fdc: QOM'ify ISA floppy controller, (continued)
- [Qemu-devel] [RFC 09/34] fdc: QOM'ify ISA floppy controller, Andreas Färber, 2012/11/25
- [Qemu-devel] [RFC 13/34] ide: QOM'ify ISA IDE, Andreas Färber, 2012/11/25
- [Qemu-devel] [RFC 24/34] vga-isa: QOM'ify ISA VGA, Andreas Färber, 2012/11/25
- [Qemu-devel] [RFC 32/34] i8259: QOM'ify some more, Andreas Färber, 2012/11/25
- [Qemu-devel] [PATCH 01/34] qdev: Eliminate qdev_free() in favor of QOM, Andreas Färber, 2012/11/25
- [Qemu-devel] [PATCH 11/34] i8259: Fix PIC_COMMON() macro, Andreas Färber, 2012/11/25
- [Qemu-devel] [RFC 03/34] qdev: Fold state enum into bool realized, Andreas Färber, 2012/11/25
- [Qemu-devel] [RFC 30/34] kvm/i8254: QOM'ify some more, Andreas Färber, 2012/11/25
- [Qemu-devel] [RFC 33/34] kvm/i8259: QOM'ify some more, Andreas Färber, 2012/11/25
- [Qemu-devel] [RFC 34/34] i8259: Convert PICCommonState to use QOM realizefn, Andreas Färber, 2012/11/25
- [Qemu-devel] [RFC 19/34] pckbd: QOM'ify,
Andreas Färber <=
- [Qemu-devel] [RFC 31/34] i8254: Convert PITCommonState to QOM realizefn, Andreas Färber, 2012/11/25
- [Qemu-devel] [RFC 27/34] wdt_ib700: QOM'ify, Andreas Färber, 2012/11/25
- [Qemu-devel] [RFC 16/34] ne2000-isa: QOM'ify, Andreas Färber, 2012/11/25
- [Qemu-devel] [RFC 04/34] qdev: Prepare "realized" property, Andreas Färber, 2012/11/25
- [Qemu-devel] [RFC 20/34] pcspk: QOM'ify, Andreas Färber, 2012/11/25
- [Qemu-devel] [RFC 26/34] vmport: QOM'ify, Andreas Färber, 2012/11/25
- [Qemu-devel] [RFC 25/34] vmmouse: QOM'ify, Andreas Färber, 2012/11/25
- [Qemu-devel] [RFC 28/34] isa: Use realizefn for ISADevice, Andreas Färber, 2012/11/25