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 8ee40e22967414b4bd934d568645f1e3c7a84eb2..1364bddd15d94b8acd499bb183014b6042099666 100644 (file)
--- 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 c2f3f23bfb388db3acfc4cb72c6b3e9eb16b101b..b65b16019cde33a458be999cbde8ec48a97a5a31 100644 (file)
--- 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 4b7bad82df95dfbf5fb27c1f5bf6a34b0b89530a..152a4ff8af1a0cc06053343f791d7b9f347b808f 100644 (file)
--- 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 e28ad6d964751902c7b1943c2a717f56055b0a93..aacb513d680c5e70d72d0c789d9a2645ce0324c7 100644 (file)
--- 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: