From nobody Wed Oct 29 22:59:57 2025 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) client-ip=208.118.235.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; spf=pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=redhat.com Return-Path: Received: from lists.gnu.org (208.118.235.17 [208.118.235.17]) by mx.zohomail.com with SMTPS id 1525713550270522.4959411003645; Mon, 7 May 2018 10:19:10 -0700 (PDT) Received: from localhost ([::1]:47323 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fFjmv-0001G0-MR for importer@patchew.org; Mon, 07 May 2018 13:19:01 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:38680) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fFjYK-0006eg-R0 for qemu-devel@nongnu.org; Mon, 07 May 2018 13:03:57 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1fFjYH-0007ol-O4 for qemu-devel@nongnu.org; Mon, 07 May 2018 13:03:56 -0400 Received: from mx1.redhat.com ([209.132.183.28]:51040) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1fFjYH-0007oD-IG for qemu-devel@nongnu.org; Mon, 07 May 2018 13:03:53 -0400 Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.phx2.redhat.com [10.5.11.14]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id C863D30BEA44; Mon, 7 May 2018 17:03:52 +0000 (UTC) Received: from localhost (ovpn-116-33.gru2.redhat.com [10.97.116.33]) by smtp.corp.redhat.com (Postfix) with ESMTP id 9704E5D9C6; Mon, 7 May 2018 17:03:48 +0000 (UTC) From: Eduardo Habkost To: Peter Maydell , qemu-devel@nongnu.org Date: Mon, 7 May 2018 14:03:11 -0300 Message-Id: <20180507170315.11497-9-ehabkost@redhat.com> In-Reply-To: <20180507170315.11497-1-ehabkost@redhat.com> References: <20180507170315.11497-1-ehabkost@redhat.com> X-Scanned-By: MIMEDefang 2.79 on 10.5.11.14 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.45]); Mon, 07 May 2018 17:03:52 +0000 (UTC) X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 209.132.183.28 Subject: [Qemu-devel] [PULL 08/12] machine: rename MemoryHotplugState to DeviceMemoryState X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: David Hildenbrand Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail: RSF_0 Z_629925259 SPT_0 Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" From: David Hildenbrand Rename it to better match the new terminology. Signed-off-by: David Hildenbrand Message-Id: <20180423165126.15441-9-david@redhat.com> Reviewed-by: Michael S. Tsirkin Signed-off-by: Eduardo Habkost --- include/hw/boards.h | 8 ++++---- hw/ppc/spapr_hcall.c | 6 +++--- hw/ppc/spapr_rtas_ddw.c | 5 ++--- 3 files changed, 9 insertions(+), 10 deletions(-) diff --git a/include/hw/boards.h b/include/hw/boards.h index e27c28b514..ef7457f5dd 100644 --- a/include/hw/boards.h +++ b/include/hw/boards.h @@ -214,15 +214,15 @@ struct MachineClass { }; =20 /** - * MemoryHotplugState: + * DeviceMemoryState: * @base: address in guest physical address space where the memory * address space for memory devices starts * @mr: address space container for memory devices */ -typedef struct MemoryHotplugState { +typedef struct DeviceMemoryState { hwaddr base; MemoryRegion mr; -} MemoryHotplugState; +} DeviceMemoryState; =20 /** * MachineState: @@ -254,7 +254,7 @@ struct MachineState { bool enforce_config_section; bool enable_graphics; char *memory_encryption; - MemoryHotplugState *device_memory; + DeviceMemoryState *device_memory; =20 ram_addr_t ram_size; ram_addr_t maxram_size; diff --git a/hw/ppc/spapr_hcall.c b/hw/ppc/spapr_hcall.c index 52b8f40955..022f6d8101 100644 --- a/hw/ppc/spapr_hcall.c +++ b/hw/ppc/spapr_hcall.c @@ -67,13 +67,13 @@ static inline bool valid_ptex(PowerPCCPU *cpu, target_u= long ptex) static bool is_ram_address(sPAPRMachineState *spapr, hwaddr addr) { MachineState *machine =3D MACHINE(spapr); - MemoryHotplugState *hpms =3D machine->device_memory; + DeviceMemoryState *dms =3D machine->device_memory; =20 if (addr < machine->ram_size) { return true; } - if ((addr >=3D hpms->base) - && ((addr - hpms->base) < memory_region_size(&hpms->mr))) { + if ((addr >=3D dms->base) + && ((addr - dms->base) < memory_region_size(&dms->mr))) { return true; } =20 diff --git a/hw/ppc/spapr_rtas_ddw.c b/hw/ppc/spapr_rtas_ddw.c index d3666c1921..329feb148f 100644 --- a/hw/ppc/spapr_rtas_ddw.c +++ b/hw/ppc/spapr_rtas_ddw.c @@ -122,9 +122,8 @@ static void rtas_ibm_query_pe_dma_window(PowerPCCPU *cp= u, if (machine->ram_size =3D=3D machine->maxram_size) { max_window_size =3D machine->ram_size; } else { - MemoryHotplugState *hpms =3D machine->device_memory; - - max_window_size =3D hpms->base + memory_region_size(&hpms->mr); + max_window_size =3D machine->device_memory->base + + memory_region_size(&machine->device_memory->mr); } =20 avail =3D SPAPR_PCI_DMA_MAX_WINDOWS - spapr_phb_get_active_win_num(sph= b); --=20 2.14.3