Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
openeuler
libvirt
提交
580dbf06
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,发现更多精彩内容 >>
提交
580dbf06
编写于
5月 23, 2016
作者:
J
Jovanka Gulicoska
提交者:
Cole Robinson
5月 23, 2016
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
storage: Replace VIR_ERROR with standard vir*Error in state driver init
Replace VIR_ERROR with virReportError and virReportSystemError
上级
1433c803
变更
1
隐藏空白更改
内联
并排
Showing
1 changed file
with
14 addition
and
9 deletion
+14
-9
src/storage/storage_driver.c
src/storage/storage_driver.c
+14
-9
未找到文件。
src/storage/storage_driver.c
浏览文件 @
580dbf06
...
@@ -88,7 +88,8 @@ storagePoolUpdateState(virStoragePoolObjPtr pool)
...
@@ -88,7 +88,8 @@ storagePoolUpdateState(virStoragePoolObjPtr pool)
goto
error
;
goto
error
;
if
((
backend
=
virStorageBackendForType
(
pool
->
def
->
type
))
==
NULL
)
{
if
((
backend
=
virStorageBackendForType
(
pool
->
def
->
type
))
==
NULL
)
{
VIR_ERROR
(
_
(
"Missing backend %d"
),
pool
->
def
->
type
);
virReportError
(
VIR_ERR_INTERNAL_ERROR
,
_
(
"Missing backend %d"
),
pool
->
def
->
type
);
goto
error
;
goto
error
;
}
}
...
@@ -98,8 +99,9 @@ storagePoolUpdateState(virStoragePoolObjPtr pool)
...
@@ -98,8 +99,9 @@ storagePoolUpdateState(virStoragePoolObjPtr pool)
active
=
false
;
active
=
false
;
if
(
backend
->
checkPool
&&
if
(
backend
->
checkPool
&&
backend
->
checkPool
(
pool
,
&
active
)
<
0
)
{
backend
->
checkPool
(
pool
,
&
active
)
<
0
)
{
VIR_ERROR
(
_
(
"Failed to initialize storage pool '%s': %s"
),
virReportError
(
VIR_ERR_INTERNAL_ERROR
,
pool
->
def
->
name
,
virGetLastErrorMessage
());
_
(
"Failed to initialize storage pool '%s': %s"
),
pool
->
def
->
name
,
virGetLastErrorMessage
());
goto
error
;
goto
error
;
}
}
...
@@ -112,8 +114,9 @@ storagePoolUpdateState(virStoragePoolObjPtr pool)
...
@@ -112,8 +114,9 @@ storagePoolUpdateState(virStoragePoolObjPtr pool)
if
(
backend
->
refreshPool
(
NULL
,
pool
)
<
0
)
{
if
(
backend
->
refreshPool
(
NULL
,
pool
)
<
0
)
{
if
(
backend
->
stopPool
)
if
(
backend
->
stopPool
)
backend
->
stopPool
(
NULL
,
pool
);
backend
->
stopPool
(
NULL
,
pool
);
VIR_ERROR
(
_
(
"Failed to restart storage pool '%s': %s"
),
virReportError
(
VIR_ERR_INTERNAL_ERROR
,
pool
->
def
->
name
,
virGetLastErrorMessage
());
_
(
"Failed to restart storage pool '%s': %s"
),
pool
->
def
->
name
,
virGetLastErrorMessage
());
goto
error
;
goto
error
;
}
}
}
}
...
@@ -172,8 +175,9 @@ storageDriverAutostart(void)
...
@@ -172,8 +175,9 @@ storageDriverAutostart(void)
!
virStoragePoolObjIsActive
(
pool
))
{
!
virStoragePoolObjIsActive
(
pool
))
{
if
(
backend
->
startPool
&&
if
(
backend
->
startPool
&&
backend
->
startPool
(
conn
,
pool
)
<
0
)
{
backend
->
startPool
(
conn
,
pool
)
<
0
)
{
VIR_ERROR
(
_
(
"Failed to autostart storage pool '%s': %s"
),
virReportError
(
VIR_ERR_INTERNAL_ERROR
,
pool
->
def
->
name
,
virGetLastErrorMessage
());
_
(
"Failed to autostart storage pool '%s': %s"
),
pool
->
def
->
name
,
virGetLastErrorMessage
());
virStoragePoolObjUnlock
(
pool
);
virStoragePoolObjUnlock
(
pool
);
continue
;
continue
;
}
}
...
@@ -193,8 +197,9 @@ storageDriverAutostart(void)
...
@@ -193,8 +197,9 @@ storageDriverAutostart(void)
unlink
(
stateFile
);
unlink
(
stateFile
);
if
(
backend
->
stopPool
)
if
(
backend
->
stopPool
)
backend
->
stopPool
(
conn
,
pool
);
backend
->
stopPool
(
conn
,
pool
);
VIR_ERROR
(
_
(
"Failed to autostart storage pool '%s': %s"
),
virReportError
(
VIR_ERR_INTERNAL_ERROR
,
pool
->
def
->
name
,
virGetLastErrorMessage
());
_
(
"Failed to autostart storage pool '%s': %s"
),
pool
->
def
->
name
,
virGetLastErrorMessage
());
}
else
{
}
else
{
pool
->
active
=
true
;
pool
->
active
=
true
;
}
}
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录