NuKVM/libvirt
3
0
Fork 0
mirror of https://github.com/libvirt/libvirt.git synced 2025-02-25 18:55:26 -06:00
Code Issues Packages Projects Releases Wiki Activity

bhyvexml2argvdata: Fix <drive/> addresses

Browse Source 
After c07d1c1c4f got merged it uncovered couple of broken domain
XMLs for bhyvexml2argv test. Some disk drives had incompatible
type of address configured.

Signed-off-by: Michal Privoznik <mprivozn@redhat.com>
This commit is contained in:
Michal Privoznik
2016-12-25 17:56:22 +01:00
parent a6f05c5a81
commit 5b51848c76
22 changed files with 32 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
tests/bhyvexml2argvdata/bhyvexml2argv-acpiapic.xml
View File

@@ -15,7 +15,7 @@
<driver name='file' type='raw'/>
<source file='/tmp/freebsd.img'/>
<target dev='hda' bus='sata'/>
<address type='pci' domain='0x0000' bus='0x00' slot='0x02' function='0x0'/>
<address type='drive' controller='0' bus='0' target='2' unit='0'/>
</disk>
<interface type='bridge'>
<model type='virtio'/>

2
tests/bhyvexml2argvdata/bhyvexml2argv-base.xml
View File

@@ -11,7 +11,7 @@
<driver name='file' type='raw'/>
<source file='/tmp/freebsd.img'/>
<target dev='hda' bus='sata'/>
<address type='pci' domain='0x0000' bus='0x00' slot='0x02' function='0x0'/>
<address type='drive' controller='0' bus='0' target='2' unit='0'/>
</disk>
<interface type='bridge'>
<model type='virtio'/>

4
tests/bhyvexml2argvdata/bhyvexml2argv-bhyveload-bootorder.xml
View File

@@ -12,13 +12,13 @@
<driver name='file' type='raw'/>
<source file='/tmp/freebsd.img'/>
<target dev='hda' bus='sata'/>
<address type='pci' domain='0x0000' bus='0x00' slot='0x02' function='0x0'/>
<address type='drive' controller='0' bus='0' target='2' unit='0'/>
</disk>
<disk type='file' device='cdrom'>
<driver name='file' type='raw'/>
<source file='/tmp/cdrom.iso'/>
<target dev='hdb' bus='sata'/>
<address type='pci' domain='0x0000' bus='0x00' slot='0x04' function='0x0'/>
<address type='drive' controller='0' bus='0' target='4' unit='0'/>
</disk>
<interface type='bridge'>
<model type='virtio'/>

4
tests/bhyvexml2argvdata/bhyvexml2argv-bhyveload-bootorder1.xml
View File

@@ -12,13 +12,13 @@
<driver name='file' type='raw'/>
<source file='/tmp/freebsd.img'/>
<target dev='hda' bus='sata'/>
<address type='pci' domain='0x0000' bus='0x00' slot='0x02' function='0x0'/>
<address type='drive' controller='0' bus='0' target='2' unit='0'/>
</disk>
<disk type='file' device='cdrom'>
<driver name='file' type='raw'/>
<source file='/tmp/cdrom.iso'/>
<target dev='hdb' bus='sata'/>
<address type='pci' domain='0x0000' bus='0x00' slot='0x04' function='0x0'/>
<address type='drive' controller='0' bus='0' target='4' unit='0'/>
</disk>
<interface type='bridge'>
<model type='virtio'/>

2
tests/bhyvexml2argvdata/bhyvexml2argv-bhyveload-bootorder2.xml
View File

@@ -12,7 +12,7 @@
<driver name='file' type='raw'/>
<source file='/tmp/freebsd.img'/>
<target dev='hda' bus='sata'/>
<address type='pci' domain='0x0000' bus='0x00' slot='0x02' function='0x0'/>
<address type='drive' controller='0' bus='0' target='2' unit='0'/>
</disk>
<interface type='bridge'>
<model type='virtio'/>

4
tests/bhyvexml2argvdata/bhyvexml2argv-bhyveload-bootorder3.xml
View File

@@ -11,13 +11,13 @@
<driver name='file' type='raw'/>
<source file='/tmp/freebsd.img'/>
<target dev='hda' bus='sata'/>
<address type='pci' domain='0x0000' bus='0x00' slot='0x02' function='0x0'/>
<address type='drive' controller='0' bus='0' target='2' unit='0'/>
</disk>
<disk type='file' device='cdrom'>
<driver name='file' type='raw'/>
<source file='/tmp/cdrom.iso'/>
<target dev='hdc' bus='sata'/>
<address type='pci' domain='0x0000' bus='0x00' slot='0x04' function='0x0'/>
<address type='drive' controller='0' bus='0' target='4' unit='0'/>
<boot order='1'/>
</disk>
<interface type='bridge'>

4
tests/bhyvexml2argvdata/bhyvexml2argv-bhyveload-bootorder4.xml
View File

