OSDN Git Service
(root)
/
qmiga
/
qemu.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
d85d016
)
net: mipsnet: convert SysBus init method to a realize method
author
Cédric Le Goater
<clg@kaod.org>
Mon, 1 Oct 2018 06:37:58 +0000
(08:37 +0200)
committer
Eduardo Habkost
<ehabkost@redhat.com>
Wed, 24 Oct 2018 09:44:59 +0000
(06:44 -0300)
Cc: Aleksandar Markovic <amarkovic@wavecomp.com>
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-7-clg@kaod.org>
Signed-off-by: Eduardo Habkost <ehabkost@redhat.com>
hw/net/mipsnet.c
patch
|
blob
|
history
diff --git
a/hw/net/mipsnet.c
b/hw/net/mipsnet.c
index
5a63df7
..
03b3104
100644
(file)
--- a/
hw/net/mipsnet.c
+++ b/
hw/net/mipsnet.c
@@
-236,9
+236,9
@@
static const MemoryRegionOps mipsnet_ioport_ops = {
.impl.max_access_size = 4,
};
.impl.max_access_size = 4,
};
-static
int mipsnet_sysbus_init(SysBusDevice *sbd
)
+static
void mipsnet_realize(DeviceState *dev, Error **errp
)
{
{
-
DeviceState *dev = DEVICE(sbd
);
+
SysBusDevice *sbd = SYS_BUS_DEVICE(dev
);
MIPSnetState *s = MIPS_NET(dev);
memory_region_init_io(&s->io, OBJECT(dev), &mipsnet_ioport_ops, s,
MIPSnetState *s = MIPS_NET(dev);
memory_region_init_io(&s->io, OBJECT(dev), &mipsnet_ioport_ops, s,
@@
-249,8
+249,6
@@
static int mipsnet_sysbus_init(SysBusDevice *sbd)
s->nic = qemu_new_nic(&net_mipsnet_info, &s->conf,
object_get_typename(OBJECT(dev)), dev->id, s);
qemu_format_nic_info_str(qemu_get_queue(s->nic), s->conf.macaddr.a);
s->nic = qemu_new_nic(&net_mipsnet_info, &s->conf,
object_get_typename(OBJECT(dev)), dev->id, s);
qemu_format_nic_info_str(qemu_get_queue(s->nic), s->conf.macaddr.a);
-
- return 0;
}
static void mipsnet_sysbus_reset(DeviceState *dev)
}
static void mipsnet_sysbus_reset(DeviceState *dev)
@@
-267,9
+265,8
@@
static Property mipsnet_properties[] = {
static void mipsnet_class_init(ObjectClass *klass, void *data)
{
DeviceClass *dc = DEVICE_CLASS(klass);
static void mipsnet_class_init(ObjectClass *klass, void *data)
{
DeviceClass *dc = DEVICE_CLASS(klass);
- SysBusDeviceClass *k = SYS_BUS_DEVICE_CLASS(klass);
-
k->init = mipsnet_sysbus_init
;
+
dc->realize = mipsnet_realize
;
set_bit(DEVICE_CATEGORY_NETWORK, dc->categories);
dc->desc = "MIPS Simulator network device";
dc->reset = mipsnet_sysbus_reset;
set_bit(DEVICE_CATEGORY_NETWORK, dc->categories);
dc->desc = "MIPS Simulator network device";
dc->reset = mipsnet_sysbus_reset;