From 09083437ffa45dbe43771ef57f31d9d58dd324b9 Mon Sep 17 00:00:00 2001
From: Eric Blake <eblake@redhat.com>
Date: Mon, 10 Jun 2019 22:01:08 -0500
Subject: [PATCH] qemumonitorjsontest: Use VIR_AUTOPTR support

Simplify the GEN_TEST_FUNC() and target of the DO_TEST_SIMPLE() macros
by using autoptr support.

Signed-off-by: Eric Blake <eblake@redhat.com>
Acked-by: Peter Krempa <pkrempa@redhat.com>
---
 tests/qemumonitorjsontest.c | 28 ++++++++++------------------
 1 file changed, 10 insertions(+), 18 deletions(-)

diff --git a/tests/qemumonitorjsontest.c b/tests/qemumonitorjsontest.c
index 0894e748ae..a6f1d4d728 100644
--- a/tests/qemumonitorjsontest.c
+++ b/tests/qemumonitorjsontest.c
@@ -1268,26 +1268,22 @@ testQemuMonitorJSONSimpleFunc(const void *opaque)
     testQemuMonitorJSONSimpleFuncDataPtr data =
         (testQemuMonitorJSONSimpleFuncDataPtr) opaque;
     virDomainXMLOptionPtr xmlopt = data->xmlopt;
-    qemuMonitorTestPtr test = qemuMonitorTestNewSchema(xmlopt, data->schema);
     const char *reply = data->reply;
-    int ret = -1;
+    VIR_AUTOPTR(qemuMonitorTest) test = NULL;
 
-    if (!test)
+    if (!(test = qemuMonitorTestNewSchema(xmlopt, data->schema)))
         return -1;
 
     if (!reply)
         reply = "{\"return\":{}}";
 
     if (qemuMonitorTestAddItem(test, data->cmd, reply) < 0)
-        goto cleanup;
+        return -1;
 
     if (data->func(qemuMonitorTestGetMonitor(test)) < 0)
-        goto cleanup;
+        return -1;
 
-    ret = 0;
- cleanup:
-    qemuMonitorTestFree(test);
-    return ret;
+    return 0;
 }
 
 #define GEN_TEST_FUNC(funcName, ...) \
@@ -1296,26 +1292,22 @@ testQemuMonitorJSON ## funcName(const void *opaque) \
 { \
     const testQemuMonitorJSONSimpleFuncData *data = opaque; \
     virDomainXMLOptionPtr xmlopt = data->xmlopt; \
-    qemuMonitorTestPtr test = qemuMonitorTestNewSchema(xmlopt, data->schema); \
     const char *reply = data->reply; \
-    int ret = -1; \
+    VIR_AUTOPTR(qemuMonitorTest) test = NULL; \
  \
-    if (!test) \
+    if (!(test = qemuMonitorTestNewSchema(xmlopt, data->schema))) \
         return -1; \
  \
     if (!reply) \
         reply = "{\"return\":{}}"; \
  \
     if (qemuMonitorTestAddItem(test, data->cmd, reply) < 0) \
-        goto cleanup; \
+        return -1; \
  \
     if (funcName(qemuMonitorTestGetMonitor(test), __VA_ARGS__) < 0) \
-        goto cleanup; \
+        return -1; \
  \
-    ret = 0; \
-cleanup: \
-    qemuMonitorTestFree(test); \
-    return ret; \
+    return 0; \
 }
 
 GEN_TEST_FUNC(qemuMonitorJSONSetLink, "vnet0", VIR_DOMAIN_NET_INTERFACE_LINK_STATE_DOWN)