From patchwork Tue Feb 25 11:49:57 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Paolo Bonzini X-Patchwork-Id: 1244121 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=FxnSizaD; 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 48Rdc53R3Jz9sPk for ; Tue, 25 Feb 2020 23:32:21 +1100 (AEDT) Received: from localhost ([::1]:54244 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1j6ZNr-0006nE-8K for incoming@patchwork.ozlabs.org; Tue, 25 Feb 2020 07:32:19 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:49811) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1j6Yl4-0001Ip-EB for qemu-devel@nongnu.org; Tue, 25 Feb 2020 06:52:18 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1j6Ykz-0008Ik-JD for qemu-devel@nongnu.org; Tue, 25 Feb 2020 06:52:14 -0500 Received: from mail-wr1-x42f.google.com ([2a00:1450:4864:20::42f]:41099) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1j6Ykz-0008Ez-7m for qemu-devel@nongnu.org; Tue, 25 Feb 2020 06:52:09 -0500 Received: by mail-wr1-x42f.google.com with SMTP id v4so1507383wrs.8 for ; Tue, 25 Feb 2020 03:52:09 -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=0GeSPUd+mKg9D1za+RBzaJqkiW6pHjAlr8xTe40NNV0=; b=FxnSizaDoNaD0hVWAR5gAEUIKgtITDVWMU15YFsycy2iDdwyD7s0XOgyMuuJFNo08J oQ+MUiIgxhht69HB07oxLtdnzdkK3lMBTJDbmgACEtBqyxGYm14Qo5Zpufq21ByIbZ7V 1yguG3S6kMCE2R8Cr7wLFGHmUZ2l5zF2yaea2FBIA+ZGSEnBhIuVHkd9i0LLgdHZY+12 RUpLmMNeruUoGD8e8e/qjo567KmkkWhqki1abzgtzdolO0fS+wwiDPuL4V/v8FV2Aql8 3USoIal77xYrdYettIa3tU3nVOCQuugMpgbGMhX7aYTZEH9Gz/DhUE0yc40jZ1I0ghwO UI4g== 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=0GeSPUd+mKg9D1za+RBzaJqkiW6pHjAlr8xTe40NNV0=; b=GFfP1Vjfdc1fS/Zl7PD4G6oxUGdo+k3xERorad/iFsF3aVDi6Ytm2XPZfiA2Hvglss nVNXwb7uSajThIKjFqMBY++O1pNnc2xbGJgj3tRlkenwNWozrmcRpSamSDOTQwe8oW5I fXsDr0KuvGguWE1ytACUE/nQYGCkjYnLbWQces5cryWuajIyUAMFLSQEVxV6FjbE+kis q9fk2FUdutmsGBo0sj0ZpKlih9Aj4fQYhrYRLKUV3Q7T2NyE4MjXjghpFwJvgS0lQBBH qDG0a3i5eFhDKOxIgVRWkeyijDNpNphCtmlwtrYaiIXpWvTnEUmf6TEbXmjc82uK+y32 97xA== X-Gm-Message-State: APjAAAUMNhJ+FaUf7SBAiWNR/Y868OtU9PTbH+lS7U0rLPqAq63Lcbz5 M2yNx5gKk+tnFJv0cEU10rKdkPN2 X-Google-Smtp-Source: APXvYqzChQ/oJ6neqRqJNcE1nR780F6lp9cpX4kPybYxqxhCDRaEO2objemPsGtLY3plUCAMH2V+dQ== X-Received: by 2002:adf:cd92:: with SMTP id q18mr71539552wrj.261.1582631527937; Tue, 25 Feb 2020 03:52:07 -0800 (PST) Received: from 640k.localdomain ([93.56.166.5]) by smtp.gmail.com with ESMTPSA id b67sm3922326wmc.38.2020.02.25.03.52.06 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 25 Feb 2020 03:52:07 -0800 (PST) From: Paolo Bonzini To: qemu-devel@nongnu.org Subject: [PULL 067/136] ppc/spapr: use memdev for RAM Date: Tue, 25 Feb 2020 12:49:57 +0100 Message-Id: <1582631466-13880-67-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::42f 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: Richard Henderson Reviewed-by: Philippe Mathieu-Daudé Message-Id: <20200219160953.13771-68-imammedo@redhat.com> --- hw/ppc/spapr.c | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/hw/ppc/spapr.c b/hw/ppc/spapr.c index c9b2e0a..4d90f99 100644 --- a/hw/ppc/spapr.c +++ b/hw/ppc/spapr.c @@ -2634,7 +2634,6 @@ static void spapr_machine_init(MachineState *machine) PCIHostState *phb; int i; MemoryRegion *sysmem = get_system_memory(); - MemoryRegion *ram = g_new(MemoryRegion, 1); hwaddr node0_size = spapr_node0_size(machine); long load_limit, fw_size; char *filename; @@ -2813,10 +2812,8 @@ static void spapr_machine_init(MachineState *machine) kvmppc_enable_h_page_init(); } - /* allocate RAM */ - memory_region_allocate_system_memory(ram, NULL, "ppc_spapr.ram", - machine->ram_size); - memory_region_add_subregion(sysmem, 0, ram); + /* map RAM */ + memory_region_add_subregion(sysmem, 0, machine->ram); /* always allocate the device memory information */ machine->device_memory = g_malloc0(sizeof(*machine->device_memory)); @@ -4400,6 +4397,7 @@ static void spapr_machine_class_init(ObjectClass *oc, void *data) mc->no_parallel = 1; mc->default_boot_order = ""; mc->default_ram_size = 512 * MiB; + mc->default_ram_id = "ppc_spapr.ram"; mc->default_display = "std"; mc->kvm_type = spapr_kvm_type; machine_class_allow_dynamic_sysbus_dev(mc, TYPE_SPAPR_PCI_HOST_BRIDGE);