shaba/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2025-02-26 05:57:45 +03:00
Code Releases Activity

bhyvexml2argvtest: Use internal wrapping of command line arguments

Browse Source 
virCommandToString has the possibility to return an already wrapped
string with better format than what we get from the test wrapper script.

The main advantage is that arguments for an option are always on the
same line which makes it more easy to see what changed in a diff and
prevents re-wrapping of the line if a wrapping point moves over the
threshold.

Signed-off-by: Peter Krempa <pkrempa@redhat.com>
Reviewed-by: Ján Tomko <jtomko@redhat.com>
Reviewed-by: Pavel Hrdina <phrdina@redhat.com>
This commit is contained in:
Peter Krempa 2021-03-31 10:46:36 +02:00
parent 13ffa48d2f
commit 2dcbdc7f4b
88 changed files with 181 additions and 104 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
build-aux/syntax-check.mk
View File

@ -1713,7 +1713,7 @@ sc_header-ifdef:
$(PYTHON) $(top_srcdir)/scripts/header-ifdef.py
sc_test-wrap-argv:
$(AM_V_GEN)$(VC_LIST) | $(GREP) -v -E 'qemuxml2argvdata|nwfilterxml2firewalldata' \
$(AM_V_GEN)$(VC_LIST) | $(GREP) -v -E 'qemuxml2argvdata|nwfilterxml2firewalldata|bhyvexml2argvdata' \
|$(GREP) -E '\.(ldargs|args)' | $(RUNUTF8) xargs \
$(PYTHON) $(top_srcdir)/scripts/test-wrap-argv.py --check

3
tests/bhyvexml2argvdata/bhyvexml2argv-acpiapic.args
View File

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

3
tests/bhyvexml2argvdata/bhyvexml2argv-acpiapic.ldargs
View File

@ -1,3 +1,4 @@
/usr/sbin/bhyveload \
-m 214 \
-d /tmp/freebsd.img bhyve
-d /tmp/freebsd.img \
bhyve

3
tests/bhyvexml2argvdata/bhyvexml2argv-addr-isa-controller-on-slot-1.args
View File

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

3
tests/bhyvexml2argvdata/bhyvexml2argv-addr-isa-controller-on-slot-1.ldargs
View File

@ -1,3 +1,4 @@
/usr/sbin/bhyveload \
-m 214 \
-d /tmp/freebsd.img bhyve
-d /tmp/freebsd.img \
bhyve

3
tests/bhyvexml2argvdata/bhyvexml2argv-addr-isa-controller-on-slot-31.args
View File

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

3
tests/bhyvexml2argvdata/bhyvexml2argv-addr-isa-controller-on-slot-31.ldargs
View File

@ -1,3 +1,4 @@
/usr/sbin/bhyveload \
-m 214 \
-d /tmp/freebsd.img bhyve
-d /tmp/freebsd.img \
bhyve

18
tests/bhyvexml2argvdata/bhyvexml2argv-addr-more-than-32-sata-disks.args
View File

