Commit e017da37 authored by David Hildenbrand's avatar David Hildenbrand Committed by Eduardo Habkost
Browse files

machine: rename MemoryHotplugState to DeviceMemoryState 



Rename it to better match the new terminology.

Signed-off-by: default avatarDavid Hildenbrand <david@redhat.com>
Message-Id: <20180423165126.15441-9-david@redhat.com>
Reviewed-by: default avatarMichael S. Tsirkin <mst@redhat.com>
Signed-off-by: default avatarEduardo Habkost <ehabkost@redhat.com>
parent 18d11dc9

hw/ppc/spapr_hcall.c

+3 −3
Original line number Diff line number Diff line
@@ -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;

    }

hw/ppc/spapr_rtas_ddw.c

+2 −3
Original line number Diff line number Diff line
@@ -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);

include/hw/boards.h

+4 −4
Original line number Diff line number Diff line
@@ -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;