bhyvexml2argvdata: Add mac address to <interface/>

In the next patch we will need a stable mac address for
<interface/>.

Signed-off-by: Michal Privoznik <mprivozn@redhat.com>

tests/bhyvexml2argvdata/bhyvexml2argv-acpiapic.args

@@ -7,5 +7,5 @@
 -H \
 -P \
 -s 0:0,hostbridge \
--s 3:0,virtio-net,faketapdev,mac=52:54:00:00:00:00 \
+-s 3:0,virtio-net,faketapdev,mac=52:54:00:81:c4:b1 \
 -s 2:0,ahci-hd,/tmp/freebsd.img bhyve

tests/bhyvexml2argvdata/bhyvexml2argv-acpiapic.xml

@@ -18,6 +18,7 @@
       <address type='drive' controller='0' bus='0' target='2' unit='0'/>
     </disk>
     <interface type='bridge'>
+      <mac address='52:54:00:81:c4:b1'/>
       <model type='virtio'/>
       <source bridge="virbr0"/>
       <address type='pci' domain='0x0000' bus='0x00' slot='0x03' function='0x0'/>

tests/bhyvexml2argvdata/bhyvexml2argv-base.args

@@ -5,5 +5,5 @@
 -H \
 -P \
 -s 0:0,hostbridge \
--s 3:0,virtio-net,faketapdev,mac=52:54:00:00:00:00 \
+-s 3:0,virtio-net,faketapdev,mac=52:54:00:b9:94:02 \
 -s 2:0,ahci-hd,/tmp/freebsd.img bhyve

tests/bhyvexml2argvdata/bhyvexml2argv-base.xml

@@ -14,6 +14,7 @@
       <address type='drive' controller='0' bus='0' target='2' unit='0'/>
     </disk>
     <interface type='bridge'>
+      <mac address='52:54:00:b9:94:02'/>
       <model type='virtio'/>
       <source bridge="virbr0"/>
       <address type='pci' domain='0x0000' bus='0x00' slot='0x03' function='0x0'/>

tests/bhyvexml2argvdata/bhyvexml2argv-bhyveload-bootorder.args

@@ -5,6 +5,6 @@
 -H \
 -P \
 -s 0:0,hostbridge \
--s 3:0,virtio-net,faketapdev,mac=52:54:00:00:00:00 \
+-s 3:0,virtio-net,faketapdev,mac=52:54:00:8d:10:e1 \
 -s 2:0,ahci-hd,/tmp/freebsd.img \
 -s 4:0,ahci-cd,/tmp/cdrom.iso bhyve

tests/bhyvexml2argvdata/bhyvexml2argv-bhyveload-bootorder.xml

@@ -21,6 +21,7 @@
       <address type='drive' controller='0' bus='0' target='4' unit='0'/>
     </disk>
     <interface type='bridge'>
+      <mac address='52:54:00:8d:10:e1'/>
       <model type='virtio'/>
       <source bridge="virbr0"/>
       <address type='pci' domain='0x0000' bus='0x00' slot='0x03' function='0x0'/>

tests/bhyvexml2argvdata/bhyvexml2argv-bhyveload-bootorder1.args

@@ -5,6 +5,6 @@
 -H \
 -P \
 -s 0:0,hostbridge \
--s 3:0,virtio-net,faketapdev,mac=52:54:00:00:00:00 \
+-s 3:0,virtio-net,faketapdev,mac=52:54:00:92:68:0e \
 -s 2:0,ahci-hd,/tmp/freebsd.img \
 -s 4:0,ahci-cd,/tmp/cdrom.iso bhyve

tests/bhyvexml2argvdata/bhyvexml2argv-bhyveload-bootorder1.xml

@@ -21,6 +21,7 @@
       <address type='drive' controller='0' bus='0' target='4' unit='0'/>
     </disk>
     <interface type='bridge'>
+      <mac address='52:54:00:92:68:0e'/>
       <model type='virtio'/>
       <source bridge="virbr0"/>
       <address type='pci' domain='0x0000' bus='0x00' slot='0x03' function='0x0'/>

tests/bhyvexml2argvdata/bhyvexml2argv-bhyveload-bootorder2.xml

@@ -15,6 +15,7 @@
       <address type='drive' controller='0' bus='0' target='2' unit='0'/>
     </disk>
     <interface type='bridge'>
