ShuriZma
/
xqemu
mirror of https://github.com/xqemu/xqemu.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

apic: QOM'ify APIC 

Convert 'init' function to QOM's 'realize' for apic, kvm/apic and
xen/xen_apic.

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:03 +08:00 committed by Andreas Färber
parent d3b0c9e90a
commit ff6986ce61
5 changed files with 14 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -171,8 +171,10 @@ static const MemoryRegionOps kvm_apic_io_ops = {
.endianness = DEVICE_NATIVE_ENDIAN, .endianness = DEVICE_NATIVE_ENDIAN,
}; };
static void kvm_apic_init(APICCommonState *s) static void kvm_apic_realize(DeviceState *dev, Error **errp)
{ {
APICCommonState *s = APIC_COMMON(dev);
memory_region_init_io(&s->io_memory, NULL, &kvm_apic_io_ops, s, "kvm-apic-msi", memory_region_init_io(&s->io_memory, NULL, &kvm_apic_io_ops, s, "kvm-apic-msi",
APIC_SPACE_SIZE); APIC_SPACE_SIZE);
@ -185,7 +187,7 @@ static void kvm_apic_class_init(ObjectClass *klass, void *data)
{ {
APICCommonClass *k = APIC_COMMON_CLASS(klass); APICCommonClass *k = APIC_COMMON_CLASS(klass);
k->init = kvm_apic_init; k->realize = kvm_apic_realize;
k->set_base = kvm_apic_set_base; k->set_base = kvm_apic_set_base;
k->set_tpr = kvm_apic_set_tpr; k->set_tpr = kvm_apic_set_tpr;
k->get_tpr = kvm_apic_get_tpr; k->get_tpr = kvm_apic_get_tpr;

6
hw/intc/apic.c
View File

@ -871,8 +871,10 @@ static const MemoryRegionOps apic_io_ops = {
.endianness = DEVICE_NATIVE_ENDIAN, .endianness = DEVICE_NATIVE_ENDIAN,
}; };
static void apic_init(APICCommonState *s) static void apic_realize(DeviceState *dev, Error **errp)
{ {
APICCommonState *s = APIC_COMMON(dev);
memory_region_init_io(&s->io_memory, OBJECT(s), &apic_io_ops, s, "apic-msi", memory_region_init_io(&s->io_memory, OBJECT(s), &apic_io_ops, s, "apic-msi",
APIC_SPACE_SIZE); APIC_SPACE_SIZE);
@ -886,7 +888,7 @@ static void apic_class_init(ObjectClass *klass, void *data)
{ {
APICCommonClass *k = APIC_COMMON_CLASS(klass); APICCommonClass *k = APIC_COMMON_CLASS(klass);
k->init = apic_init; k->realize = apic_realize;
k->set_base = apic_set_base; k->set_base = apic_set_base;
k->set_tpr = apic_set_tpr; k->set_tpr = apic_set_tpr;
k->get_tpr = apic_get_tpr; k->get_tpr = apic_get_tpr;

2
hw/intc/apic_common.c
View File

@ -298,7 +298,7 @@ static int apic_init_common(ICCDevice *dev)
s->idx = apic_no++; s->idx = apic_no++;
info = APIC_COMMON_GET_CLASS(s); info = APIC_COMMON_GET_CLASS(s);
info->init(s); info->realize(DEVICE(dev), NULL);
if (!mmio_registered) { if (!mmio_registered) {
ICCBus *b = ICC_BUS(qdev_get_parent_bus(DEVICE(dev))); ICCBus *b = ICC_BUS(qdev_get_parent_bus(DEVICE(dev)));
memory_region_add_subregion(b->apic_address_space, 0, &s->io_memory); memory_region_add_subregion(b->apic_address_space, 0, &s->io_memory);

6
hw/xen/xen_apic.c
View File

@ -36,8 +36,10 @@ static const MemoryRegionOps xen_apic_io_ops = {
.endianness = DEVICE_NATIVE_ENDIAN, .endianness = DEVICE_NATIVE_ENDIAN,
}; };
static void xen_apic_init(APICCommonState *s) static void xen_apic_realize(DeviceState *dev, Error **errp)
{ {
APICCommonState *s = APIC_COMMON(dev);
memory_region_init_io(&s->io_memory, OBJECT(s), &xen_apic_io_ops, s, memory_region_init_io(&s->io_memory, OBJECT(s), &xen_apic_io_ops, s,
"xen-apic-msi", APIC_SPACE_SIZE); "xen-apic-msi", APIC_SPACE_SIZE);
@ -72,7 +74,7 @@ static void xen_apic_class_init(ObjectClass *klass, void *data)
{ {
APICCommonClass *k = APIC_COMMON_CLASS(klass); APICCommonClass *k = APIC_COMMON_CLASS(klass);
k->init = xen_apic_init; k->realize = xen_apic_realize;
k->set_base = xen_apic_set_base; k->set_base = xen_apic_set_base;
k->set_tpr = xen_apic_set_tpr; k->set_tpr = xen_apic_set_tpr;
k->get_tpr = xen_apic_get_tpr; k->get_tpr = xen_apic_get_tpr;

2
include/hw/i386/apic_internal.h
View File

@ -80,7 +80,7 @@ typedef struct APICCommonClass
{ {
ICCDeviceClass parent_class; ICCDeviceClass parent_class;
void (*init)(APICCommonState *s); DeviceRealize realize;
void (*set_base)(APICCommonState *s, uint64_t val); void (*set_base)(APICCommonState *s, uint64_t val);
void (*set_tpr)(APICCommonState *s, uint8_t val); void (*set_tpr)(APICCommonState *s, uint8_t val);
uint8_t (*get_tpr)(APICCommonState *s); uint8_t (*get_tpr)(APICCommonState *s);