提交 ccc8c311 编写于 作者: J John Ferlan

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.
上级 bb15e65a
...@@ -133,13 +133,13 @@ virStoragePoolObjIsAutostart(virStoragePoolObjPtr obj) ...@@ -133,13 +133,13 @@ virStoragePoolObjIsAutostart(virStoragePoolObjPtr obj)
if (!obj->configFile) if (!obj->configFile)
return 0; return 0;
return obj->autostart == 1; return obj->autostart;
} }
void void
virStoragePoolObjSetAutostart(virStoragePoolObjPtr obj, virStoragePoolObjSetAutostart(virStoragePoolObjPtr obj,
int autostart) bool autostart)
{ {
obj->autostart = autostart; obj->autostart = autostart;
} }
......
...@@ -33,7 +33,7 @@ struct _virStoragePoolObj { ...@@ -33,7 +33,7 @@ struct _virStoragePoolObj {
char *configFile; char *configFile;
char *autostartLink; char *autostartLink;
bool active; bool active;
int autostart; bool autostart;
unsigned int asyncjobs; unsigned int asyncjobs;
virStoragePoolDefPtr def; virStoragePoolDefPtr def;
...@@ -108,7 +108,7 @@ virStoragePoolObjIsAutostart(virStoragePoolObjPtr obj); ...@@ -108,7 +108,7 @@ virStoragePoolObjIsAutostart(virStoragePoolObjPtr obj);
void void
virStoragePoolObjSetAutostart(virStoragePoolObjPtr obj, virStoragePoolObjSetAutostart(virStoragePoolObjPtr obj,
int autostart); bool autostart);
unsigned int unsigned int
virStoragePoolObjGetAsyncjobs(virStoragePoolObjPtr obj); virStoragePoolObjGetAsyncjobs(virStoragePoolObjPtr obj);
......
...@@ -1310,7 +1310,7 @@ storagePoolSetAutostart(virStoragePoolPtr pool, ...@@ -1310,7 +1310,7 @@ storagePoolSetAutostart(virStoragePoolPtr pool,
goto cleanup; goto cleanup;
} }
} }
virStoragePoolObjSetAutostart(obj, autostart); virStoragePoolObjSetAutostart(obj, new_autostart);
} }
ret = 0; ret = 0;
......
...@@ -4777,6 +4777,7 @@ testStoragePoolSetAutostart(virStoragePoolPtr pool, ...@@ -4777,6 +4777,7 @@ testStoragePoolSetAutostart(virStoragePoolPtr pool,
{ {
testDriverPtr privconn = pool->conn->privateData; testDriverPtr privconn = pool->conn->privateData;
virStoragePoolObjPtr obj; virStoragePoolObjPtr obj;
bool new_autostart = (autostart != 0);
int ret = -1; int ret = -1;
if (!(obj = testStoragePoolObjFindByName(privconn, pool->name))) if (!(obj = testStoragePoolObjFindByName(privconn, pool->name)))
...@@ -4788,8 +4789,7 @@ testStoragePoolSetAutostart(virStoragePoolPtr pool, ...@@ -4788,8 +4789,7 @@ testStoragePoolSetAutostart(virStoragePoolPtr pool,
goto cleanup; goto cleanup;
} }
autostart = (autostart != 0); virStoragePoolObjSetAutostart(obj, new_autostart);
virStoragePoolObjSetAutostart(obj, autostart);
ret = 0; ret = 0;
cleanup: cleanup:
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册