Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
openeuler
libvirt
提交
8f3f51b7
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,发现更多精彩内容 >>
提交
8f3f51b7
编写于
6月 05, 2014
作者:
J
Ján Tomko
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
virsh: Separate API calls and result printing in cmdVcpuinfo
This allows reuse of the result printing code.
上级
bec105e6
变更
1
显示空白变更内容
内联
并排
Showing
1 changed file
with
25 addition
and
36 deletion
+25
-36
tools/virsh-domain.c
tools/virsh-domain.c
+25
-36
未找到文件。
tools/virsh-domain.c
浏览文件 @
8f3f51b7
...
...
@@ -5558,9 +5558,21 @@ cmdVcpuinfo(vshControl *ctl, const vshCmd *cmd)
if
((
ncpus
=
virDomainGetVcpus
(
dom
,
cpuinfo
,
info
.
nrVirtCpu
,
cpumaps
,
cpumaplen
))
>=
0
)
{
cpumaps
,
cpumaplen
))
<
0
)
{
if
(
info
.
state
!=
VIR_DOMAIN_SHUTOFF
)
goto
cleanup
;
/* fall back to virDomainGetVcpuPinInfo and free cpuinfo to mark this */
VIR_FREE
(
cpuinfo
);
if
((
ncpus
=
virDomainGetVcpuPinInfo
(
dom
,
info
.
nrVirtCpu
,
cpumaps
,
cpumaplen
,
VIR_DOMAIN_AFFECT_CONFIG
))
<
0
)
goto
cleanup
;
}
for
(
n
=
0
;
n
<
ncpus
;
n
++
)
{
vshPrint
(
ctl
,
"%-15s %d
\n
"
,
_
(
"VCPU:"
),
n
);
if
(
cpuinfo
)
{
vshPrint
(
ctl
,
"%-15s %d
\n
"
,
_
(
"CPU:"
),
cpuinfo
[
n
].
cpu
);
vshPrint
(
ctl
,
"%-15s %s
\n
"
,
_
(
"State:"
),
vshDomainVcpuStateToString
(
cpuinfo
[
n
].
state
));
...
...
@@ -5571,42 +5583,19 @@ cmdVcpuinfo(vshControl *ctl, const vshCmd *cmd)
vshPrint
(
ctl
,
"%-15s %.1lfs
\n
"
,
_
(
"CPU time:"
),
cpuUsed
);
}
vshPrint
(
ctl
,
"%-15s "
,
_
(
"CPU Affinity:"
));
for
(
m
=
0
;
m
<
maxcpu
;
m
++
)
{
vshPrint
(
ctl
,
"%c"
,
VIR_CPU_USABLE
(
cpumaps
,
cpumaplen
,
n
,
m
)
?
'y'
:
'-'
);
}
vshPrint
(
ctl
,
"
\n
"
);
if
(
n
<
(
ncpus
-
1
))
{
vshPrint
(
ctl
,
"
\n
"
);
}
}
}
else
{
if
(
info
.
state
==
VIR_DOMAIN_SHUTOFF
&&
(
ncpus
=
virDomainGetVcpuPinInfo
(
dom
,
info
.
nrVirtCpu
,
cpumaps
,
cpumaplen
,
VIR_DOMAIN_AFFECT_CONFIG
))
>=
0
)
{
/* fallback plan to use virDomainGetVcpuPinInfo */
for
(
n
=
0
;
n
<
ncpus
;
n
++
)
{
vshPrint
(
ctl
,
"%-15s %d
\n
"
,
_
(
"VCPU:"
),
n
);
vshPrint
(
ctl
,
"%-15s %s
\n
"
,
_
(
"CPU:"
),
_
(
"N/A"
));
vshPrint
(
ctl
,
"%-15s %s
\n
"
,
_
(
"State:"
),
_
(
"N/A"
));
vshPrint
(
ctl
,
"%-15s %s
\n
"
,
_
(
"CPU time"
),
_
(
"N/A"
));
}
vshPrint
(
ctl
,
"%-15s "
,
_
(
"CPU Affinity:"
));
for
(
m
=
0
;
m
<
maxcpu
;
m
++
)
{
vshPrint
(
ctl
,
"%c"
,
VIR_CPU_USABLE
(
cpumaps
,
cpumaplen
,
n
,
m
)
?
'y'
:
'-'
);
vshPrint
(
ctl
,
"%c"
,
VIR_CPU_USABLE
(
cpumaps
,
cpumaplen
,
n
,
m
)
?
'y'
:
'-'
);
}
vshPrint
(
ctl
,
"
\n
"
);
if
(
n
<
(
ncpus
-
1
))
{
if
(
n
<
(
ncpus
-
1
))
vshPrint
(
ctl
,
"
\n
"
);
}
}
}
else
{
goto
cleanup
;
}
}
ret
=
true
;
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录