Commit bafc90bdc594 ("q35: implement TSEG") uses memory_region_set_address() for updating the address of mch->tseg_window but uses memory_region_del_subregion() and memory_region_add_subregion_overlap() for doing the same on mch- >tseg_blackhole. The latter seems to be the old, cumbersome way of changing a memory region's address. So make the code more comprehensible by modernizing it.
Signed-off-by: Bernhard Beschow <shen...@gmail.com> --- hw/pci-host/q35.c | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/hw/pci-host/q35.c b/hw/pci-host/q35.c index 40bfe99910..0497194983 100644 --- a/hw/pci-host/q35.c +++ b/hw/pci-host/q35.c @@ -404,12 +404,11 @@ static void mch_update_smram(MCHPCIState *mch) } else { tseg_size = 0; } - memory_region_del_subregion(mch->system_memory, &mch->tseg_blackhole); + memory_region_set_enabled(&mch->tseg_blackhole, tseg_size); memory_region_set_size(&mch->tseg_blackhole, tseg_size); - memory_region_add_subregion_overlap(mch->system_memory, - mch->below_4g_mem_size - tseg_size, - &mch->tseg_blackhole, 1); + memory_region_set_address(&mch->tseg_blackhole, + mch->below_4g_mem_size - tseg_size); memory_region_set_enabled(&mch->tseg_window, tseg_size); memory_region_set_size(&mch->tseg_window, tseg_size); -- 2.39.2