mirrors/qemu
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

net: lance: convert SysBus init method to a realize method

Browse Source 
Signed-off-by: Cédric Le Goater <clg@kaod.org>
Reviewed-by: Peter Maydell <peter.maydell@linaro.org>
Reviewed-by: Philippe Mathieu-Daudé <philmd@redhat.com>
Message-Id: <20181001063803.22330-5-clg@kaod.org>
Signed-off-by: Eduardo Habkost <ehabkost@redhat.com>
This commit is contained in:
Cédric Le Goater 2018-10-01 08:37:56 +02:00 committed by Eduardo Habkost
parent f71b3367a2
commit 45099c42b2
1 changed files with 3 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
hw/net/lance.c
View File

@ -97,9 +97,9 @@ static const VMStateDescription vmstate_lance = {
} }
}; };
static int lance_init(SysBusDevice *sbd) static void lance_realize(DeviceState *dev, Error **errp)
{ {
DeviceState *dev = DEVICE(sbd); SysBusDevice *sbd = SYS_BUS_DEVICE(dev);
SysBusPCNetState *d = SYSBUS_PCNET(dev); SysBusPCNetState *d = SYSBUS_PCNET(dev);
PCNetState *s = &d->state; PCNetState *s = &d->state;
@ -115,7 +115,6 @@ static int lance_init(SysBusDevice *sbd)
s->phys_mem_read = ledma_memory_read; s->phys_mem_read = ledma_memory_read;
s->phys_mem_write = ledma_memory_write; s->phys_mem_write = ledma_memory_write;
pcnet_common_init(dev, s, &net_lance_info); pcnet_common_init(dev, s, &net_lance_info);
return 0;
} }
static void lance_reset(DeviceState *dev) static void lance_reset(DeviceState *dev)
@ -144,9 +143,8 @@ static Property lance_properties[] = {
static void lance_class_init(ObjectClass *klass, void *data) static void lance_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 = lance_init; dc->realize = lance_realize;
set_bit(DEVICE_CATEGORY_NETWORK, dc->categories); set_bit(DEVICE_CATEGORY_NETWORK, dc->categories);
dc->fw_name = "ethernet"; dc->fw_name = "ethernet";
dc->reset = lance_reset; dc->reset = lance_reset;