mirror of https://github.com/proxmox/mirror_qemu
spapr: Fix ibm,lrdr-capacity
ibm,lrdr-capacity has a field to describe the maximum address in bytes and therefore, the most memory that can be allocated to this guest. We are using maxmem for this field, but instead should use the actual RAM address corresponding to the end of hotplug region. Signed-off-by: Bharata B Rao <bharata@linux.vnet.ibm.com> Signed-off-by: David Gibson <david@gibson.dropbear.id.au>master
parent
ead5268f21
commit
a110655a06
|
@ -684,6 +684,9 @@ int spapr_rtas_device_tree_setup(void *fdt, hwaddr rtas_addr,
|
||||||
int i;
|
int i;
|
||||||
uint32_t lrdr_capacity[5];
|
uint32_t lrdr_capacity[5];
|
||||||
MachineState *machine = MACHINE(qdev_get_machine());
|
MachineState *machine = MACHINE(qdev_get_machine());
|
||||||
|
sPAPRMachineState *spapr = SPAPR_MACHINE(machine);
|
||||||
|
uint64_t max_hotplug_addr = spapr->hotplug_memory.base +
|
||||||
|
memory_region_size(&spapr->hotplug_memory.mr);
|
||||||
|
|
||||||
ret = fdt_add_mem_rsv(fdt, rtas_addr, rtas_size);
|
ret = fdt_add_mem_rsv(fdt, rtas_addr, rtas_size);
|
||||||
if (ret < 0) {
|
if (ret < 0) {
|
||||||
|
@ -733,8 +736,8 @@ int spapr_rtas_device_tree_setup(void *fdt, hwaddr rtas_addr,
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
lrdr_capacity[0] = cpu_to_be32(((uint64_t)machine->maxram_size) >> 32);
|
lrdr_capacity[0] = cpu_to_be32(max_hotplug_addr >> 32);
|
||||||
lrdr_capacity[1] = cpu_to_be32(machine->maxram_size & 0xffffffff);
|
lrdr_capacity[1] = cpu_to_be32(max_hotplug_addr & 0xffffffff);
|
||||||
lrdr_capacity[2] = 0;
|
lrdr_capacity[2] = 0;
|
||||||
lrdr_capacity[3] = cpu_to_be32(SPAPR_MEMORY_BLOCK_SIZE);
|
lrdr_capacity[3] = cpu_to_be32(SPAPR_MEMORY_BLOCK_SIZE);
|
||||||
lrdr_capacity[4] = cpu_to_be32(max_cpus/smp_threads);
|
lrdr_capacity[4] = cpu_to_be32(max_cpus/smp_threads);
|
||||||
|
|
Loading…
Reference in New Issue