Commit c118d44b authored by Hu Tao's avatar Hu Tao Committed by Andreas Färber
Browse files

kvmvapic: Use QOM realize 



Signed-off-by: default avatarHu Tao <hutao@cn.fujitsu.com>
[AF: Renamed variable]
Signed-off-by: default avatarAndreas Färber <afaerber@suse.de>
parent 913bc638

hw/i386/kvmvapic.c

+5 −7
Original line number Diff line number Diff line
@@ -703,19 +703,18 @@ static const MemoryRegionOps vapic_ops = { 
    .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);



    memory_region_init_io(&s->io, OBJECT(s), &vapic_ops, s, "kvmvapic", 2);

    sysbus_add_io(dev, VAPIC_IO_PORT, &s->io);

    sysbus_init_ioports(dev, VAPIC_IO_PORT, 2);

    sysbus_add_io(sbd, VAPIC_IO_PORT, &s->io);

    sysbus_init_ioports(sbd, VAPIC_IO_PORT, 2);



    option_rom[nb_option_roms].name = "kvmvapic.bin";

    option_rom[nb_option_roms].bootindex = -1;

    nb_option_roms++;



    return 0;

}



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)

{

    SysBusDeviceClass *sc = SYS_BUS_DEVICE_CLASS(klass);

    DeviceClass *dc = DEVICE_CLASS(klass);



    dc->no_user = 1;

    dc->reset   = vapic_reset;

    dc->vmsd    = &vmstate_vapic;

    sc->init    = vapic_init;

    dc->realize = vapic_realize;

}



static const TypeInfo vapic_type = {