From: John Ferlan <jferlan@redhat.com>
Date: Sat, 19 Aug 2017 12:16:18 +0000 (-0400)
Subject: storage: Internally represent @autostart as bool
X-Git-Tag: v3.8.0-rc1~76
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=ccc8c311b26b7d4e4d631e392edf8b265966bfd1;p=thirdparty%2Flibvirt.git

storage: Internally represent @autostart as bool

Since it's been used that way anyway, let's just convert it to a bool
and only make the external representation be an int.
---

diff --git a/src/conf/virstorageobj.c b/src/conf/virstorageobj.c
index 8ee40e2296..1364bddd15 100644
--- a/src/conf/virstorageobj.c
+++ b/src/conf/virstorageobj.c
@@ -133,13 +133,13 @@ virStoragePoolObjIsAutostart(virStoragePoolObjPtr obj)
     if (!obj->configFile)
         return 0;
 
-    return obj->autostart == 1;
+    return obj->autostart;
 }
 
 
 void
 virStoragePoolObjSetAutostart(virStoragePoolObjPtr obj,
-                              int autostart)
+                              bool autostart)
 {
     obj->autostart = autostart;
 }
diff --git a/src/conf/virstorageobj.h b/src/conf/virstorageobj.h
index c2f3f23bfb..b65b16019c 100644
--- a/src/conf/virstorageobj.h
+++ b/src/conf/virstorageobj.h
@@ -33,7 +33,7 @@ struct _virStoragePoolObj {
     char *configFile;
     char *autostartLink;
     bool active;
-    int autostart;
+    bool autostart;
     unsigned int asyncjobs;
 
     virStoragePoolDefPtr def;
@@ -108,7 +108,7 @@ virStoragePoolObjIsAutostart(virStoragePoolObjPtr obj);
 
 void
 virStoragePoolObjSetAutostart(virStoragePoolObjPtr obj,
-                              int autostart);
+                              bool autostart);
 
 unsigned int
 virStoragePoolObjGetAsyncjobs(virStoragePoolObjPtr obj);
diff --git a/src/storage/storage_driver.c b/src/storage/storage_driver.c
index 4b7bad82df..152a4ff8af 100644
--- a/src/storage/storage_driver.c
+++ b/src/storage/storage_driver.c
@@ -1310,7 +1310,7 @@ storagePoolSetAutostart(virStoragePoolPtr pool,
                 goto cleanup;
             }
         }
-        virStoragePoolObjSetAutostart(obj, autostart);
+        virStoragePoolObjSetAutostart(obj, new_autostart);
     }
 
     ret = 0;
diff --git a/src/test/test_driver.c b/src/test/test_driver.c
index e28ad6d964..aacb513d68 100644
--- a/src/test/test_driver.c
+++ b/src/test/test_driver.c
@@ -4777,6 +4777,7 @@ testStoragePoolSetAutostart(virStoragePoolPtr pool,
 {
     testDriverPtr privconn = pool->conn->privateData;
     virStoragePoolObjPtr obj;
+    bool new_autostart = (autostart != 0);
     int ret = -1;
 
     if (!(obj = testStoragePoolObjFindByName(privconn, pool->name)))
@@ -4788,8 +4789,7 @@ testStoragePoolSetAutostart(virStoragePoolPtr pool,
         goto cleanup;
     }
 
-    autostart = (autostart != 0);
-    virStoragePoolObjSetAutostart(obj, autostart);
+    virStoragePoolObjSetAutostart(obj, new_autostart);
     ret = 0;
 
  cleanup: