[libvirt] [RFC PATCH 16/30] tests: qemublock: Rename variables in anticipation of new tests

Peter Krempa pkrempa at redhat.com
Thu Apr 19 15:25:13 UTC 2018


New tests will add new data structures so rename the 'data' structure.

Signed-off-by: Peter Krempa <pkrempa at redhat.com>
---
 tests/qemublocktest.c | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/tests/qemublocktest.c b/tests/qemublocktest.c
index bd628295ff..7eef9f286a 100644
--- a/tests/qemublocktest.c
+++ b/tests/qemublocktest.c
@@ -117,15 +117,16 @@ static int
 mymain(void)
 {
     int ret = 0;
-    struct testBackingXMLjsonXMLdata data;
+    struct testBackingXMLjsonXMLdata xmljsonxmldata;

     virTestCounterReset("qemu storage source xml->json->xml ");

 #define TEST_JSON_FORMAT(tpe, xmlstr) \
     do { \
-        data.type = tpe; \
-        data.xml = xmlstr; \
-        if (virTestRun(virTestCounterNext(), testBackingXMLjsonXML, &data) < 0) \
+        xmljsonxmldata.type = tpe; \
+        xmljsonxmldata.xml = xmlstr; \
+        if (virTestRun(virTestCounterNext(), testBackingXMLjsonXML, \
+                       &xmljsonxmldata) < 0) \
             ret = -1; \
     } while (0)

-- 
2.14.3




More information about the libvir-list mailing list