From: David Gibson Date: Tue, 10 Jul 2018 01:40:52 +0000 (+1000) Subject: spapr: Correct inverted test in spapr_pc_dimm_node() X-Git-Tag: v3.0.0-rc1~22^2~4 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=ccc2cef8b3f1dedd059924eb8ec1a87eff8ef607;p=thirdparty%2Fqemu.git spapr: Correct inverted test in spapr_pc_dimm_node() This function was introduced between v2.11 and v2.12 to replace obsolete ways of specifying the NUMA nodes for DIMMs. It's used to find the correct node for an LMB, by locating which DIMM object it lies within. Unfortunately, one of the checks is inverted, so we check whether the address is less than two different things, rather than actually checking a range. This introduced a regression, meaning that after a reboot qemu will advertise incorrect node information for memory to the guest. Signed-off-by: David Gibson Reviewed-by: Greg Kurz Reviewed-by: Igor Mammedov --- diff --git a/hw/ppc/spapr.c b/hw/ppc/spapr.c index 3f5e1d3ec21..421b2dd09b5 100644 --- a/hw/ppc/spapr.c +++ b/hw/ppc/spapr.c @@ -665,7 +665,7 @@ static uint32_t spapr_pc_dimm_node(MemoryDeviceInfoList *list, ram_addr_t addr) if (value && value->type == MEMORY_DEVICE_INFO_KIND_DIMM) { PCDIMMDeviceInfo *pcdimm_info = value->u.dimm.data; - if (pcdimm_info->addr >= addr && + if (addr >= pcdimm_info->addr && addr < (pcdimm_info->addr + pcdimm_info->size)) { return pcdimm_info->node; }