aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDavid Hildenbrand <david@redhat.com>2018-04-23 18:51:23 +0200
committerEduardo Habkost <ehabkost@redhat.com>2018-05-07 10:00:02 -0300
commite017da370b3e87a3041b66092de2eb2318d28a6b (patch)
treeef279b677c67514ea6dd176245f45d3543542d77
parent18d11dc910ca2a292b3f12c6a4a7c927b0f226f4 (diff)
machine: rename MemoryHotplugState to DeviceMemoryState
Rename it to better match the new terminology. Signed-off-by: David Hildenbrand <david@redhat.com> Message-Id: <20180423165126.15441-9-david@redhat.com> Reviewed-by: Michael S. Tsirkin <mst@redhat.com> Signed-off-by: Eduardo Habkost <ehabkost@redhat.com>
-rw-r--r--hw/ppc/spapr_hcall.c6
-rw-r--r--hw/ppc/spapr_rtas_ddw.c5
-rw-r--r--include/hw/boards.h8
3 files changed, 9 insertions, 10 deletions
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_ulong ptex)
static bool is_ram_address(sPAPRMachineState *spapr, hwaddr addr)
{
MachineState *machine = MACHINE(spapr);
- MemoryHotplugState *hpms = machine->device_memory;
+ DeviceMemoryState *dms = machine->device_memory;
if (addr < machine->ram_size) {
return true;
}
- if ((addr >= hpms->base)
- && ((addr - hpms->base) < memory_region_size(&hpms->mr))) {
+ if ((addr >= dms->base)
+ && ((addr - dms->base) < memory_region_size(&dms->mr))) {
return true;
}
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 *cpu,
if (machine->ram_size == machine->maxram_size) {
max_window_size = machine->ram_size;
} else {
- MemoryHotplugState *hpms = machine->device_memory;
-
- max_window_size = hpms->base + memory_region_size(&hpms->mr);
+ max_window_size = machine->device_memory->base +
+ memory_region_size(&machine->device_memory->mr);
}
avail = SPAPR_PCI_DMA_MAX_WINDOWS - spapr_phb_get_active_win_num(sphb);
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 {
};
/**
- * 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;
/**
* MachineState:
@@ -254,7 +254,7 @@ struct MachineState {
bool enforce_config_section;
bool enable_graphics;
char *memory_encryption;
- MemoryHotplugState *device_memory;
+ DeviceMemoryState *device_memory;
ram_addr_t ram_size;
ram_addr_t maxram_size;