bhyve: fix bhyvexml2arg test

Don't use duplicating target dev names.

diff --git a/tests/bhyvexml2argvdata/bhyvexml2argv-bhyveload-bootorder.xml b/tests/bhyvexml2argvdata/bhyvexml2argv-bhyveload-bootorder.xml
index e58c5f17e5cfbf3dce9b603033c084a0b983b97b..c96e79f4525d35e82b629a68f1201605386c3b78 100644 (file)
--- a/tests/bhyvexml2argvdata/bhyvexml2argv-bhyveload-bootorder.xml
+++ b/tests/bhyvexml2argvdata/bhyvexml2argv-bhyveload-bootorder.xml
@@ -17,7 +17,7 @@
     <disk type='file' device='cdrom'>
       <driver name='file' type='raw'/>
       <source file='/tmp/cdrom.iso'/>
-      <target dev='hda' bus='sata'/>
+      <target dev='hdb' bus='sata'/>
       <address type='pci' domain='0x0000' bus='0x00' slot='0x04' function='0x0'/>
     </disk>
     <interface type='bridge'>

diff --git a/tests/bhyvexml2argvdata/bhyvexml2argv-bhyveload-bootorder1.xml b/tests/bhyvexml2argvdata/bhyvexml2argv-bhyveload-bootorder1.xml
index 6ea46313074a182eed6734914d2e3d6846409c32..28cfa057fdee3cd06440a1885fda7fd5499ec1b0 100644 (file)
--- a/tests/bhyvexml2argvdata/bhyvexml2argv-bhyveload-bootorder1.xml
+++ b/tests/bhyvexml2argvdata/bhyvexml2argv-bhyveload-bootorder1.xml
@@ -17,7 +17,7 @@
     <disk type='file' device='cdrom'>
       <driver name='file' type='raw'/>
       <source file='/tmp/cdrom.iso'/>
-      <target dev='hda' bus='sata'/>
+      <target dev='hdb' bus='sata'/>
       <address type='pci' domain='0x0000' bus='0x00' slot='0x04' function='0x0'/>
     </disk>
     <interface type='bridge'>

diff --git a/tests/bhyvexml2argvdata/bhyvexml2argv-bhyveload-bootorder3.xml b/tests/bhyvexml2argvdata/bhyvexml2argv-bhyveload-bootorder3.xml
index 96a8e5a91fd5ee0000bf01e9cb1aa9f16e9150f1..69a9d282c463eb5df8b15fd3fa0723a667a2bd9e 100644 (file)
--- a/tests/bhyvexml2argvdata/bhyvexml2argv-bhyveload-bootorder3.xml
+++ b/tests/bhyvexml2argvdata/bhyvexml2argv-bhyveload-bootorder3.xml
@@ -16,7 +16,7 @@
     <disk type='file' device='cdrom'>
       <driver name='file' type='raw'/>
       <source file='/tmp/cdrom.iso'/>
-      <target dev='hda' bus='sata'/>
+      <target dev='hdc' bus='sata'/>
       <address type='pci' domain='0x0000' bus='0x00' slot='0x04' function='0x0'/>
       <boot order='1'/>
     </disk>

diff --git a/tests/bhyvexml2argvdata/bhyvexml2argv-bhyveload-bootorder4.xml b/tests/bhyvexml2argvdata/bhyvexml2argv-bhyveload-bootorder4.xml
index 4680358afd4be35cce45f4c66023b464be9882b6..b854e740b3809b660f9ee68b03f62bb15507239d 100644 (file)
--- a/tests/bhyvexml2argvdata/bhyvexml2argv-bhyveload-bootorder4.xml
+++ b/tests/bhyvexml2argvdata/bhyvexml2argv-bhyveload-bootorder4.xml
@@ -17,7 +17,7 @@
     <disk type='file' device='cdrom'>
       <driver name='file' type='raw'/>
       <source file='/tmp/cdrom.iso'/>
-      <target dev='hda' bus='sata'/>
+      <target dev='hdb' bus='sata'/>
       <address type='pci' domain='0x0000' bus='0x00' slot='0x04' function='0x0'/>
       <boot order='1'/>
     </disk>

diff --git a/tests/bhyvexml2argvdata/bhyvexml2argv-grub-bootorder.xml b/tests/bhyvexml2argvdata/bhyvexml2argv-grub-bootorder.xml
index e372024405dac829d7f27a02b54ec8679be4fe35..9906cacaf0289f548f209c9d15b97ef500ace3d8 100644 (file)
--- a/tests/bhyvexml2argvdata/bhyvexml2argv-grub-bootorder.xml
+++ b/tests/bhyvexml2argvdata/bhyvexml2argv-grub-bootorder.xml
@@ -17,13 +17,13 @@
     <disk type='file'>
       <driver name='file' type='raw'/>
       <source file='/tmp/freebsd2.img'/>
-      <target dev='hda' bus='sata'/>
+      <target dev='hdb' bus='sata'/>
       <address type='pci' domain='0x0000' bus='0x00' slot='0x02' function='0x0'/>
     </disk>
     <disk type='file'>
       <driver name='file' type='raw'/>
       <source file='/tmp/freebsd3.img'/>
-      <target dev='hda' bus='sata'/>
+      <target dev='hdc' bus='sata'/>
       <boot order='1'/>
       <address type='pci' domain='0x0000' bus='0x00' slot='0x02' function='0x0'/>
     </disk>

diff --git a/tests/bhyvexml2argvdata/bhyvexml2argv-grub-bootorder2.xml b/tests/bhyvexml2argvdata/bhyvexml2argv-grub-bootorder2.xml
index 8742a30a9d0fe897c3e1595af48749a18ffffafe..65943f9fbbcf8493b51eafd58e351c2891950078 100644 (file)
--- a/tests/bhyvexml2argvdata/bhyvexml2argv-grub-bootorder2.xml
+++ b/tests/bhyvexml2argvdata/bhyvexml2argv-grub-bootorder2.xml
@@ -18,14 +18,14 @@
     <disk type='file'>
       <driver name='file' type='raw'/>
       <source file='/tmp/freebsd2.img'/>
-      <target dev='hda' bus='sata'/>
+      <target dev='hdb' bus='sata'/>
       <boot order='22'/>
       <address type='pci' domain='0x0000' bus='0x00' slot='0x02' function='0x0'/>
     </disk>
     <disk type='file'>
       <driver name='file' type='raw'/>
       <source file='/tmp/freebsd3.img'/>
-      <target dev='hda' bus='sata'/>
+      <target dev='hdc' bus='sata'/>
       <boot order='3'/>
       <address type='pci' domain='0x0000' bus='0x00' slot='0x02' function='0x0'/>
     </disk>