NuKVM/libvirt
3
0
Fork 0
mirror of https://github.com/libvirt/libvirt.git synced 2026-07-29 15:54:48 -05:00
Code Issues Packages Projects Releases Wiki Activity

conf: Introduce new attribute for device address format

Browse Source 
* src/conf/domain_conf.h: Add new member "target" to struct
  _virDomainDeviceDriveAddress.

* src/conf/domain_conf.c: Parse and format "target"

* Lots of tests (.xml) in tests/domainsnapshotxml2xmlout,
  tests/qemuxml2argvdata, tests/qemuxml2xmloutdata, and
  tests/vmx2xmldata/ are modified for newly introduced
  attribute "target" for address of "drive" type.
This commit is contained in:
Osier Yang
2012-02-28 14:27:11 +08:00
parent 7eadfddad5
commit 4288b22fb2
194 changed files with 292 additions and 264 deletions
Download Patch File Download Diff File Expand all files Collapse all files
tests/vmx2xmldata/vmx2xml-case-insensitive-1.xml
+1 -1
View File
@@ -18,7 +18,7 @@
<disk type='file' device='disk'>
<source file='[datastore] directory/FEDORA11.VMDK'/>
<target dev='sda' bus='scsi'/>
<address type='drive' controller='0' bus='0' unit='0'/>
<address type='drive' controller='0' bus='0' target='0' unit='0'/>
</disk>
<controller type='scsi' index='0' model='lsilogic'/>
<interface type='bridge'>
tests/vmx2xmldata/vmx2xml-case-insensitive-2.xml
+1 -1
View File
@@ -18,7 +18,7 @@
<disk type='file' device='disk'>
<source file='[datastore] directory/fedora11.vmdk'/>
<target dev='sda' bus='scsi'/>
<address type='drive' controller='0' bus='0' unit='0'/>
<address type='drive' controller='0' bus='0' target='0' unit='0'/>
</disk>
<controller type='scsi' index='0' model='lsilogic'/>
<interface type='bridge'>
tests/vmx2xmldata/vmx2xml-cdrom-ide-device.xml
+1 -1
View File
@@ -14,7 +14,7 @@
<disk type='block' device='cdrom'>
<source dev='/dev/scd0'/>
<target dev='hda' bus='ide'/>
<address type='drive' controller='0' bus='0' unit='0'/>
<address type='drive' controller='0' bus='0' target='0' unit='0'/>
</disk>
<controller type='ide' index='0'/>
<video>
tests/vmx2xmldata/vmx2xml-cdrom-ide-file.xml
+1 -1
View File
@@ -14,7 +14,7 @@
<disk type='file' device='cdrom'>
<source file='[datastore] directory/cdrom.iso'/>
<target dev='hda' bus='ide'/>
<address type='drive' controller='0' bus='0' unit='0'/>
<address type='drive' controller='0' bus='0' target='0' unit='0'/>
</disk>
<controller type='ide' index='0'/>
<video>
tests/vmx2xmldata/vmx2xml-cdrom-scsi-device.xml
+1 -1
View File
@@ -14,7 +14,7 @@
<disk type='block' device='cdrom'>
<source dev='/dev/scd0'/>
<target dev='sda' bus='scsi'/>
<address type='drive' controller='0' bus='0' unit='0'/>
<address type='drive' controller='0' bus='0' target='0' unit='0'/>
</disk>
<controller type='scsi' index='0'/>
<video>
tests/vmx2xmldata/vmx2xml-cdrom-scsi-file.xml
+1 -1
View File
@@ -14,7 +14,7 @@
<disk type='file' device='cdrom'>
<source file='[datastore] directory/cdrom.iso'/>
<target dev='sda' bus='scsi'/>
<address type='drive' controller='0' bus='0' unit='0'/>
<address type='drive' controller='0' bus='0' target='0' unit='0'/>
</disk>
<controller type='scsi' index='0'/>
<video>
tests/vmx2xmldata/vmx2xml-esx-in-the-wild-1.xml
+1 -1
View File
@@ -18,7 +18,7 @@
<disk type='file' device='disk'>
<source file='[datastore] directory/Fedora11.vmdk'/>
<target dev='sda' bus='scsi'/>
<address type='drive' controller='0' bus='0' unit='0'/>
<address type='drive' controller='0' bus='0' target='0' unit='0'/>
</disk>
<controller type='scsi' index='0' model='lsilogic'/>
<interface type='bridge'>
tests/vmx2xmldata/vmx2xml-esx-in-the-wild-2.xml
+6 -6
View File
@@ -16,32 +16,32 @@
<driver cache='writethrough'/>
<source file='[datastore] directory/Debian1.vmdk'/>
<target dev='sda' bus='scsi'/>
<address type='drive' controller='0' bus='0' unit='0'/>
<address type='drive' controller='0' bus='0' target='0' unit='0'/>
</disk>
<disk type='file' device='cdrom'>
<source file='[datastore] directory/Debian1-cdrom.iso'/>
<target dev='sdp' bus='scsi'/>
<address type='drive' controller='1' bus='0' unit='0'/>
<address type='drive' controller='1' bus='0' target='0' unit='0'/>
</disk>
<disk type='file' device='cdrom'>
<source file='/vmimages/tools-isoimages/linux.iso'/>
<target dev='hda' bus='ide'/>
<address type='drive' controller='0' bus='0' unit='0'/>
<address type='drive' controller='0' bus='0' target='0' unit='0'/>
</disk>
<disk type='block' device='cdrom'>
<source dev='/dev/scd0'/>
<target dev='hdb' bus='ide'/>
<address type='drive' controller='0' bus='0' unit='1'/>
<address type='drive' controller='0' bus='0' target='0' unit='1'/>
</disk>
<disk type='file' device='disk'>
<source file='[datastore] directory/Debian1-IDE.vmdk'/>
<target dev='hdd' bus='ide'/>
<address type='drive' controller='0' bus='1' unit='1'/>
<address type='drive' controller='0' bus='1' target='0' unit='1'/>
</disk>
<disk type='block' device='floppy'>
<source dev='/dev/fd0'/>
<target dev='fda' bus='fdc'/>
<address type='drive' controller='0' bus='0' unit='0'/>
<address type='drive' controller='0' bus='0' target='0' unit='0'/>
</disk>
<controller type='scsi' index='0' model='lsilogic'/>
<controller type='scsi' index='1' model='buslogic'/>
tests/vmx2xmldata/vmx2xml-esx-in-the-wild-3.xml
+3 -3
View File
@@ -15,17 +15,17 @@
<disk type='file' device='disk'>
<source file='[datastore] directory/Debian2.vmdk'/>
<target dev='sda' bus='scsi'/>
<address type='drive' controller='0' bus='0' unit='0'/>
<address type='drive' controller='0' bus='0' target='0' unit='0'/>
</disk>
<disk type='file' device='cdrom'>
<source file='[498076b2-02796c1a-ef5b-000ae484a6a3] Isos/debian-testing-amd64-netinst.iso'/>
<target dev='hda' bus='ide'/>
<address type='drive' controller='0' bus='0' unit='0'/>
<address type='drive' controller='0' bus='0' target='0' unit='0'/>
</disk>
<disk type='file' device='floppy'>
<source file='[498076b2-02796c1a-ef5b-000ae484a6a3] Debian2/dummy.flp'/>
<target dev='fdb' bus='fdc'/>
<address type='drive' controller='0' bus='0' unit='1'/>
<address type='drive' controller='0' bus='0' target='0' unit='1'/>
</disk>
<controller type='scsi' index='0' model='lsilogic'/>
<controller type='fdc' index='0'/>
tests/vmx2xmldata/vmx2xml-esx-in-the-wild-4.xml
+1 -1
View File
@@ -18,7 +18,7 @@
<disk type='file' device='disk'>
<source file='[datastore] directory/virtMonServ1.vmdk'/>
<target dev='sda' bus='scsi'/>
<address type='drive' controller='0' bus='0' unit='0'/>
<address type='drive' controller='0' bus='0' target='0' unit='0'/>
</disk>
<controller type='scsi' index='0' model='lsilogic'/>
<interface type='bridge'>
tests/vmx2xmldata/vmx2xml-esx-in-the-wild-5.xml
+2 -2
View File
@@ -22,12 +22,12 @@
<disk type='file' device='disk'>
<source file='[datastore] directory/vmtest-000001.vmdk'/>
<target dev='sda' bus='scsi'/>
<address type='drive' controller='0' bus='0' unit='0'/>
<address type='drive' controller='0' bus='0' target='0' unit='0'/>
</disk>
<disk type='file' device='cdrom'>
<source file='[4af0231d-1eff559a-6369-0024e84773b6] isos/CentOS-5.5-x86_64-bin-DVD-1of2.iso'/>
<target dev='hda' bus='ide'/>
<address type='drive' controller='0' bus='0' unit='0'/>
<address type='drive' controller='0' bus='0' target='0' unit='0'/>
</disk>
<controller type='scsi' index='0' model='lsilogic'/>
<controller type='ide' index='0'/>
tests/vmx2xmldata/vmx2xml-esx-in-the-wild-6.xml
+2 -2
View File
@@ -15,12 +15,12 @@
<disk type='file' device='disk'>
<source file='[datastore] directory/el6-test-000001.vmdk'/>
<target dev='sda' bus='scsi'/>
<address type='drive' controller='0' bus='0' unit='0'/>
<address type='drive' controller='0' bus='0' target='0' unit='0'/>
</disk>
<disk type='file' device='cdrom'>
<source file='/usr/lib/vmware/isoimages/linux.iso'/>
<target dev='hdc' bus='ide'/>
<address type='drive' controller='0' bus='1' unit='0'/>
<address type='drive' controller='0' bus='1' target='0' unit='0'/>
</disk>
<controller type='scsi' index='0' model='vmpvscsi'/>
<controller type='ide' index='0'/>
tests/vmx2xmldata/vmx2xml-floppy-device.xml
+1 -1
View File
@@ -14,7 +14,7 @@
<disk type='block' device='floppy'>
<source dev='/dev/fd0'/>
<target dev='fda' bus='fdc'/>
<address type='drive' controller='0' bus='0' unit='0'/>
<address type='drive' controller='0' bus='0' target='0' unit='0'/>
</disk>
<controller type='fdc' index='0'/>
<video>
tests/vmx2xmldata/vmx2xml-floppy-file.xml
+1 -1
View File
@@ -14,7 +14,7 @@
<disk type='file' device='floppy'>
<source file='[datastore] directory/floppy.flp'/>
<target dev='fda' bus='fdc'/>
<address type='drive' controller='0' bus='0' unit='0'/>
<address type='drive' controller='0' bus='0' target='0' unit='0'/>
</disk>
<controller type='fdc' index='0'/>
<video>
tests/vmx2xmldata/vmx2xml-gsx-in-the-wild-1.xml
+1 -1
View File
@@ -15,7 +15,7 @@
<disk type='file' device='disk'>
<source file='[datastore] directory/Debian-System1-0-cl2.vmdk'/>
<target dev='hda' bus='ide'/>
<address type='drive' controller='0' bus='0' unit='0'/>
<address type='drive' controller='0' bus='0' target='0' unit='0'/>
</disk>
<controller type='ide' index='0'/>
<interface type='bridge'>
tests/vmx2xmldata/vmx2xml-gsx-in-the-wild-2.xml
+1 -1
View File
@@ -15,7 +15,7 @@
<disk type='file' device='disk'>
<source file='[datastore] directory/Debian-System1-0-cl3.vmdk'/>
<target dev='hda' bus='ide'/>
<address type='drive' controller='0' bus='0' unit='0'/>
<address type='drive' controller='0' bus='0' target='0' unit='0'/>
</disk>
<controller type='ide' index='0'/>
<interface type='bridge'>
tests/vmx2xmldata/vmx2xml-gsx-in-the-wild-3.xml
+1 -1
View File
@@ -15,7 +15,7 @@
<disk type='file' device='disk'>
<source file='[datastore] directory/Debian-System1-0-cl1.vmdk'/>
<target dev='hda' bus='ide'/>
<address type='drive' controller='0' bus='0' unit='0'/>
<address type='drive' controller='0' bus='0' target='0' unit='0'/>
</disk>
<controller type='ide' index='0'/>
<interface type='bridge'>
tests/vmx2xmldata/vmx2xml-gsx-in-the-wild-4.xml
+1 -1
View File
@@ -15,7 +15,7 @@
<disk type='file' device='disk'>
<source file='[datastore] directory/Debian-System1-0-cl2.vmdk'/>
<target dev='hda' bus='ide'/>
<address type='drive' controller='0' bus='0' unit='0'/>
<address type='drive' controller='0' bus='0' target='0' unit='0'/>
</disk>
<controller type='ide' index='0'/>
<interface type='bridge'>
tests/vmx2xmldata/vmx2xml-harddisk-ide-file.xml
+1 -1
View File
@@ -14,7 +14,7 @@
<disk type='file' device='disk'>
<source file='[datastore] directory/harddisk.vmdk'/>
<target dev='hda' bus='ide'/>
<address type='drive' controller='0' bus='0' unit='0'/>
<address type='drive' controller='0' bus='0' target='0' unit='0'/>
</disk>
<controller type='ide' index='0'/>
<video>
tests/vmx2xmldata/vmx2xml-harddisk-scsi-file.xml
+1 -1
View File
@@ -14,7 +14,7 @@
<disk type='file' device='disk'>
<source file='[datastore] directory/harddisk.vmdk'/>
<target dev='sda' bus='scsi'/>
<address type='drive' controller='0' bus='0' unit='0'/>
<address type='drive' controller='0' bus='0' target='0' unit='0'/>
</disk>
<controller type='scsi' index='0'/>
<video>
tests/vmx2xmldata/vmx2xml-scsi-driver.xml
+4 -4
View File
@@ -14,22 +14,22 @@
<disk type='file' device='disk'>
<source file='[datastore] directory/harddisk1.vmdk'/>
<target dev='sda' bus='scsi'/>
<address type='drive' controller='0' bus='0' unit='0'/>
<address type='drive' controller='0' bus='0' target='0' unit='0'/>
</disk>
<disk type='file' device='disk'>
<source file='[datastore] directory/harddisk2.vmdk'/>
<target dev='sdp' bus='scsi'/>
<address type='drive' controller='1' bus='0' unit='0'/>
<address type='drive' controller='1' bus='0' target='0' unit='0'/>
</disk>
<disk type='file' device='disk'>
<source file='[datastore] directory/harddisk3.vmdk'/>
<target dev='sdae' bus='scsi'/>
<address type='drive' controller='2' bus='0' unit='0'/>
<address type='drive' controller='2' bus='0' target='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'/>
<address type='drive' controller='3' bus='0' target='0' unit='0'/>
</disk>
<controller type='scsi' index='0' model='buslogic'/>
<controller type='scsi' index='1' model='lsilogic'/>
tests/vmx2xmldata/vmx2xml-scsi-writethrough.xml
+1 -1
View File
@@ -15,7 +15,7 @@
<driver cache='writethrough'/>
<source file='[datastore] directory/harddisk.vmdk'/>
<target dev='sda' bus='scsi'/>
<address type='drive' controller='0' bus='0' unit='0'/>
<address type='drive' controller='0' bus='0' target='0' unit='0'/>
</disk>
<controller type='scsi' index='0' model='buslogic'/>
<video>
tests/vmx2xmldata/vmx2xml-ws-in-the-wild-1.xml
+2 -2
View File
@@ -15,12 +15,12 @@
<disk type='file' device='disk'>
<source file='/data/vmware/disk.vmdk'/>
<target dev='sda' bus='scsi'/>
<address type='drive' controller='0' bus='0' unit='0'/>
<address type='drive' controller='0' bus='0' target='0' unit='0'/>
</disk>
<disk type='file' device='cdrom'>
<source file='/usr/lib/vmware/isoimages/linux.iso'/>
<target dev='hdc' bus='ide'/>
<address type='drive' controller='0' bus='1' unit='0'/>
<address type='drive' controller='0' bus='1' target='0' unit='0'/>
</disk>
<controller type='scsi' index='0' model='lsilogic'/>
<controller type='ide' index='0'/>
tests/vmx2xmldata/vmx2xml-ws-in-the-wild-2.xml
+2 -2
View File
@@ -15,12 +15,12 @@
<disk type='file' device='disk'>
<source file='/data/vmware/disk.vmdk'/>
<target dev='sda' bus='scsi'/>
<address type='drive' controller='0' bus='0' unit='0'/>
<address type='drive' controller='0' bus='0' target='0' unit='0'/>
</disk>
<disk type='file' device='cdrom'>
<source file='/usr/lib/vmware/isoimages/linux.iso'/>
<target dev='hdc' bus='ide'/>
<address type='drive' controller='0' bus='1' unit='0'/>
<address type='drive' controller='0' bus='1' target='0' unit='0'/>
</disk>
<controller type='scsi' index='0' model='lsilogic'/>
<controller type='ide' index='0'/>