@ -5,17 +5,7 @@
-H \
-P \
-s 0:0,hostbridge \
-s 2:0,ahci,hd:/tmp/freebsd1.img,hd:/tmp/freebsd2.img,hd:/tmp/freebsd3.img,\
hd:/tmp/freebsd4.img,hd:/tmp/freebsd5.img,hd:/tmp/freebsd6.img,\
hd:/tmp/freebsd7.img,hd:/tmp/freebsd8.img,hd:/tmp/freebsd9.img,\
hd:/tmp/freebsd10.img,hd:/tmp/freebsd11.img,hd:/tmp/freebsd12.img,\
hd:/tmp/freebsd12.img,hd:/tmp/freebsd13.img,hd:/tmp/freebsd14.img,\
hd:/tmp/freebsd15.img,hd:/tmp/freebsd16.img,hd:/tmp/freebsd17.img,\
hd:/tmp/freebsd18.img,hd:/tmp/freebsd19.img,hd:/tmp/freebsd20.img,\
hd:/tmp/freebsd21.img,hd:/tmp/freebsd22.img,hd:/tmp/freebsd23.img,\
hd:/tmp/freebsd24.img,hd:/tmp/freebsd25.img,hd:/tmp/freebsd26.img,\
hd:/tmp/freebsd27.img,hd:/tmp/freebsd28.img,hd:/tmp/freebsd29.img,\
hd:/tmp/freebsd30.img \
-s 3:0,ahci,hd:/tmp/freebsd31.img,hd:/tmp/freebsd32.img,hd:/tmp/freebsd33.img,\
hd:/tmp/freebsd34.img,hd:/tmp/freebsd35.img \
-s 4:0,virtio-net,faketapdev,mac=52:54:00:b9:94:02 bhyve
-s 2:0,ahci,hd:/tmp/freebsd1.img,hd:/tmp/freebsd2.img,hd:/tmp/freebsd3.img,hd:/tmp/freebsd4.img,hd:/tmp/freebsd5.img,hd:/tmp/freebsd6.img,hd:/tmp/freebsd7.img,hd:/tmp/freebsd8.img,hd:/tmp/freebsd9.img,hd:/tmp/freebsd10.img,hd:/tmp/freebsd11.img,hd:/tmp/freebsd12.img,hd:/tmp/freebsd12.img,hd:/tmp/freebsd13.img,hd:/tmp/freebsd14.img,hd:/tmp/freebsd15.img,hd:/tmp/freebsd16.img,hd:/tmp/freebsd17.img,hd:/tmp/freebsd18.img,hd:/tmp/freebsd19.img,hd:/tmp/freebsd20.img,hd:/tmp/freebsd21.img,hd:/tmp/freebsd22.img,hd:/tmp/freebsd23.img,hd:/tmp/freebsd24.img,hd:/tmp/freebsd25.img,hd:/tmp/freebsd26.img,hd:/tmp/freebsd27.img,hd:/tmp/freebsd28.img,hd:/tmp/freebsd29.img,hd:/tmp/freebsd30.img \
-s 3:0,ahci,hd:/tmp/freebsd31.img,hd:/tmp/freebsd32.img,hd:/tmp/freebsd33.img,hd:/tmp/freebsd34.img,hd:/tmp/freebsd35.img \
-s 4:0,virtio-net,faketapdev,mac=52:54:00:b9:94:02 \
bhyve

3
tests/bhyvexml2argvdata/bhyvexml2argv-addr-more-than-32-sata-disks.ldargs
View File

@ -1,3 +1,4 @@
/usr/sbin/bhyveload \
-m 214 \
-d /tmp/freebsd1.img bhyve
-d /tmp/freebsd1.img \
bhyve

3
tests/bhyvexml2argvdata/bhyvexml2argv-addr-multiple-sata-disks.args
View File

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

3
tests/bhyvexml2argvdata/bhyvexml2argv-addr-multiple-sata-disks.ldargs
View File

@ -1,3 +1,4 @@
/usr/sbin/bhyveload \
-m 214 \
-d /tmp/freebsd1.img bhyve
-d /tmp/freebsd1.img \
bhyve

3
tests/bhyvexml2argvdata/bhyvexml2argv-addr-multiple-virtio-disks.args
View File

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

3
tests/bhyvexml2argvdata/bhyvexml2argv-addr-multiple-virtio-disks.ldargs
View File

@ -1,3 +1,4 @@
/usr/sbin/bhyveload \
-m 214 \
-d /tmp/freebsd.img bhyve
-d /tmp/freebsd.img \
bhyve

3
tests/bhyvexml2argvdata/bhyvexml2argv-addr-no32devs-multiple-sata-disks.args
View File

@ -8,4 +8,5 @@
-s 2:0,ahci-hd,/tmp/freebsd1.img \
-s 3:0,ahci-hd,/tmp/freebsd2.img \
-s 4:0,ahci-hd,/tmp/freebsd2.img \
-s 5:0,virtio-net,faketapdev,mac=52:54:00:b9:94:02 bhyve
-s 5:0,virtio-net,faketapdev,mac=52:54:00:b9:94:02 \
bhyve

3
tests/bhyvexml2argvdata/bhyvexml2argv-addr-no32devs-multiple-sata-disks.ldargs
View File

