]> git.ipfire.org Git - thirdparty/libvirt.git/commitdiff
qemu: Don't error out on 'unknown' memory model in qemuMonitorJSONGetMemoryDeviceInfo() v9.1.0-rc2
authorMichal Privoznik <mprivozn@redhat.com>
Mon, 27 Feb 2023 09:23:12 +0000 (10:23 +0100)
committerMichal Privoznik <mprivozn@redhat.com>
Mon, 27 Feb 2023 13:05:13 +0000 (14:05 +0100)
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 <mprivozn@redhat.com>
Reviewed-by: Kristina Hanicova <khanicov@redhat.com>
src/qemu/qemu_monitor_json.c

index e81b464eea23667f14c19f03dae5e21cdefb9cec..d76fea8b00da7a81bb02c76e7f006ffb3276e0be 100644 (file)
@@ -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);