From patchwork Wed Aug 31 14:48:47 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Walle X-Patchwork-Id: 112579 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [140.186.70.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id 7BE6CB6F18 for ; Thu, 1 Sep 2011 01:33:34 +1000 (EST) Received: from localhost ([::1]:33489 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Qym7B-0004G0-Kr for incoming@patchwork.ozlabs.org; Wed, 31 Aug 2011 10:50:05 -0400 Received: from eggs.gnu.org ([140.186.70.92]:52299) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Qym6X-0002NI-0m for qemu-devel@nongnu.org; Wed, 31 Aug 2011 10:49:26 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Qym6U-0000oe-Su for qemu-devel@nongnu.org; Wed, 31 Aug 2011 10:49:24 -0400 Received: from mail.serverraum.org ([78.47.150.89]:60339) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Qym6U-0000oS-K4 for qemu-devel@nongnu.org; Wed, 31 Aug 2011 10:49:22 -0400 Received: from localhost (localhost [127.0.0.1]) by mail.serverraum.org (Postfix) with ESMTP id 3C1EA3EF4B; Wed, 31 Aug 2011 16:53:49 +0200 (CEST) X-Virus-Scanned: Debian amavisd-new at mail.serverraum.org Received: from mail.serverraum.org ([127.0.0.1]) by localhost (web.serverraum.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id dNDpMI1SSHJi; Wed, 31 Aug 2011 16:53:49 +0200 (CEST) Received: from thanatos.fritz.box (95-89-251-205-dynip.superkabel.de [95.89.251.205]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by mail.serverraum.org (Postfix) with ESMTPSA id 241FA3EF44; Wed, 31 Aug 2011 16:53:47 +0200 (CEST) From: Michael Walle To: qemu-devel@nongnu.org Date: Wed, 31 Aug 2011 16:48:47 +0200 Message-Id: <1314802127-13202-10-git-send-email-michael@walle.cc> X-Mailer: git-send-email 1.7.2.5 In-Reply-To: <1314802127-13202-1-git-send-email-michael@walle.cc> References: <1314802127-13202-1-git-send-email-michael@walle.cc> X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 2) X-Received-From: 78.47.150.89 Cc: Michael Walle , Avi Kivity Subject: [Qemu-devel] [PATCH 9/9] milkymist-{minimac2, softusb}: rename memory names X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Be consistent with other milkymist models. Signed-off-by: Michael Walle --- 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);