Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
openeuler
libvirt
提交
e4bdba8d
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,发现更多精彩内容 >>
提交
e4bdba8d
编写于
4月 22, 2013
作者:
J
Jiri Denemark
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
qemu: Move QEMU log reading into a separate function
上级
1e5306c7
变更
1
隐藏空白更改
内联
并排
Showing
1 changed file
with
38 addition
and
23 deletion
+38
-23
src/qemu/qemu_process.c
src/qemu/qemu_process.c
+38
-23
未找到文件。
src/qemu/qemu_process.c
浏览文件 @
e4bdba8d
...
@@ -1346,6 +1346,41 @@ error:
...
@@ -1346,6 +1346,41 @@ error:
return
ret
;
return
ret
;
}
}
static
int
qemuProcessReadLog
(
int
fd
,
char
*
buf
,
int
buflen
,
int
off
)
{
char
*
filter_next
=
buf
;
ssize_t
bytes
;
char
*
eol
;
buf
[
0
]
=
'\0'
;
while
(
off
<
buflen
-
1
)
{
bytes
=
saferead
(
fd
,
buf
+
off
,
buflen
-
off
-
1
);
if
(
bytes
<
0
)
return
-
1
;
else
if
(
bytes
==
0
)
break
;
off
+=
bytes
;
buf
[
off
]
=
'\0'
;
/* Filter out debug messages from intermediate libvirt process */
while
((
eol
=
strchr
(
filter_next
,
'\n'
)))
{
*
eol
=
'\0'
;
if
(
virLogProbablyLogMessage
(
filter_next
))
{
memmove
(
filter_next
,
eol
+
1
,
off
-
(
eol
-
buf
));
off
-=
eol
+
1
-
filter_next
;
}
else
{
filter_next
=
eol
+
1
;
*
eol
=
'\n'
;
}
}
}
return
off
;
}
typedef
int
qemuProcessLogHandleOutput
(
virDomainObjPtr
vm
,
typedef
int
qemuProcessLogHandleOutput
(
virDomainObjPtr
vm
,
const
char
*
output
,
const
char
*
output
,
int
fd
);
int
fd
);
...
@@ -1365,46 +1400,26 @@ qemuProcessReadLogOutput(virDomainObjPtr vm,
...
@@ -1365,46 +1400,26 @@ qemuProcessReadLogOutput(virDomainObjPtr vm,
int
retries
=
(
timeout
*
10
);
int
retries
=
(
timeout
*
10
);
int
got
=
0
;
int
got
=
0
;
int
ret
=
-
1
;
int
ret
=
-
1
;
char
*
filter_next
=
buf
;
buf
[
0
]
=
'\0'
;
buf
[
0
]
=
'\0'
;
while
(
retries
)
{
while
(
retries
)
{
ssize_t
func_ret
,
bytes
;
ssize_t
func_ret
;
int
isdead
=
0
;
int
isdead
=
0
;
char
*
eol
;
func_ret
=
func
(
vm
,
buf
,
fd
);
func_ret
=
func
(
vm
,
buf
,
fd
);
if
(
kill
(
vm
->
pid
,
0
)
==
-
1
&&
errno
==
ESRCH
)
if
(
kill
(
vm
->
pid
,
0
)
==
-
1
&&
errno
==
ESRCH
)
isdead
=
1
;
isdead
=
1
;
/* Any failures should be detected before we read the log, so we
got
=
qemuProcessReadLog
(
fd
,
buf
,
buflen
,
got
);
* always have something useful to report on failure. */
if
(
got
<
0
)
{
bytes
=
saferead
(
fd
,
buf
+
got
,
buflen
-
got
-
1
);
if
(
bytes
<
0
)
{
virReportSystemError
(
errno
,
virReportSystemError
(
errno
,
_
(
"Failure while reading %s log output"
),
_
(
"Failure while reading %s log output"
),
what
);
what
);
goto
cleanup
;
goto
cleanup
;
}
}
got
+=
bytes
;
buf
[
got
]
=
'\0'
;
/* Filter out debug messages from intermediate libvirt process */
while
((
eol
=
strchr
(
filter_next
,
'\n'
)))
{
*
eol
=
'\0'
;
VIR_ERROR
(
"<<<<<<<<<<<<%s>>>>>>>>>>"
,
filter_next
);
if
(
virLogProbablyLogMessage
(
filter_next
))
{
memmove
(
filter_next
,
eol
+
1
,
got
-
(
eol
-
buf
));
got
-=
eol
+
1
-
filter_next
;
}
else
{
filter_next
=
eol
+
1
;
*
eol
=
'\n'
;
}
}
if
(
got
==
buflen
-
1
)
{
if
(
got
==
buflen
-
1
)
{
virReportError
(
VIR_ERR_INTERNAL_ERROR
,
virReportError
(
VIR_ERR_INTERNAL_ERROR
,
_
(
"Out of space while reading %s log output: %s"
),
_
(
"Out of space while reading %s log output: %s"
),
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录