[libvirt] [PATCH 5/7] tests: Alter logic in testCompareXMLToDomConfig

John Ferlan jferlan at redhat.com
Fri Sep 28 15:28:08 UTC 2018


Rather than initialize actualconfig and expectconfig before
having the possibility that libxlDriverConfigNew could fail
and thus land in cleanup, let's just move them and return
immediately upon failure.

Signed-off-by: John Ferlan <jferlan at redhat.com>
---
 tests/libxlxml2domconfigtest.c | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

diff --git a/tests/libxlxml2domconfigtest.c b/tests/libxlxml2domconfigtest.c
index 22f9c2c871..2f0bfd5eaf 100644
--- a/tests/libxlxml2domconfigtest.c
+++ b/tests/libxlxml2domconfigtest.c
@@ -62,14 +62,14 @@ testCompareXMLToDomConfig(const char *xmlfile,
     char *tempjson = NULL;
     char *expectjson = NULL;
 
-    libxl_domain_config_init(&actualconfig);
-    libxl_domain_config_init(&expectconfig);
-
     if (!(cfg = libxlDriverConfigNew()))
-        goto cleanup;
+        return -1;
 
     cfg->caps = caps;
 
+    libxl_domain_config_init(&actualconfig);
+    libxl_domain_config_init(&expectconfig);
+
     if (!(log = (xentoollog_logger *)xtl_createlogger_stdiostream(stderr, XTL_DEBUG, 0)))
         goto cleanup;
 
@@ -135,8 +135,7 @@ testCompareXMLToDomConfig(const char *xmlfile,
     libxl_domain_config_dispose(&actualconfig);
     libxl_domain_config_dispose(&expectconfig);
     xtl_logger_destroy(log);
-    if (cfg)
-        cfg->caps = NULL;
+    cfg->caps = NULL;
     virObjectUnref(cfg);
     return ret;
 }
-- 
2.17.1




More information about the libvir-list mailing list