bhyvexml2argvdata: Fix <drive/> addresses

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>

diff --git a/tests/bhyvexml2argvdata/bhyvexml2argv-acpiapic.xml b/tests/bhyvexml2argvdata/bhyvexml2argv-acpiapic.xml
index 2be970e05db8d67a34b06efa9cb8575871db3e31..316aaf8953f6f199c024a646cb076d98d1696263 100644 (file)
--- a/tests/bhyvexml2argvdata/bhyvexml2argv-acpiapic.xml
+++ b/tests/bhyvexml2argvdata/bhyvexml2argv-acpiapic.xml
@@ -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'/>

diff --git a/tests/bhyvexml2argvdata/bhyvexml2argv-base.xml b/tests/bhyvexml2argvdata/bhyvexml2argv-base.xml
index 3d2337520bc0afcc32ea11cbcc1428715c33196b..c0d00f13107ace1372b782d3e9812e70a8c2ff86 100644 (file)
--- a/tests/bhyvexml2argvdata/bhyvexml2argv-base.xml
+++ b/tests/bhyvexml2argvdata/bhyvexml2argv-base.xml
@@ -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'/>

diff --git a/tests/bhyvexml2argvdata/bhyvexml2argv-bhyveload-bootorder.xml b/tests/bhyvexml2argvdata/bhyvexml2argv-bhyveload-bootorder.xml
index c96e79f4525d35e82b629a68f1201605386c3b78..983e3ccae6e19f12c0f86983e23fc6e5d8066f5a 100644 (file)
--- a/tests/bhyvexml2argvdata/bhyvexml2argv-bhyveload-bootorder.xml
+++ b/tests/bhyvexml2argvdata/bhyvexml2argv-bhyveload-bootorder.xml
@@ -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'/>

diff --git a/tests/bhyvexml2argvdata/bhyvexml2argv-bhyveload-bootorder1.xml b/tests/bhyvexml2argvdata/bhyvexml2argv-bhyveload-bootorder1.xml
index 28cfa057fdee3cd06440a1885fda7fd5499ec1b0..4dfc142b7c28c6223eb5d85598bb2fdf9fc8d7b3 100644 (file)
--- a/tests/bhyvexml2argvdata/bhyvexml2argv-bhyveload-bootorder1.xml
+++ b/tests/bhyvexml2argvdata/bhyvexml2argv-bhyveload-bootorder1.xml
@@ -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'/>

diff --git a/tests/bhyvexml2argvdata/bhyvexml2argv-bhyveload-bootorder2.xml b/tests/bhyvexml2argvdata/bhyvexml2argv-bhyveload-bootorder2.xml
index 2fe87dbc4b9328d7e3b3d548135bc10147a343db..74622bc8215955e367683270f95f54d12d2b4c33 100644 (file)
--- a/tests/bhyvexml2argvdata/bhyvexml2argv-bhyveload-bootorder2.xml
+++ b/tests/bhyvexml2argvdata/bhyvexml2argv-bhyveload-bootorder2.xml
@@ -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'/>

diff --git a/tests/bhyvexml2argvdata/bhyvexml2argv-bhyveload-bootorder3.xml b/tests/bhyvexml2argvdata/bhyvexml2argv-bhyveload-bootorder3.xml
index 69a9d282c463eb5df8b15fd3fa0723a667a2bd9e..da29b1bd42c5922b5a1bc8cc9ac283d88242721d 100644 (file)
--- a/tests/bhyvexml2argvdata/bhyvexml2argv-bhyveload-bootorder3.xml
+++ b/tests/bhyvexml2argvdata/bhyvexml2argv-bhyveload-bootorder3.xml
@@ -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'>

diff --git a/tests/bhyvexml2argvdata/bhyvexml2argv-bhyveload-bootorder4.xml b/tests/bhyvexml2argvdata/bhyvexml2argv-bhyveload-bootorder4.xml
index b854e740b3809b660f9ee68b03f62bb15507239d..f2190be33a8dddbfcff56e92257123f0b6d06c10 100644 (file)
--- a/tests/bhyvexml2argvdata/bhyvexml2argv-bhyveload-bootorder4.xml
+++ b/tests/bhyvexml2argvdata/bhyvexml2argv-bhyveload-bootorder4.xml
@@ -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'>

