diff options
| author | xiaoqiang zhao <zxq_yx_007@163.com> | 2013-11-05 18:16:04 +0800 |
|---|---|---|
| committer | Andreas Färber <afaerber@suse.de> | 2013-12-24 18:02:18 +0100 |
| commit | f97718584baa6ef919d00067b9787ba7fc5f1a5b (patch) | |
| tree | 1c61534d0acf3586eb4e8eabc8ee5eda9152e673 | |
| parent | 494c271784a5e360523e874be9f67259932ea68c (diff) | |
| download | qemu-f97718584baa6ef919d00067b9787ba7fc5f1a5b.tar.gz qemu-f97718584baa6ef919d00067b9787ba7fc5f1a5b.tar.bz2 qemu-f97718584baa6ef919d00067b9787ba7fc5f1a5b.zip | |
ioapic: Cleanup for QOM'ification
Some cleanups:
* ioapic_common.c: Rename 'register_types' to 'ioapic_common_register_types'
* Replace inline 'DEVICE(s)' with local 'DeviceState *dev' variable
Signed-off-by: xiaoqiang zhao <zxq_yx_007@163.com>
Signed-off-by: Andreas Färber <afaerber@suse.de>
| -rw-r--r-- | hw/i386/kvm/ioapic.c | 4 | ||||
| -rw-r--r-- | hw/intc/ioapic.c | 4 | ||||
| -rw-r--r-- | hw/intc/ioapic_common.c | 4 |
3 files changed, 8 insertions, 4 deletions
diff --git a/hw/i386/kvm/ioapic.c b/hw/i386/kvm/ioapic.c index f11a540825..772a7127d4 100644 --- a/hw/i386/kvm/ioapic.c +++ b/hw/i386/kvm/ioapic.c @@ -129,9 +129,11 @@ static void kvm_ioapic_set_irq(void *opaque, int irq, int level) static void kvm_ioapic_init(IOAPICCommonState *s, int instance_no) { + DeviceState *dev = DEVICE(s); + memory_region_init_reservation(&s->io_memory, NULL, "kvm-ioapic", 0x1000); - qdev_init_gpio_in(DEVICE(s), kvm_ioapic_set_irq, IOAPIC_NUM_PINS); + qdev_init_gpio_in(dev, kvm_ioapic_set_irq, IOAPIC_NUM_PINS); } static Property kvm_ioapic_properties[] = { diff --git a/hw/intc/ioapic.c b/hw/intc/ioapic.c index d866e00297..88428458a0 100644 --- a/hw/intc/ioapic.c +++ b/hw/intc/ioapic.c @@ -227,10 +227,12 @@ static const MemoryRegionOps ioapic_io_ops = { static void ioapic_init(IOAPICCommonState *s, int instance_no) { + DeviceState *dev = DEVICE(s); + memory_region_init_io(&s->io_memory, OBJECT(s), &ioapic_io_ops, s, "ioapic", 0x1000); - qdev_init_gpio_in(DEVICE(s), ioapic_set_irq, IOAPIC_NUM_PINS); + qdev_init_gpio_in(dev, ioapic_set_irq, IOAPIC_NUM_PINS); ioapics[instance_no] = s; } diff --git a/hw/intc/ioapic_common.c b/hw/intc/ioapic_common.c index 9ba1a26092..4611f7fbce 100644 --- a/hw/intc/ioapic_common.c +++ b/hw/intc/ioapic_common.c @@ -109,9 +109,9 @@ static const TypeInfo ioapic_common_type = { .abstract = true, }; -static void register_types(void) +static void ioapic_common_register_types(void) { type_register_static(&ioapic_common_type); } -type_init(register_types) +type_init(ioapic_common_register_types) |