@@ -12,13 +12,13 @@
<source file='/tmp/freebsd.img'/>
<target dev='hda' bus='sata'/>
<boot order='2'/>
<address type='pci' domain='0x0000' bus='0x00' slot='0x02' function='0x0'/>
<address type='drive' controller='0' bus='0' target='2' unit='0'/>
</disk>
<disk type='file' device='cdrom'>
<driver name='file' type='raw'/>
<source file='/tmp/cdrom.iso'/>
<target dev='hdb' bus='sata'/>
<address type='pci' domain='0x0000' bus='0x00' slot='0x04' function='0x0'/>
<address type='drive' controller='0' bus='0' target='4' unit='0'/>
<boot order='1'/>
</disk>
<interface type='bridge'>

2
tests/bhyvexml2argvdata/bhyvexml2argv-bhyveload-explicitargs.xml
View File

@@ -12,7 +12,7 @@
<driver name='file' type='raw'/>
<source file='/tmp/freebsd.img'/>
<target dev='hda' bus='sata'/>
<address type='pci' domain='0x0000' bus='0x00' slot='0x02' function='0x0'/>
<address type='drive' controller='0' bus='0' target='2' unit='0'/>
</disk>
<interface type='bridge'>
<model type='virtio'/>

2
tests/bhyvexml2argvdata/bhyvexml2argv-console.xml
View File

@@ -11,7 +11,7 @@
<driver name='file' type='raw'/>
<source file='/tmp/freebsd.img'/>
<target dev='hda' bus='sata'/>
<address type='pci' domain='0x0000' bus='0x00' slot='0x02' function='0x0'/>
<address type='drive' controller='0' bus='0' target='2' unit='0'/>
</disk>
<interface type='bridge'>
<model type='virtio'/>

2
tests/bhyvexml2argvdata/bhyvexml2argv-custom-loader.xml
View File

@@ -13,7 +13,7 @@
<driver name='file' type='raw'/>
<source file='/tmp/freebsd.img'/>
<target dev='hda' bus='sata'/>
<address type='pci' domain='0x0000' bus='0x00' slot='0x02' function='0x0'/>
<address type='drive' controller='0' bus='0' target='2' unit='0'/>
</disk>
<interface type='bridge'>
<model type='virtio'/>

2
tests/bhyvexml2argvdata/bhyvexml2argv-disk-cdrom-grub.xml
View File

@@ -12,7 +12,7 @@
<driver name='file' type='raw'/>
<source file='/tmp/cdrom.iso'/>
<target dev='hdc' bus='sata'/>
<address type='pci' domain='0x0000' bus='0x00' slot='0x02' function='0x0'/>
<address type='drive' controller='0' bus='0' target='2' unit='0'/>
</disk>
<interface type='bridge'>
<model type='virtio'/>

2
tests/bhyvexml2argvdata/bhyvexml2argv-disk-cdrom.xml
View File

@@ -12,7 +12,7 @@
<driver name='file' type='raw'/>
<source file='/tmp/cdrom.iso'/>
<target dev='hdc' bus='sata'/>
<address type='pci' domain='0x0000' bus='0x00' slot='0x02' function='0x0'/>
<address type='drive' controller='0' bus='0' target='2' unit='0'/>
</disk>
<interface type='bridge'>
<model type='virtio'/>

4
tests/bhyvexml2argvdata/bhyvexml2argv-grub-bootorder.args
View File

@@ -7,5 +7,5 @@
-s 0:0,hostbridge \
-s 3:0,virtio-net,faketapdev,mac=52:54:00:00:00:00 \
-s 2:0,ahci-hd,/tmp/freebsd1.img \
-s 2:0,ahci-hd,/tmp/freebsd2.img \
-s 2:0,ahci-hd,/tmp/freebsd3.img bhyve
-s 4:0,ahci-hd,/tmp/freebsd2.img \
-s 6:0,ahci-hd,/tmp/freebsd3.img bhyve

6
tests/bhyvexml2argvdata/bhyvexml2argv-grub-bootorder.xml
View File

@@ -12,20 +12,20 @@
<driver name='file' type='raw'/>
<source file='/tmp/freebsd1.img'/>
<target dev='hda' bus='sata'/>
<address type='pci' domain='0x0000' bus='0x00' slot='0x02' function='0x0'/>
<address type='drive' controller='0' bus='0' target='2' unit='0'/>
</disk>
<disk type='file'>
<driver name='file' type='raw'/>
<source file='/tmp/freebsd2.img'/>
<target dev='hdb' bus='sata'/>
<address type='pci' domain='0x0000' bus='0x00' slot='0x02' function='0x0'/>
<address type='drive' controller='0' bus='0' target='4' unit='0'/>
</disk>
<disk type='file'>
<driver name='file' type='raw'/>
<source file='/tmp/freebsd3.img'/>
<target dev='hdc' bus='sata'/>
<boot order='1'/>
<address type='pci' domain='0x0000' bus='0x00' slot='0x02' function='0x0'/>
<address type='drive' controller='0' bus='0' target='6' unit='0'/>
</disk>
<interface type='bridge'>
<model type='virtio'/>