diff --git a/tests/bhyvexml2argvdata/bhyvexml2argv-bhyveload-explicitargs.xml b/tests/bhyvexml2argvdata/bhyvexml2argv-bhyveload-explicitargs.xml
index 65823cd828905eb656ffcc192a0d8dc35252694e..c8268e0c1647c57de0d51fa882e353e377952ea1 100644 (file)
--- a/tests/bhyvexml2argvdata/bhyvexml2argv-bhyveload-explicitargs.xml
+++ b/tests/bhyvexml2argvdata/bhyvexml2argv-bhyveload-explicitargs.xml
@@ -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'/>

diff --git a/tests/bhyvexml2argvdata/bhyvexml2argv-console.xml b/tests/bhyvexml2argvdata/bhyvexml2argv-console.xml
index 35206b521629ea34f80e3ec09875724bd7113167..bf1564ae208fb9837c5109d13c15b3fbebb14cd8 100644 (file)
--- a/tests/bhyvexml2argvdata/bhyvexml2argv-console.xml
+++ b/tests/bhyvexml2argvdata/bhyvexml2argv-console.xml
@@ -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'/>

diff --git a/tests/bhyvexml2argvdata/bhyvexml2argv-custom-loader.xml b/tests/bhyvexml2argvdata/bhyvexml2argv-custom-loader.xml
index e9e0d5ebce73fe2db56cfa5dea53131095793637..02e83f7bbd529ae22a3457966916a3def6714a74 100644 (file)
--- a/tests/bhyvexml2argvdata/bhyvexml2argv-custom-loader.xml
+++ b/tests/bhyvexml2argvdata/bhyvexml2argv-custom-loader.xml
@@ -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'/>

diff --git a/tests/bhyvexml2argvdata/bhyvexml2argv-disk-cdrom-grub.xml b/tests/bhyvexml2argvdata/bhyvexml2argv-disk-cdrom-grub.xml
index 00708e6abedaef26fc707a885a1038b965ea1626..67ad9807909a0b37c040a9643620596e8456d8d5 100644 (file)
--- a/tests/bhyvexml2argvdata/bhyvexml2argv-disk-cdrom-grub.xml
+++ b/tests/bhyvexml2argvdata/bhyvexml2argv-disk-cdrom-grub.xml
@@ -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'/>

diff --git a/tests/bhyvexml2argvdata/bhyvexml2argv-disk-cdrom.xml b/tests/bhyvexml2argvdata/bhyvexml2argv-disk-cdrom.xml
index c2afcd42b2db326a3e47ee864808b210c073b17a..61cef732aeccad49a1dc75b6107cd29028aa0e08 100644 (file)
--- a/tests/bhyvexml2argvdata/bhyvexml2argv-disk-cdrom.xml
+++ b/tests/bhyvexml2argvdata/bhyvexml2argv-disk-cdrom.xml
@@ -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'/>

diff --git a/tests/bhyvexml2argvdata/bhyvexml2argv-grub-bootorder.args b/tests/bhyvexml2argvdata/bhyvexml2argv-grub-bootorder.args
index 52434233bc6ddcee97c8634319da76704ba24e5f..74d53be5ac2a7367ed46091a2684548d6f35cffb 100644 (file)
--- a/tests/bhyvexml2argvdata/bhyvexml2argv-grub-bootorder.args
+++ b/tests/bhyvexml2argvdata/bhyvexml2argv-grub-bootorder.args
@@ -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

diff --git a/tests/bhyvexml2argvdata/bhyvexml2argv-grub-bootorder.xml b/tests/bhyvexml2argvdata/bhyvexml2argv-grub-bootorder.xml
index 9906cacaf0289f548f209c9d15b97ef500ace3d8..40f46a337e90ec17543f5699f208aa9ec77c622d 100644 (file)
--- a/tests/bhyvexml2argvdata/bhyvexml2argv-grub-bootorder.xml
+++ b/tests/bhyvexml2argvdata/bhyvexml2argv-grub-bootorder.xml
@@ -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'/>

