]> git.ipfire.org Git - thirdparty/libvirt.git/commitdiff
testQemuMonitorJSONqemuMonitorJSONGetChardevInfo: `virHashNew` cannot return NULL
authorTim Wiederhake <twiederh@redhat.com>
Mon, 5 Jul 2021 14:49:52 +0000 (16:49 +0200)
committerTim Wiederhake <twiederh@redhat.com>
Wed, 14 Jul 2021 13:37:07 +0000 (15:37 +0200)
Signed-off-by: Tim Wiederhake <twiederh@redhat.com>
Reviewed-by: Peter Krempa <pkrempa@redhat.com>
tests/qemumonitorjsontest.c

index 37d878b0ad751c962141936754e9b0ed4d0b7875..0b321e8ed89eb1507c220ea6776376928d21c688 100644 (file)
@@ -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 ||