OpenE2K/qemu-e2k
13
4
Fork 0
Code Issues 4 Pull Requests Projects 2 Releases Activity

display/g364fb: Convert sysbus init function to realize function

Browse Source 
Use DeviceClass rather than SysBusDeviceClass in
g364fb_sysbus_class_init().

Cc: pbonzini@redhat.com
Cc: kraxel@redhat.com
Cc: f4bug@amsat.org
Cc: alistair.francis@wdc.com

Signed-off-by: Mao Zhongyi <maozhongyi@cmss.chinamobile.com>
Signed-off-by: Zhang Shengju <zhangshengju@cmss.chinamobile.com>
Reviewed-by: Alistair Francis <alistair.francis@wdc.com>
Reviewed-by: Philippe Mathieu-Daudé <philmd@redhat.com>
Message-id: 20181130093852.20739-6-maozhongyi@cmss.chinamobile.com
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
This commit is contained in:
Mao Zhongyi 2018-12-13 13:47:57 +00:00 committed by Peter Maydell
parent 4dbf209d42
commit 0323ee4321
1 changed files with 3 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
hw/display/g364fb.c
View File

@ -489,18 +489,16 @@ typedef struct {
G364State g364; G364State g364;
} G364SysBusState; } G364SysBusState;
static int g364fb_sysbus_init(SysBusDevice *sbd) static void g364fb_sysbus_realize(DeviceState *dev, Error **errp)
{ {
DeviceState *dev = DEVICE(sbd);
G364SysBusState *sbs = G364(dev); G364SysBusState *sbs = G364(dev);
G364State *s = &sbs->g364; G364State *s = &sbs->g364;
SysBusDevice *sbd = SYS_BUS_DEVICE(dev);
g364fb_init(dev, s); g364fb_init(dev, s);
sysbus_init_irq(sbd, &s->irq); sysbus_init_irq(sbd, &s->irq);
sysbus_init_mmio(sbd, &s->mem_ctrl); sysbus_init_mmio(sbd, &s->mem_ctrl);
sysbus_init_mmio(sbd, &s->mem_vram); sysbus_init_mmio(sbd, &s->mem_vram);
return 0;
} }
static void g364fb_sysbus_reset(DeviceState *d) static void g364fb_sysbus_reset(DeviceState *d)
@ -518,9 +516,8 @@ static Property g364fb_sysbus_properties[] = {
static void g364fb_sysbus_class_init(ObjectClass *klass, void *data) static void g364fb_sysbus_class_init(ObjectClass *klass, void *data)
{ {
DeviceClass *dc = DEVICE_CLASS(klass); DeviceClass *dc = DEVICE_CLASS(klass);
SysBusDeviceClass *k = SYS_BUS_DEVICE_CLASS(klass);
k->init = g364fb_sysbus_init; dc->realize = g364fb_sysbus_realize;
set_bit(DEVICE_CATEGORY_DISPLAY, dc->categories); set_bit(DEVICE_CATEGORY_DISPLAY, dc->categories);
dc->desc = "G364 framebuffer"; dc->desc = "G364 framebuffer";
dc->reset = g364fb_sysbus_reset; dc->reset = g364fb_sysbus_reset;