From: Michal Privoznik Date: Mon, 27 Feb 2023 09:23:12 +0000 (+0100) Subject: qemu: Don't error out on 'unknown' memory model in qemuMonitorJSONGetMemoryDeviceInfo() X-Git-Tag: v9.1.0-rc2^0 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=d427102fbd690cb2f43dbf33751cc5194a5b16ce;p=thirdparty%2Flibvirt.git qemu: Don't error out on 'unknown' memory model in qemuMonitorJSONGetMemoryDeviceInfo() When starting QEMU (or when reconnecting to a running one), qemuMonitorJSONGetMemoryDeviceInfo() is called to refresh info on memory devices. In here, query-memory-devices is called which returns info on all memory devices. The result is then iterated over and for some memory models runtime information is updated. The rest is to be ignored. Except, when introducing SGX support, this was turned into an error leaving us unable to start any domain with virtio-pmem memory device (as virtio-pmem is to be ignored). Fixes: ddb1bc051959eef4ad7ed6ac47b57056632bdb5e Signed-off-by: Michal Privoznik Reviewed-by: Kristina Hanicova --- diff --git a/src/qemu/qemu_monitor_json.c b/src/qemu/qemu_monitor_json.c index e81b464eea..d76fea8b00 100644 --- a/src/qemu/qemu_monitor_json.c +++ b/src/qemu/qemu_monitor_json.c @@ -7243,9 +7243,8 @@ qemuMonitorJSONGetMemoryDeviceInfo(qemuMonitor *mon, return -1; } } else { - virReportError(VIR_ERR_INTERNAL_ERROR, - _("%s memory device info is not handled yet"), type); - return -1; + /* type not handled yet */ + continue; } meminfo = g_new0(qemuMonitorMemoryDeviceInfo, 1);