@ -1,3 +1,4 @@
/usr/sbin/bhyveload \
-m 214 \
-d /tmp/freebsd1.img bhyve
-d /tmp/freebsd1.img \
bhyve

3
tests/bhyvexml2argvdata/bhyvexml2argv-addr-no32devs-single-sata-disk.args
View File

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

3
tests/bhyvexml2argvdata/bhyvexml2argv-addr-no32devs-single-sata-disk.ldargs
View File

@ -1,3 +1,4 @@
/usr/sbin/bhyveload \
-m 214 \
-d /tmp/freebsd.img bhyve
-d /tmp/freebsd.img \
bhyve

3
tests/bhyvexml2argvdata/bhyvexml2argv-addr-non-isa-controller-on-slot-1.args
View File

@ -8,4 +8,5 @@
-l bootrom,/path/to/test.fd \
-s 2:0,lpc \
-s 3:0,ahci,hd:/tmp/freebsd.img \
-s 1:0,virtio-net,faketapdev,mac=52:54:00:b9:94:02 bhyve
-s 1:0,virtio-net,faketapdev,mac=52:54:00:b9:94:02 \
bhyve

3
tests/bhyvexml2argvdata/bhyvexml2argv-addr-single-sata-disk.args
View File

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

3
tests/bhyvexml2argvdata/bhyvexml2argv-addr-single-sata-disk.ldargs
View File

@ -1,3 +1,4 @@
/usr/sbin/bhyveload \
-m 214 \
-d /tmp/freebsd.img bhyve
-d /tmp/freebsd.img \
bhyve

3
tests/bhyvexml2argvdata/bhyvexml2argv-addr-single-virtio-disk.args
View File

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

3
tests/bhyvexml2argvdata/bhyvexml2argv-addr-single-virtio-disk.ldargs
View File

@ -1,3 +1,4 @@
/usr/sbin/bhyveload \
-m 214 \
-d /tmp/freebsd.img bhyve
-d /tmp/freebsd.img \
bhyve

3
tests/bhyvexml2argvdata/bhyvexml2argv-base.args
View File

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

3
tests/bhyvexml2argvdata/bhyvexml2argv-base.ldargs
View File

@ -1,3 +1,4 @@
/usr/sbin/bhyveload \
-m 214 \
-d /tmp/freebsd.img bhyve
-d /tmp/freebsd.img \
bhyve

3
tests/bhyvexml2argvdata/bhyvexml2argv-bhyveload-bootorder.args
View File

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

3
tests/bhyvexml2argvdata/bhyvexml2argv-bhyveload-bootorder.ldargs
View File

@ -1,3 +1,4 @@
/usr/sbin/bhyveload \
-m 214 \
-d /tmp/cdrom.iso bhyve
-d /tmp/cdrom.iso \
bhyve

3
tests/bhyvexml2argvdata/bhyvexml2argv-bhyveload-bootorder1.args
View File

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

3
tests/bhyvexml2argvdata/bhyvexml2argv-bhyveload-bootorder1.ldargs
View File

@ -1,3 +1,4 @@
/usr/sbin/bhyveload \
-m 214 \
-d /tmp/freebsd.img bhyve
-d /tmp/freebsd.img \
bhyve

3
tests/bhyvexml2argvdata/bhyvexml2argv-bhyveload-bootorder3.args
View File

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

3
tests/bhyvexml2argvdata/bhyvexml2argv-bhyveload-bootorder3.ldargs
View File

@ -1,3 +1,4 @@
/usr/sbin/bhyveload \
-m 214 \
-d /tmp/cdrom.iso bhyve
-d /tmp/cdrom.iso \
bhyve

3
tests/bhyvexml2argvdata/bhyvexml2argv-bhyveload-explicitargs.args
View File

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

5
tests/bhyvexml2argvdata/bhyvexml2argv-commandline.args
View File

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

3
tests/bhyvexml2argvdata/bhyvexml2argv-commandline.ldargs
View File

@ -1,3 +1,4 @@
/usr/sbin/bhyveload \
-m 214 \
-d /tmp/freebsd.img bhyve
-d /tmp/freebsd.img \
bhyve

3
tests/bhyvexml2argvdata/bhyvexml2argv-console-master-slave-not-specified.args
View File

