Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
openeuler
libvirt
提交
82a3c81d
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,发现更多精彩内容 >>
提交
82a3c81d
编写于
5月 20, 2010
作者:
J
Jim Meyering
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
maint: VIR_ERROR/VIR_ERROR0: mark up the remaining ones manually
Handle concatenated strings manually.
上级
2d320802
变更
2
隐藏空白更改
内联
并排
Showing
2 changed file
with
15 addition
and
15 deletion
+15
-15
src/esx/esx_vi.c
src/esx/esx_vi.c
+5
-5
src/node_device/node_device_udev.c
src/node_device/node_device_udev.c
+10
-10
未找到文件。
src/esx/esx_vi.c
浏览文件 @
82a3c81d
...
@@ -2770,13 +2770,13 @@ esxVI_WaitForTaskCompletion(esxVI_Context *ctx,
...
@@ -2770,13 +2770,13 @@ esxVI_WaitForTaskCompletion(esxVI_Context *ctx,
if
(
taskInfo
->
cancelable
==
esxVI_Boolean_True
)
{
if
(
taskInfo
->
cancelable
==
esxVI_Boolean_True
)
{
if
(
esxVI_CancelTask
(
ctx
,
task
)
<
0
)
{
if
(
esxVI_CancelTask
(
ctx
,
task
)
<
0
)
{
VIR_ERROR0
(
"Cancelable task is blocked by an "
VIR_ERROR0
(
_
(
"Cancelable task is blocked by an "
"unanswered question but cancelation "
"unanswered question but cancelation "
"failed"
);
"failed"
)
);
}
}
}
else
{
}
else
{
VIR_ERROR0
(
"Non-cancelable task is blocked by an "
VIR_ERROR0
(
_
(
"Non-cancelable task is blocked by an "
"unanswered question"
);
"unanswered question"
)
);
}
}
/* FIXME: Enable error reporting here again */
/* FIXME: Enable error reporting here again */
...
...
src/node_device/node_device_udev.c
浏览文件 @
82a3c81d
...
@@ -122,8 +122,8 @@ static int udevGetDeviceProperty(struct udev_device *udev_device,
...
@@ -122,8 +122,8 @@ static int udevGetDeviceProperty(struct udev_device *udev_device,
* of the function must also be changed. */
* of the function must also be changed. */
*
property_value
=
strdup
(
udev_value
);
*
property_value
=
strdup
(
udev_value
);
if
(
*
property_value
==
NULL
)
{
if
(
*
property_value
==
NULL
)
{
VIR_ERROR
(
"Failed to allocate memory for property value for "
VIR_ERROR
(
_
(
"Failed to allocate memory for property value for "
"property key '%s' on device with sysname '%s'"
,
"property key '%s' on device with sysname '%s'"
)
,
property_key
,
udev_device_get_sysname
(
udev_device
));
property_key
,
udev_device_get_sysname
(
udev_device
));
virReportOOMError
();
virReportOOMError
();
ret
=
PROPERTY_ERROR
;
ret
=
PROPERTY_ERROR
;
...
@@ -211,8 +211,8 @@ static int udevGetDeviceSysfsAttr(struct udev_device *udev_device,
...
@@ -211,8 +211,8 @@ static int udevGetDeviceSysfsAttr(struct udev_device *udev_device,
* of the function must also be changed. */
* of the function must also be changed. */
*
attr_value
=
strdup
(
udev_value
);
*
attr_value
=
strdup
(
udev_value
);
if
(
*
attr_value
==
NULL
)
{
if
(
*
attr_value
==
NULL
)
{
VIR_ERROR
(
"Failed to allocate memory for sysfs attribute value for "
VIR_ERROR
(
_
(
"Failed to allocate memory for sysfs attribute value for "
"sysfs attribute '%s' on device with sysname '%s'"
,
"sysfs attribute '%s' on device with sysname '%s'"
)
,
attr_name
,
udev_device_get_sysname
(
udev_device
));
attr_name
,
udev_device_get_sysname
(
udev_device
));
virReportOOMError
();
virReportOOMError
();
ret
=
PROPERTY_ERROR
;
ret
=
PROPERTY_ERROR
;
...
@@ -329,8 +329,8 @@ static int udevGenerateDeviceName(struct udev_device *device,
...
@@ -329,8 +329,8 @@ static int udevGenerateDeviceName(struct udev_device *device,
if
(
virBufferError
(
&
buf
))
{
if
(
virBufferError
(
&
buf
))
{
virBufferFreeAndReset
(
&
buf
);
virBufferFreeAndReset
(
&
buf
);
VIR_ERROR
(
"Buffer error when generating device name for device "
VIR_ERROR
(
_
(
"Buffer error when generating device name for device "
"with sysname '%s'"
,
udev_device_get_sysname
(
device
));
"with sysname '%s'"
)
,
udev_device_get_sysname
(
device
));
ret
=
-
1
;
ret
=
-
1
;
}
}
...
@@ -639,8 +639,8 @@ static int udevProcessSCSIHost(struct udev_device *device ATTRIBUTE_UNUSED,
...
@@ -639,8 +639,8 @@ static int udevProcessSCSIHost(struct udev_device *device ATTRIBUTE_UNUSED,
filename
=
basename
(
def
->
sysfs_path
);
filename
=
basename
(
def
->
sysfs_path
);
if
(
!
STRPREFIX
(
filename
,
"host"
))
{
if
(
!
STRPREFIX
(
filename
,
"host"
))
{
VIR_ERROR
(
"SCSI host found, but its udev name '%s' does "
VIR_ERROR
(
_
(
"SCSI host found, but its udev name '%s' does "
"not begin with 'host'"
,
filename
);
"not begin with 'host'"
)
,
filename
);
goto
out
;
goto
out
;
}
}
...
@@ -1401,8 +1401,8 @@ static void udevEventHandleCallback(int watch ATTRIBUTE_UNUSED,
...
@@ -1401,8 +1401,8 @@ static void udevEventHandleCallback(int watch ATTRIBUTE_UNUSED,
udev_fd
=
udev_monitor_get_fd
(
udev_monitor
);
udev_fd
=
udev_monitor_get_fd
(
udev_monitor
);
if
(
fd
!=
udev_fd
)
{
if
(
fd
!=
udev_fd
)
{
VIR_ERROR
(
"File descriptor returned by udev %d does not "
VIR_ERROR
(
_
(
"File descriptor returned by udev %d does not "
"match node device file descriptor %d"
,
fd
,
udev_fd
);
"match node device file descriptor %d"
)
,
fd
,
udev_fd
);
goto
out
;
goto
out
;
}
}
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录