Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
openeuler
libvirt
提交
d575a83f
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,发现更多精彩内容 >>
提交
d575a83f
编写于
12月 17, 2007
作者:
D
Daniel P. Berrange
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Fix nodeinfo compat with Xen 3.2.0
上级
1be1fe69
变更
2
隐藏空白更改
内联
并排
Showing
2 changed file
with
24 addition
and
3 deletion
+24
-3
ChangeLog
ChangeLog
+5
-0
src/xend_internal.c
src/xend_internal.c
+19
-3
未找到文件。
ChangeLog
浏览文件 @
d575a83f
Mon Dec 17 18:03:00 UTC 2007 Daniel P. Berrange <berrange@redhat.com>
* src/xend_internal.c: Compatability with Xen 3.2.0 changed
fields for physinfo data used by virNodeInfoPtr.
Mon Dec 17 17:38:00 UTC 2007 Richard W.M. Jones <rjones@redhat.com>
Fix remote_internal.c error handling of qparam_get_query
...
...
src/xend_internal.c
浏览文件 @
d575a83f
...
...
@@ -1288,6 +1288,8 @@ xend_parse_sexp_desc_os(virConnectPtr xend, struct sexpr *node, virBufferPtr buf
if
(
hvm
)
{
virBufferVSprintf
(
buf
,
" <type>hvm</type>
\n
"
);
tmp
=
sexpr_node
(
node
,
"domain/image/hvm/kernel"
);
if
(
tmp
==
NULL
)
tmp
=
sexpr_node
(
node
,
"domain/image/hvm/loader"
);
if
(
tmp
==
NULL
&&
!
bootloader
)
{
virXendError
(
xend
,
VIR_ERR_INTERNAL_ERROR
,
_
(
"domain information incomplete, missing kernel & bootloader"
));
...
...
@@ -1893,11 +1895,11 @@ sexpr_to_xend_node_info(struct sexpr *root, virNodeInfoPtr info)
return
(
-
1
);
machine
=
sexpr_node
(
root
,
"node/machine"
);
if
(
machine
==
NULL
)
if
(
machine
==
NULL
)
{
info
->
model
[
0
]
=
0
;
else
{
}
else
{
snprintf
(
&
info
->
model
[
0
],
sizeof
(
info
->
model
)
-
1
,
"%s"
,
machine
);
info
->
model
[
sizeof
(
info
->
model
)
-
1
]
=
0
;
info
->
model
[
sizeof
(
info
->
model
)
-
1
]
=
0
;
}
info
->
memory
=
(
unsigned
long
)
sexpr_u64
(
root
,
"node/total_memory"
)
<<
10
;
...
...
@@ -1905,6 +1907,20 @@ sexpr_to_xend_node_info(struct sexpr *root, virNodeInfoPtr info)
info
->
mhz
=
sexpr_int
(
root
,
"node/cpu_mhz"
);
info
->
nodes
=
sexpr_int
(
root
,
"node/nr_nodes"
);
info
->
sockets
=
sexpr_int
(
root
,
"node/sockets_per_node"
);
/* Xen 3.2.0 replaces sockets_per_node with 'nr_cpus'.
* Old Xen calculated sockets_per_node using its internal
* nr_cpus / (nodes*cores*threads), so fake it ourselves
* in the same way
*/
if
(
info
->
sockets
==
0
)
{
int
nr_cpus
=
sexpr_int
(
root
,
"node/nr_cpus"
);
info
->
sockets
=
nr_cpus
/
(
info
->
nodes
*
info
->
cores
*
info
->
threads
);
/* Should already be fine, but for sanity make
* sure we have at least one socket
*/
if
(
info
->
sockets
==
0
)
info
->
sockets
=
1
;
}
info
->
cores
=
sexpr_int
(
root
,
"node/cores_per_socket"
);
info
->
threads
=
sexpr_int
(
root
,
"node/threads_per_core"
);
return
(
0
);
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录