Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
openeuler
libvirt
提交
5759a5cc
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,发现更多精彩内容 >>
提交
5759a5cc
编写于
10月 21, 2011
作者:
P
Patrice LACHANCE
提交者:
Matthias Bolte
11月 01, 2011
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
esx: Support vSphere 5.x
And virtual hardware version 8.
上级
8bec4ff2
变更
5
隐藏空白更改
内联
并排
Showing
5 changed file
with
64 addition
and
20 deletion
+64
-20
AUTHORS
AUTHORS
+1
-0
src/esx/esx_driver.c
src/esx/esx_driver.c
+9
-5
src/esx/esx_vi.c
src/esx/esx_vi.c
+42
-11
src/esx/esx_vi.h
src/esx/esx_vi.h
+8
-2
src/vmx/vmx.c
src/vmx/vmx.c
+4
-2
未找到文件。
AUTHORS
浏览文件 @
5759a5cc
...
...
@@ -202,6 +202,7 @@ Patches have also been contributed by:
Tyler Coumbes <coumbes@gmail.com>
Josh Durgin <josh.durgin@dreamhost.com>
Wen Ruo Lv <lvroyce@linux.vnet.ibm.com>
Patrice LACHANCE <patlachance@gmail.com>
[....send patches to get your name here....]
...
...
src/esx/esx_driver.c
浏览文件 @
5759a5cc
...
...
@@ -730,9 +730,11 @@ esxConnectToHost(esxPrivate *priv, virConnectAuthPtr auth,
if
(
priv
->
host
->
productVersion
!=
esxVI_ProductVersion_ESX35
&&
priv
->
host
->
productVersion
!=
esxVI_ProductVersion_ESX40
&&
priv
->
host
->
productVersion
!=
esxVI_ProductVersion_ESX41
&&
priv
->
host
->
productVersion
!=
esxVI_ProductVersion_ESX4x
)
{
priv
->
host
->
productVersion
!=
esxVI_ProductVersion_ESX4x
&&
priv
->
host
->
productVersion
!=
esxVI_ProductVersion_ESX50
&&
priv
->
host
->
productVersion
!=
esxVI_ProductVersion_ESX5x
)
{
ESX_ERROR
(
VIR_ERR_INTERNAL_ERROR
,
_
(
"%s is neither an ESX 3.5
host nor an ESX 4
.x host"
),
_
(
"%s is neither an ESX 3.5
, 4.x nor 5
.x host"
),
hostname
);
goto
cleanup
;
}
...
...
@@ -857,10 +859,12 @@ esxConnectToVCenter(esxPrivate *priv, virConnectAuthPtr auth,
if
(
priv
->
vCenter
->
productVersion
!=
esxVI_ProductVersion_VPX25
&&
priv
->
vCenter
->
productVersion
!=
esxVI_ProductVersion_VPX40
&&
priv
->
vCenter
->
productVersion
!=
esxVI_ProductVersion_VPX41
&&
priv
->
vCenter
->
productVersion
!=
esxVI_ProductVersion_VPX4x
)
{
priv
->
vCenter
->
productVersion
!=
esxVI_ProductVersion_VPX4x
&&
priv
->
vCenter
->
productVersion
!=
esxVI_ProductVersion_VPX50
&&
priv
->
vCenter
->
productVersion
!=
esxVI_ProductVersion_VPX5x
)
{
ESX_ERROR
(
VIR_ERR_INTERNAL_ERROR
,
_
(
"%s is neither a vCenter 2.5
server nor a vCenter "
"4.x server"
),
hostname
);
_
(
"%s is neither a vCenter 2.5
, 4.x nor 5.x server"
),
hostname
);
goto
cleanup
;
}
...
...
src/esx/esx_vi.c
浏览文件 @
5759a5cc
...
...
@@ -673,12 +673,19 @@ esxVI_Context_Connect(esxVI_Context *ctx, const char *url,
}
else
if
(
STRPREFIX
(
ctx
->
service
->
about
->
apiVersion
,
"4."
))
{
ctx
->
apiVersion
=
esxVI_APIVersion_4x
;
VIR_WARN
(
"Found untested VI API major/minor version '%s'"
,
ctx
->
service
->
about
->
apiVersion
);
}
else
if
(
STRPREFIX
(
ctx
->
service
->
about
->
apiVersion
,
"5.0"
))
{
ctx
->
apiVersion
=
esxVI_APIVersion_50
;
}
else
if
(
STRPREFIX
(
ctx
->
service
->
about
->
apiVersion
,
"5."
))
{
ctx
->
apiVersion
=
esxVI_APIVersion_5x
;
VIR_WARN
(
"Found untested VI API major/minor version '%s'"
,
ctx
->
service
->
about
->
apiVersion
);
}
else
{
ESX_VI_ERROR
(
VIR_ERR_INTERNAL_ERROR
,
_
(
"Expecting VI API major/minor version '2.5'
or '4.x'
"
"but found '%s'"
),
ctx
->
service
->
about
->
apiVersion
);
_
(
"Expecting VI API major/minor version '2.5'
, '4.x' or
"
"
'5.x'
but found '%s'"
),
ctx
->
service
->
about
->
apiVersion
);
return
-
1
;
}
...
...
@@ -702,12 +709,19 @@ esxVI_Context_Connect(esxVI_Context *ctx, const char *url,
}
else
if
(
STRPREFIX
(
ctx
->
service
->
about
->
version
,
"4."
))
{
ctx
->
productVersion
=
esxVI_ProductVersion_ESX4x
;
VIR_WARN
(
"Found untested ESX major/minor version '%s'"
,
ctx
->
service
->
about
->
version
);
}
else
if
(
STRPREFIX
(
ctx
->
service
->
about
->
version
,
"5.0"
))
{
ctx
->
productVersion
=
esxVI_ProductVersion_ESX50
;
}
else
if
(
STRPREFIX
(
ctx
->
service
->
about
->
version
,
"5."
))
{
ctx
->
productVersion
=
esxVI_ProductVersion_ESX5x
;
VIR_WARN
(
"Found untested ESX major/minor version '%s'"
,
ctx
->
service
->
about
->
version
);
}
else
{
ESX_VI_ERROR
(
VIR_ERR_INTERNAL_ERROR
,
_
(
"Expecting ESX major/minor version '3.5'
or
"
"'4.x' but found '%s'"
),
_
(
"Expecting ESX major/minor version '3.5'
,
"
"'4.x'
or '5.x'
but found '%s'"
),
ctx
->
service
->
about
->
version
);
return
-
1
;
}
...
...
@@ -721,12 +735,20 @@ esxVI_Context_Connect(esxVI_Context *ctx, const char *url,
}
else
if
(
STRPREFIX
(
ctx
->
service
->
about
->
version
,
"4."
))
{
ctx
->
productVersion
=
esxVI_ProductVersion_VPX4x
;
VIR_WARN
(
"Found untested VPX major/minor version '%s'"
,
ctx
->
service
->
about
->
version
);
}
else
if
(
STRPREFIX
(
ctx
->
service
->
about
->
version
,
"5.0"
))
{
ctx
->
productVersion
=
esxVI_ProductVersion_VPX50
;
}
else
if
(
STRPREFIX
(
ctx
->
service
->
about
->
version
,
"5."
))
{
ctx
->
productVersion
=
esxVI_ProductVersion_VPX5x
;
VIR_WARN
(
"Found untested VPX major/minor version '%s'"
,
ctx
->
service
->
about
->
version
);
}
else
{
ESX_VI_ERROR
(
VIR_ERR_INTERNAL_ERROR
,
_
(
"Expecting VPX major/minor version '2.5' or '4.x' "
"but found '%s'"
),
ctx
->
service
->
about
->
version
);
_
(
"Expecting VPX major/minor version '2.5', '4.x' "
"or '5.x' but found '%s'"
),
ctx
->
service
->
about
->
version
);
return
-
1
;
}
}
else
{
...
...
@@ -3897,11 +3919,12 @@ esxVI_ProductVersionToDefaultVirtualHWVersion(esxVI_ProductVersion productVersio
/*
* virtualHW.version compatibility matrix:
*
* 4 7 API
* ESX 3.5 + 2.5
* ESX 4.0 + + 4.0
* ESX 4.1 + + 4.1
* GSX 2.0 + + 2.5
* 4 7 8 API
* ESX 3.5 + 2.5
* ESX 4.0 + + 4.0
* ESX 4.1 + + 4.1
* ESX 5.0 + + + 5.0
* GSX 2.0 + + 2.5
*/
switch
(
productVersion
)
{
case
esxVI_ProductVersion_ESX35
:
...
...
@@ -3919,6 +3942,14 @@ esxVI_ProductVersionToDefaultVirtualHWVersion(esxVI_ProductVersion productVersio
case
esxVI_ProductVersion_VPX4x
:
return
7
;
case
esxVI_ProductVersion_ESX50
:
case
esxVI_ProductVersion_VPX50
:
return
8
;
case
esxVI_ProductVersion_ESX5x
:
case
esxVI_ProductVersion_VPX5x
:
return
8
;
default:
ESX_VI_ERROR
(
VIR_ERR_INTERNAL_ERROR
,
"%s"
,
_
(
"Unexpected product version"
));
...
...
src/esx/esx_vi.h
浏览文件 @
5759a5cc
...
...
@@ -99,7 +99,9 @@ enum _esxVI_APIVersion {
esxVI_APIVersion_25
,
esxVI_APIVersion_40
,
esxVI_APIVersion_41
,
esxVI_APIVersion_4x
/* > 4.1 */
esxVI_APIVersion_4x
,
/* > 4.1 */
esxVI_APIVersion_50
,
esxVI_APIVersion_5x
/* > 5.0 */
};
/*
...
...
@@ -117,12 +119,16 @@ enum _esxVI_ProductVersion {
esxVI_ProductVersion_ESX40
=
esxVI_ProductVersion_ESX
|
2
,
esxVI_ProductVersion_ESX41
=
esxVI_ProductVersion_ESX
|
3
,
esxVI_ProductVersion_ESX4x
=
esxVI_ProductVersion_ESX
|
4
,
/* > 4.1 */
esxVI_ProductVersion_ESX50
=
esxVI_ProductVersion_ESX
|
5
,
esxVI_ProductVersion_ESX5x
=
esxVI_ProductVersion_ESX
|
6
,
/* > 5.0 */
esxVI_ProductVersion_VPX
=
(
1
<<
2
)
<<
16
,
esxVI_ProductVersion_VPX25
=
esxVI_ProductVersion_VPX
|
1
,
esxVI_ProductVersion_VPX40
=
esxVI_ProductVersion_VPX
|
2
,
esxVI_ProductVersion_VPX41
=
esxVI_ProductVersion_VPX
|
3
,
esxVI_ProductVersion_VPX4x
=
esxVI_ProductVersion_VPX
|
4
/* > 4.1 */
esxVI_ProductVersion_VPX4x
=
esxVI_ProductVersion_VPX
|
4
,
/* > 4.1 */
esxVI_ProductVersion_VPX50
=
esxVI_ProductVersion_VPX
|
5
,
esxVI_ProductVersion_VPX5x
=
esxVI_ProductVersion_VPX
|
6
/* > 5.0 */
};
enum
_esxVI_Occurrence
{
...
...
src/vmx/vmx.c
浏览文件 @
5759a5cc
...
...
@@ -44,6 +44,7 @@ domain-xml <=> vmx
config.version = "8" # essential
virtualHW.version = "4" # essential for ESX 3.5
virtualHW.version = "7" # essential for ESX 4.0
virtualHW.version = "8" # essential for ESX 5.0
??? <=> guestOS = "<value>" # essential, FIXME: not representable
...
...
@@ -1278,9 +1279,10 @@ virVMXParseConfig(virVMXContext *ctx, virCapsPtr caps, const char *vmx)
goto
cleanup
;
}
if
(
virtualHW_version
!=
4
&&
virtualHW_version
!=
7
)
{
if
(
virtualHW_version
!=
4
&&
virtualHW_version
!=
7
&&
virtualHW_version
!=
8
)
{
VMX_ERROR
(
VIR_ERR_INTERNAL_ERROR
,
_
(
"Expecting VMX entry 'virtualHW.version' to be 4
or 7
"
_
(
"Expecting VMX entry 'virtualHW.version' to be 4
, 7 or 8
"
"but found %lld"
),
virtualHW_version
);
goto
cleanup
;
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录