proxmox-mirrors/qemu
1
0
Fork 0
mirror of https://git.proxmox.com/git/qemu synced 2025-06-14 23:54:31 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

milkymist-minimac2: Just expose buffers as a sysbus mmio region

Browse Source 
Just expose the register buffers memory as a standard sysbus mmio
region which the creator of the device can map, rather than
providing a qdev property which the creator has to set to the
base address and then doing the mapping in the device's own
init function.

Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Reviewed-by: Andreas Färber <afaerber@suse.de>
Acked-by: Michael Walle <michael@walle.cc>
Message-id: 1363358063-23973-4-git-send-email-peter.maydell@linaro.org
Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
This commit is contained in:
Peter Maydell 2013-03-15 14:34:21 +00:00 committed by Anthony Liguori
parent a86f200aeb
commit 20cf850c6a
2 changed files with 2 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
hw/milkymist-hw.h
View File

@ -177,10 +177,10 @@ static inline DeviceState *milkymist_minimac2_create(hwaddr base,
qemu_check_nic_model(&nd_table[0], "minimac2"); qemu_check_nic_model(&nd_table[0], "minimac2");
dev = qdev_create(NULL, "milkymist-minimac2"); dev = qdev_create(NULL, "milkymist-minimac2");
qdev_prop_set_taddr(dev, "buffers_base", buffers_base);
qdev_set_nic_properties(dev, &nd_table[0]); qdev_set_nic_properties(dev, &nd_table[0]);
qdev_init_nofail(dev); qdev_init_nofail(dev);
sysbus_mmio_map(SYS_BUS_DEVICE(dev), 0, base); sysbus_mmio_map(SYS_BUS_DEVICE(dev), 0, base);
sysbus_mmio_map(SYS_BUS_DEVICE(dev), 1, buffers_base);
sysbus_connect_irq(SYS_BUS_DEVICE(dev), 0, rx_irq); sysbus_connect_irq(SYS_BUS_DEVICE(dev), 0, rx_irq);
sysbus_connect_irq(SYS_BUS_DEVICE(dev), 1, tx_irq); sysbus_connect_irq(SYS_BUS_DEVICE(dev), 1, tx_irq);

5
hw/milkymist-minimac2.c
View File

@ -96,7 +96,6 @@ struct MilkymistMinimac2State {
NICState *nic; NICState *nic;
NICConf conf; NICConf conf;
char *phy_model; char *phy_model;
hwaddr buffers_base;
MemoryRegion buffers; MemoryRegion buffers;
MemoryRegion regs_region; MemoryRegion regs_region;
@ -475,7 +474,7 @@ static int milkymist_minimac2_init(SysBusDevice *dev)
s->rx1_buf = s->rx0_buf + MINIMAC2_BUFFER_SIZE; s->rx1_buf = s->rx0_buf + MINIMAC2_BUFFER_SIZE;
s->tx_buf = s->rx1_buf + MINIMAC2_BUFFER_SIZE; s->tx_buf = s->rx1_buf + MINIMAC2_BUFFER_SIZE;
sysbus_add_memory(dev, s->buffers_base, &s->buffers); sysbus_init_mmio(dev, &s->buffers);
qemu_macaddr_default_if_unset(&s->conf.macaddr); qemu_macaddr_default_if_unset(&s->conf.macaddr);
s->nic = qemu_new_nic(&net_milkymist_minimac2_info, &s->conf, s->nic = qemu_new_nic(&net_milkymist_minimac2_info, &s->conf,
@ -517,8 +516,6 @@ static const VMStateDescription vmstate_milkymist_minimac2 = {
}; };
static Property milkymist_minimac2_properties[] = { static Property milkymist_minimac2_properties[] = {
DEFINE_PROP_TADDR("buffers_base", MilkymistMinimac2State,
buffers_base, 0),
DEFINE_NIC_PROPERTIES(MilkymistMinimac2State, conf), DEFINE_NIC_PROPERTIES(MilkymistMinimac2State, conf),
DEFINE_PROP_STRING("phy_model", MilkymistMinimac2State, phy_model), DEFINE_PROP_STRING("phy_model", MilkymistMinimac2State, phy_model),
DEFINE_PROP_END_OF_LIST(), DEFINE_PROP_END_OF_LIST(),