[libvirt] [PATCHv4 09/21] tests: virstoragetest: Remove now unused pathAbs

Peter Krempa pkrempa at redhat.com
Wed Jun 11 11:45:19 UTC 2014


Separately remove the now unused variable.
---
 tests/virstoragetest.c | 15 ---------------
 1 file changed, 15 deletions(-)

diff --git a/tests/virstoragetest.c b/tests/virstoragetest.c
index dd25069..11bc4dd 100644
--- a/tests/virstoragetest.c
+++ b/tests/virstoragetest.c
@@ -283,7 +283,6 @@ struct _testFileData
     unsigned long long expCapacity;
     bool expEncrypted;
     const char *pathRel;
-    const char *pathAbs;
     const char *path;
     const char *relDirRel;
     const char *relDirAbs;
@@ -730,7 +729,6 @@ mymain(void)

     /* Raw image, whether with right format or no specified format */
     testFileData raw = {
-        .pathAbs = canonraw,
         .path = canonraw,
         .relDirRel = ".",
         .relDirAbs = datadir,
@@ -749,12 +747,10 @@ mymain(void)
                (&raw), ALLOW_PROBE | EXP_PASS);

     /* Qcow2 file with relative raw backing, format provided */
-    raw.pathAbs = "raw";
     raw.pathRel = "raw";
     testFileData qcow2 = {
         .expBackingStoreRaw = "raw",
         .expCapacity = 1024,
-        .pathAbs = canonqcow2,
         .path = canonqcow2,
         .relDirRel = ".",
         .relDirAbs = datadir,
@@ -762,7 +758,6 @@ mymain(void)
         .format = VIR_STORAGE_FILE_QCOW2,
     };
     testFileData qcow2_as_raw = {
-        .pathAbs = canonqcow2,
         .path = canonqcow2,
         .relDirRel = ".",
         .relDirAbs = datadir,
@@ -788,7 +783,6 @@ mymain(void)
         ret = -1;
     qcow2.expBackingStoreRaw = absraw;
     raw.pathRel = NULL;
-    raw.pathAbs = absraw;
     raw.relDirRel = datadir;

     /* Qcow2 file with raw as absolute backing, backing format provided */
@@ -807,7 +801,6 @@ mymain(void)
     testFileData wrap = {
         .expBackingStoreRaw = absqcow2,
         .expCapacity = 1024,
-        .pathAbs = abswrap,
         .path = canonwrap,
         .relDirRel = ".",
         .relDirAbs = datadir,
@@ -839,7 +832,6 @@ mymain(void)
     testFileData wrap_as_raw = {
         .expBackingStoreRaw = absqcow2,
         .expCapacity = 1024,
-        .pathAbs = abswrap,
         .path = canonwrap,
         .relDirRel = ".",
         .relDirAbs = datadir,
@@ -894,7 +886,6 @@ mymain(void)

     /* Qcow2 file with backing protocol instead of file */
     testFileData nbd = {
-        .pathAbs = "nbd:example.org:6000:exportname=blah",
         .path = "blah",
         .type = VIR_STORAGE_TYPE_NETWORK,
         .format = VIR_STORAGE_FILE_RAW,
@@ -911,7 +902,6 @@ mymain(void)
     testFileData qed = {
         .expBackingStoreRaw = absraw,
         .expCapacity = 1024,
-        .pathAbs = absqed,
         .path = canonqed,
         .relDirRel = ".",
         .relDirAbs = datadir,
@@ -919,7 +909,6 @@ mymain(void)
         .format = VIR_STORAGE_FILE_QED,
     };
     testFileData qed_as_raw = {
-        .pathAbs = absqed,
         .path = canonqed,
         .relDirRel = ".",
         .relDirAbs = datadir,
@@ -934,7 +923,6 @@ mymain(void)

     /* directory */
     testFileData dir = {
-        .pathAbs = absdir,
         .path = canondir,
         .relDirRel = ".",
         .relDirAbs = datadir,
@@ -973,7 +961,6 @@ mymain(void)
         .expBackingStoreRaw = "../raw",
         .expCapacity = 1024,
         .pathRel = "../sub/link1",
-        .pathAbs = "../sub/link1",
         .path = canonqcow2,
         .relDirRel = "sub/../sub",
         .relDirAbs = datadir "/sub/../sub",
@@ -983,7 +970,6 @@ mymain(void)
     testFileData link2 = {
         .expBackingStoreRaw = "../sub/link1",
         .expCapacity = 1024,
-        .pathAbs = abslink2,
         .path = canonwrap,
         .relDirRel = "sub",
         .relDirAbs = datadir "/sub",
@@ -991,7 +977,6 @@ mymain(void)
         .format = VIR_STORAGE_FILE_QCOW2,
     };
     raw.pathRel = "../raw";
-    raw.pathAbs = "../raw";
     raw.relDirRel = "sub/../sub/..";
     raw.relDirAbs = datadir "/sub/../sub/..";
     TEST_CHAIN(15, "sub/link2", abslink2, VIR_STORAGE_FILE_QCOW2,
-- 
1.9.3




More information about the libvir-list mailing list