4
tests/bhyvexml2argvdata/bhyvexml2argv-grub-bootorder2.args
View File

@@ -7,5 +7,5 @@
-s 0:0,hostbridge \
-s 3:0,virtio-net,faketapdev,mac=52:54:00:00:00:00 \
-s 2:0,ahci-hd,/tmp/freebsd1.img \
-s 2:0,ahci-hd,/tmp/freebsd2.img \
-s 2:0,ahci-hd,/tmp/freebsd3.img bhyve
-s 4:0,ahci-hd,/tmp/freebsd2.img \
-s 6:0,ahci-hd,/tmp/freebsd3.img bhyve

6
tests/bhyvexml2argvdata/bhyvexml2argv-grub-bootorder2.xml
View File

@@ -13,21 +13,21 @@
<source file='/tmp/freebsd1.img'/>
<target dev='hda' bus='sata'/>
<boot order='111'/>
<address type='pci' domain='0x0000' bus='0x00' slot='0x02' function='0x0'/>
<address type='drive' controller='0' bus='0' target='2' unit='0'/>
</disk>
<disk type='file'>
<driver name='file' type='raw'/>
<source file='/tmp/freebsd2.img'/>
<target dev='hdb' bus='sata'/>
<boot order='22'/>
<address type='pci' domain='0x0000' bus='0x00' slot='0x02' function='0x0'/>
<address type='drive' controller='0' bus='0' target='4' unit='0'/>
</disk>
<disk type='file'>
<driver name='file' type='raw'/>
<source file='/tmp/freebsd3.img'/>
<target dev='hdc' bus='sata'/>
<boot order='3'/>
<address type='pci' domain='0x0000' bus='0x00' slot='0x02' function='0x0'/>
<address type='drive' controller='0' bus='0' target='6' unit='0'/>
</disk>
<interface type='bridge'>
<model type='virtio'/>

2
tests/bhyvexml2argvdata/bhyvexml2argv-grub-defaults.xml
View File

@@ -12,7 +12,7 @@
<driver name='file' type='raw'/>
<source file='/tmp/freebsd.img'/>
<target dev='hda' bus='sata'/>
<address type='pci' domain='0x0000' bus='0x00' slot='0x02' function='0x0'/>
<address type='drive' controller='0' bus='0' target='2' unit='0'/>
</disk>
<interface type='bridge'>
<model type='virtio'/>

2
tests/bhyvexml2argvdata/bhyvexml2argv-localtime.xml
View File

@@ -12,7 +12,7 @@
<driver name='file' type='raw'/>
<source file='/tmp/freebsd.img'/>
<target dev='hda' bus='sata'/>
<address type='pci' domain='0x0000' bus='0x00' slot='0x02' function='0x0'/>
<address type='drive' controller='0' bus='0' target='2' unit='0'/>
</disk>
<interface type='bridge'>
<model type='virtio'/>

2
tests/bhyvexml2argvdata/bhyvexml2argv-macaddr.xml
View File

@@ -11,7 +11,7 @@
<driver name='file' type='raw'/>
<source file='/tmp/freebsd.img'/>
<target dev='hda' bus='sata'/>
<address type='pci' domain='0x0000' bus='0x00' slot='0x02' function='0x0'/>
<address type='drive' controller='0' bus='0' target='2' unit='0'/>
</disk>
<interface type='bridge'>
<mac address="52:54:00:22:ee:11"/>

2
tests/bhyvexml2argvdata/bhyvexml2argv-serial-grub-nocons.xml
View File

@@ -12,7 +12,7 @@
<driver name='file' type='raw'/>
<source file='/tmp/freebsd.img'/>
<target dev='hda' bus='sata'/>
<address type='pci' domain='0x0000' bus='0x00' slot='0x02' function='0x0'/>
<address type='drive' controller='0' bus='0' target='2' unit='0'/>
</disk>
<interface type='bridge'>
<model type='virtio'/>

2
tests/bhyvexml2argvdata/bhyvexml2argv-serial-grub.xml
View File

@@ -12,7 +12,7 @@
<driver name='file' type='raw'/>
<source file='/tmp/freebsd.img'/>
<target dev='hda' bus='sata'/>
<address type='pci' domain='0x0000' bus='0x00' slot='0x02' function='0x0'/>
<address type='drive' controller='0' bus='0' target='2' unit='0'/>
</disk>
<interface type='bridge'>
<model type='virtio'/>

2
tests/bhyvexml2argvdata/bhyvexml2argv-serial.xml
View File

@@ -11,7 +11,7 @@
<driver name='file' type='raw'/>
<source file='/tmp/freebsd.img'/>
<target dev='hda' bus='sata'/>
<address type='pci' domain='0x0000' bus='0x00' slot='0x02' function='0x0'/>
<address type='drive' controller='0' bus='0' target='2' unit='0'/>
</disk>
<interface type='bridge'>
<model type='virtio'/>