david.venhoff/QEMU-Nyx-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

kvmvapic: Use QOM realize

Browse Source 
Signed-off-by: Hu Tao <hutao@cn.fujitsu.com>
[AF: Renamed variable]
Signed-off-by: Andreas Färber <afaerber@suse.de>
This commit is contained in:
Hu Tao 2013-07-01 18:18:40 +08:00 committed by Andreas Färber
parent 913bc63844
commit c118d44b6a
1 changed files with 5 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
hw/i386/kvmvapic.c
View File

@ -703,19 +703,18 @@ static const MemoryRegionOps vapic_ops = {
.endianness = DEVICE_NATIVE_ENDIAN, .endianness = DEVICE_NATIVE_ENDIAN,
}; };
static int vapic_init(SysBusDevice *dev) static void vapic_realize(DeviceState *dev, Error **errp)
{ {
SysBusDevice *sbd = SYS_BUS_DEVICE(dev);
VAPICROMState *s = VAPIC(dev); VAPICROMState *s = VAPIC(dev);
memory_region_init_io(&s->io, OBJECT(s), &vapic_ops, s, "kvmvapic", 2); memory_region_init_io(&s->io, OBJECT(s), &vapic_ops, s, "kvmvapic", 2);
sysbus_add_io(dev, VAPIC_IO_PORT, &s->io); sysbus_add_io(sbd, VAPIC_IO_PORT, &s->io);
sysbus_init_ioports(dev, VAPIC_IO_PORT, 2); sysbus_init_ioports(sbd, VAPIC_IO_PORT, 2);
option_rom[nb_option_roms].name = "kvmvapic.bin"; option_rom[nb_option_roms].name = "kvmvapic.bin";
option_rom[nb_option_roms].bootindex = -1; option_rom[nb_option_roms].bootindex = -1;
nb_option_roms++; nb_option_roms++;
return 0;
} }
static void do_vapic_enable(void *data) static void do_vapic_enable(void *data)
@ -812,13 +811,12 @@ static const VMStateDescription vmstate_vapic = {
static void vapic_class_init(ObjectClass *klass, void *data) static void vapic_class_init(ObjectClass *klass, void *data)
{ {
SysBusDeviceClass *sc = SYS_BUS_DEVICE_CLASS(klass);
DeviceClass *dc = DEVICE_CLASS(klass); DeviceClass *dc = DEVICE_CLASS(klass);
dc->no_user = 1; dc->no_user = 1;
dc->reset = vapic_reset; dc->reset = vapic_reset;
dc->vmsd = &vmstate_vapic; dc->vmsd = &vmstate_vapic;
sc->init = vapic_init; dc->realize = vapic_realize;
} }
static const TypeInfo vapic_type = { static const TypeInfo vapic_type = {