From nobody Mon Feb 9 02:52:06 2026 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=fail; 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=fail(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1579779975; cv=none; d=zohomail.com; s=zohoarc; b=d9DrnZ/zSXXKZ4H0zYROH24lAm+cYfGby2TFJUo2uldYAigZQwi8B0FF1p5n5TOKRLCy9hZWVY2C9GJmPhiopCE+qhb4ucnP49s1BB10jdEm9p3e8T0BpWDxmJgf+9p0iki0yGWz0vtdlNLlp59Zz7j4kzJ3a4176r93KFBXkyk= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1579779975; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:Message-ID:References:Sender:Subject:To; bh=OaPpm+jzhh/dVZ7iFExc/6XQtE0cH9GjgUf2LdnzmYY=; b=lP9twNJc5yXCOq2XuGfD/9isbdRZNqTz+aUOAZO6tpV043XdxdxqPESiZGKN8od3Lxl7TFnb+lP4fINamEhz+fdvCQcjZb9NuMyeIdrsc5v+2xLUbIr+v0zJHLIA9k20iT1B/56nzF+Ddk0YxVYz4e32+DN0z7FyM0z1L5oPrCg= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail; 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=fail 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 1579779975444525.939483204016; Thu, 23 Jan 2020 03:46:15 -0800 (PST) Received: from localhost ([::1]:55298 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iuaw9-0002NC-KC for importer@patchew.org; Thu, 23 Jan 2020 06:46:13 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:34812) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iuarN-000556-Nf for qemu-devel@nongnu.org; Thu, 23 Jan 2020 06:41:18 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1iuarM-0003sO-GC for qemu-devel@nongnu.org; Thu, 23 Jan 2020 06:41:17 -0500 Received: from us-smtp-2.mimecast.com ([207.211.31.81]:32115 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 1iuarM-0003sI-CI for qemu-devel@nongnu.org; Thu, 23 Jan 2020 06:41:16 -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-187-kHtuyX3OOoe91GlBG7Ik-A-1; Thu, 23 Jan 2020 06:41:13 -0500 Received: from smtp.corp.redhat.com (int-mx07.intmail.prod.int.phx2.redhat.com [10.5.11.22]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 84D06107ACC4 for ; Thu, 23 Jan 2020 11:41:12 +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 A940A10016E8; Thu, 23 Jan 2020 11:41:11 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1579779676; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=OaPpm+jzhh/dVZ7iFExc/6XQtE0cH9GjgUf2LdnzmYY=; b=YeLgw1oIQUPyXUKszG66bW1q+eyMKnzPujHf7FTRcJCpfiNERWLd7UO9LVBXFN92dInDah nRf+dPuHKjVV4HjrbecNCFF6ci2Tz9/3UjnZtU1Day+chm+/GmeNBCK9cZCzyTp7j4NHAx 2F3siCEkL/3uIN8NKOb/9uhqSY/P2bs= From: Igor Mammedov To: qemu-devel@nongnu.org Subject: [PATCH REPOST v3 04/80] machine: introduce convenience MachineState::ram Date: Thu, 23 Jan 2020 12:37:29 +0100 Message-Id: <1579779525-20065-5-git-send-email-imammedo@redhat.com> In-Reply-To: <1579779525-20065-1-git-send-email-imammedo@redhat.com> References: <1579779525-20065-1-git-send-email-imammedo@redhat.com> X-Scanned-By: MIMEDefang 2.84 on 10.5.11.22 X-MC-Unique: kHtuyX3OOoe91GlBG7Ik-A-1 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 207.211.31.81 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: pbonzini@redhat.com, ehabkost@redhat.com Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) 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 introduce 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 --- CC: ehabkost@redhat.com CC: pbonzini@redhat.com --- 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 2a4e804..351479d 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: @@ -292,6 +297,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 bf30183..81791a0 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" }, @@ -1041,10 +1042,30 @@ static void machine_numa_finish_cpu_init(MachineSta= te *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 840e685..8264336 100644 --- a/hw/core/numa.c +++ b/hw/core/numa.c @@ -817,20 +817,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