Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
openeuler
libvirt
提交
afb85c58
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,发现更多精彩内容 >>
提交
afb85c58
编写于
6月 24, 2010
作者:
M
Matthias Bolte
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
esx: Allow 'vmpvscsi' as SCSI controller model
上级
8c145200
变更
9
隐藏空白更改
内联
并排
Showing
9 changed file
with
55 addition
and
9 deletion
+55
-9
docs/drvesx.html.in
docs/drvesx.html.in
+12
-1
docs/schemas/domain.rng
docs/schemas/domain.rng
+1
-0
src/conf/domain_conf.c
src/conf/domain_conf.c
+2
-1
src/conf/domain_conf.h
src/conf/domain_conf.h
+1
-0
src/esx/esx_vmx.c
src/esx/esx_vmx.c
+18
-7
tests/vmx2xmldata/vmx2xml-scsi-driver.vmx
tests/vmx2xmldata/vmx2xml-scsi-driver.vmx
+5
-0
tests/vmx2xmldata/vmx2xml-scsi-driver.xml
tests/vmx2xmldata/vmx2xml-scsi-driver.xml
+6
-0
tests/xml2vmxdata/xml2vmx-scsi-driver.vmx
tests/xml2vmxdata/xml2vmx-scsi-driver.vmx
+5
-0
tests/xml2vmxdata/xml2vmx-scsi-driver.xml
tests/xml2vmxdata/xml2vmx-scsi-driver.xml
+5
-0
未找到文件。
docs/drvesx.html.in
浏览文件 @
afb85c58
...
...
@@ -302,7 +302,13 @@ ethernet0.checkMACAddress = "false"
</dd>
<dt><code>
lsisas1068
</code></dt>
<dd>
LSI Logic SAS 1068 controller.
LSI Logic SAS 1068 controller.
<span
class=
"since"
>
Since 0.8.0
</span>
</dd>
<dt><code>
vmpvscsi
</code></dt>
<dd>
Special VMware Paravirtual SCSI controller, requires VMware tools inside
the guest. See
<a
href=
"http://kb.vmware.com/kb/1010398"
>
VMware KB1010398
</a>
for details.
<span
class=
"since"
>
Since 0.8.3
</span>
</dd>
</dl>
<p>
...
...
@@ -642,5 +648,10 @@ Enter administrator password for example-vcenter.com:
VMware VMX config parameters
</a>
</li>
<li>
<a
href=
"http://www.vmware.com/pdf/vsp_4_pvscsi_perf.pdf"
>
VMware ESX 4.0 PVSCSI Storage Performance
</a>
</li>
</ul>
</body></html>
docs/schemas/domain.rng
浏览文件 @
afb85c58
...
...
@@ -679,6 +679,7 @@
<value>
buslogic
</value>
<value>
lsilogic
</value>
<value>
lsisas1068
</value>
<value>
vmpvscsi
</value>
</choice>
</attribute>
</optional>
...
...
src/conf/domain_conf.c
浏览文件 @
afb85c58
...
...
@@ -143,7 +143,8 @@ VIR_ENUM_IMPL(virDomainController, VIR_DOMAIN_CONTROLLER_TYPE_LAST,
VIR_ENUM_IMPL
(
virDomainControllerModel
,
VIR_DOMAIN_CONTROLLER_MODEL_LAST
,
"buslogic"
,
"lsilogic"
,
"lsisas1068"
)
"lsisas1068"
,
"vmpvscsi"
)
VIR_ENUM_IMPL
(
virDomainFS
,
VIR_DOMAIN_FS_TYPE_LAST
,
"mount"
,
...
...
src/conf/domain_conf.h
浏览文件 @
afb85c58
...
...
@@ -199,6 +199,7 @@ enum virDomainControllerModel {
VIR_DOMAIN_CONTROLLER_MODEL_BUSLOGIC
,
VIR_DOMAIN_CONTROLLER_MODEL_LSILOGIC
,
VIR_DOMAIN_CONTROLLER_MODEL_LSISAS1068
,
VIR_DOMAIN_CONTROLLER_MODEL_VMPVSCSI
,
VIR_DOMAIN_CONTROLLER_MODEL_LAST
};
...
...
src/esx/esx_vmx.c
浏览文件 @
afb85c58
...
...
@@ -428,6 +428,15 @@ def->parallels[0]...
#define ESX_BUILD_VMX_NAME(_suffix) \
snprintf(_suffix##_name, sizeof(_suffix##_name), "%s."#_suffix, prefix);
/* directly map the virDomainControllerModel to esxVMX_SCSIControllerModel,
* this is good enough for now because all virDomainControllerModel values
* are actually SCSI controller models in the ESX case */
VIR_ENUM_DECL
(
esxVMX_SCSIControllerModel
)
VIR_ENUM_IMPL
(
esxVMX_SCSIControllerModel
,
VIR_DOMAIN_CONTROLLER_MODEL_LAST
,
"buslogic"
,
"lsilogic"
,
"lsisas1068"
,
"pvscsi"
);
int
...
...
@@ -740,11 +749,12 @@ esxVMX_GatherSCSIControllers(virDomainDefPtr def, int virtualDev[4],
if
(
controller
->
model
!=
-
1
&&
controller
->
model
!=
VIR_DOMAIN_CONTROLLER_MODEL_BUSLOGIC
&&
controller
->
model
!=
VIR_DOMAIN_CONTROLLER_MODEL_LSILOGIC
&&
controller
->
model
!=
VIR_DOMAIN_CONTROLLER_MODEL_LSISAS1068
)
{
controller
->
model
!=
VIR_DOMAIN_CONTROLLER_MODEL_LSISAS1068
&&
controller
->
model
!=
VIR_DOMAIN_CONTROLLER_MODEL_VMPVSCSI
)
{
ESX_ERROR
(
VIR_ERR_INTERNAL_ERROR
,
_
(
"Expecting domain XML attribute 'model' of entry "
"'controller' to be 'buslogic' or 'lsilogic' or "
"'lsisas1068' but found '%s'"
),
"'lsisas1068'
or 'vmpvscsi'
but found '%s'"
),
virDomainControllerModelTypeToString
(
controller
->
model
));
return
-
1
;
}
...
...
@@ -1478,16 +1488,17 @@ esxVMX_ParseSCSIController(virConfPtr conf, int controller, bool *present,
*
tmp
=
c_tolower
(
*
tmp
);
}
*
virtualDev
=
virDomain
ControllerModelTypeFromString
(
virtualDev_string
);
*
virtualDev
=
esxVMX_SCSI
ControllerModelTypeFromString
(
virtualDev_string
);
if
(
*
virtualDev
==
-
1
||
(
*
virtualDev
!=
VIR_DOMAIN_CONTROLLER_MODEL_BUSLOGIC
&&
*
virtualDev
!=
VIR_DOMAIN_CONTROLLER_MODEL_LSILOGIC
&&
*
virtualDev
!=
VIR_DOMAIN_CONTROLLER_MODEL_LSISAS1068
))
{
*
virtualDev
!=
VIR_DOMAIN_CONTROLLER_MODEL_LSISAS1068
&&
*
virtualDev
!=
VIR_DOMAIN_CONTROLLER_MODEL_VMPVSCSI
))
{
ESX_ERROR
(
VIR_ERR_INTERNAL_ERROR
,
_
(
"Expecting VMX entry '%s' to be 'buslogic' or 'lsilogic' "
"or 'lsisas1068'
but found '%s'"
),
virtualDev_name
,
virtualDev_string
);
"or 'lsisas1068'
or 'pvscsi' but found '%s'"
)
,
virtualDev_name
,
virtualDev_string
);
goto
failure
;
}
}
...
...
@@ -2619,7 +2630,7 @@ esxVMX_FormatConfig(esxVI_Context *ctx, virCapsPtr caps, virDomainDefPtr def,
if
(
scsi_virtualDev
[
i
]
!=
-
1
)
{
virBufferVSprintf
(
&
buffer
,
"scsi%d.virtualDev =
\"
%s
\"\n
"
,
i
,
virDomain
ControllerModelTypeToString
esxVMX_SCSI
ControllerModelTypeToString
(
scsi_virtualDev
[
i
]));
}
}
...
...
tests/vmx2xmldata/vmx2xml-scsi-driver.vmx
浏览文件 @
afb85c58
...
...
@@ -6,6 +6,8 @@ scsi1.present = "true"
scsi1.virtualDev = "lsilogic"
scsi2.present = "true"
scsi2.virtualDev = "lsisas1068"
scsi3.present = "true"
scsi3.virtualDev = "pvscsi"
scsi0:0.present = "true"
scsi0:0.deviceType = "scsi-hardDisk"
scsi0:0.fileName = "harddisk1.vmdk"
...
...
@@ -15,3 +17,6 @@ scsi1:0.fileName = "harddisk2.vmdk"
scsi2:0.present = "true"
scsi2:0.deviceType = "scsi-hardDisk"
scsi2:0.fileName = "harddisk3.vmdk"
scsi3:0.present = "true"
scsi3:0.deviceType = "scsi-hardDisk"
scsi3:0.fileName = "harddisk4.vmdk"
tests/vmx2xmldata/vmx2xml-scsi-driver.xml
浏览文件 @
afb85c58
...
...
@@ -26,8 +26,14 @@
<target
dev=
'sdae'
bus=
'scsi'
/>
<address
type=
'drive'
controller=
'2'
bus=
'0'
unit=
'0'
/>
</disk>
<disk
type=
'file'
device=
'disk'
>
<source
file=
'[datastore] directory/harddisk4.vmdk'
/>
<target
dev=
'sdat'
bus=
'scsi'
/>
<address
type=
'drive'
controller=
'3'
bus=
'0'
unit=
'0'
/>
</disk>
<controller
type=
'scsi'
index=
'0'
model=
'buslogic'
/>
<controller
type=
'scsi'
index=
'1'
model=
'lsilogic'
/>
<controller
type=
'scsi'
index=
'2'
model=
'lsisas1068'
/>
<controller
type=
'scsi'
index=
'3'
model=
'vmpvscsi'
/>
</devices>
</domain>
tests/xml2vmxdata/xml2vmx-scsi-driver.vmx
浏览文件 @
afb85c58
...
...
@@ -11,6 +11,8 @@ scsi1.present = "true"
scsi1.virtualDev = "lsilogic"
scsi2.present = "true"
scsi2.virtualDev = "lsisas1068"
scsi3.present = "true"
scsi3.virtualDev = "pvscsi"
scsi0:0.present = "true"
scsi0:0.deviceType = "scsi-hardDisk"
scsi0:0.fileName = "/vmfs/volumes/datastore/directory/harddisk1.vmdk"
...
...
@@ -20,3 +22,6 @@ scsi1:0.fileName = "/vmfs/volumes/datastore/directory/harddisk2.vmdk"
scsi2:0.present = "true"
scsi2:0.deviceType = "scsi-hardDisk"
scsi2:0.fileName = "/vmfs/volumes/datastore/directory/harddisk3.vmdk"
scsi3:0.present = "true"
scsi3:0.deviceType = "scsi-hardDisk"
scsi3:0.fileName = "/vmfs/volumes/datastore/directory/harddisk4.vmdk"
tests/xml2vmxdata/xml2vmx-scsi-driver.xml
浏览文件 @
afb85c58
...
...
@@ -21,5 +21,10 @@
<source
file=
'[datastore] directory/harddisk3.vmdk'
/>
<target
dev=
'sdae'
bus=
'scsi'
/>
</disk>
<disk
type=
'file'
device=
'disk'
>
<driver
name=
'vmpvscsi'
/>
<source
file=
'[datastore] directory/harddisk4.vmdk'
/>
<target
dev=
'sdat'
bus=
'scsi'
/>
</disk>
</devices>
</domain>
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录