[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 9/9] milkymist-{minimac2, softusb}: rename memory na
From: |
Michael Walle |
Subject: |
[Qemu-devel] [PATCH 9/9] milkymist-{minimac2, softusb}: rename memory names |
Date: |
Wed, 31 Aug 2011 16:48:47 +0200 |
Be consistent with other milkymist models.
Signed-off-by: Michael Walle <address@hidden>
---
hw/milkymist-minimac2.c | 4 ++--
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 fb48e37..85d9400 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 ef4d9ee..ec5f334 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);
--
1.7.2.5
- [Qemu-devel] [PATCH 0/9] Memory API conversion for milkymist models, Michael Walle, 2011/08/31
- [Qemu-devel] [PATCH 1/9] milkymist-ac97: convert to memory API, Michael Walle, 2011/08/31
- [Qemu-devel] [PATCH 3/9] milkymist-memcard: convert to memory API, Michael Walle, 2011/08/31
- [Qemu-devel] [PATCH 4/9] milkymist-pfpu: convert to memory API, Michael Walle, 2011/08/31
- [Qemu-devel] [PATCH 2/9] milkymist-hpdmc: convert to memory API, Michael Walle, 2011/08/31
- [Qemu-devel] [PATCH 6/9] milkymist-tmu2: convert to memory API, Michael Walle, 2011/08/31
- [Qemu-devel] [PATCH 5/9] milkymist-sysctl: convert to memory API, Michael Walle, 2011/08/31
- [Qemu-devel] [PATCH 9/9] milkymist-{minimac2, softusb}: rename memory names,
Michael Walle <=
- [Qemu-devel] [PATCH 7/9] milkymist-uart: convert to memory API, Michael Walle, 2011/08/31
- [Qemu-devel] [PATCH 8/9] milkymist-vgafb: convert to memory API, Michael Walle, 2011/08/31
- Re: [Qemu-devel] [PATCH 0/9] Memory API conversion for milkymist models, Avi Kivity, 2011/08/31