+      <mac address='52:54:00:1e:63:25'/>
       <model type='virtio'/>
       <source bridge="virbr0"/>
       <address type='pci' domain='0x0000' bus='0x00' slot='0x03' function='0x0'/>

tests/bhyvexml2argvdata/bhyvexml2argv-bhyveload-bootorder3.args

@@ -5,6 +5,6 @@
 -H \
 -P \
 -s 0:0,hostbridge \
--s 3:0,virtio-net,faketapdev,mac=52:54:00:00:00:00 \
+-s 3:0,virtio-net,faketapdev,mac=52:54:00:7a:f5:a4 \
 -s 2:0,ahci-hd,/tmp/freebsd.img \
 -s 4:0,ahci-cd,/tmp/cdrom.iso bhyve

tests/bhyvexml2argvdata/bhyvexml2argv-bhyveload-bootorder3.xml

@@ -21,6 +21,7 @@
       <boot order='1'/>
     </disk>
     <interface type='bridge'>
+      <mac address='52:54:00:7a:f5:a4'/>
       <model type='virtio'/>
       <source bridge="virbr0"/>
       <address type='pci' domain='0x0000' bus='0x00' slot='0x03' function='0x0'/>

tests/bhyvexml2argvdata/bhyvexml2argv-bhyveload-bootorder4.xml

@@ -22,6 +22,7 @@
       <boot order='1'/>
     </disk>
     <interface type='bridge'>
+      <mac address='52:54:00:fe:97:82'/>
       <model type='virtio'/>
       <source bridge="virbr0"/>
       <address type='pci' domain='0x0000' bus='0x00' slot='0x03' function='0x0'/>

tests/bhyvexml2argvdata/bhyvexml2argv-bhyveload-explicitargs.args

@@ -5,5 +5,5 @@
 -H \
 -P \
 -s 0:0,hostbridge \
--s 3:0,virtio-net,faketapdev,mac=52:54:00:00:00:00 \
+-s 3:0,virtio-net,faketapdev,mac=52:54:00:11:bd:26 \
 -s 2:0,ahci-hd,/tmp/freebsd.img bhyve

tests/bhyvexml2argvdata/bhyvexml2argv-bhyveload-explicitargs.xml

@@ -15,6 +15,7 @@
       <address type='drive' controller='0' bus='0' target='2' unit='0'/>
     </disk>
     <interface type='bridge'>
+      <mac address='52:54:00:11:bd:26'/>
       <model type='virtio'/>
       <source bridge="virbr0"/>
       <address type='pci' domain='0x0000' bus='0x00' slot='0x03' function='0x0'/>

tests/bhyvexml2argvdata/bhyvexml2argv-console.args

@@ -5,7 +5,7 @@
 -H \
 -P \
 -s 0:0,hostbridge \
--s 3:0,virtio-net,faketapdev,mac=52:54:00:00:00:00 \
+-s 3:0,virtio-net,faketapdev,mac=52:54:00:b1:42:eb \
 -s 2:0,ahci-hd,/tmp/freebsd.img \
 -s 1,lpc \
 -l com1,/dev/nmdm0A bhyve

tests/bhyvexml2argvdata/bhyvexml2argv-console.xml

@@ -14,6 +14,7 @@
       <address type='drive' controller='0' bus='0' target='2' unit='0'/>
     </disk>
     <interface type='bridge'>
+      <mac address='52:54:00:b1:42:eb'/>
       <model type='virtio'/>
       <source bridge="virbr0"/>
       <address type='pci' domain='0x0000' bus='0x00' slot='0x03' function='0x0'/>

tests/bhyvexml2argvdata/bhyvexml2argv-custom-loader.args

@@ -5,5 +5,5 @@
 -H \
 -P \
 -s 0:0,hostbridge \
--s 3:0,virtio-net,faketapdev,mac=52:54:00:00:00:00 \
+-s 3:0,virtio-net,faketapdev,mac=52:54:00:35:99:c2 \
 -s 2:0,ahci-hd,/tmp/freebsd.img bhyve

tests/bhyvexml2argvdata/bhyvexml2argv-custom-loader.xml

@@ -16,6 +16,7 @@
       <address type='drive' controller='0' bus='0' target='2' unit='0'/>
     </disk>
     <interface type='bridge'>
+      <mac address='52:54:00:35:99:c2'/>
       <model type='virtio'/>
       <source bridge="virbr0"/>
       <address type='pci' domain='0x0000' bus='0x00' slot='0x03' function='0x0'/>

