From: Roman Bogorodskiy <bogorodskiy@gmail.com>
Date: Sun, 12 Jun 2016 08:01:50 +0000 (+0300)
Subject: bhyve: fix bhyvexml2arg test
X-Git-Url: http://xenbits.xensource.com/gitweb?a=commitdiff_plain;h=de77d34ab16d70dce5890d64f085f4ae1738f5f4;p=libvirt.git

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 e58c5f17e5..c96e79f452 100644
--- 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 6ea4631307..28cfa057fd 100644
--- 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 96a8e5a91f..69a9d282c4 100644
--- 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 4680358afd..b854e740b3 100644
--- 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 e372024405..9906cacaf0 100644
--- 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 8742a30a9d..65943f9fbb 100644
--- 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>