ShuriZma
/
xemu
mirror of https://github.com/xemu-project/xemu.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

pc: rename "hotplug memory" terminology to "device memory" 

Let's make it clear that we are dealing with device memory. That it can
be used for memory hotplug is just a special case.

Signed-off-by: David Hildenbrand <david@redhat.com>
Message-Id: <20180423165126.15441-10-david@redhat.com>
Reviewed-by: Michael S. Tsirkin <mst@redhat.com>
Signed-off-by: Eduardo Habkost <ehabkost@redhat.com>
This commit is contained in:
David Hildenbrand 2018-04-23 18:51:24 +02:00 committed by Eduardo Habkost
parent e017da370b
commit f2ffbe2b7d
3 changed files with 14 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
hw/i386/acpi-build.c
View File

@ -2313,7 +2313,7 @@ build_srat(GArray *table_data, BIOSLinker *linker, MachineState *machine)
const CPUArchIdList *apic_ids = mc->possible_cpu_arch_ids(machine); const CPUArchIdList *apic_ids = mc->possible_cpu_arch_ids(machine);
PCMachineState *pcms = PC_MACHINE(machine); PCMachineState *pcms = PC_MACHINE(machine);
ram_addr_t hotplugabble_address_space_size = ram_addr_t hotplugabble_address_space_size =
object_property_get_int(OBJECT(pcms), PC_MACHINE_MEMHP_REGION_SIZE, object_property_get_int(OBJECT(pcms), PC_MACHINE_DEVMEM_REGION_SIZE,
NULL); NULL);
srat_start = table_data->len; srat_start = table_data->len;

21
hw/i386/pc.c
View File

@ -1374,11 +1374,10 @@ void pc_memory_init(PCMachineState *pcms,
/* always allocate the device memory information */ /* always allocate the device memory information */
machine->device_memory = g_malloc0(sizeof(*machine->device_memory)); machine->device_memory = g_malloc0(sizeof(*machine->device_memory));
/* initialize hotplug memory address space */ /* initialize device memory address space */
if (pcmc->has_reserved_memory && if (pcmc->has_reserved_memory &&
(machine->ram_size < machine->maxram_size)) { (machine->ram_size < machine->maxram_size)) {
ram_addr_t hotplug_mem_size = ram_addr_t device_mem_size = machine->maxram_size - machine->ram_size;
machine->maxram_size - machine->ram_size;
if (machine->ram_slots > ACPI_MAX_RAM_SLOTS) { if (machine->ram_slots > ACPI_MAX_RAM_SLOTS) {
error_report("unsupported amount of memory slots: %"PRIu64, error_report("unsupported amount of memory slots: %"PRIu64,
@ -1397,19 +1396,19 @@ void pc_memory_init(PCMachineState *pcms,
ROUND_UP(0x100000000ULL + pcms->above_4g_mem_size, 1ULL << 30); ROUND_UP(0x100000000ULL + pcms->above_4g_mem_size, 1ULL << 30);
if (pcmc->enforce_aligned_dimm) { if (pcmc->enforce_aligned_dimm) {
/* size hotplug region assuming 1G page max alignment per slot */ /* size device region assuming 1G page max alignment per slot */
hotplug_mem_size += (1ULL << 30) * machine->ram_slots; device_mem_size += (1ULL << 30) * machine->ram_slots;
} }
if ((machine->device_memory->base + hotplug_mem_size) < if ((machine->device_memory->base + device_mem_size) <
hotplug_mem_size) { device_mem_size) {
error_report("unsupported amount of maximum memory: " RAM_ADDR_FMT, error_report("unsupported amount of maximum memory: " RAM_ADDR_FMT,
machine->maxram_size); machine->maxram_size);
exit(EXIT_FAILURE); exit(EXIT_FAILURE);
} }
memory_region_init(&machine->device_memory->mr, OBJECT(pcms), memory_region_init(&machine->device_memory->mr, OBJECT(pcms),
"hotplug-memory", hotplug_mem_size); "device-memory", device_mem_size);
memory_region_add_subregion(system_memory, machine->device_memory->base, memory_region_add_subregion(system_memory, machine->device_memory->base,
&machine->device_memory->mr); &machine->device_memory->mr);
} }
@ -2064,7 +2063,7 @@ static HotplugHandler *pc_get_hotpug_handler(MachineState *machine,
} }
static void static void
pc_machine_get_hotplug_memory_region_size(Object *obj, Visitor *v, pc_machine_get_device_memory_region_size(Object *obj, Visitor *v,
const char *name, void *opaque, const char *name, void *opaque,
Error **errp) Error **errp)
{ {
@ -2373,8 +2372,8 @@ static void pc_machine_class_init(ObjectClass *oc, void *data)
nc->nmi_monitor_handler = x86_nmi; nc->nmi_monitor_handler = x86_nmi;
mc->default_cpu_type = TARGET_DEFAULT_CPU_TYPE; mc->default_cpu_type = TARGET_DEFAULT_CPU_TYPE;
object_class_property_add(oc, PC_MACHINE_MEMHP_REGION_SIZE, "int", object_class_property_add(oc, PC_MACHINE_DEVMEM_REGION_SIZE, "int",
pc_machine_get_hotplug_memory_region_size, NULL, pc_machine_get_device_memory_region_size, NULL,
NULL, NULL, &error_abort); NULL, NULL, &error_abort);
object_class_property_add(oc, PC_MACHINE_MAX_RAM_BELOW_4G, "size", object_class_property_add(oc, PC_MACHINE_MAX_RAM_BELOW_4G, "size",

2
include/hw/i386/pc.h
View File

@ -71,7 +71,7 @@ struct PCMachineState {
}; };
#define PC_MACHINE_ACPI_DEVICE_PROP "acpi-device" #define PC_MACHINE_ACPI_DEVICE_PROP "acpi-device"
#define PC_MACHINE_MEMHP_REGION_SIZE "hotplug-memory-region-size" #define PC_MACHINE_DEVMEM_REGION_SIZE "device-memory-region-size"
#define PC_MACHINE_MAX_RAM_BELOW_4G "max-ram-below-4g" #define PC_MACHINE_MAX_RAM_BELOW_4G "max-ram-below-4g"
#define PC_MACHINE_VMPORT "vmport" #define PC_MACHINE_VMPORT "vmport"
#define PC_MACHINE_SMM "smm" #define PC_MACHINE_SMM "smm"