@ -8,4 +8,5 @@
-s 1:0,lpc \
-s 2:0,ahci,hd:/tmp/freebsd.img \
-s 3:0,virtio-net,faketapdev,mac=52:54:00:b1:42:eb \
-l com1,/dev/nmdmdf3be7e7-a104-11e3-aeb0-50e5492bd3dcA bhyve
-l com1,/dev/nmdmdf3be7e7-a104-11e3-aeb0-50e5492bd3dcA \
bhyve

3
tests/bhyvexml2argvdata/bhyvexml2argv-console-master-slave-not-specified.ldargs
View File

@ -1,3 +1,4 @@
/usr/sbin/bhyveload \
-m 214 \
-d /tmp/freebsd.img bhyve
-d /tmp/freebsd.img \
bhyve

3
tests/bhyvexml2argvdata/bhyvexml2argv-console.args
View File

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

3
tests/bhyvexml2argvdata/bhyvexml2argv-console.ldargs
View File

@ -1,3 +1,4 @@
/usr/sbin/bhyveload \
-m 214 \
-d /tmp/freebsd.img bhyve
-d /tmp/freebsd.img \
bhyve

3
tests/bhyvexml2argvdata/bhyvexml2argv-cputopology.args
View File

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

3
tests/bhyvexml2argvdata/bhyvexml2argv-cputopology.ldargs
View File

@ -1,3 +1,4 @@
/usr/sbin/bhyveload \
-m 214 \
-d /tmp/freebsd.img bhyve
-d /tmp/freebsd.img \
bhyve

3
tests/bhyvexml2argvdata/bhyvexml2argv-custom-loader.args
View File

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

3
tests/bhyvexml2argvdata/bhyvexml2argv-disk-cdrom-grub.args
View File

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

3
tests/bhyvexml2argvdata/bhyvexml2argv-disk-cdrom-grub.ldargs
View File

@ -1,4 +1,5 @@
/usr/local/sbin/grub-bhyve \
--root cd \
--device-map '<device.map>' \
--memory 214 bhyve
--memory 214 \
bhyve

3
tests/bhyvexml2argvdata/bhyvexml2argv-disk-cdrom.args
View File

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

3
tests/bhyvexml2argvdata/bhyvexml2argv-disk-cdrom.ldargs
View File

@ -1,3 +1,4 @@
/usr/sbin/bhyveload \
-m 214 \
-d /tmp/cdrom.iso bhyve
-d /tmp/cdrom.iso \
bhyve

3
tests/bhyvexml2argvdata/bhyvexml2argv-disk-virtio.args
View File

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

3
tests/bhyvexml2argvdata/bhyvexml2argv-disk-virtio.ldargs
View File

@ -1,3 +1,4 @@
/usr/sbin/bhyveload \
-m 214 \
-d /tmp/freebsd.img bhyve
-d /tmp/freebsd.img \
bhyve

3
tests/bhyvexml2argvdata/bhyvexml2argv-firmware-efi.args
View File

@ -8,4 +8,5 @@
-l bootrom,fakefirmwaredir/BHYVE_UEFI.fd \
-s 1:0,lpc \
-s 2:0,ahci,hd:/tmp/freebsd.img \
-s 3:0,virtio-net,faketapdev,mac=52:54:00:00:00:00 bhyve
-s 3:0,virtio-net,faketapdev,mac=52:54:00:00:00:00 \
bhyve

3
tests/bhyvexml2argvdata/bhyvexml2argv-fs-9p-readonly.args
View File

@ -7,4 +7,5 @@
-s 0:0,hostbridge \
-s 2:0,ahci,hd:/tmp/freebsd.img \
-s 3:0,virtio-net,faketapdev,mac=52:54:00:b9:94:02 \
-s 4:0,virtio-9p,shared_dir=/shared/dir,ro bhyve
-s 4:0,virtio-9p,shared_dir=/shared/dir,ro \
bhyve

3
tests/bhyvexml2argvdata/bhyvexml2argv-fs-9p-readonly.ldargs
View File

@ -1,3 +1,4 @@
/usr/sbin/bhyveload \
-m 214 \
-d /tmp/freebsd.img bhyve
-d /tmp/freebsd.img \
bhyve

