From nobody Sun Dec 14 06:15:21 2025 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1577797859; cv=none; d=zohomail.com; s=zohoarc; b=bh71wpG9tAsu222DHO45kPSHbCk6RWj+JrZ5+XWNU5N2hIByaibRGF+L0aLcPeLrPW9wrD5XbvXonwviMKcui7ladCiuQluihGXEcDQcZBr7vUvVKFvMyXv0cS24o0KxjdVlQRbGiPjsyLcGkTbzrukXgGThOeGo6Fb9d2brIcA= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1577797859; h=Content-Type:Content-Transfer-Encoding:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:Message-ID:References:Sender:Subject:To; bh=CvQmX9TtRsW2ZDQR4ftwakYAXnfi8zri8FLICoD7kqw=; b=YryXhL4lqPa9qg3TKbUIl370XcZMBn+A6OKttjdUFHhRawk+HIKNptk+WsO0jlnfMuf2TS6fYUzJhLVXvSVU/o0mYhlCmKNrV0hBKDAexEZrVy3CITQ5bVd0fRPRGNwyMcsOce+32bnz8KZEXBuFaWonkHLf8wanDQd8aoIeu8U= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 157779785936720.427978866169042; Tue, 31 Dec 2019 05:10:59 -0800 (PST) Received: from localhost ([::1]:42272 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1imHIX-0005e5-P2 for importer@patchew.org; Tue, 31 Dec 2019 08:10:57 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:54658) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1imHBo-00055h-Mk for qemu-devel@nongnu.org; Tue, 31 Dec 2019 08:04:01 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1imHBn-0002D8-4E for qemu-devel@nongnu.org; Tue, 31 Dec 2019 08:04:00 -0500 Received: from us-smtp-delivery-1.mimecast.com ([205.139.110.120]:49888 helo=us-smtp-1.mimecast.com) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1imHBm-0002AW-VF for qemu-devel@nongnu.org; Tue, 31 Dec 2019 08:03:59 -0500 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-228-TZ0EcxrmMA64nCqRLRmc3Q-1; Tue, 31 Dec 2019 08:03:56 -0500 Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 29498800D50 for ; Tue, 31 Dec 2019 13:03:55 +0000 (UTC) Received: from dell-r430-03.lab.eng.brq.redhat.com (dell-r430-03.lab.eng.brq.redhat.com [10.37.153.18]) by smtp.corp.redhat.com (Postfix) with ESMTP id A420E78E96 for ; Tue, 31 Dec 2019 13:03:54 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1577797438; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=CvQmX9TtRsW2ZDQR4ftwakYAXnfi8zri8FLICoD7kqw=; b=iLDfxE7KnyA+tSG/AL2gSbE45qx9jxWrKKpo9V+IybQC5o2FD4ng4xn9ciuDTcFWhlaj5O ifTItj4qYzxTupwVenFiX0CVnuR+rKfqZcN03Y3UO3n+6u9mAEbbXCfejqpFl5wwZCEZcL hwT6gzZKrBFfixO5YR8bsZNL1B7snGA= From: Igor Mammedov To: qemu-devel@nongnu.org Subject: [PATCH 06/86] machine: introduce convenience MachineState::ram Date: Tue, 31 Dec 2019 14:02:50 +0100 Message-Id: <1577797450-88458-7-git-send-email-imammedo@redhat.com> In-Reply-To: <1577797450-88458-1-git-send-email-imammedo@redhat.com> References: <1577797450-88458-1-git-send-email-imammedo@redhat.com> X-Scanned-By: MIMEDefang 2.79 on 10.5.11.11 X-MC-Unique: TZ0EcxrmMA64nCqRLRmc3Q-1 X-Mimecast-Spam-Score: 0 Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 205.139.110.120 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: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: pass (identity @redhat.com) MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" the new field will be used by boards to get access to main RAM memory region and will help to save boiler plate in boards which often add a field or variable just for this purpose. Memory region will be equivalent to what currently used memory_region_allocate_system_memory() is returning apart from that it will come from hostmem backend. Followup patches will incrementally switch boards to using RAM from MachineState::ram. Patch takes care of non-NUMA case and follow up patch will initialize MachineState::ram for NUMA case. Signed-off-by: Igor Mammedov --- include/hw/boards.h | 9 ++++++++- hw/core/machine.c | 21 +++++++++++++++++++++ hw/core/numa.c | 14 +------------- 3 files changed, 30 insertions(+), 14 deletions(-) diff --git a/include/hw/boards.h b/include/hw/boards.h index 65da7f0..70491c1 100644 --- a/include/hw/boards.h +++ b/include/hw/boards.h @@ -73,7 +73,12 @@ void machine_set_cpu_numa_node(MachineState *machine, Error **errp); =20 void machine_class_allow_dynamic_sysbus_dev(MachineClass *mc, const char *= type); - +/* + * Checks that backend isn't used, preps it for exclusive usage and + * returns migratable MemoryRegion provided by backend. + */ +MemoryRegion *machine_consume_memdev(MachineState *machine, + HostMemoryBackend *backend); =20 /** * CPUArchId: @@ -295,6 +300,8 @@ struct MachineState { bool enable_graphics; char *memory_encryption; HostMemoryBackend *ram_memdev; + /* convenience alias to ram_memdev memory region or numa container */ + MemoryRegion *ram; DeviceMemoryState *device_memory; =20 ram_addr_t ram_size; diff --git a/hw/core/machine.c b/hw/core/machine.c index 4a5cd0d..080ce57 100644 --- a/hw/core/machine.c +++ b/hw/core/machine.c @@ -26,6 +26,7 @@ #include "sysemu/qtest.h" #include "hw/pci/pci.h" #include "hw/mem/nvdimm.h" +#include "migration/vmstate.h" =20 GlobalProperty hw_compat_4_2[] =3D { { "virtio-blk-device", "x-enable-wce-if-config-wce", "off" }, @@ -971,10 +972,30 @@ static void machine_numa_finish_cpu_init(MachineState= *machine) g_string_free(s, true); } =20 +MemoryRegion *machine_consume_memdev(MachineState *machine, + HostMemoryBackend *backend) +{ + MemoryRegion *ret =3D host_memory_backend_get_memory(backend); + + if (memory_region_is_mapped(ret)) { + char *path =3D object_get_canonical_path_component(OBJECT(backend)= ); + error_report("memory backend %s can't be used multiple times.", pa= th); + g_free(path); + exit(EXIT_FAILURE); + } + host_memory_backend_set_mapped(backend, true); + vmstate_register_ram_global(ret); + return ret; +} + void machine_run_board_init(MachineState *machine) { MachineClass *machine_class =3D MACHINE_GET_CLASS(machine); =20 + if (machine->ram_memdev) { + machine->ram =3D machine_consume_memdev(machine, machine->ram_memd= ev); + } + if (machine->numa_state) { numa_complete_configuration(machine); if (machine->numa_state->num_nodes) { diff --git a/hw/core/numa.c b/hw/core/numa.c index e0c6a69..ee655b0 100644 --- a/hw/core/numa.c +++ b/hw/core/numa.c @@ -520,20 +520,8 @@ void memory_region_allocate_system_memory(MemoryRegion= *mr, Object *owner, if (!backend) { continue; } - MemoryRegion *seg =3D host_memory_backend_get_memory(backend); - - if (memory_region_is_mapped(seg)) { - char *path =3D object_get_canonical_path_component(OBJECT(back= end)); - error_report("memory backend %s is used multiple times. Each " - "-numa option must use a different memdev value.", - path); - g_free(path); - exit(1); - } - - host_memory_backend_set_mapped(backend, true); + MemoryRegion *seg =3D machine_consume_memdev(ms, backend); memory_region_add_subregion(mr, addr, seg); - vmstate_register_ram_global(seg); addr +=3D size; } } --=20 2.7.4