diff --git a/tests/bhyvexml2argvdata/bhyvexml2argv-grub-bootorder2.args b/tests/bhyvexml2argvdata/bhyvexml2argv-grub-bootorder2.args
index 52434233bc6ddcee97c8634319da76704ba24e5f..74d53be5ac2a7367ed46091a2684548d6f35cffb 100644 (file)
--- a/tests/bhyvexml2argvdata/bhyvexml2argv-grub-bootorder2.args
+++ b/tests/bhyvexml2argvdata/bhyvexml2argv-grub-bootorder2.args
@@ -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

diff --git a/tests/bhyvexml2argvdata/bhyvexml2argv-grub-bootorder2.xml b/tests/bhyvexml2argvdata/bhyvexml2argv-grub-bootorder2.xml
index 65943f9fbbcf8493b51eafd58e351c2891950078..c8e877c62f2e842addf5776c29a107367deca0b6 100644 (file)
--- a/tests/bhyvexml2argvdata/bhyvexml2argv-grub-bootorder2.xml
+++ b/tests/bhyvexml2argvdata/bhyvexml2argv-grub-bootorder2.xml
@@ -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'/>

diff --git a/tests/bhyvexml2argvdata/bhyvexml2argv-grub-defaults.xml b/tests/bhyvexml2argvdata/bhyvexml2argv-grub-defaults.xml
index 27b7fd9d2bade8a56a53a6b964e7055669496acf..2745cd9e22adc525075938db846988780a32513e 100644 (file)
--- a/tests/bhyvexml2argvdata/bhyvexml2argv-grub-defaults.xml
+++ b/tests/bhyvexml2argvdata/bhyvexml2argv-grub-defaults.xml
@@ -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'/>

diff --git a/tests/bhyvexml2argvdata/bhyvexml2argv-localtime.xml b/tests/bhyvexml2argvdata/bhyvexml2argv-localtime.xml
index f62c6261c9cee851d54c4d0c15b2c0cce2670450..e16d2132f2b3ac182cfe297340048195205467bb 100644 (file)
--- a/tests/bhyvexml2argvdata/bhyvexml2argv-localtime.xml
+++ b/tests/bhyvexml2argvdata/bhyvexml2argv-localtime.xml
@@ -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'/>

diff --git a/tests/bhyvexml2argvdata/bhyvexml2argv-macaddr.xml b/tests/bhyvexml2argvdata/bhyvexml2argv-macaddr.xml
index b262eb709835cdc00400af23ba29bfc1f11a9c3d..8df0f1dd440a82ae87b973b91ebcf33ebd5b4c42 100644 (file)
--- a/tests/bhyvexml2argvdata/bhyvexml2argv-macaddr.xml
+++ b/tests/bhyvexml2argvdata/bhyvexml2argv-macaddr.xml
@@ -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"/>

diff --git a/tests/bhyvexml2argvdata/bhyvexml2argv-serial-grub-nocons.xml b/tests/bhyvexml2argvdata/bhyvexml2argv-serial-grub-nocons.xml
index 8c451f7fbd37f91a977a32a5ad98ef84f806b389..83690d2d31db88ae8f0f9562f16e7344e8319296 100644 (file)
--- a/tests/bhyvexml2argvdata/bhyvexml2argv-serial-grub-nocons.xml
+++ b/tests/bhyvexml2argvdata/bhyvexml2argv-serial-grub-nocons.xml
@@ -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'/>

diff --git a/tests/bhyvexml2argvdata/bhyvexml2argv-serial-grub.xml b/tests/bhyvexml2argvdata/bhyvexml2argv-serial-grub.xml
index 8c451f7fbd37f91a977a32a5ad98ef84f806b389..83690d2d31db88ae8f0f9562f16e7344e8319296 100644 (file)
--- a/tests/bhyvexml2argvdata/bhyvexml2argv-serial-grub.xml
+++ b/tests/bhyvexml2argvdata/bhyvexml2argv-serial-grub.xml
@@ -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'/>

diff --git a/tests/bhyvexml2argvdata/bhyvexml2argv-serial.xml b/tests/bhyvexml2argvdata/bhyvexml2argv-serial.xml
index cd4f25b6e2cbf334213f4627cd0d3a171ed422fc..2c6330c082bc6bd514a2b3a43a31ba00b4dc25ef 100644 (file)
--- a/tests/bhyvexml2argvdata/bhyvexml2argv-serial.xml
+++ b/tests/bhyvexml2argvdata/bhyvexml2argv-serial.xml
@@ -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'/>