3
tests/bhyvexml2argvdata/bhyvexml2argv-fs-9p.args
View File

@ -7,4 +7,5 @@
-s 0:0,hostbridge \
-s 2:0,ahci,hd:/tmp/freebsd.img \
-s 3:0,virtio-net,faketapdev,mac=52:54:00:b9:94:02 \
-s 4:0,virtio-9p,shared_dir=/shared/dir bhyve
-s 4:0,virtio-9p,shared_dir=/shared/dir \
bhyve

3
tests/bhyvexml2argvdata/bhyvexml2argv-fs-9p.ldargs
View File

@ -1,3 +1,4 @@
/usr/sbin/bhyveload \
-m 214 \
-d /tmp/freebsd.img bhyve
-d /tmp/freebsd.img \
bhyve

3
tests/bhyvexml2argvdata/bhyvexml2argv-grub-bootorder.args
View File

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

3
tests/bhyvexml2argvdata/bhyvexml2argv-grub-bootorder.ldargs
View File

@ -1,4 +1,5 @@
/usr/local/sbin/grub-bhyve \
--root hd0,msdos1 \
--device-map '<device.map>' \
--memory 214 bhyve
--memory 214 \
bhyve

3
tests/bhyvexml2argvdata/bhyvexml2argv-grub-bootorder2.args
View File

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

3
tests/bhyvexml2argvdata/bhyvexml2argv-grub-bootorder2.ldargs
View File

@ -1,4 +1,5 @@
/usr/local/sbin/grub-bhyve \
--root hd0,msdos1 \
--device-map '<device.map>' \
--memory 214 bhyve
--memory 214 \
bhyve

3
tests/bhyvexml2argvdata/bhyvexml2argv-grub-defaults.args
View File

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

3
tests/bhyvexml2argvdata/bhyvexml2argv-grub-defaults.ldargs
View File

@ -1,4 +1,5 @@
/usr/local/sbin/grub-bhyve \
--root hd0,msdos1 \
--device-map '<device.map>' \
--memory 214 bhyve
--memory 214 \
bhyve

3
tests/bhyvexml2argvdata/bhyvexml2argv-input-xhci-tablet.args
View File

@ -6,4 +6,5 @@
-P \
-s 0:0,hostbridge \
-s 2:0,xhci,tablet \
-s 3:0,ahci-hd,/tmp/freebsd.img bhyve
-s 3:0,ahci-hd,/tmp/freebsd.img \
bhyve

3
tests/bhyvexml2argvdata/bhyvexml2argv-input-xhci-tablet.ldargs
View File

@ -1,3 +1,4 @@
/usr/sbin/bhyveload \
-m 214 \
-d /tmp/freebsd.img bhyve
-d /tmp/freebsd.img \
bhyve

3
tests/bhyvexml2argvdata/bhyvexml2argv-isa-controller.args
View File

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

3
tests/bhyvexml2argvdata/bhyvexml2argv-isa-controller.ldargs
View File

@ -1,3 +1,4 @@
/usr/sbin/bhyveload \
-m 214 \
-d /tmp/freebsd.img bhyve
-d /tmp/freebsd.img \
bhyve

3
tests/bhyvexml2argvdata/bhyvexml2argv-localtime.args
View File

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

3
tests/bhyvexml2argvdata/bhyvexml2argv-localtime.ldargs
View File

@ -1,3 +1,4 @@
/usr/sbin/bhyveload \
-m 214 \
-d /tmp/freebsd.img bhyve
-d /tmp/freebsd.img \
bhyve

3
tests/bhyvexml2argvdata/bhyvexml2argv-macaddr.args
View File

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

3
tests/bhyvexml2argvdata/bhyvexml2argv-macaddr.ldargs
View File

@ -1,3 +1,4 @@
/usr/sbin/bhyveload \
-m 214 \
-d /tmp/freebsd.img bhyve
-d /tmp/freebsd.img \
bhyve

3
tests/bhyvexml2argvdata/bhyvexml2argv-msrs.args
View File

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

3
tests/bhyvexml2argvdata/bhyvexml2argv-msrs.ldargs
View File

