From patchwork Tue Feb 25 11:49:52 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Paolo Bonzini X-Patchwork-Id: 1244098 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=cMv7FR9p; 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 48RdMk6XMYz9sRQ for ; Tue, 25 Feb 2020 23:21:38 +1100 (AEDT) Received: from localhost ([::1]:53990 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1j6ZDU-0002WR-Rm for incoming@patchwork.ozlabs.org; Tue, 25 Feb 2020 07:21:36 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:49784) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1j6Yl3-0001Fu-F0 for qemu-devel@nongnu.org; Tue, 25 Feb 2020 06:52:17 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1j6Ykz-0008GC-7i for qemu-devel@nongnu.org; Tue, 25 Feb 2020 06:52:13 -0500 Received: from mail-wm1-x32b.google.com ([2a00:1450:4864:20::32b]:55322) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1j6Ykx-00085Y-Cj for qemu-devel@nongnu.org; Tue, 25 Feb 2020 06:52:08 -0500 Received: by mail-wm1-x32b.google.com with SMTP id q9so2666788wmj.5 for ; Tue, 25 Feb 2020 03:52:04 -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=vqmrNOvjCGW7erTAY2E+vByuvai3gyKtXKdjs6y5w2c=; b=cMv7FR9pW7mht8pIRvMsFJ0cn2NpGbjHERqfx1V5v7/AHJaUjq2UYeyYO/3zmlEywO VAx8wQGBuva/d08YdnmUUIJKoX6tAqABVgrciJO8eu5h93RxRtFqgIadzNc8S05/mqEE UaxbHJ0aRx4ABCXrm/gNsmrWXjuOsaQmtSBU2dw37hp4BXvi7VUw3vYzWhu4VS1VBT6U z6ekANer9EXIIYplPanf2RXc2lTkF3g/IjMqDImSSxUMkn6lWIeK6WGkmDngESEbgdz/ IG1GQGRVIeMuGIctKs5kV8egyVdxChKrP+Z2eFMEq6u1gFGyL7LKTU0O+E9JWXExZxCJ 9/Tg== 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=vqmrNOvjCGW7erTAY2E+vByuvai3gyKtXKdjs6y5w2c=; b=kEyqm7FDUCZ3N6PWpdqKlXkwOKS6mKz+2p4rjrEVBm8UQwXw5N9csp3aJyo0UkYU5r PRV3yLX+5/VGiQmK/mJyB/gfQ76SGtxfJI50+vJd9u2mWRNl6RTDgr+WYQvcwShe5wbt Ye8wIIxQBIzbffjsE4m2ATizga08JItYg3Ap4j2daF0SLAFqYquVnUF3OWvzTJAFD9j2 jCz4+9mVeh0hI5TTxNWh3KYlhZZWphg+AWiUk696OOion+6TTBk+EW3xVG9JJF3Z5mdM msEvlrnyYe4aTrUVEws5KgoI94hoMlsSSTNIfpzVPJnoY+SzHMk/5QLMITUbMc4ZkIGH rwyQ== X-Gm-Message-State: APjAAAUngTYk322I2LvZZ5UXxpxF0x8a+AXv2yxLiMck7/oyA5Rvx4B8 NtX/tu5XDlXTqSfg96Y5qk/0HiYH X-Google-Smtp-Source: APXvYqxZQOzSg/NvUEV/vtSWfYiWfYxp76+Oz4XEMW9edJTs1CW8fWOKkjGhWSeAoQYadjrPR8rG7g== X-Received: by 2002:a7b:cf08:: with SMTP id l8mr4824393wmg.169.1582631522918; Tue, 25 Feb 2020 03:52:02 -0800 (PST) Received: from 640k.localdomain ([93.56.166.5]) by smtp.gmail.com with ESMTPSA id b67sm3922326wmc.38.2020.02.25.03.52.02 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 25 Feb 2020 03:52:02 -0800 (PST) From: Paolo Bonzini To: qemu-devel@nongnu.org Subject: [PULL 062/136] ppc/pnv: use memdev for RAM Date: Tue, 25 Feb 2020 12:49:52 +0100 Message-Id: <1582631466-13880-62-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::32b 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: David Gibson Reviewed-by: Cédric Le Goater Reviewed-by: Richard Henderson Message-Id: <20200219160953.13771-63-imammedo@redhat.com> --- hw/ppc/pnv.c | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/hw/ppc/pnv.c b/hw/ppc/pnv.c index 139c857..ea20a1d 100644 --- a/hw/ppc/pnv.c +++ b/hw/ppc/pnv.c @@ -690,7 +690,6 @@ static void pnv_init(MachineState *machine) { PnvMachineState *pnv = PNV_MACHINE(machine); MachineClass *mc = MACHINE_GET_CLASS(machine); - MemoryRegion *ram; char *fw_filename; long fw_size; int i; @@ -702,11 +701,7 @@ static void pnv_init(MachineState *machine) if (machine->ram_size < (1 * GiB)) { warn_report("skiboot may not work with < 1GB of RAM"); } - - ram = g_new(MemoryRegion, 1); - memory_region_allocate_system_memory(ram, NULL, "pnv.ram", - machine->ram_size); - memory_region_add_subregion(get_system_memory(), 0, ram); + memory_region_add_subregion(get_system_memory(), 0, machine->ram); /* * Create our simple PNOR device @@ -1976,6 +1971,7 @@ static void pnv_machine_class_init(ObjectClass *oc, void *data) * enough to fit the maximum initrd size at it's load address */ mc->default_ram_size = INITRD_LOAD_ADDR + INITRD_MAX_SIZE; + mc->default_ram_id = "pnv.ram"; ispc->print_info = pnv_pic_print_info; object_class_property_add_bool(oc, "hb-mode",