From patchwork Sun Oct 20 22:56:38 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= X-Patchwork-Id: 1180104 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" (1024-bit key; unprotected) header.d=redhat.com header.i=@redhat.com header.b="SCZJC8OZ"; 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 46xFvx14Jvz9sP6 for ; Mon, 21 Oct 2019 10:14:20 +1100 (AEDT) Received: from localhost ([::1]:51292 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iMKOw-0005JB-4n for incoming@patchwork.ozlabs.org; Sun, 20 Oct 2019 19:14:18 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:34854) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iMKBS-0001iT-RL for qemu-devel@nongnu.org; Sun, 20 Oct 2019 19:00:25 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1iMKBR-0001XA-2l for qemu-devel@nongnu.org; Sun, 20 Oct 2019 19:00:22 -0400 Received: from us-smtp-1.mimecast.com ([205.139.110.61]:23252 helo=us-smtp-delivery-1.mimecast.com) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1iMKBQ-0001Ws-T9 for qemu-devel@nongnu.org; Sun, 20 Oct 2019 19:00:20 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1571612420; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=LBfcXdZi7rmaayMUIJe621EviYh+sNbuG1duBKXRdNY=; b=SCZJC8OZ3ADs7OYyklSAdLQboARsYvBuWE2Lpmv/JX4xhiWwaDMLXcQnqz1zfqVzKoxkKm Mcth87pAzT/Wy9xZJndLuSNMEqTCsyEnzo31z1SAVbhZrM2COmA1EvCUBv6Ql9CZQS9u2p ve2LBvHrokzyM0fbMlEHxRgjOqoHpGY= Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-254-8yE4KQl8NF6B_y0XkBCCtQ-1; Sun, 20 Oct 2019 19:00:16 -0400 Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 999DB800D41; Sun, 20 Oct 2019 23:00:12 +0000 (UTC) Received: from x1w.redhat.com (ovpn-204-40.brq.redhat.com [10.40.204.40]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 0BFD860C18; Sun, 20 Oct 2019 22:59:49 +0000 (UTC) From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= To: Paolo Bonzini , Igor Mammedov , qemu-devel@nongnu.org, Markus Armbruster , Eduardo Habkost Subject: [PATCH 09/21] hw: Let memory_region_allocate_system_memory take MachineState argument Date: Mon, 21 Oct 2019 00:56:38 +0200 Message-Id: <20191020225650.3671-10-philmd@redhat.com> In-Reply-To: <20191020225650.3671-1-philmd@redhat.com> References: <20191020225650.3671-1-philmd@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.12 X-MC-Unique: 8yE4KQl8NF6B_y0XkBCCtQ-1 X-Mimecast-Spam-Score: 0 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 205.139.110.61 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: Paul Burton , Peter Maydell , "Michael S. Tsirkin" , Leif Lindholm , Mark Cave-Ayland , KONRAD Frederic , "Edgar E. Iglesias" , Rob Herring , Andrey Smirnov , Helge Deller , =?utf-8?q?Herv=C3=A9_Poussineau?= , Joel Stanley , Aleksandar Rikalo , Richard Henderson , Artyom Tarasenko , Antony Pavlov , Alistair Francis , Fabien Chouteau , Beniamino Galvani , qemu-arm@nongnu.org, Peter Chubb , =?utf-8?q?C=C3=A9dric_Le_Goat?= =?utf-8?q?er?= , David Gibson , Radoslaw Biernacki , Thomas Huth , =?utf-8?q?Philippe_Mathieu-Daud?= =?utf-8?b?w6k=?= , Andrew Baumann , Jean-Christophe Dubois , Andrew Jeffery , Michael Walle , qemu-ppc@nongnu.org, Aleksandar Markovic , Jan Kiszka , Aurelien Jarno Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" All the codebase calls memory_region_allocate_system_memory() with a NULL 'owner' from the board_init() function. Let pass a MachineState argument, and enforce the QOM ownership of the system memory. Signed-off-by: Philippe Mathieu-Daudé Reviewed-by: Alistair Francis --- hw/core/numa.c | 11 +++++++---- include/hw/boards.h | 6 ++++-- 2 files changed, 11 insertions(+), 6 deletions(-) diff --git a/hw/core/numa.c b/hw/core/numa.c index 038c96d4ab..2e29e4bfe0 100644 --- a/hw/core/numa.c +++ b/hw/core/numa.c @@ -520,21 +520,24 @@ static void allocate_system_memory_nonnuma(MemoryRegion *mr, Object *owner, vmstate_register_ram_global(mr); } -void memory_region_allocate_system_memory(MemoryRegion *mr, Object *owner, +void memory_region_allocate_system_memory(MemoryRegion *mr, MachineState *ms, const char *name, uint64_t ram_size) { uint64_t addr = 0; int i; - MachineState *ms = MACHINE(qdev_get_machine()); + + if (!ms) { + ms = MACHINE(qdev_get_machine()); + } if (ms->numa_state == NULL || ms->numa_state->num_nodes == 0 || !have_memdevs) { - allocate_system_memory_nonnuma(mr, owner, name, ram_size); + allocate_system_memory_nonnuma(mr, OBJECT(ms), name, ram_size); return; } - memory_region_init(mr, owner, name, ram_size); + memory_region_init(mr, OBJECT(ms), name, ram_size); for (i = 0; i < ms->numa_state->num_nodes; i++) { uint64_t size = ms->numa_state->nodes[i].node_mem; HostMemoryBackend *backend = ms->numa_state->nodes[i].node_memdev; diff --git a/include/hw/boards.h b/include/hw/boards.h index de45087f34..3b6cb82b6c 100644 --- a/include/hw/boards.h +++ b/include/hw/boards.h @@ -14,7 +14,7 @@ /** * memory_region_allocate_system_memory - Allocate a board's main memory * @mr: the #MemoryRegion to be initialized - * @owner: the object that tracks the region's reference count + * @ms: the #MachineState object that own the system memory * @name: name of the memory region * @ram_size: size of the region in bytes * @@ -38,8 +38,10 @@ * Smaller pieces of memory (display RAM, static RAMs, etc) don't need * to be backed via the -mem-path memory backend and can simply * be created via memory_region_init_ram(). + * + * The #MachineState object will track the region's reference count. */ -void memory_region_allocate_system_memory(MemoryRegion *mr, Object *owner, +void memory_region_allocate_system_memory(MemoryRegion *mr, MachineState *ms, const char *name, uint64_t ram_size);