@ -1,3 +1,4 @@
/usr/sbin/bhyveload \
-m 214 \
-d /tmp/freebsd.img bhyve
-d /tmp/freebsd.img \
bhyve

3
tests/bhyvexml2argvdata/bhyvexml2argv-net-e1000.args
View File

@ -6,4 +6,5 @@
-P \
-s 0:0,hostbridge \
-s 2:0,ahci,hd:/tmp/freebsd.img \
-s 3:0,e1000,faketapdev,mac=52:54:00:00:00:00 bhyve
-s 3:0,e1000,faketapdev,mac=52:54:00:00:00:00 \
bhyve

3
tests/bhyvexml2argvdata/bhyvexml2argv-net-e1000.ldargs
View File

@ -1,3 +1,4 @@
/usr/sbin/bhyveload \
-m 214 \
-d /tmp/freebsd.img bhyve
-d /tmp/freebsd.img \
bhyve

3
tests/bhyvexml2argvdata/bhyvexml2argv-serial-grub-nocons.args
View File

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

3
tests/bhyvexml2argvdata/bhyvexml2argv-serial-grub-nocons.ldargs
View File

@ -1,4 +1,5 @@
/usr/local/sbin/grub-bhyve \
--root hd0,msdos1 \
--device-map '<device.map>' \
--memory 214 bhyve
--memory 214 \
bhyve

3
tests/bhyvexml2argvdata/bhyvexml2argv-serial-grub.args
View File

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

3
tests/bhyvexml2argvdata/bhyvexml2argv-serial-grub.ldargs
View File

@ -2,4 +2,5 @@
--root hd0,msdos1 \
--device-map '<device.map>' \
--memory 214 \
--cons-dev /dev/nmdm0A bhyve
--cons-dev /dev/nmdm0A \
bhyve

3
tests/bhyvexml2argvdata/bhyvexml2argv-serial.args
View File

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

3
tests/bhyvexml2argvdata/bhyvexml2argv-serial.ldargs
View File

@ -1,3 +1,4 @@
/usr/sbin/bhyveload \
-m 214 \
-d /tmp/freebsd.img bhyve
-d /tmp/freebsd.img \
bhyve

3
tests/bhyvexml2argvdata/bhyvexml2argv-sound.args
View File

@ -7,4 +7,5 @@
-s 0:0,hostbridge \
-s 2:0,ahci,hd:/tmp/freebsd.img \
-s 3:0,virtio-net,faketapdev,mac=52:54:00:b9:94:02 \
-s 4:0,hda,play=/dev/dsp0,rec=/dev/dsp0 bhyve
-s 4:0,hda,play=/dev/dsp0,rec=/dev/dsp0 \
bhyve

3
tests/bhyvexml2argvdata/bhyvexml2argv-sound.ldargs
View File

@ -1,3 +1,4 @@
/usr/sbin/bhyveload \
-m 214 \
-d /tmp/freebsd.img bhyve
-d /tmp/freebsd.img \
bhyve

3
tests/bhyvexml2argvdata/bhyvexml2argv-uefi.args
View File

@ -8,4 +8,5 @@
-l bootrom,/path/to/test.fd \
-s 1:0,lpc \
-s 2:0,ahci,hd:/tmp/freebsd.img \
-s 3:0,virtio-net,faketapdev,mac=52:54:00:00:00:00 bhyve
-s 3:0,virtio-net,faketapdev,mac=52:54:00:00:00:00 \
bhyve

3
tests/bhyvexml2argvdata/bhyvexml2argv-vnc-autoport.args
View File

@ -9,4 +9,5 @@
-s 1:0,lpc \
-s 2:0,ahci,hd:/tmp/freebsd.img \
-s 3:0,virtio-net,faketapdev,mac=52:54:00:00:00:00 \
-s 4:0,fbuf,tcp=127.0.0.1:5900 bhyve
-s 4:0,fbuf,tcp=127.0.0.1:5900 \
bhyve

3
tests/bhyvexml2argvdata/bhyvexml2argv-vnc-password.args
View File

