From: Michal Privoznik Date: Mon, 15 Mar 2021 14:47:04 +0000 (+0100) Subject: qemu_process: Use accessor for def->mem.total_memory X-Git-Tag: v7.2.0-rc1~105 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=6e9c4811be37f1f237f7a5610da22af31f15cb99;p=thirdparty%2Flibvirt.git qemu_process: Use accessor for def->mem.total_memory When connecting to the monitor, a timeout is calculated that is bigger the more memory guest has (because QEMU has to allocate and possibly zero out the memory and what not, empirically deducted). However, when computing the timeout the @total_memory mmember is accessed directly even though virDomainDefGetMemoryTotal() should have been used. Signed-off-by: Michal Privoznik Reviewed-by: Ján Tomko --- diff --git a/src/qemu/qemu_process.c b/src/qemu/qemu_process.c index 971a270793..5f31260221 100644 --- a/src/qemu/qemu_process.c +++ b/src/qemu/qemu_process.c @@ -2026,7 +2026,7 @@ qemuConnectMonitor(virQEMUDriverPtr driver, virDomainObjPtr vm, int asyncJob, * handing them over to qemu. This can be very time * consuming. Therefore, add a second to timeout for each * 1GiB of guest RAM. */ - timeout = vm->def->mem.total_memory / (1024 * 1024); + timeout = virDomainDefGetMemoryTotal(vm->def) / (1024 * 1024); ignore_value(virTimeMillisNow(&priv->monStart));