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

Tim Wiederhake twiederh at redhat.com
Mon Jul 12 09:34:17 UTC 2021


Signed-off-by: Tim Wiederhake <twiederh at redhat.com>
---
 tests/qemumonitorjsontest.c | 8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)

diff --git a/tests/qemumonitorjsontest.c b/tests/qemumonitorjsontest.c
index 37d878b0ad..0b321e8ed8 100644
--- a/tests/qemumonitorjsontest.c
+++ b/tests/qemumonitorjsontest.c
@@ -1811,8 +1811,8 @@ testQemuMonitorJSONqemuMonitorJSONGetChardevInfo(const void *opaque)
 {
     const testGenericData *data = opaque;
     virDomainXMLOption *xmlopt = data->xmlopt;
-    g_autoptr(GHashTable) info = NULL;
-    g_autoptr(GHashTable) expectedInfo = NULL;
+    g_autoptr(GHashTable) info = virHashNew(qemuMonitorChardevInfoFree);
+    g_autoptr(GHashTable) expectedInfo = virHashNew(NULL);
     qemuMonitorChardevInfo info0 = { NULL, VIR_DOMAIN_CHR_DEVICE_STATE_DEFAULT };
     qemuMonitorChardevInfo info1 = { (char *) "/dev/pts/21", VIR_DOMAIN_CHR_DEVICE_STATE_CONNECTED };
     qemuMonitorChardevInfo info2 = { (char *) "/dev/pts/20", VIR_DOMAIN_CHR_DEVICE_STATE_DEFAULT };
@@ -1822,10 +1822,6 @@ testQemuMonitorJSONqemuMonitorJSONGetChardevInfo(const void *opaque)
     if (!(test = qemuMonitorTestNewSchema(xmlopt, data->schema)))
         return -1;
 
-    if (!(info = virHashNew(qemuMonitorChardevInfoFree)) ||
-        !(expectedInfo = virHashNew(NULL)))
-        return -1;
-
     if (virHashAddEntry(expectedInfo, "charserial1", &info1) < 0 ||
         virHashAddEntry(expectedInfo, "charserial0", &info2) < 0 ||
         virHashAddEntry(expectedInfo, "charmonitor", &info0) < 0 ||
-- 
2.31.1




More information about the libvir-list mailing list