@ -9,4 +9,5 @@
-s 1:0,lpc \
-s 2:0,ahci,hd:/tmp/freebsd.img \
-s 3:0,virtio-net,faketapdev,mac=52:54:00:00:00:00 \
-s 4:0,fbuf,tcp=127.0.0.1:5904,password=s3cr3t bhyve
-s 4:0,fbuf,tcp=127.0.0.1:5904,password=s3cr3t \
bhyve

3
tests/bhyvexml2argvdata/bhyvexml2argv-vnc-resolution.args
View File

@ -7,4 +7,5 @@
-s 0:0,hostbridge \
-l bootrom,/path/to/test.fd \
-s 1:0,lpc \
-s 2:0,fbuf,tcp=127.0.0.1:5904,w=1920,h=1080 bhyve
-s 2:0,fbuf,tcp=127.0.0.1:5904,w=1920,h=1080 \
bhyve

3
tests/bhyvexml2argvdata/bhyvexml2argv-vnc-vgaconf-io.args
View File

@ -9,4 +9,5 @@
-s 1:0,lpc \
-s 2:0,ahci,hd:/tmp/freebsd.img \
-s 3:0,virtio-net,faketapdev,mac=52:54:00:00:00:00 \
-s 4:0,fbuf,tcp=127.0.0.1:5904,vga=io bhyve
-s 4:0,fbuf,tcp=127.0.0.1:5904,vga=io \
bhyve

3
tests/bhyvexml2argvdata/bhyvexml2argv-vnc-vgaconf-off.args
View File

@ -9,4 +9,5 @@
-s 1:0,lpc \
-s 2:0,ahci,hd:/tmp/freebsd.img \
-s 3:0,virtio-net,faketapdev,mac=52:54:00:00:00:00 \
-s 4:0,fbuf,tcp=127.0.0.1:5904,vga=off bhyve
-s 4:0,fbuf,tcp=127.0.0.1:5904,vga=off \
bhyve

3
tests/bhyvexml2argvdata/bhyvexml2argv-vnc-vgaconf-on.args
View File

@ -9,4 +9,5 @@
-s 1:0,lpc \
-s 2:0,ahci,hd:/tmp/freebsd.img \
-s 3:0,virtio-net,faketapdev,mac=52:54:00:00:00:00 \
-s 4:0,fbuf,tcp=127.0.0.1:5904,vga=on bhyve
-s 4:0,fbuf,tcp=127.0.0.1:5904,vga=on \
bhyve

3
tests/bhyvexml2argvdata/bhyvexml2argv-vnc.args
View File

@ -9,4 +9,5 @@
-s 1:0,lpc \
-s 2:0,ahci,hd:/tmp/freebsd.img \
-s 3:0,virtio-net,faketapdev,mac=52:54:00:00:00:00 \
-s 4:0,fbuf,tcp=127.0.0.1:5904 bhyve
-s 4:0,fbuf,tcp=127.0.0.1:5904 \
bhyve

3
tests/bhyvexml2argvdata/bhyvexml2argv-wired.args
View File

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

3
tests/bhyvexml2argvdata/bhyvexml2argv-wired.ldargs
View File

@ -1,3 +1,4 @@
/usr/sbin/bhyveload \
-m 214 \
-d /tmp/freebsd.img bhyve
-d /tmp/freebsd.img \
bhyve

8
tests/bhyvexml2argvtest.c
View File

@ -86,19 +86,19 @@ static int testCompareXMLToArgvFiles(const char *xml,
goto out;
}
if (!(actualargv = virCommandToString(cmd, false)))
if (!(actualargv = virCommandToString(cmd, true)))
goto out;
if (actualdm != NULL)
virTrimSpaces(actualdm, NULL);
if (!(actualld = virCommandToString(ldcmd, false)))
if (!(actualld = virCommandToString(ldcmd, true)))
goto out;
if (virTestCompareToFile(actualargv, cmdline) < 0)
if (virTestCompareToFileFull(actualargv, cmdline, false) < 0)
goto out;
if (virTestCompareToFile(actualld, ldcmdline) < 0)
if (virTestCompareToFileFull(actualld, ldcmdline, false) < 0)
goto out;
if (virFileExists(dmcmdline) || actualdm) {