tests/bhyvexml2argvdata/bhyvexml2argv-disk-cdrom-grub.args

@@ -5,5 +5,5 @@
 -H \
 -P \
 -s 0:0,hostbridge \
--s 3:0,virtio-net,faketapdev,mac=52:54:00:00:00:00 \
+-s 3:0,virtio-net,faketapdev,mac=52:54:00:6f:6a:53 \
 -s 2:0,ahci-cd,/tmp/cdrom.iso bhyve

tests/bhyvexml2argvdata/bhyvexml2argv-disk-cdrom-grub.xml

@@ -15,6 +15,7 @@
       <address type='drive' controller='0' bus='0' target='2' unit='0'/>
     </disk>
     <interface type='bridge'>
+      <mac address='52:54:00:6f:6a:53'/>
       <model type='virtio'/>
       <source bridge="virbr0"/>
       <address type='pci' domain='0x0000' bus='0x00' slot='0x03' function='0x0'/>

tests/bhyvexml2argvdata/bhyvexml2argv-disk-cdrom.args

@@ -5,5 +5,5 @@
 -H \
 -P \
 -s 0:0,hostbridge \
--s 3:0,virtio-net,faketapdev,mac=52:54:00:00:00:00 \
+-s 3:0,virtio-net,faketapdev,mac=52:54:00:e3:ec:9b \
 -s 2:0,ahci-cd,/tmp/cdrom.iso bhyve

tests/bhyvexml2argvdata/bhyvexml2argv-disk-cdrom.xml

@@ -15,6 +15,7 @@
       <address type='drive' controller='0' bus='0' target='2' unit='0'/>
     </disk>
     <interface type='bridge'>
+      <mac address='52:54:00:e3:ec:9b'/>
       <model type='virtio'/>
       <source bridge="virbr0"/>
       <address type='pci' domain='0x0000' bus='0x00' slot='0x03' function='0x0'/>

tests/bhyvexml2argvdata/bhyvexml2argv-disk-virtio.args

@@ -5,5 +5,5 @@
 -H \
 -P \
 -s 0:0,hostbridge \
--s 3:0,virtio-net,faketapdev,mac=52:54:00:00:00:00 \
+-s 3:0,virtio-net,faketapdev,mac=52:54:00:bc:85:fe \
 -s 2:0,virtio-blk,/tmp/freebsd.img bhyve

tests/bhyvexml2argvdata/bhyvexml2argv-disk-virtio.xml

@@ -14,6 +14,7 @@
       <address type='pci' domain='0x0000' bus='0x00' slot='0x02' function='0x0'/>
     </disk>
     <interface type='bridge'>
+      <mac address='52:54:00:bc:85:fe'/>
       <model type='virtio'/>
       <source bridge="virbr0"/>
       <address type='pci' domain='0x0000' bus='0x00' slot='0x03' function='0x0'/>

tests/bhyvexml2argvdata/bhyvexml2argv-grub-bootorder.args

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

tests/bhyvexml2argvdata/bhyvexml2argv-grub-bootorder.xml

@@ -28,6 +28,7 @@
       <address type='drive' controller='0' bus='0' target='6' unit='0'/>
     </disk>
     <interface type='bridge'>
+      <mac address='52:54:00:f4:6c:be'/>
       <model type='virtio'/>
       <source bridge="virbr0"/>
       <address type='pci' domain='0x0000' bus='0x00' slot='0x03' function='0x0'/>

tests/bhyvexml2argvdata/bhyvexml2argv-grub-bootorder2.args

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

tests/bhyvexml2argvdata/bhyvexml2argv-grub-bootorder2.xml

@@ -30,6 +30,7 @@
       <address type='drive' controller='0' bus='0' target='6' unit='0'/>
     </disk>
     <interface type='bridge'>
+      <mac address='52:54:00:0e:d2:6f'/>
       <model type='virtio'/>
       <source bridge="virbr0"/>
       <address type='pci' domain='0x0000' bus='0x00' slot='0x03' function='0x0'/>

tests/bhyvexml2argvdata/bhyvexml2argv-grub-defaults.args

@@ -5,5 +5,5 @@
 -H \
 -P \
 -s 0:0,hostbridge \
--s 3:0,virtio-net,faketapdev,mac=52:54:00:00:00:00 \
+-s 3:0,virtio-net,faketapdev,mac=52:54:00:ee:f5:79 \
 -s 2:0,ahci-hd,/tmp/freebsd.img bhyve

