On Fri, Aug 14, 2015 at 10:52:00PM +0800, Xiao Guangrong wrote:
> NVDIMM reserves all the free range above 4G to do:
> - Persistent Memory (PMEM) mapping
> - implement NVDIMM ACPI device _DSM method
>
> Signed-off-by: Xiao Guangrong <guangrong.x...@linux.intel.com>
[...]
> @@ -1302,6 +1303,7 @@ FWCfgState *pc_memory_init(MachineState *machine,
> MemoryRegion *ram_below_4g, *ram_above_4g;
> FWCfgState *fw_cfg;
> PCMachineState *pcms = PC_MACHINE(machine);
> + ram_addr_t offset;
"offset" is a very generic name. I suggest naming it "nvdimm_offset".
>
> assert(machine->ram_size == below_4g_mem_size + above_4g_mem_size);
>
> @@ -1339,6 +1341,8 @@ FWCfgState *pc_memory_init(MachineState *machine,
> exit(EXIT_FAILURE);
> }
>
> + offset = 0x100000000ULL + above_4g_mem_size;
> +
> /* initialize hotplug memory address space */
> if (guest_info->has_reserved_memory &&
> (machine->ram_size < machine->maxram_size)) {
> @@ -1358,8 +1362,7 @@ FWCfgState *pc_memory_init(MachineState *machine,
> exit(EXIT_FAILURE);
> }
>
> - pcms->hotplug_memory.base =
> - ROUND_UP(0x100000000ULL + above_4g_mem_size, 1ULL << 30);
> + pcms->hotplug_memory.base = ROUND_UP(offset, 1ULL << 30);
>
> if (pcms->enforce_aligned_dimm) {
> /* size hotplug region assuming 1G page max alignment per slot */
--
Eduardo
