3:30 a.m.
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(a)redhat.com>
---
tests/bhyvexml2argvdata/bhyvexml2argv-acpiapic.xml | 2 +-
tests/bhyvexml2argvdata/bhyvexml2argv-base.xml | 2 +-
tests/bhyvexml2argvdata/bhyvexml2argv-bhyveload-bootorder.xml | 4 ++--
tests/bhyvexml2argvdata/bhyvexml2argv-bhyveload-bootorder1.xml | 4 ++--
tests/bhyvexml2argvdata/bhyvexml2argv-bhyveload-bootorder2.xml | 2 +-
tests/bhyvexml2argvdata/bhyvexml2argv-bhyveload-bootorder3.xml | 4 ++--
tests/bhyvexml2argvdata/bhyvexml2argv-bhyveload-bootorder4.xml | 4 ++--
tests/bhyvexml2argvdata/bhyvexml2argv-bhyveload-explicitargs.xml | 2 +-
tests/bhyvexml2argvdata/bhyvexml2argv-console.xml | 2 +-
tests/bhyvexml2argvdata/bhyvexml2argv-custom-loader.xml | 2 +-
tests/bhyvexml2argvdata/bhyvexml2argv-disk-cdrom-grub.xml | 2 +-
tests/bhyvexml2argvdata/bhyvexml2argv-disk-cdrom.xml | 2 +-
tests/bhyvexml2argvdata/bhyvexml2argv-grub-bootorder.args | 4 ++--
tests/bhyvexml2argvdata/bhyvexml2argv-grub-bootorder.xml | 6 +++---
tests/bhyvexml2argvdata/bhyvexml2argv-grub-bootorder2.args | 4 ++--
tests/bhyvexml2argvdata/bhyvexml2argv-grub-bootorder2.xml | 6 +++---
tests/bhyvexml2argvdata/bhyvexml2argv-grub-defaults.xml | 2 +-
tests/bhyvexml2argvdata/bhyvexml2argv-localtime.xml | 2 +-
tests/bhyvexml2argvdata/bhyvexml2argv-macaddr.xml | 2 +-
tests/bhyvexml2argvdata/bhyvexml2argv-serial-grub-nocons.xml | 2 +-
tests/bhyvexml2argvdata/bhyvexml2argv-serial-grub.xml | 2 +-
tests/bhyvexml2argvdata/bhyvexml2argv-serial.xml | 2 +-
22 files changed, 32 insertions(+), 32 deletions(-)
diff --git a/tests/bhyvexml2argvdata/bhyvexml2argv-acpiapic.xml
b/tests/bhyvexml2argvdata/bhyvexml2argv-acpiapic.xml
index 2be970e05..316aaf895 100644
--- 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 3d2337520..c0d00f131 100644
--- 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 c96e79f45..983e3ccae 100644
--- 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 28cfa057f..4dfc142b7 100644
--- 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 2fe87dbc4..74622bc82 100644
--- 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 69a9d282c..da29b1bd4 100644
--- 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 b854e740b..f2190be33 100644
--- 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 65823cd82..c8268e0c1 100644
--- 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 35206b521..bf1564ae2 100644
--- 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 e9e0d5ebc..02e83f7bb 100644
--- 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 00708e6ab..67ad98079 100644
--- 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 c2afcd42b..61cef732a 100644
--- 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 52434233b..74d53be5a 100644
--- 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 9906cacaf..40f46a337 100644
--- 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 52434233b..74d53be5a 100644
--- 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 65943f9fb..c8e877c62 100644
--- 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 27b7fd9d2..2745cd9e2 100644
--- 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 f62c6261c..e16d2132f 100644
--- 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 b262eb709..8df0f1dd4 100644
--- 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 8c451f7fb..83690d2d3 100644
--- 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 8c451f7fb..83690d2d3 100644
--- 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 cd4f25b6e..2c6330c08 100644
--- 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'/>
--
2.11.0