提交 55130c0b 编写于 作者: M Marc Hartmayer 提交者: John Ferlan

test: rename defaultConn to defaultPrivconn

Rename the variable @defaultConn to @defaultPrivconn as it doesn't
point to a default connection but to the private data used for the
shared default connection of the test driver.
Signed-off-by: NMarc Hartmayer <mhartmay@linux.vnet.ibm.com>
Reviewed-by: NBoris Fiuczynski <fiuczy@linux.vnet.ibm.com>
Reviewed-by: NJohn Ferlan <jferlan@redhat.com>
上级 81b2a8e0
......@@ -125,7 +125,7 @@ struct _testDriver {
typedef struct _testDriver testDriver;
typedef testDriver *testDriverPtr;
static testDriverPtr defaultConn;
static testDriverPtr defaultPrivconn;
static int defaultConnections;
static virMutex defaultLock = VIR_MUTEX_INITIALIZER;
......@@ -1305,7 +1305,7 @@ testOpenDefault(virConnectPtr conn)
virMutexLock(&defaultLock);
if (defaultConnections++) {
conn->privateData = defaultConn;
conn->privateData = defaultPrivconn;
virMutexUnlock(&defaultLock);
return VIR_DRV_OPEN_SUCCESS;
}
......@@ -1345,7 +1345,7 @@ testOpenDefault(virConnectPtr conn)
if (testOpenParse(privconn, NULL, ctxt) < 0)
goto error;
defaultConn = privconn;
defaultPrivconn = privconn;
ret = VIR_DRV_OPEN_SUCCESS;
cleanup:
virMutexUnlock(&defaultLock);
......@@ -1468,7 +1468,7 @@ static int testConnectClose(virConnectPtr conn)
testDriverPtr privconn = conn->privateData;
bool dflt = false;
if (privconn == defaultConn) {
if (privconn == defaultPrivconn) {
dflt = true;
virMutexLock(&defaultLock);
if (--defaultConnections) {
......@@ -1482,7 +1482,7 @@ static int testConnectClose(virConnectPtr conn)
testDriverFree(privconn);
if (dflt) {
defaultConn = NULL;
defaultPrivconn = NULL;
virMutexUnlock(&defaultLock);
}
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册