mirrors/qemu
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

ioapic: QOM'ify ioapic

Browse Source 
Convert 'init' function to QOM's 'realize' for ioapic and kvm-ioapic.
Change variable 'ioapic_no' from static to global. Then we can drop
the 'instance_no' function argument.

Signed-off-by: xiaoqiang zhao <zxq_yx_007@163.com>
Signed-off-by: Andreas Färber <afaerber@suse.de>
This commit is contained in:
xiaoqiang zhao 2013-11-05 18:16:05 +08:00 committed by Andreas Färber
parent f97718584b
commit db0f888848
4 changed files with 21 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
hw/i386/kvm/ioapic.c
View File

@ -127,9 +127,9 @@ static void kvm_ioapic_set_irq(void *opaque, int irq, int level)
apic_report_irq_delivered(delivered); apic_report_irq_delivered(delivered);
} }
static void kvm_ioapic_init(IOAPICCommonState *s, int instance_no) static void kvm_ioapic_realize(DeviceState *dev, Error **errp)
{ {
DeviceState *dev = DEVICE(s); IOAPICCommonState *s = IOAPIC_COMMON(dev);
memory_region_init_reservation(&s->io_memory, NULL, "kvm-ioapic", 0x1000); memory_region_init_reservation(&s->io_memory, NULL, "kvm-ioapic", 0x1000);
@ -146,7 +146,7 @@ static void kvm_ioapic_class_init(ObjectClass *klass, void *data)
IOAPICCommonClass *k = IOAPIC_COMMON_CLASS(klass); IOAPICCommonClass *k = IOAPIC_COMMON_CLASS(klass);
DeviceClass *dc = DEVICE_CLASS(klass); DeviceClass *dc = DEVICE_CLASS(klass);
k->init = kvm_ioapic_init; k->realize = kvm_ioapic_realize;
k->pre_save = kvm_ioapic_get; k->pre_save = kvm_ioapic_get;
k->post_load = kvm_ioapic_put; k->post_load = kvm_ioapic_put;
dc->reset = kvm_ioapic_reset; dc->reset = kvm_ioapic_reset;

11
hw/intc/ioapic.c
View File

@ -36,6 +36,9 @@
static IOAPICCommonState *ioapics[MAX_IOAPICS]; static IOAPICCommonState *ioapics[MAX_IOAPICS];
/* global variable from ioapic_common.c */
extern int ioapic_no;
static void ioapic_service(IOAPICCommonState *s) static void ioapic_service(IOAPICCommonState *s)
{ {
uint8_t i; uint8_t i;
@ -225,16 +228,16 @@ static const MemoryRegionOps ioapic_io_ops = {
.endianness = DEVICE_NATIVE_ENDIAN, .endianness = DEVICE_NATIVE_ENDIAN,
}; };
static void ioapic_init(IOAPICCommonState *s, int instance_no) static void ioapic_realize(DeviceState *dev, Error **errp)
{ {
DeviceState *dev = DEVICE(s); IOAPICCommonState *s = IOAPIC_COMMON(dev);
memory_region_init_io(&s->io_memory, OBJECT(s), &ioapic_io_ops, s, memory_region_init_io(&s->io_memory, OBJECT(s), &ioapic_io_ops, s,
"ioapic", 0x1000); "ioapic", 0x1000);
qdev_init_gpio_in(dev, ioapic_set_irq, IOAPIC_NUM_PINS); qdev_init_gpio_in(dev, ioapic_set_irq, IOAPIC_NUM_PINS);
ioapics[instance_no] = s; ioapics[ioapic_no] = s;
} }
static void ioapic_class_init(ObjectClass *klass, void *data) static void ioapic_class_init(ObjectClass *klass, void *data)
@ -242,7 +245,7 @@ static void ioapic_class_init(ObjectClass *klass, void *data)
IOAPICCommonClass *k = IOAPIC_COMMON_CLASS(klass); IOAPICCommonClass *k = IOAPIC_COMMON_CLASS(klass);
DeviceClass *dc = DEVICE_CLASS(klass); DeviceClass *dc = DEVICE_CLASS(klass);
k->init = ioapic_init; k->realize = ioapic_realize;
dc->reset = ioapic_reset_common; dc->reset = ioapic_reset_common;
} }

11
hw/intc/ioapic_common.c
View File

@ -23,6 +23,14 @@
#include "hw/i386/ioapic_internal.h" #include "hw/i386/ioapic_internal.h"
#include "hw/sysbus.h" #include "hw/sysbus.h"
/* ioapic_no count start from 0 to MAX_IOAPICS,
* remove as static variable from ioapic_common_init.
* now as a global variable, let child to increase the counter
* then we can drop the 'instance_no' argument
* and convert to our QOM's realize function
*/
int ioapic_no;
void ioapic_reset_common(DeviceState *dev) void ioapic_reset_common(DeviceState *dev)
{ {
IOAPICCommonState *s = IOAPIC_COMMON(dev); IOAPICCommonState *s = IOAPIC_COMMON(dev);
@ -61,7 +69,6 @@ static void ioapic_common_realize(DeviceState *dev, Error **errp)
{ {
IOAPICCommonState *s = IOAPIC_COMMON(dev); IOAPICCommonState *s = IOAPIC_COMMON(dev);
IOAPICCommonClass *info; IOAPICCommonClass *info;
static int ioapic_no;
if (ioapic_no >= MAX_IOAPICS) { if (ioapic_no >= MAX_IOAPICS) {
error_setg(errp, "Only %d ioapics allowed", MAX_IOAPICS); error_setg(errp, "Only %d ioapics allowed", MAX_IOAPICS);
@ -69,7 +76,7 @@ static void ioapic_common_realize(DeviceState *dev, Error **errp)
} }
info = IOAPIC_COMMON_GET_CLASS(s); info = IOAPIC_COMMON_GET_CLASS(s);
info->init(s, ioapic_no); info->realize(dev, errp);
sysbus_init_mmio(SYS_BUS_DEVICE(s), &s->io_memory); sysbus_init_mmio(SYS_BUS_DEVICE(s), &s->io_memory);
ioapic_no++; ioapic_no++;

3
include/hw/i386/ioapic_internal.h
View File

@ -83,7 +83,8 @@ typedef struct IOAPICCommonState IOAPICCommonState;
typedef struct IOAPICCommonClass { typedef struct IOAPICCommonClass {
SysBusDeviceClass parent_class; SysBusDeviceClass parent_class;
void (*init)(IOAPICCommonState *s, int instance_no);
DeviceRealize realize;
void (*pre_save)(IOAPICCommonState *s); void (*pre_save)(IOAPICCommonState *s);
void (*post_load)(IOAPICCommonState *s); void (*post_load)(IOAPICCommonState *s);
} IOAPICCommonClass; } IOAPICCommonClass;