From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([140.186.70.92]:51239) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1RAN0k-00077k-QY for qemu-devel@nongnu.org; Sun, 02 Oct 2011 10:27:23 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1RAN0g-0008DJ-NH for qemu-devel@nongnu.org; Sun, 02 Oct 2011 10:27:22 -0400 Received: from mx1.redhat.com ([209.132.183.28]:35688) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1RAN0f-0008CE-45 for qemu-devel@nongnu.org; Sun, 02 Oct 2011 10:27:18 -0400 From: Avi Kivity Date: Sun, 2 Oct 2011 16:26:56 +0200 Message-Id: <1317565616-12997-26-git-send-email-avi@redhat.com> In-Reply-To: <1317565616-12997-1-git-send-email-avi@redhat.com> References: <1317565616-12997-1-git-send-email-avi@redhat.com> Subject: [Qemu-devel] [PATCH 25/25] milkymist-{minimac2, softusb}: rename memory names List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org, Anthony Liguori From: Michael Walle Be consistent with other milkymist models. Signed-off-by: Michael Walle Signed-off-by: Avi Kivity --- 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.6.3