diff options
| author | Michael Walle <michael@walle.cc> | 2011-08-31 16:48:47 +0200 |
|---|---|---|
| committer | Avi Kivity <avi@redhat.com> | 2011-10-02 16:14:03 +0200 |
| commit | 306f66b42f961e38442d1721523dbb4906b33afb (patch) | |
| tree | 8ae342712f2bf22a2bb6e3ad090b5b3c8e846980 | |
| parent | 883abf8d2c8728b62e6345aee882d79c829de34c (diff) | |
| download | focaccia-qemu-306f66b42f961e38442d1721523dbb4906b33afb.tar.gz focaccia-qemu-306f66b42f961e38442d1721523dbb4906b33afb.zip | |
milkymist-{minimac2,softusb}: rename memory names
Be consistent with other milkymist models. Signed-off-by: Michael Walle <michael@walle.cc> Signed-off-by: Avi Kivity <avi@redhat.com>
| -rw-r--r-- | hw/milkymist-minimac2.c | 4 | ||||
| -rw-r--r-- | hw/milkymist-softusb.c | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/hw/milkymist-minimac2.c b/hw/milkymist-minimac2.c index fb48e37187..85d9400c67 100644 --- a/hw/milkymist-minimac2.c +++ b/hw/milkymist-minimac2.c @@ -464,11 +464,11 @@ static int milkymist_minimac2_init(SysBusDevice *dev) sysbus_init_irq(dev, &s->tx_irq); memory_region_init_io(&s->regs_region, &minimac2_ops, s, - "minimac2-mmio", R_MAX * 4); + "milkymist-minimac2", R_MAX * 4); sysbus_init_mmio_region(dev, &s->regs_region); /* register buffers memory */ - memory_region_init_ram(&s->buffers, NULL, "milkymist_minimac2.buffers", + memory_region_init_ram(&s->buffers, NULL, "milkymist-minimac2.buffers", buffers_size); s->rx0_buf = memory_region_get_ram_ptr(&s->buffers); s->rx1_buf = s->rx0_buf + MINIMAC2_BUFFER_SIZE; diff --git a/hw/milkymist-softusb.c b/hw/milkymist-softusb.c index ef4d9ee2ce..ec5f3343d4 100644 --- a/hw/milkymist-softusb.c +++ b/hw/milkymist-softusb.c @@ -267,10 +267,10 @@ static int milkymist_softusb_init(SysBusDevice *dev) sysbus_init_mmio_region(dev, &s->regs_region); /* register pmem and dmem */ - memory_region_init_ram(&s->pmem, NULL, "milkymist_softusb.pmem", + memory_region_init_ram(&s->pmem, NULL, "milkymist-softusb.pmem", s->pmem_size); sysbus_add_memory(dev, s->pmem_base, &s->pmem); - memory_region_init_ram(&s->dmem, NULL, "milkymist_softusb.dmem", + memory_region_init_ram(&s->dmem, NULL, "milkymist-softusb.dmem", s->dmem_size); sysbus_add_memory(dev, s->dmem_base, &s->dmem); |