[libvirt PATCH 10/10] qemuMonitorGetMemoryDeviceInfo: `virHashNew` cannot return NULL

Tim Wiederhake twiederh at redhat.com
Fri Jul 9 08:27:39 UTC 2021


Signed-off-by: Tim Wiederhake <twiederh at redhat.com>
---
 src/qemu/qemu_monitor.c | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/src/qemu/qemu_monitor.c b/src/qemu/qemu_monitor.c
index 3a56ed8ef9..4506f962d1 100644
--- a/src/qemu/qemu_monitor.c
+++ b/src/qemu/qemu_monitor.c
@@ -4238,7 +4238,7 @@ int
 qemuMonitorGetMemoryDeviceInfo(qemuMonitor *mon,
                                GHashTable **info)
 {
-    g_autoptr(GHashTable) hash = NULL;
+    g_autoptr(GHashTable) hash = virHashNew(g_free);
     int ret;
 
     VIR_DEBUG("info=%p", info);
@@ -4247,9 +4247,6 @@ qemuMonitorGetMemoryDeviceInfo(qemuMonitor *mon,
 
     QEMU_CHECK_MONITOR(mon);
 
-    if (!(hash = virHashNew(g_free)))
-        return -1;
-
     if ((ret = qemuMonitorJSONGetMemoryDeviceInfo(mon, hash)) >= 0) {
         *info = g_steal_pointer(&hash);
     }
-- 
2.31.1




More information about the libvir-list mailing list