Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
openeuler
libvirt
提交
5a19c246
L
libvirt
项目概览
openeuler
/
libvirt
通知
3
Star
0
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
L
libvirt
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
提交
5a19c246
编写于
4月 03, 2010
作者:
M
Matthias Bolte
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Remove virConnectPtr from virLibConnError
上级
b290e48c
变更
1
隐藏空白更改
内联
并排
Showing
1 changed file
with
55 addition
and
54 deletion
+55
-54
src/datatypes.c
src/datatypes.c
+55
-54
未找到文件。
src/datatypes.c
浏览文件 @
5a19c246
...
...
@@ -31,8 +31,8 @@
#define VIR_FROM_THIS VIR_FROM_NONE
#define virLibConnError(co
nn, code, ...)
\
virReportErrorHelper(
conn
, VIR_FROM_THIS, code, __FILE__, \
#define virLibConnError(co
de, ...)
\
virReportErrorHelper(
NULL
, VIR_FROM_THIS, code, __FILE__, \
__FUNCTION__, __LINE__, __VA_ARGS__)
/************************************************************************
...
...
@@ -269,7 +269,7 @@ virUnrefConnect(virConnectPtr conn) {
int
refs
;
if
((
!
VIR_IS_CONNECT
(
conn
)))
{
virLibConnError
(
NULL
,
VIR_ERR_INVALID_ARG
,
__FUNCTION__
);
virLibConnError
(
VIR_ERR_INVALID_ARG
,
__FUNCTION__
);
return
(
-
1
);
}
virMutexLock
(
&
conn
->
lock
);
...
...
@@ -325,7 +325,7 @@ virGetDomain(virConnectPtr conn, const char *name, const unsigned char *uuid) {
virDomainPtr
ret
=
NULL
;
if
((
!
VIR_IS_CONNECT
(
conn
))
||
(
name
==
NULL
)
||
(
uuid
==
NULL
))
{
virLibConnError
(
NULL
,
VIR_ERR_INVALID_ARG
,
__FUNCTION__
);
virLibConnError
(
VIR_ERR_INVALID_ARG
,
__FUNCTION__
);
return
(
NULL
);
}
virMutexLock
(
&
conn
->
lock
);
...
...
@@ -355,8 +355,8 @@ virGetDomain(virConnectPtr conn, const char *name, const unsigned char *uuid) {
if
(
virHashAddEntry
(
conn
->
domains
,
name
,
ret
)
<
0
)
{
virMutexUnlock
(
&
conn
->
lock
);
virLibConnError
(
conn
,
VIR_ERR_INTERNAL_ERROR
,
"%s"
,
_
(
"failed to add domain to connection hash table"
));
virLibConnError
(
VIR_ERR_INTERNAL_ERROR
,
"%s"
,
_
(
"failed to add domain to connection hash table"
));
goto
error
;
}
conn
->
refs
++
;
...
...
@@ -396,8 +396,8 @@ virReleaseDomain(virDomainPtr domain) {
/* TODO search by UUID first as they are better differenciators */
if
(
virHashRemoveEntry
(
conn
->
domains
,
domain
->
name
,
NULL
)
<
0
)
{
virMutexUnlock
(
&
conn
->
lock
);
virLibConnError
(
conn
,
VIR_ERR_INTERNAL_ERROR
,
"%s"
,
_
(
"domain missing from connection hash table"
));
virLibConnError
(
VIR_ERR_INTERNAL_ERROR
,
"%s"
,
_
(
"domain missing from connection hash table"
));
conn
=
NULL
;
}
...
...
@@ -435,7 +435,7 @@ virUnrefDomain(virDomainPtr domain) {
int
refs
;
if
(
!
VIR_IS_CONNECTED_DOMAIN
(
domain
))
{
virLibConnError
(
NULL
,
VIR_ERR_INVALID_ARG
,
__FUNCTION__
);
virLibConnError
(
VIR_ERR_INVALID_ARG
,
__FUNCTION__
);
return
(
-
1
);
}
virMutexLock
(
&
domain
->
conn
->
lock
);
...
...
@@ -470,7 +470,7 @@ virGetNetwork(virConnectPtr conn, const char *name, const unsigned char *uuid) {
virNetworkPtr
ret
=
NULL
;
if
((
!
VIR_IS_CONNECT
(
conn
))
||
(
name
==
NULL
)
||
(
uuid
==
NULL
))
{
virLibConnError
(
NULL
,
VIR_ERR_INVALID_ARG
,
__FUNCTION__
);
virLibConnError
(
VIR_ERR_INVALID_ARG
,
__FUNCTION__
);
return
(
NULL
);
}
virMutexLock
(
&
conn
->
lock
);
...
...
@@ -498,8 +498,8 @@ virGetNetwork(virConnectPtr conn, const char *name, const unsigned char *uuid) {
if
(
virHashAddEntry
(
conn
->
networks
,
name
,
ret
)
<
0
)
{
virMutexUnlock
(
&
conn
->
lock
);
virLibConnError
(
conn
,
VIR_ERR_INTERNAL_ERROR
,
"%s"
,
_
(
"failed to add network to connection hash table"
));
virLibConnError
(
VIR_ERR_INTERNAL_ERROR
,
"%s"
,
_
(
"failed to add network to connection hash table"
));
goto
error
;
}
conn
->
refs
++
;
...
...
@@ -536,8 +536,8 @@ virReleaseNetwork(virNetworkPtr network) {
/* TODO search by UUID first as they are better differenciators */
if
(
virHashRemoveEntry
(
conn
->
networks
,
network
->
name
,
NULL
)
<
0
)
{
virMutexUnlock
(
&
conn
->
lock
);
virLibConnError
(
conn
,
VIR_ERR_INTERNAL_ERROR
,
"%s"
,
_
(
"network missing from connection hash table"
));
virLibConnError
(
VIR_ERR_INTERNAL_ERROR
,
"%s"
,
_
(
"network missing from connection hash table"
));
conn
=
NULL
;
}
...
...
@@ -572,7 +572,7 @@ virUnrefNetwork(virNetworkPtr network) {
int
refs
;
if
(
!
VIR_IS_CONNECTED_NETWORK
(
network
))
{
virLibConnError
(
NULL
,
VIR_ERR_INVALID_ARG
,
__FUNCTION__
);
virLibConnError
(
VIR_ERR_INVALID_ARG
,
__FUNCTION__
);
return
(
-
1
);
}
virMutexLock
(
&
network
->
conn
->
lock
);
...
...
@@ -609,7 +609,7 @@ virGetInterface(virConnectPtr conn, const char *name, const char *mac) {
virInterfacePtr
ret
=
NULL
;
if
((
!
VIR_IS_CONNECT
(
conn
))
||
(
name
==
NULL
))
{
virLibConnError
(
NULL
,
VIR_ERR_INVALID_ARG
,
__FUNCTION__
);
virLibConnError
(
VIR_ERR_INVALID_ARG
,
__FUNCTION__
);
return
(
NULL
);
}
...
...
@@ -645,8 +645,9 @@ virGetInterface(virConnectPtr conn, const char *name, const char *mac) {
* interface, and that is unlikely to change.
*/
virMutexUnlock
(
&
conn
->
lock
);
virLibConnError
(
conn
,
VIR_ERR_INTERNAL_ERROR
,
_
(
"Failed to change interface mac address from %s to %s due to differing lengths."
),
virLibConnError
(
VIR_ERR_INTERNAL_ERROR
,
_
(
"Failed to change interface mac address "
"from %s to %s due to differing lengths."
),
ret
->
mac
,
mac
);
ret
=
NULL
;
goto
error
;
...
...
@@ -676,8 +677,8 @@ _("Failed to change interface mac address from %s to %s due to differing lengths
if
(
virHashAddEntry
(
conn
->
interfaces
,
name
,
ret
)
<
0
)
{
virMutexUnlock
(
&
conn
->
lock
);
virLibConnError
(
conn
,
VIR_ERR_INTERNAL_ERROR
,
"%s"
,
_
(
"failed to add interface to connection hash table"
));
virLibConnError
(
VIR_ERR_INTERNAL_ERROR
,
"%s"
,
_
(
"failed to add interface to connection hash table"
));
goto
error
;
}
conn
->
refs
++
;
...
...
@@ -715,8 +716,8 @@ virReleaseInterface(virInterfacePtr iface) {
if
(
virHashRemoveEntry
(
conn
->
interfaces
,
iface
->
name
,
NULL
)
<
0
)
{
/* unlock before reporting error because error report grabs lock */
virMutexUnlock
(
&
conn
->
lock
);
virLibConnError
(
conn
,
VIR_ERR_INTERNAL_ERROR
,
"%s"
,
_
(
"interface missing from connection hash table"
));
virLibConnError
(
VIR_ERR_INTERNAL_ERROR
,
"%s"
,
_
(
"interface missing from connection hash table"
));
/* don't decr the conn refct if we weren't connected to it */
conn
=
NULL
;
}
...
...
@@ -753,7 +754,7 @@ virUnrefInterface(virInterfacePtr iface) {
int
refs
;
if
(
!
VIR_IS_CONNECTED_INTERFACE
(
iface
))
{
virLibConnError
(
NULL
,
VIR_ERR_INVALID_ARG
,
__FUNCTION__
);
virLibConnError
(
VIR_ERR_INVALID_ARG
,
__FUNCTION__
);
return
(
-
1
);
}
virMutexLock
(
&
iface
->
conn
->
lock
);
...
...
@@ -789,7 +790,7 @@ virGetStoragePool(virConnectPtr conn, const char *name, const unsigned char *uui
virStoragePoolPtr
ret
=
NULL
;
if
((
!
VIR_IS_CONNECT
(
conn
))
||
(
name
==
NULL
)
||
(
uuid
==
NULL
))
{
virLibConnError
(
NULL
,
VIR_ERR_INVALID_ARG
,
__FUNCTION__
);
virLibConnError
(
VIR_ERR_INVALID_ARG
,
__FUNCTION__
);
return
(
NULL
);
}
virMutexLock
(
&
conn
->
lock
);
...
...
@@ -817,7 +818,7 @@ virGetStoragePool(virConnectPtr conn, const char *name, const unsigned char *uui
if
(
virHashAddEntry
(
conn
->
storagePools
,
name
,
ret
)
<
0
)
{
virMutexUnlock
(
&
conn
->
lock
);
virLibConnError
(
conn
,
VIR_ERR_INTERNAL_ERROR
,
virLibConnError
(
VIR_ERR_INTERNAL_ERROR
,
"%s"
,
_
(
"failed to add storage pool to connection hash table"
));
goto
error
;
}
...
...
@@ -856,8 +857,8 @@ virReleaseStoragePool(virStoragePoolPtr pool) {
/* TODO search by UUID first as they are better differenciators */
if
(
virHashRemoveEntry
(
conn
->
storagePools
,
pool
->
name
,
NULL
)
<
0
)
{
virMutexUnlock
(
&
conn
->
lock
);
virLibConnError
(
conn
,
VIR_ERR_INTERNAL_ERROR
,
"%s"
,
_
(
"pool missing from connection hash table"
));
virLibConnError
(
VIR_ERR_INTERNAL_ERROR
,
"%s"
,
_
(
"pool missing from connection hash table"
));
conn
=
NULL
;
}
...
...
@@ -892,7 +893,7 @@ virUnrefStoragePool(virStoragePoolPtr pool) {
int
refs
;
if
(
!
VIR_IS_CONNECTED_STORAGE_POOL
(
pool
))
{
virLibConnError
(
NULL
,
VIR_ERR_INVALID_ARG
,
__FUNCTION__
);
virLibConnError
(
VIR_ERR_INVALID_ARG
,
__FUNCTION__
);
return
(
-
1
);
}
virMutexLock
(
&
pool
->
conn
->
lock
);
...
...
@@ -929,7 +930,7 @@ virGetStorageVol(virConnectPtr conn, const char *pool, const char *name, const c
virStorageVolPtr
ret
=
NULL
;
if
((
!
VIR_IS_CONNECT
(
conn
))
||
(
name
==
NULL
)
||
(
key
==
NULL
))
{
virLibConnError
(
NULL
,
VIR_ERR_INVALID_ARG
,
__FUNCTION__
);
virLibConnError
(
VIR_ERR_INVALID_ARG
,
__FUNCTION__
);
return
(
NULL
);
}
virMutexLock
(
&
conn
->
lock
);
...
...
@@ -955,7 +956,7 @@ virGetStorageVol(virConnectPtr conn, const char *pool, const char *name, const c
}
if
(
virStrcpyStatic
(
ret
->
key
,
key
)
==
NULL
)
{
virMutexUnlock
(
&
conn
->
lock
);
virLibConnError
(
conn
,
VIR_ERR_INTERNAL_ERROR
,
virLibConnError
(
VIR_ERR_INTERNAL_ERROR
,
_
(
"Volume key %s too large for destination"
),
key
);
goto
error
;
}
...
...
@@ -964,8 +965,8 @@ virGetStorageVol(virConnectPtr conn, const char *pool, const char *name, const c
if
(
virHashAddEntry
(
conn
->
storageVols
,
key
,
ret
)
<
0
)
{
virMutexUnlock
(
&
conn
->
lock
);
virLibConnError
(
conn
,
VIR_ERR_INTERNAL_ERROR
,
"%s"
,
_
(
"failed to add storage vol to connection hash table"
));
virLibConnError
(
VIR_ERR_INTERNAL_ERROR
,
"%s"
,
_
(
"failed to add storage vol to connection hash table"
));
goto
error
;
}
conn
->
refs
++
;
...
...
@@ -1004,8 +1005,8 @@ virReleaseStorageVol(virStorageVolPtr vol) {
/* TODO search by UUID first as they are better differenciators */
if
(
virHashRemoveEntry
(
conn
->
storageVols
,
vol
->
key
,
NULL
)
<
0
)
{
virMutexUnlock
(
&
conn
->
lock
);
virLibConnError
(
conn
,
VIR_ERR_INTERNAL_ERROR
,
"%s"
,
_
(
"vol missing from connection hash table"
));
virLibConnError
(
VIR_ERR_INTERNAL_ERROR
,
"%s"
,
_
(
"vol missing from connection hash table"
));
conn
=
NULL
;
}
...
...
@@ -1041,7 +1042,7 @@ virUnrefStorageVol(virStorageVolPtr vol) {
int
refs
;
if
(
!
VIR_IS_CONNECTED_STORAGE_VOL
(
vol
))
{
virLibConnError
(
NULL
,
VIR_ERR_INVALID_ARG
,
__FUNCTION__
);
virLibConnError
(
VIR_ERR_INVALID_ARG
,
__FUNCTION__
);
return
(
-
1
);
}
virMutexLock
(
&
vol
->
conn
->
lock
);
...
...
@@ -1077,7 +1078,7 @@ virGetNodeDevice(virConnectPtr conn, const char *name)
virNodeDevicePtr
ret
=
NULL
;
if
((
!
VIR_IS_CONNECT
(
conn
))
||
(
name
==
NULL
))
{
virLibConnError
(
NULL
,
VIR_ERR_INVALID_ARG
,
__FUNCTION__
);
virLibConnError
(
VIR_ERR_INVALID_ARG
,
__FUNCTION__
);
return
(
NULL
);
}
virMutexLock
(
&
conn
->
lock
);
...
...
@@ -1100,7 +1101,7 @@ virGetNodeDevice(virConnectPtr conn, const char *name)
if
(
virHashAddEntry
(
conn
->
nodeDevices
,
name
,
ret
)
<
0
)
{
virMutexUnlock
(
&
conn
->
lock
);
virLibConnError
(
conn
,
VIR_ERR_INTERNAL_ERROR
,
virLibConnError
(
VIR_ERR_INTERNAL_ERROR
,
"%s"
,
_
(
"failed to add node dev to conn hash table"
));
goto
error
;
}
...
...
@@ -1138,7 +1139,7 @@ virReleaseNodeDevice(virNodeDevicePtr dev) {
if
(
virHashRemoveEntry
(
conn
->
nodeDevices
,
dev
->
name
,
NULL
)
<
0
)
{
virMutexUnlock
(
&
conn
->
lock
);
virLibConnError
(
conn
,
VIR_ERR_INTERNAL_ERROR
,
virLibConnError
(
VIR_ERR_INTERNAL_ERROR
,
"%s"
,
_
(
"dev missing from connection hash table"
));
conn
=
NULL
;
}
...
...
@@ -1209,7 +1210,7 @@ virGetSecret(virConnectPtr conn, const unsigned char *uuid,
char
uuidstr
[
VIR_UUID_STRING_BUFLEN
];
if
(
!
VIR_IS_CONNECT
(
conn
)
||
uuid
==
NULL
||
usageID
==
NULL
)
{
virLibConnError
(
NULL
,
VIR_ERR_INVALID_ARG
,
__FUNCTION__
);
virLibConnError
(
VIR_ERR_INVALID_ARG
,
__FUNCTION__
);
return
NULL
;
}
virMutexLock
(
&
conn
->
lock
);
...
...
@@ -1234,8 +1235,8 @@ virGetSecret(virConnectPtr conn, const unsigned char *uuid,
}
if
(
virHashAddEntry
(
conn
->
secrets
,
uuidstr
,
ret
)
<
0
)
{
virMutexUnlock
(
&
conn
->
lock
);
virLibConnError
(
conn
,
VIR_ERR_INTERNAL_ERROR
,
"%s"
,
_
(
"failed to add secret to conn hash table"
));
virLibConnError
(
VIR_ERR_INTERNAL_ERROR
,
"%s"
,
_
(
"failed to add secret to conn hash table"
));
goto
error
;
}
conn
->
refs
++
;
...
...
@@ -1273,8 +1274,8 @@ virReleaseSecret(virSecretPtr secret) {
virUUIDFormat
(
secret
->
uuid
,
uuidstr
);
if
(
virHashRemoveEntry
(
conn
->
secrets
,
uuidstr
,
NULL
)
<
0
)
{
virMutexUnlock
(
&
conn
->
lock
);
virLibConnError
(
conn
,
VIR_ERR_INTERNAL_ERROR
,
"%s"
,
_
(
"secret missing from connection hash table"
));
virLibConnError
(
VIR_ERR_INTERNAL_ERROR
,
"%s"
,
_
(
"secret missing from connection hash table"
));
conn
=
NULL
;
}
...
...
@@ -1308,7 +1309,7 @@ virUnrefSecret(virSecretPtr secret) {
int
refs
;
if
(
!
VIR_IS_CONNECTED_SECRET
(
secret
))
{
virLibConnError
(
NULL
,
VIR_ERR_INVALID_ARG
,
__FUNCTION__
);
virLibConnError
(
VIR_ERR_INVALID_ARG
,
__FUNCTION__
);
return
-
1
;
}
virMutexLock
(
&
secret
->
conn
->
lock
);
...
...
@@ -1402,7 +1403,7 @@ virGetNWFilter(virConnectPtr conn, const char *name, const unsigned char *uuid)
virNWFilterPtr
ret
=
NULL
;
if
((
!
VIR_IS_CONNECT
(
conn
))
||
(
name
==
NULL
)
||
(
uuid
==
NULL
))
{
virLibConnError
(
NULL
,
VIR_ERR_INVALID_ARG
,
__FUNCTION__
);
virLibConnError
(
VIR_ERR_INVALID_ARG
,
__FUNCTION__
);
return
(
NULL
);
}
virMutexLock
(
&
conn
->
lock
);
...
...
@@ -1430,8 +1431,8 @@ virGetNWFilter(virConnectPtr conn, const char *name, const unsigned char *uuid)
if
(
virHashAddEntry
(
conn
->
nwfilterPools
,
name
,
ret
)
<
0
)
{
virMutexUnlock
(
&
conn
->
lock
);
virLibConnError
(
conn
,
VIR_ERR_INTERNAL_ERROR
,
"%s"
,
_
(
"failed to add network filter pool to connection hash table"
));
virLibConnError
(
VIR_ERR_INTERNAL_ERROR
,
"%s"
,
_
(
"failed to add network filter pool to connection hash table"
));
goto
error
;
}
conn
->
refs
++
;
...
...
@@ -1469,8 +1470,8 @@ virReleaseNWFilterPool(virNWFilterPtr pool) {
/* TODO search by UUID first as they are better differenciators */
if
(
virHashRemoveEntry
(
conn
->
nwfilterPools
,
pool
->
name
,
NULL
)
<
0
)
{
virMutexUnlock
(
&
conn
->
lock
);
virLibConnError
(
conn
,
VIR_ERR_INTERNAL_ERROR
,
"%s"
,
_
(
"pool missing from connection hash table"
));
virLibConnError
(
VIR_ERR_INTERNAL_ERROR
,
"%s"
,
_
(
"pool missing from connection hash table"
));
conn
=
NULL
;
}
...
...
@@ -1505,7 +1506,7 @@ virUnrefNWFilter(virNWFilterPtr pool) {
int
refs
;
if
(
!
VIR_IS_CONNECTED_NWFILTER
(
pool
))
{
virLibConnError
(
NULL
,
VIR_ERR_INVALID_ARG
,
__FUNCTION__
);
virLibConnError
(
VIR_ERR_INVALID_ARG
,
__FUNCTION__
);
return
-
1
;
}
virMutexLock
(
&
pool
->
conn
->
lock
);
...
...
@@ -1529,7 +1530,7 @@ virGetDomainSnapshot(virDomainPtr domain, const char *name)
virDomainSnapshotPtr
ret
=
NULL
;
if
((
!
VIR_IS_DOMAIN
(
domain
))
||
(
name
==
NULL
))
{
virLibConnError
(
NULL
,
VIR_ERR_INVALID_ARG
,
__FUNCTION__
);
virLibConnError
(
VIR_ERR_INVALID_ARG
,
__FUNCTION__
);
return
(
NULL
);
}
virMutexLock
(
&
domain
->
conn
->
lock
);
...
...
@@ -1552,7 +1553,7 @@ virGetDomainSnapshot(virDomainPtr domain, const char *name)
if
(
virHashAddEntry
(
domain
->
snapshots
,
name
,
ret
)
<
0
)
{
virMutexUnlock
(
&
domain
->
conn
->
lock
);
virLibConnError
(
domain
->
conn
,
VIR_ERR_INTERNAL_ERROR
,
virLibConnError
(
VIR_ERR_INTERNAL_ERROR
,
"%s"
,
_
(
"failed to add snapshot to domain hash table"
));
goto
error
;
}
...
...
@@ -1582,7 +1583,7 @@ virReleaseDomainSnapshot(virDomainSnapshotPtr snapshot)
if
(
virHashRemoveEntry
(
domain
->
snapshots
,
snapshot
->
name
,
NULL
)
<
0
)
{
virMutexUnlock
(
&
domain
->
conn
->
lock
);
virLibConnError
(
domain
->
conn
,
VIR_ERR_INTERNAL_ERROR
,
virLibConnError
(
VIR_ERR_INTERNAL_ERROR
,
"%s"
,
_
(
"snapshot missing from domain hash table"
));
domain
=
NULL
;
}
...
...
@@ -1609,7 +1610,7 @@ virUnrefDomainSnapshot(virDomainSnapshotPtr snapshot)
int
refs
;
if
(
!
VIR_IS_DOMAIN_SNAPSHOT
(
snapshot
))
{
virLibConnError
(
NULL
,
VIR_ERR_INVALID_ARG
,
__FUNCTION__
);
virLibConnError
(
VIR_ERR_INVALID_ARG
,
__FUNCTION__
);
return
(
-
1
);
}
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录