From patchwork Tue Feb 25 11:49:36 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Paolo Bonzini X-Patchwork-Id: 1244071 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=nongnu.org (client-ip=209.51.188.17; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=redhat.com Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.a=rsa-sha256 header.s=20161025 header.b=l/NJDvnN; dkim-atps=neutral Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 48Rd6P2SGNz9sRY for ; Tue, 25 Feb 2020 23:10:05 +1100 (AEDT) Received: from localhost ([::1]:53786 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1j6Z2J-0006jk-6W for incoming@patchwork.ozlabs.org; Tue, 25 Feb 2020 07:10:03 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:49574) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1j6Yko-0000vP-Oj for qemu-devel@nongnu.org; Tue, 25 Feb 2020 06:52:02 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1j6Ykh-0007t1-AR for qemu-devel@nongnu.org; Tue, 25 Feb 2020 06:51:55 -0500 Received: from mail-wr1-x431.google.com ([2a00:1450:4864:20::431]:39815) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1j6Ykg-0007iR-Nr for qemu-devel@nongnu.org; Tue, 25 Feb 2020 06:51:51 -0500 Received: by mail-wr1-x431.google.com with SMTP id y17so5561475wrn.6 for ; Tue, 25 Feb 2020 03:51:50 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=Frd9kAdV84R9k9k/O1Hor30Emol0j6Z4RBCmBlmORMU=; b=l/NJDvnN9q+AycqU81VHIqwkq9uJ81euJfxHlKaEKtUdHuYKS/itzl9NhK90GseOEb TpLhKfXF47OOELTjGxfmJFZjgbRXL52ZF5hoCGw6pcKIPok/d+e4AJ7ASP68B14WqZcS WBt3nHk5BURAjUVrDGBGjBsYFihJ5ozH94Zh58fLDSEFJAjlUAy+Sr2eBBTZzgzw2tHL eHU/drqBVAZxhNQtrkZbczVa7KZEu3OuvNoM5MlKcwoSGjG+MrAvjqgXQQk/KphXTkys I/PY4lbVFf79PysJ3rnZG60smgq+/sFA2spHO/CSR2SBbc62m/mYiY0Yfbzb96DghYFA N54Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=Frd9kAdV84R9k9k/O1Hor30Emol0j6Z4RBCmBlmORMU=; b=qv/FzZmSYtVVehmWu7zDGUtqEnkGpRhKzm9qrDcIRSNimrDI63kBoEmVuLmtPMRtTF B5PXtipzpth5gtk6KDbZQsM6OcVgYbB87ag2ARviZuBzifvBGiwWJI2QQKZxWrYnAUCM +ot0E037oZh6MxaD/y4Q464R5XzyMb75hgbaYt+XT+L+zckQ1vpsE2Db8b+FC7205Ahc JdcU+B7SGbBCcG5RvPEKxZ1VqY+VFSe6Lze7qSQnmy8v2AeDNw6NsdMq8qTtWPDAxWZg JmXsZjfQtWPTXm0aRjXn8smntm2QDzw/VAQ539xCjArB1pOCWrbRsJv9kNxlBVhwJTeu 67YA== X-Gm-Message-State: APjAAAV4lYHwbKUZqFEmr+FrgsAwIy//OQecu+01DsUJxy+zt285dpE8 YlNvtoEF1P0HTf4WZBOFAHIox8gq X-Google-Smtp-Source: APXvYqwKcaKFCchGuGi15U9oG4MDHLVBcEt9xdG/h8HsunTqVZbpKlLmWAen4jRqA6Rm44P1L0ABpw== X-Received: by 2002:adf:ef8e:: with SMTP id d14mr14810976wro.316.1582631509521; Tue, 25 Feb 2020 03:51:49 -0800 (PST) Received: from 640k.localdomain ([93.56.166.5]) by smtp.gmail.com with ESMTPSA id b67sm3922326wmc.38.2020.02.25.03.51.48 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 25 Feb 2020 03:51:48 -0800 (PST) From: Paolo Bonzini To: qemu-devel@nongnu.org Subject: [PULL 046/136] m68k/an5206: use memdev for RAM Date: Tue, 25 Feb 2020 12:49:36 +0100 Message-Id: <1582631466-13880-46-git-send-email-pbonzini@redhat.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1582631466-13880-1-git-send-email-pbonzini@redhat.com> References: <1582631466-13880-1-git-send-email-pbonzini@redhat.com> MIME-Version: 1.0 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:4864:20::431 X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Igor Mammedov Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" From: Igor Mammedov memory_region_allocate_system_memory() API is going away, so replace it with memdev allocated MemoryRegion. The later is initialized by generic code, so board only needs to opt in to memdev scheme by providing MachineClass::default_ram_id and using MachineState::ram instead of manually initializing RAM memory region. Signed-off-by: Igor Mammedov Acked-by: Thomas Huth Reviewed-by: Richard Henderson Reviewed-by: Philippe Mathieu-Daudé Message-Id: <20200219160953.13771-47-imammedo@redhat.com> --- hw/m68k/an5206.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/hw/m68k/an5206.c b/hw/m68k/an5206.c index bed43a9..846f4e4 100644 --- a/hw/m68k/an5206.c +++ b/hw/m68k/an5206.c @@ -33,7 +33,6 @@ static void an5206_init(MachineState *machine) uint64_t elf_entry; hwaddr entry; MemoryRegion *address_space_mem = get_system_memory(); - MemoryRegion *ram = g_new(MemoryRegion, 1); MemoryRegion *sram = g_new(MemoryRegion, 1); cpu = M68K_CPU(cpu_create(machine->cpu_type)); @@ -46,8 +45,7 @@ static void an5206_init(MachineState *machine) env->rambar0 = AN5206_RAMBAR_ADDR | 1; /* DRAM at address zero */ - memory_region_allocate_system_memory(ram, NULL, "an5206.ram", ram_size); - memory_region_add_subregion(address_space_mem, 0, ram); + memory_region_add_subregion(address_space_mem, 0, machine->ram); /* Internal SRAM. */ memory_region_init_ram(sram, NULL, "an5206.sram", 512, &error_fatal); @@ -89,6 +87,7 @@ static void an5206_machine_init(MachineClass *mc) mc->desc = "Arnewsh 5206"; mc->init = an5206_init; mc->default_cpu_type = M68K_CPU_TYPE_NAME("m5206"); + mc->default_ram_id = "an5206.ram"; } DEFINE_MACHINE("an5206", an5206_machine_init)