mirror of https://gitee.com/openkylin/qemu.git
net: lan9118: convert SysBus init method to a realize method
Signed-off-by: Cédric Le Goater <clg@kaod.org> Message-Id: <20181001063803.22330-4-clg@kaod.org> Reviewed-by: Philippe Mathieu-Daudé <philmd@redhat.com> Signed-off-by: Eduardo Habkost <ehabkost@redhat.com>
This commit is contained in:
parent
56dff42a2c
commit
f71b3367a2
hw/net
|
@ -1320,9 +1320,9 @@ static NetClientInfo net_lan9118_info = {
|
||||||
.link_status_changed = lan9118_set_link,
|
.link_status_changed = lan9118_set_link,
|
||||||
};
|
};
|
||||||
|
|
||||||
static int lan9118_init1(SysBusDevice *sbd)
|
static void lan9118_realize(DeviceState *dev, Error **errp)
|
||||||
{
|
{
|
||||||
DeviceState *dev = DEVICE(sbd);
|
SysBusDevice *sbd = SYS_BUS_DEVICE(dev);
|
||||||
lan9118_state *s = LAN9118(dev);
|
lan9118_state *s = LAN9118(dev);
|
||||||
QEMUBH *bh;
|
QEMUBH *bh;
|
||||||
int i;
|
int i;
|
||||||
|
@ -1349,8 +1349,6 @@ static int lan9118_init1(SysBusDevice *sbd)
|
||||||
s->timer = ptimer_init(bh, PTIMER_POLICY_DEFAULT);
|
s->timer = ptimer_init(bh, PTIMER_POLICY_DEFAULT);
|
||||||
ptimer_set_freq(s->timer, 10000);
|
ptimer_set_freq(s->timer, 10000);
|
||||||
ptimer_set_limit(s->timer, 0xffff, 1);
|
ptimer_set_limit(s->timer, 0xffff, 1);
|
||||||
|
|
||||||
return 0;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
static Property lan9118_properties[] = {
|
static Property lan9118_properties[] = {
|
||||||
|
@ -1362,12 +1360,11 @@ static Property lan9118_properties[] = {
|
||||||
static void lan9118_class_init(ObjectClass *klass, void *data)
|
static void lan9118_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 = lan9118_init1;
|
|
||||||
dc->reset = lan9118_reset;
|
dc->reset = lan9118_reset;
|
||||||
dc->props = lan9118_properties;
|
dc->props = lan9118_properties;
|
||||||
dc->vmsd = &vmstate_lan9118;
|
dc->vmsd = &vmstate_lan9118;
|
||||||
|
dc->realize = lan9118_realize;
|
||||||
}
|
}
|
||||||
|
|
||||||
static const TypeInfo lan9118_info = {
|
static const TypeInfo lan9118_info = {
|
||||||
|
|
Loading…
Reference in New Issue