mirror of
https://github.com/libvirt/libvirt.git
synced 2025-02-25 18:55:26 -06:00
esx: Allow 'lsisas1068' as SCSI controller type
Extend tests to cover all SCSI controller types and document the new type. The lsisas1068 SCSI controller type was added in ESX 4.0. The VMX parser reports an error when this controller type is present. This makes virsh dumpxml fail for every domain that uses this controller type. This patch fixes this and adds lsisas1068 to the list of accepted SCSI controller types. Reported by Jonathan Kelley.
This commit is contained in:
@@ -1,12 +0,0 @@
|
||||
config.version = "8"
|
||||
virtualHW.version = "4"
|
||||
guestOS = "other"
|
||||
uuid.bios = "56 4d 9b ef ac d9 b4 e0-c8 f0 ae a8 b9 10 35 15"
|
||||
displayName = "scsi-buslogic"
|
||||
memsize = "4"
|
||||
numvcpus = "1"
|
||||
scsi0.present = "true"
|
||||
scsi0.virtualDev = "buslogic"
|
||||
scsi0:0.present = "true"
|
||||
scsi0:0.deviceType = "scsi-hardDisk"
|
||||
scsi0:0.fileName = "/vmfs/volumes/datastore/directory/harddisk.vmdk"
|
||||
@@ -1,15 +0,0 @@
|
||||
<domain type='vmware'>
|
||||
<name>scsi-buslogic</name>
|
||||
<uuid>564d9bef-acd9-b4e0-c8f0-aea8b9103515</uuid>
|
||||
<memory>4096</memory>
|
||||
<os>
|
||||
<type>hvm</type>
|
||||
</os>
|
||||
<devices>
|
||||
<disk type='file' device='disk'>
|
||||
<driver name='buslogic'/>
|
||||
<source file='[datastore] directory/harddisk.vmdk'/>
|
||||
<target dev='sda' bus='scsi'/>
|
||||
</disk>
|
||||
</devices>
|
||||
</domain>
|
||||
22
tests/xml2vmxdata/xml2vmx-scsi-driver.vmx
Normal file
22
tests/xml2vmxdata/xml2vmx-scsi-driver.vmx
Normal file
@@ -0,0 +1,22 @@
|
||||
config.version = "8"
|
||||
virtualHW.version = "4"
|
||||
guestOS = "other"
|
||||
uuid.bios = "56 4d 9b ef ac d9 b4 e0-c8 f0 ae a8 b9 10 35 15"
|
||||
displayName = "scsi-buslogic"
|
||||
memsize = "4"
|
||||
numvcpus = "1"
|
||||
scsi0.present = "true"
|
||||
scsi0.virtualDev = "buslogic"
|
||||
scsi1.present = "true"
|
||||
scsi1.virtualDev = "lsilogic"
|
||||
scsi2.present = "true"
|
||||
scsi2.virtualDev = "lsisas1068"
|
||||
scsi0:0.present = "true"
|
||||
scsi0:0.deviceType = "scsi-hardDisk"
|
||||
scsi0:0.fileName = "/vmfs/volumes/datastore/directory/harddisk1.vmdk"
|
||||
scsi1:0.present = "true"
|
||||
scsi1:0.deviceType = "scsi-hardDisk"
|
||||
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"
|
||||
25
tests/xml2vmxdata/xml2vmx-scsi-driver.xml
Normal file
25
tests/xml2vmxdata/xml2vmx-scsi-driver.xml
Normal file
@@ -0,0 +1,25 @@
|
||||
<domain type='vmware'>
|
||||
<name>scsi-buslogic</name>
|
||||
<uuid>564d9bef-acd9-b4e0-c8f0-aea8b9103515</uuid>
|
||||
<memory>4096</memory>
|
||||
<os>
|
||||
<type>hvm</type>
|
||||
</os>
|
||||
<devices>
|
||||
<disk type='file' device='disk'>
|
||||
<driver name='buslogic'/>
|
||||
<source file='[datastore] directory/harddisk1.vmdk'/>
|
||||
<target dev='sda' bus='scsi'/>
|
||||
</disk>
|
||||
<disk type='file' device='disk'>
|
||||
<driver name='lsilogic'/>
|
||||
<source file='[datastore] directory/harddisk2.vmdk'/>
|
||||
<target dev='sdp' bus='scsi'/>
|
||||
</disk>
|
||||
<disk type='file' device='disk'>
|
||||
<driver name='lsisas1068'/>
|
||||
<source file='[datastore] directory/harddisk3.vmdk'/>
|
||||
<target dev='sdae' bus='scsi'/>
|
||||
</disk>
|
||||
</devices>
|
||||
</domain>
|
||||
Reference in New Issue
Block a user