tests/bhyvexml2argvdata/bhyvexml2argv-grub-defaults.xml

@@ -15,6 +15,7 @@
       <address type='drive' controller='0' bus='0' target='2' unit='0'/>
     </disk>
     <interface type='bridge'>
+      <mac address='52:54:00:ee:f5:79'/>
       <model type='virtio'/>
       <source bridge="virbr0"/>
       <address type='pci' domain='0x0000' bus='0x00' slot='0x03' function='0x0'/>

tests/bhyvexml2argvdata/bhyvexml2argv-localtime.args

@@ -4,5 +4,5 @@
 -H \
 -P \
 -s 0:0,hostbridge \
--s 3:0,virtio-net,faketapdev,mac=52:54:00:00:00:00 \
+-s 3:0,virtio-net,faketapdev,mac=52:54:00:82:ca:a3 \
 -s 2:0,ahci-hd,/tmp/freebsd.img bhyve

tests/bhyvexml2argvdata/bhyvexml2argv-localtime.xml

@@ -15,6 +15,7 @@
       <address type='drive' controller='0' bus='0' target='2' unit='0'/>
     </disk>
     <interface type='bridge'>
+      <mac address='52:54:00:82:ca:a3'/>
       <model type='virtio'/>
       <source bridge="virbr0"/>
       <address type='pci' domain='0x0000' bus='0x00' slot='0x03' function='0x0'/>

tests/bhyvexml2argvdata/bhyvexml2argv-serial-grub-nocons.args

@@ -5,7 +5,7 @@
 -H \
 -P \
 -s 0:0,hostbridge \
--s 3:0,virtio-net,faketapdev,mac=52:54:00:00:00:00 \
+-s 3:0,virtio-net,faketapdev,mac=52:54:00:a7:cd:5b \
 -s 2:0,ahci-hd,/tmp/freebsd.img \
 -s 1,lpc \
 -l com1,/dev/nmdm0A bhyve

tests/bhyvexml2argvdata/bhyvexml2argv-serial-grub-nocons.xml

@@ -15,6 +15,7 @@
       <address type='drive' controller='0' bus='0' target='2' unit='0'/>
     </disk>
     <interface type='bridge'>
+      <mac address='52:54:00:a7:cd:5b'/>
       <model type='virtio'/>
       <source bridge="virbr0"/>
       <address type='pci' domain='0x0000' bus='0x00' slot='0x03' function='0x0'/>

tests/bhyvexml2argvdata/bhyvexml2argv-serial-grub.args

@@ -5,7 +5,7 @@
 -H \
 -P \
 -s 0:0,hostbridge \
--s 3:0,virtio-net,faketapdev,mac=52:54:00:00:00:00 \
+-s 3:0,virtio-net,faketapdev,mac=52:54:00:f0:72:11 \
 -s 2:0,ahci-hd,/tmp/freebsd.img \
 -s 1,lpc \
 -l com1,/dev/nmdm0A bhyve

tests/bhyvexml2argvdata/bhyvexml2argv-serial-grub.xml

@@ -15,6 +15,7 @@
       <address type='drive' controller='0' bus='0' target='2' unit='0'/>
     </disk>
     <interface type='bridge'>
+      <mac address='52:54:00:f0:72:11'/>
       <model type='virtio'/>
       <source bridge="virbr0"/>
       <address type='pci' domain='0x0000' bus='0x00' slot='0x03' function='0x0'/>

tests/bhyvexml2argvdata/bhyvexml2argv-serial.args

@@ -5,7 +5,7 @@
 -H \
 -P \
 -s 0:0,hostbridge \
--s 3:0,virtio-net,faketapdev,mac=52:54:00:00:00:00 \
+-s 3:0,virtio-net,faketapdev,mac=52:54:00:4f:f3:5b \
 -s 2:0,ahci-hd,/tmp/freebsd.img \
 -s 1,lpc \
 -l com1,/dev/nmdm0A bhyve

tests/bhyvexml2argvdata/bhyvexml2argv-serial.xml

@@ -14,6 +14,7 @@
       <address type='drive' controller='0' bus='0' target='2' unit='0'/>
     </disk>
     <interface type='bridge'>
+      <mac address='52:54:00:4f:f3:5b'/>
       <model type='virtio'/>
       <source bridge="virbr0"/>
       <address type='pci' domain='0x0000' bus='0x00' slot='0x03' function='0x0'/>