On Fri, Apr 09, 2021 at 02:50:25PM +0200, Peter Krempa wrote:
> 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@xxxxxxxxxx>
> ---
> build-aux/syntax-check.mk | 2 +-
> .../bhyvexml2argv-acpiapic.args | 3 ++-
> .../bhyvexml2argv-acpiapic.ldargs | 3 ++-
> ...xml2argv-addr-isa-controller-on-slot-1.args | 3 ++-
> ...l2argv-addr-isa-controller-on-slot-1.ldargs | 3 ++-
> ...ml2argv-addr-isa-controller-on-slot-31.args | 3 ++-
> ...2argv-addr-isa-controller-on-slot-31.ldargs | 3 ++-
> ...exml2argv-addr-more-than-32-sata-disks.args | 18 ++++--------------
> ...ml2argv-addr-more-than-32-sata-disks.ldargs | 3 ++-
> ...bhyvexml2argv-addr-multiple-sata-disks.args | 3 ++-
> ...yvexml2argv-addr-multiple-sata-disks.ldargs | 3 ++-
> ...yvexml2argv-addr-multiple-virtio-disks.args | 3 ++-
> ...exml2argv-addr-multiple-virtio-disks.ldargs | 3 ++-
> ...argv-addr-no32devs-multiple-sata-disks.args | 3 ++-
> ...gv-addr-no32devs-multiple-sata-disks.ldargs | 3 ++-
> ...ml2argv-addr-no32devs-single-sata-disk.args | 3 ++-
> ...2argv-addr-no32devs-single-sata-disk.ldargs | 3 ++-
> ...argv-addr-non-isa-controller-on-slot-1.args | 3 ++-
> .../bhyvexml2argv-addr-single-sata-disk.args | 3 ++-
> .../bhyvexml2argv-addr-single-sata-disk.ldargs | 3 ++-
> .../bhyvexml2argv-addr-single-virtio-disk.args | 3 ++-
> ...hyvexml2argv-addr-single-virtio-disk.ldargs | 3 ++-
> .../bhyvexml2argvdata/bhyvexml2argv-base.args | 3 ++-
> .../bhyvexml2argv-base.ldargs | 3 ++-
> .../bhyvexml2argv-bhyveload-bootorder.args | 3 ++-
> .../bhyvexml2argv-bhyveload-bootorder.ldargs | 3 ++-
> .../bhyvexml2argv-bhyveload-bootorder1.args | 3 ++-
> .../bhyvexml2argv-bhyveload-bootorder1.ldargs | 3 ++-
> .../bhyvexml2argv-bhyveload-bootorder3.args | 3 ++-
> .../bhyvexml2argv-bhyveload-bootorder3.ldargs | 3 ++-
> .../bhyvexml2argv-bhyveload-explicitargs.args | 3 ++-
> .../bhyvexml2argv-commandline.args | 5 ++++-
> .../bhyvexml2argv-commandline.ldargs | 3 ++-
> ...rgv-console-master-slave-not-specified.args | 3 ++-
> ...v-console-master-slave-not-specified.ldargs | 3 ++-
> .../bhyvexml2argv-console.args | 3 ++-
> .../bhyvexml2argv-console.ldargs | 3 ++-
> .../bhyvexml2argv-cputopology.args | 3 ++-
> .../bhyvexml2argv-cputopology.ldargs | 3 ++-
> .../bhyvexml2argv-custom-loader.args | 3 ++-
> .../bhyvexml2argv-disk-cdrom-grub.args | 3 ++-
> .../bhyvexml2argv-disk-cdrom-grub.ldargs | 3 ++-
> .../bhyvexml2argv-disk-cdrom.args | 3 ++-
> .../bhyvexml2argv-disk-cdrom.ldargs | 3 ++-
> .../bhyvexml2argv-disk-virtio.args | 3 ++-
> .../bhyvexml2argv-disk-virtio.ldargs | 3 ++-
> .../bhyvexml2argv-firmware-efi.args | 3 ++-
> .../bhyvexml2argv-fs-9p-readonly.args | 3 ++-
> .../bhyvexml2argv-fs-9p-readonly.ldargs | 3 ++-
> .../bhyvexml2argvdata/bhyvexml2argv-fs-9p.args | 3 ++-
> .../bhyvexml2argv-fs-9p.ldargs | 3 ++-
> .../bhyvexml2argv-grub-bootorder.args | 3 ++-
> .../bhyvexml2argv-grub-bootorder.ldargs | 3 ++-
> .../bhyvexml2argv-grub-bootorder2.args | 3 ++-
> .../bhyvexml2argv-grub-bootorder2.ldargs | 3 ++-
> .../bhyvexml2argv-grub-defaults.args | 3 ++-
> .../bhyvexml2argv-grub-defaults.ldargs | 3 ++-
> .../bhyvexml2argv-input-xhci-tablet.args | 3 ++-
> .../bhyvexml2argv-input-xhci-tablet.ldargs | 3 ++-
> .../bhyvexml2argv-isa-controller.args | 3 ++-
> .../bhyvexml2argv-isa-controller.ldargs | 3 ++-
> .../bhyvexml2argv-localtime.args | 3 ++-
> .../bhyvexml2argv-localtime.ldargs | 3 ++-
> .../bhyvexml2argv-macaddr.args | 3 ++-
> .../bhyvexml2argv-macaddr.ldargs | 3 ++-
> .../bhyvexml2argvdata/bhyvexml2argv-msrs.args | 3 ++-
> .../bhyvexml2argv-msrs.ldargs | 3 ++-
> .../bhyvexml2argv-net-e1000.args | 3 ++-
> .../bhyvexml2argv-net-e1000.ldargs | 3 ++-
> .../bhyvexml2argv-serial-grub-nocons.args | 3 ++-
> .../bhyvexml2argv-serial-grub-nocons.ldargs | 3 ++-
> .../bhyvexml2argv-serial-grub.args | 3 ++-
> .../bhyvexml2argv-serial-grub.ldargs | 3 ++-
> .../bhyvexml2argv-serial.args | 3 ++-
> .../bhyvexml2argv-serial.ldargs | 3 ++-
> .../bhyvexml2argvdata/bhyvexml2argv-sound.args | 3 ++-
> .../bhyvexml2argv-sound.ldargs | 3 ++-
> .../bhyvexml2argvdata/bhyvexml2argv-uefi.args | 3 ++-
> .../bhyvexml2argv-vnc-autoport.args | 3 ++-
> .../bhyvexml2argv-vnc-password.args | 3 ++-
> .../bhyvexml2argv-vnc-resolution.args | 3 ++-
> .../bhyvexml2argv-vnc-vgaconf-io.args | 3 ++-
> .../bhyvexml2argv-vnc-vgaconf-off.args | 3 ++-
> .../bhyvexml2argv-vnc-vgaconf-on.args | 3 ++-
> tests/bhyvexml2argvdata/bhyvexml2argv-vnc.args | 3 ++-
> .../bhyvexml2argvdata/bhyvexml2argv-wired.args | 3 ++-
> .../bhyvexml2argv-wired.ldargs | 3 ++-
> tests/bhyvexml2argvtest.c | 8 ++++----
> 88 files changed, 181 insertions(+), 104 deletions(-)
>
> diff --git a/build-aux/syntax-check.mk b/build-aux/syntax-check.mk
> index bfff8abece..d6eb26c5ec 100644
> --- a/build-aux/syntax-check.mk
> +++ b/build-aux/syntax-check.mk
> @@ -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
>
> diff --git a/tests/bhyvexml2argvdata/bhyvexml2argv-acpiapic.args b/tests/bhyvexml2argvdata/bhyvexml2argv-acpiapic.args
> index e71ceec84f..001e44147e 100644
> --- a/tests/bhyvexml2argvdata/bhyvexml2argv-acpiapic.args
> +++ b/tests/bhyvexml2argvdata/bhyvexml2argv-acpiapic.args
> @@ -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
> diff --git a/tests/bhyvexml2argvdata/bhyvexml2argv-acpiapic.ldargs b/tests/bhyvexml2argvdata/bhyvexml2argv-acpiapic.ldargs
> index 32538b558e..91f9658137 100644
> --- a/tests/bhyvexml2argvdata/bhyvexml2argv-acpiapic.ldargs
> +++ b/tests/bhyvexml2argvdata/bhyvexml2argv-acpiapic.ldargs
> @@ -1,3 +1,4 @@
> /usr/sbin/bhyveload \
> -m 214 \
> --d /tmp/freebsd.img bhyve
> +-d /tmp/freebsd.img \
> +bhyve
> diff --git a/tests/bhyvexml2argvdata/bhyvexml2argv-addr-isa-controller-on-slot-1.args b/tests/bhyvexml2argvdata/bhyvexml2argv-addr-isa-controller-on-slot-1.args
> index 910d1bbcfa..498455275a 100644
> --- a/tests/bhyvexml2argvdata/bhyvexml2argv-addr-isa-controller-on-slot-1.args
> +++ b/tests/bhyvexml2argvdata/bhyvexml2argv-addr-isa-controller-on-slot-1.args
> @@ -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
> diff --git a/tests/bhyvexml2argvdata/bhyvexml2argv-addr-isa-controller-on-slot-1.ldargs b/tests/bhyvexml2argvdata/bhyvexml2argv-addr-isa-controller-on-slot-1.ldargs
> index 32538b558e..91f9658137 100644
> --- a/tests/bhyvexml2argvdata/bhyvexml2argv-addr-isa-controller-on-slot-1.ldargs
> +++ b/tests/bhyvexml2argvdata/bhyvexml2argv-addr-isa-controller-on-slot-1.ldargs
> @@ -1,3 +1,4 @@
> /usr/sbin/bhyveload \
> -m 214 \
> --d /tmp/freebsd.img bhyve
> +-d /tmp/freebsd.img \
> +bhyve
> diff --git a/tests/bhyvexml2argvdata/bhyvexml2argv-addr-isa-controller-on-slot-31.args b/tests/bhyvexml2argvdata/bhyvexml2argv-addr-isa-controller-on-slot-31.args
> index ee833eb460..70c44932c8 100644
> --- a/tests/bhyvexml2argvdata/bhyvexml2argv-addr-isa-controller-on-slot-31.args
> +++ b/tests/bhyvexml2argvdata/bhyvexml2argv-addr-isa-controller-on-slot-31.args
> @@ -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
> diff --git a/tests/bhyvexml2argvdata/bhyvexml2argv-addr-isa-controller-on-slot-31.ldargs b/tests/bhyvexml2argvdata/bhyvexml2argv-addr-isa-controller-on-slot-31.ldargs
> index 32538b558e..91f9658137 100644
> --- a/tests/bhyvexml2argvdata/bhyvexml2argv-addr-isa-controller-on-slot-31.ldargs
> +++ b/tests/bhyvexml2argvdata/bhyvexml2argv-addr-isa-controller-on-slot-31.ldargs
> @@ -1,3 +1,4 @@
> /usr/sbin/bhyveload \
> -m 214 \
> --d /tmp/freebsd.img bhyve
> +-d /tmp/freebsd.img \
> +bhyve
> diff --git a/tests/bhyvexml2argvdata/bhyvexml2argv-addr-more-than-32-sata-disks.args b/tests/bhyvexml2argvdata/bhyvexml2argv-addr-more-than-32-sata-disks.args
> index d7917bd8f3..bd987c86aa 100644
> --- a/tests/bhyvexml2argvdata/bhyvexml2argv-addr-more-than-32-sata-disks.args
> +++ b/tests/bhyvexml2argvdata/bhyvexml2argv-addr-more-than-32-sata-disks.args
> @@ -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
Not sure about this being an improvement. Since it is one looooong line
any change to the line will be difficult to spot at first glance.
But it's a trade-off where the new wrapping improves a lot of other
cases so I guess we will have to live with this.
> diff --git a/tests/bhyvexml2argvdata/bhyvexml2argv-addr-more-than-32-sata-disks.ldargs b/tests/bhyvexml2argvdata/bhyvexml2argv-addr-more-than-32-sata-disks.ldargs
> index 70b2224f26..ec3f482ca8 100644
> --- a/tests/bhyvexml2argvdata/bhyvexml2argv-addr-more-than-32-sata-disks.ldargs
> +++ b/tests/bhyvexml2argvdata/bhyvexml2argv-addr-more-than-32-sata-disks.ldargs
> @@ -1,3 +1,4 @@
> /usr/sbin/bhyveload \
> -m 214 \
> --d /tmp/freebsd1.img bhyve
> +-d /tmp/freebsd1.img \
> +bhyve
> diff --git a/tests/bhyvexml2argvdata/bhyvexml2argv-addr-multiple-sata-disks.args b/tests/bhyvexml2argvdata/bhyvexml2argv-addr-multiple-sata-disks.args
> index 5665842b84..0bd1957e96 100644
> --- a/tests/bhyvexml2argvdata/bhyvexml2argv-addr-multiple-sata-disks.args
> +++ b/tests/bhyvexml2argvdata/bhyvexml2argv-addr-multiple-sata-disks.args
> @@ -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
> diff --git a/tests/bhyvexml2argvdata/bhyvexml2argv-addr-multiple-sata-disks.ldargs b/tests/bhyvexml2argvdata/bhyvexml2argv-addr-multiple-sata-disks.ldargs
> index 70b2224f26..ec3f482ca8 100644
> --- a/tests/bhyvexml2argvdata/bhyvexml2argv-addr-multiple-sata-disks.ldargs
> +++ b/tests/bhyvexml2argvdata/bhyvexml2argv-addr-multiple-sata-disks.ldargs
> @@ -1,3 +1,4 @@
> /usr/sbin/bhyveload \
> -m 214 \
> --d /tmp/freebsd1.img bhyve
> +-d /tmp/freebsd1.img \
> +bhyve
> diff --git a/tests/bhyvexml2argvdata/bhyvexml2argv-addr-multiple-virtio-disks.args b/tests/bhyvexml2argvdata/bhyvexml2argv-addr-multiple-virtio-disks.args
> index 8cc1668949..73b1e2ad57 100644
> --- a/tests/bhyvexml2argvdata/bhyvexml2argv-addr-multiple-virtio-disks.args
> +++ b/tests/bhyvexml2argvdata/bhyvexml2argv-addr-multiple-virtio-disks.args
> @@ -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
> diff --git a/tests/bhyvexml2argvdata/bhyvexml2argv-addr-multiple-virtio-disks.ldargs b/tests/bhyvexml2argvdata/bhyvexml2argv-addr-multiple-virtio-disks.ldargs
> index 32538b558e..91f9658137 100644
> --- a/tests/bhyvexml2argvdata/bhyvexml2argv-addr-multiple-virtio-disks.ldargs
> +++ b/tests/bhyvexml2argvdata/bhyvexml2argv-addr-multiple-virtio-disks.ldargs
> @@ -1,3 +1,4 @@
> /usr/sbin/bhyveload \
> -m 214 \
> --d /tmp/freebsd.img bhyve
> +-d /tmp/freebsd.img \
> +bhyve
> diff --git a/tests/bhyvexml2argvdata/bhyvexml2argv-addr-no32devs-multiple-sata-disks.args b/tests/bhyvexml2argvdata/bhyvexml2argv-addr-no32devs-multiple-sata-disks.args
> index 03bf381ffb..821cc58287 100644
> --- a/tests/bhyvexml2argvdata/bhyvexml2argv-addr-no32devs-multiple-sata-disks.args
> +++ b/tests/bhyvexml2argvdata/bhyvexml2argv-addr-no32devs-multiple-sata-disks.args
> @@ -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
> diff --git a/tests/bhyvexml2argvdata/bhyvexml2argv-addr-no32devs-multiple-sata-disks.ldargs b/tests/bhyvexml2argvdata/bhyvexml2argv-addr-no32devs-multiple-sata-disks.ldargs
> index 70b2224f26..ec3f482ca8 100644
> --- a/tests/bhyvexml2argvdata/bhyvexml2argv-addr-no32devs-multiple-sata-disks.ldargs
> +++ b/tests/bhyvexml2argvdata/bhyvexml2argv-addr-no32devs-multiple-sata-disks.ldargs
> @@ -1,3 +1,4 @@
> /usr/sbin/bhyveload \
> -m 214 \
> --d /tmp/freebsd1.img bhyve
> +-d /tmp/freebsd1.img \
> +bhyve
> diff --git a/tests/bhyvexml2argvdata/bhyvexml2argv-addr-no32devs-single-sata-disk.args b/tests/bhyvexml2argvdata/bhyvexml2argv-addr-no32devs-single-sata-disk.args
> index d519241359..9923c4cd85 100644
> --- a/tests/bhyvexml2argvdata/bhyvexml2argv-addr-no32devs-single-sata-disk.args
> +++ b/tests/bhyvexml2argvdata/bhyvexml2argv-addr-no32devs-single-sata-disk.args
> @@ -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
> diff --git a/tests/bhyvexml2argvdata/bhyvexml2argv-addr-no32devs-single-sata-disk.ldargs b/tests/bhyvexml2argvdata/bhyvexml2argv-addr-no32devs-single-sata-disk.ldargs
> index 32538b558e..91f9658137 100644
> --- a/tests/bhyvexml2argvdata/bhyvexml2argv-addr-no32devs-single-sata-disk.ldargs
> +++ b/tests/bhyvexml2argvdata/bhyvexml2argv-addr-no32devs-single-sata-disk.ldargs
> @@ -1,3 +1,4 @@
> /usr/sbin/bhyveload \
> -m 214 \
> --d /tmp/freebsd.img bhyve
> +-d /tmp/freebsd.img \
> +bhyve
> diff --git a/tests/bhyvexml2argvdata/bhyvexml2argv-addr-non-isa-controller-on-slot-1.args b/tests/bhyvexml2argvdata/bhyvexml2argv-addr-non-isa-controller-on-slot-1.args
> index cbbf768d71..12859f7d56 100644
> --- a/tests/bhyvexml2argvdata/bhyvexml2argv-addr-non-isa-controller-on-slot-1.args
> +++ b/tests/bhyvexml2argvdata/bhyvexml2argv-addr-non-isa-controller-on-slot-1.args
> @@ -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
> diff --git a/tests/bhyvexml2argvdata/bhyvexml2argv-addr-single-sata-disk.args b/tests/bhyvexml2argvdata/bhyvexml2argv-addr-single-sata-disk.args
> index 547485ba5d..edcb45a0ae 100644
> --- a/tests/bhyvexml2argvdata/bhyvexml2argv-addr-single-sata-disk.args
> +++ b/tests/bhyvexml2argvdata/bhyvexml2argv-addr-single-sata-disk.args
> @@ -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
> diff --git a/tests/bhyvexml2argvdata/bhyvexml2argv-addr-single-sata-disk.ldargs b/tests/bhyvexml2argvdata/bhyvexml2argv-addr-single-sata-disk.ldargs
> index 32538b558e..91f9658137 100644
> --- a/tests/bhyvexml2argvdata/bhyvexml2argv-addr-single-sata-disk.ldargs
> +++ b/tests/bhyvexml2argvdata/bhyvexml2argv-addr-single-sata-disk.ldargs
> @@ -1,3 +1,4 @@
> /usr/sbin/bhyveload \
> -m 214 \
> --d /tmp/freebsd.img bhyve
> +-d /tmp/freebsd.img \
> +bhyve
> diff --git a/tests/bhyvexml2argvdata/bhyvexml2argv-addr-single-virtio-disk.args b/tests/bhyvexml2argvdata/bhyvexml2argv-addr-single-virtio-disk.args
> index 4dcc40404b..3ee9614733 100644
> --- a/tests/bhyvexml2argvdata/bhyvexml2argv-addr-single-virtio-disk.args
> +++ b/tests/bhyvexml2argvdata/bhyvexml2argv-addr-single-virtio-disk.args
> @@ -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
> diff --git a/tests/bhyvexml2argvdata/bhyvexml2argv-addr-single-virtio-disk.ldargs b/tests/bhyvexml2argvdata/bhyvexml2argv-addr-single-virtio-disk.ldargs
> index 32538b558e..91f9658137 100644
> --- a/tests/bhyvexml2argvdata/bhyvexml2argv-addr-single-virtio-disk.ldargs
> +++ b/tests/bhyvexml2argvdata/bhyvexml2argv-addr-single-virtio-disk.ldargs
> @@ -1,3 +1,4 @@
> /usr/sbin/bhyveload \
> -m 214 \
> --d /tmp/freebsd.img bhyve
> +-d /tmp/freebsd.img \
> +bhyve
> diff --git a/tests/bhyvexml2argvdata/bhyvexml2argv-base.args b/tests/bhyvexml2argvdata/bhyvexml2argv-base.args
> index 547485ba5d..edcb45a0ae 100644
> --- a/tests/bhyvexml2argvdata/bhyvexml2argv-base.args
> +++ b/tests/bhyvexml2argvdata/bhyvexml2argv-base.args
> @@ -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
> diff --git a/tests/bhyvexml2argvdata/bhyvexml2argv-base.ldargs b/tests/bhyvexml2argvdata/bhyvexml2argv-base.ldargs
> index 32538b558e..91f9658137 100644
> --- a/tests/bhyvexml2argvdata/bhyvexml2argv-base.ldargs
> +++ b/tests/bhyvexml2argvdata/bhyvexml2argv-base.ldargs
> @@ -1,3 +1,4 @@
> /usr/sbin/bhyveload \
> -m 214 \
> --d /tmp/freebsd.img bhyve
> +-d /tmp/freebsd.img \
> +bhyve
> diff --git a/tests/bhyvexml2argvdata/bhyvexml2argv-bhyveload-bootorder.args b/tests/bhyvexml2argvdata/bhyvexml2argv-bhyveload-bootorder.args
> index 4d7c7c92a8..f790f746a9 100644
> --- a/tests/bhyvexml2argvdata/bhyvexml2argv-bhyveload-bootorder.args
> +++ b/tests/bhyvexml2argvdata/bhyvexml2argv-bhyveload-bootorder.args
> @@ -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
> diff --git a/tests/bhyvexml2argvdata/bhyvexml2argv-bhyveload-bootorder.ldargs b/tests/bhyvexml2argvdata/bhyvexml2argv-bhyveload-bootorder.ldargs
> index 24e0bc2bd9..b31d65cd06 100644
> --- a/tests/bhyvexml2argvdata/bhyvexml2argv-bhyveload-bootorder.ldargs
> +++ b/tests/bhyvexml2argvdata/bhyvexml2argv-bhyveload-bootorder.ldargs
> @@ -1,3 +1,4 @@
> /usr/sbin/bhyveload \
> -m 214 \
> --d /tmp/cdrom.iso bhyve
> +-d /tmp/cdrom.iso \
> +bhyve
> diff --git a/tests/bhyvexml2argvdata/bhyvexml2argv-bhyveload-bootorder1.args b/tests/bhyvexml2argvdata/bhyvexml2argv-bhyveload-bootorder1.args
> index 8ec9799ccd..e621edbf0e 100644
> --- a/tests/bhyvexml2argvdata/bhyvexml2argv-bhyveload-bootorder1.args
> +++ b/tests/bhyvexml2argvdata/bhyvexml2argv-bhyveload-bootorder1.args
> @@ -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
> diff --git a/tests/bhyvexml2argvdata/bhyvexml2argv-bhyveload-bootorder1.ldargs b/tests/bhyvexml2argvdata/bhyvexml2argv-bhyveload-bootorder1.ldargs
> index 32538b558e..91f9658137 100644
> --- a/tests/bhyvexml2argvdata/bhyvexml2argv-bhyveload-bootorder1.ldargs
> +++ b/tests/bhyvexml2argvdata/bhyvexml2argv-bhyveload-bootorder1.ldargs
> @@ -1,3 +1,4 @@
> /usr/sbin/bhyveload \
> -m 214 \
> --d /tmp/freebsd.img bhyve
> +-d /tmp/freebsd.img \
> +bhyve
> diff --git a/tests/bhyvexml2argvdata/bhyvexml2argv-bhyveload-bootorder3.args b/tests/bhyvexml2argvdata/bhyvexml2argv-bhyveload-bootorder3.args
> index f1c0bf3987..eedc36d35e 100644
> --- a/tests/bhyvexml2argvdata/bhyvexml2argv-bhyveload-bootorder3.args
> +++ b/tests/bhyvexml2argvdata/bhyvexml2argv-bhyveload-bootorder3.args
> @@ -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
> diff --git a/tests/bhyvexml2argvdata/bhyvexml2argv-bhyveload-bootorder3.ldargs b/tests/bhyvexml2argvdata/bhyvexml2argv-bhyveload-bootorder3.ldargs
> index 24e0bc2bd9..b31d65cd06 100644
> --- a/tests/bhyvexml2argvdata/bhyvexml2argv-bhyveload-bootorder3.ldargs
> +++ b/tests/bhyvexml2argvdata/bhyvexml2argv-bhyveload-bootorder3.ldargs
> @@ -1,3 +1,4 @@
> /usr/sbin/bhyveload \
> -m 214 \
> --d /tmp/cdrom.iso bhyve
> +-d /tmp/cdrom.iso \
> +bhyve
> diff --git a/tests/bhyvexml2argvdata/bhyvexml2argv-bhyveload-explicitargs.args b/tests/bhyvexml2argvdata/bhyvexml2argv-bhyveload-explicitargs.args
> index 17a1c83809..1c5aa009e8 100644
> --- a/tests/bhyvexml2argvdata/bhyvexml2argv-bhyveload-explicitargs.args
> +++ b/tests/bhyvexml2argvdata/bhyvexml2argv-bhyveload-explicitargs.args
> @@ -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
> diff --git a/tests/bhyvexml2argvdata/bhyvexml2argv-commandline.args b/tests/bhyvexml2argvdata/bhyvexml2argv-commandline.args
> index cb21b99cd6..153639c370 100644
> --- a/tests/bhyvexml2argvdata/bhyvexml2argv-commandline.args
> +++ b/tests/bhyvexml2argvdata/bhyvexml2argv-commandline.args
> @@ -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
> diff --git a/tests/bhyvexml2argvdata/bhyvexml2argv-commandline.ldargs b/tests/bhyvexml2argvdata/bhyvexml2argv-commandline.ldargs
> index 32538b558e..91f9658137 100644
> --- a/tests/bhyvexml2argvdata/bhyvexml2argv-commandline.ldargs
> +++ b/tests/bhyvexml2argvdata/bhyvexml2argv-commandline.ldargs
> @@ -1,3 +1,4 @@
> /usr/sbin/bhyveload \
> -m 214 \
> --d /tmp/freebsd.img bhyve
> +-d /tmp/freebsd.img \
> +bhyve
> diff --git a/tests/bhyvexml2argvdata/bhyvexml2argv-console-master-slave-not-specified.args b/tests/bhyvexml2argvdata/bhyvexml2argv-console-master-slave-not-specified.args
> index b24918e7eb..4d7cb11999 100644
> --- a/tests/bhyvexml2argvdata/bhyvexml2argv-console-master-slave-not-specified.args
> +++ b/tests/bhyvexml2argvdata/bhyvexml2argv-console-master-slave-not-specified.args
> @@ -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
> diff --git a/tests/bhyvexml2argvdata/bhyvexml2argv-console-master-slave-not-specified.ldargs b/tests/bhyvexml2argvdata/bhyvexml2argv-console-master-slave-not-specified.ldargs
> index 32538b558e..91f9658137 100644
> --- a/tests/bhyvexml2argvdata/bhyvexml2argv-console-master-slave-not-specified.ldargs
> +++ b/tests/bhyvexml2argvdata/bhyvexml2argv-console-master-slave-not-specified.ldargs
> @@ -1,3 +1,4 @@
> /usr/sbin/bhyveload \
> -m 214 \
> --d /tmp/freebsd.img bhyve
> +-d /tmp/freebsd.img \
> +bhyve
> diff --git a/tests/bhyvexml2argvdata/bhyvexml2argv-console.args b/tests/bhyvexml2argvdata/bhyvexml2argv-console.args
> index 25fbd4727e..8c6cb78c9f 100644
> --- a/tests/bhyvexml2argvdata/bhyvexml2argv-console.args
> +++ b/tests/bhyvexml2argvdata/bhyvexml2argv-console.args
> @@ -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
> diff --git a/tests/bhyvexml2argvdata/bhyvexml2argv-console.ldargs b/tests/bhyvexml2argvdata/bhyvexml2argv-console.ldargs
> index 32538b558e..91f9658137 100644
> --- a/tests/bhyvexml2argvdata/bhyvexml2argv-console.ldargs
> +++ b/tests/bhyvexml2argvdata/bhyvexml2argv-console.ldargs
> @@ -1,3 +1,4 @@
> /usr/sbin/bhyveload \
> -m 214 \
> --d /tmp/freebsd.img bhyve
> +-d /tmp/freebsd.img \
> +bhyve
> diff --git a/tests/bhyvexml2argvdata/bhyvexml2argv-cputopology.args b/tests/bhyvexml2argvdata/bhyvexml2argv-cputopology.args
> index 2d175a4178..2c88b650b5 100644
> --- a/tests/bhyvexml2argvdata/bhyvexml2argv-cputopology.args
> +++ b/tests/bhyvexml2argvdata/bhyvexml2argv-cputopology.args
> @@ -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
> diff --git a/tests/bhyvexml2argvdata/bhyvexml2argv-cputopology.ldargs b/tests/bhyvexml2argvdata/bhyvexml2argv-cputopology.ldargs
> index 32538b558e..91f9658137 100644
> --- a/tests/bhyvexml2argvdata/bhyvexml2argv-cputopology.ldargs
> +++ b/tests/bhyvexml2argvdata/bhyvexml2argv-cputopology.ldargs
> @@ -1,3 +1,4 @@
> /usr/sbin/bhyveload \
> -m 214 \
> --d /tmp/freebsd.img bhyve
> +-d /tmp/freebsd.img \
> +bhyve
> diff --git a/tests/bhyvexml2argvdata/bhyvexml2argv-custom-loader.args b/tests/bhyvexml2argvdata/bhyvexml2argv-custom-loader.args
> index f6bfc78374..aca701c3bf 100644
> --- a/tests/bhyvexml2argvdata/bhyvexml2argv-custom-loader.args
> +++ b/tests/bhyvexml2argvdata/bhyvexml2argv-custom-loader.args
> @@ -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
> diff --git a/tests/bhyvexml2argvdata/bhyvexml2argv-disk-cdrom-grub.args b/tests/bhyvexml2argvdata/bhyvexml2argv-disk-cdrom-grub.args
> index 72f1d3538c..8f336d7ef2 100644
> --- a/tests/bhyvexml2argvdata/bhyvexml2argv-disk-cdrom-grub.args
> +++ b/tests/bhyvexml2argvdata/bhyvexml2argv-disk-cdrom-grub.args
> @@ -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
> diff --git a/tests/bhyvexml2argvdata/bhyvexml2argv-disk-cdrom-grub.ldargs b/tests/bhyvexml2argvdata/bhyvexml2argv-disk-cdrom-grub.ldargs
> index bcf901ef09..85990fc60b 100644
> --- a/tests/bhyvexml2argvdata/bhyvexml2argv-disk-cdrom-grub.ldargs
> +++ b/tests/bhyvexml2argvdata/bhyvexml2argv-disk-cdrom-grub.ldargs
> @@ -1,4 +1,5 @@
> /usr/local/sbin/grub-bhyve \
> --root cd \
> --device-map '<device.map>' \
> ---memory 214 bhyve
> +--memory 214 \
> +bhyve
> diff --git a/tests/bhyvexml2argvdata/bhyvexml2argv-disk-cdrom.args b/tests/bhyvexml2argvdata/bhyvexml2argv-disk-cdrom.args
> index 3e61b8fc8a..fd36515efc 100644
> --- a/tests/bhyvexml2argvdata/bhyvexml2argv-disk-cdrom.args
> +++ b/tests/bhyvexml2argvdata/bhyvexml2argv-disk-cdrom.args
> @@ -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
> diff --git a/tests/bhyvexml2argvdata/bhyvexml2argv-disk-cdrom.ldargs b/tests/bhyvexml2argvdata/bhyvexml2argv-disk-cdrom.ldargs
> index 24e0bc2bd9..b31d65cd06 100644
> --- a/tests/bhyvexml2argvdata/bhyvexml2argv-disk-cdrom.ldargs
> +++ b/tests/bhyvexml2argvdata/bhyvexml2argv-disk-cdrom.ldargs
> @@ -1,3 +1,4 @@
> /usr/sbin/bhyveload \
> -m 214 \
> --d /tmp/cdrom.iso bhyve
> +-d /tmp/cdrom.iso \
> +bhyve
> diff --git a/tests/bhyvexml2argvdata/bhyvexml2argv-disk-virtio.args b/tests/bhyvexml2argvdata/bhyvexml2argv-disk-virtio.args
> index 4dcc40404b..3ee9614733 100644
> --- a/tests/bhyvexml2argvdata/bhyvexml2argv-disk-virtio.args
> +++ b/tests/bhyvexml2argvdata/bhyvexml2argv-disk-virtio.args
> @@ -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
> diff --git a/tests/bhyvexml2argvdata/bhyvexml2argv-disk-virtio.ldargs b/tests/bhyvexml2argvdata/bhyvexml2argv-disk-virtio.ldargs
> index 32538b558e..91f9658137 100644
> --- a/tests/bhyvexml2argvdata/bhyvexml2argv-disk-virtio.ldargs
> +++ b/tests/bhyvexml2argvdata/bhyvexml2argv-disk-virtio.ldargs
> @@ -1,3 +1,4 @@
> /usr/sbin/bhyveload \
> -m 214 \
> --d /tmp/freebsd.img bhyve
> +-d /tmp/freebsd.img \
> +bhyve
> diff --git a/tests/bhyvexml2argvdata/bhyvexml2argv-firmware-efi.args b/tests/bhyvexml2argvdata/bhyvexml2argv-firmware-efi.args
> index 2f5aa4d783..b343469d19 100644
> --- a/tests/bhyvexml2argvdata/bhyvexml2argv-firmware-efi.args
> +++ b/tests/bhyvexml2argvdata/bhyvexml2argv-firmware-efi.args
> @@ -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
> diff --git a/tests/bhyvexml2argvdata/bhyvexml2argv-fs-9p-readonly.args b/tests/bhyvexml2argvdata/bhyvexml2argv-fs-9p-readonly.args
> index bfcd88e366..de986b4eb6 100644
> --- a/tests/bhyvexml2argvdata/bhyvexml2argv-fs-9p-readonly.args
> +++ b/tests/bhyvexml2argvdata/bhyvexml2argv-fs-9p-readonly.args
> @@ -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
> diff --git a/tests/bhyvexml2argvdata/bhyvexml2argv-fs-9p-readonly.ldargs b/tests/bhyvexml2argvdata/bhyvexml2argv-fs-9p-readonly.ldargs
> index 32538b558e..91f9658137 100644
> --- a/tests/bhyvexml2argvdata/bhyvexml2argv-fs-9p-readonly.ldargs
> +++ b/tests/bhyvexml2argvdata/bhyvexml2argv-fs-9p-readonly.ldargs
> @@ -1,3 +1,4 @@
> /usr/sbin/bhyveload \
> -m 214 \
> --d /tmp/freebsd.img bhyve
> +-d /tmp/freebsd.img \
> +bhyve
> diff --git a/tests/bhyvexml2argvdata/bhyvexml2argv-fs-9p.args b/tests/bhyvexml2argvdata/bhyvexml2argv-fs-9p.args
> index e890f7400b..8943ae211f 100644
> --- a/tests/bhyvexml2argvdata/bhyvexml2argv-fs-9p.args
> +++ b/tests/bhyvexml2argvdata/bhyvexml2argv-fs-9p.args
> @@ -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
> diff --git a/tests/bhyvexml2argvdata/bhyvexml2argv-fs-9p.ldargs b/tests/bhyvexml2argvdata/bhyvexml2argv-fs-9p.ldargs
> index 32538b558e..91f9658137 100644
> --- a/tests/bhyvexml2argvdata/bhyvexml2argv-fs-9p.ldargs
> +++ b/tests/bhyvexml2argvdata/bhyvexml2argv-fs-9p.ldargs
> @@ -1,3 +1,4 @@
> /usr/sbin/bhyveload \
> -m 214 \
> --d /tmp/freebsd.img bhyve
> +-d /tmp/freebsd.img \
> +bhyve
> diff --git a/tests/bhyvexml2argvdata/bhyvexml2argv-grub-bootorder.args b/tests/bhyvexml2argvdata/bhyvexml2argv-grub-bootorder.args
> index e64e67b39d..1c400e1a7c 100644
> --- a/tests/bhyvexml2argvdata/bhyvexml2argv-grub-bootorder.args
> +++ b/tests/bhyvexml2argvdata/bhyvexml2argv-grub-bootorder.args
> @@ -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
> diff --git a/tests/bhyvexml2argvdata/bhyvexml2argv-grub-bootorder.ldargs b/tests/bhyvexml2argvdata/bhyvexml2argv-grub-bootorder.ldargs
> index 7d9a5155a1..9a50cf6537 100644
> --- a/tests/bhyvexml2argvdata/bhyvexml2argv-grub-bootorder.ldargs
> +++ b/tests/bhyvexml2argvdata/bhyvexml2argv-grub-bootorder.ldargs
> @@ -1,4 +1,5 @@
> /usr/local/sbin/grub-bhyve \
> --root hd0,msdos1 \
> --device-map '<device.map>' \
> ---memory 214 bhyve
> +--memory 214 \
> +bhyve
> diff --git a/tests/bhyvexml2argvdata/bhyvexml2argv-grub-bootorder2.args b/tests/bhyvexml2argvdata/bhyvexml2argv-grub-bootorder2.args
> index 872a69df3b..a09338d004 100644
> --- a/tests/bhyvexml2argvdata/bhyvexml2argv-grub-bootorder2.args
> +++ b/tests/bhyvexml2argvdata/bhyvexml2argv-grub-bootorder2.args
> @@ -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
> diff --git a/tests/bhyvexml2argvdata/bhyvexml2argv-grub-bootorder2.ldargs b/tests/bhyvexml2argvdata/bhyvexml2argv-grub-bootorder2.ldargs
> index 7d9a5155a1..9a50cf6537 100644
> --- a/tests/bhyvexml2argvdata/bhyvexml2argv-grub-bootorder2.ldargs
> +++ b/tests/bhyvexml2argvdata/bhyvexml2argv-grub-bootorder2.ldargs
> @@ -1,4 +1,5 @@
> /usr/local/sbin/grub-bhyve \
> --root hd0,msdos1 \
> --device-map '<device.map>' \
> ---memory 214 bhyve
> +--memory 214 \
> +bhyve
> diff --git a/tests/bhyvexml2argvdata/bhyvexml2argv-grub-defaults.args b/tests/bhyvexml2argvdata/bhyvexml2argv-grub-defaults.args
> index 3ba5c11608..91c06e3e3a 100644
> --- a/tests/bhyvexml2argvdata/bhyvexml2argv-grub-defaults.args
> +++ b/tests/bhyvexml2argvdata/bhyvexml2argv-grub-defaults.args
> @@ -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
> diff --git a/tests/bhyvexml2argvdata/bhyvexml2argv-grub-defaults.ldargs b/tests/bhyvexml2argvdata/bhyvexml2argv-grub-defaults.ldargs
> index 7d9a5155a1..9a50cf6537 100644
> --- a/tests/bhyvexml2argvdata/bhyvexml2argv-grub-defaults.ldargs
> +++ b/tests/bhyvexml2argvdata/bhyvexml2argv-grub-defaults.ldargs
> @@ -1,4 +1,5 @@
> /usr/local/sbin/grub-bhyve \
> --root hd0,msdos1 \
> --device-map '<device.map>' \
> ---memory 214 bhyve
> +--memory 214 \
> +bhyve
> diff --git a/tests/bhyvexml2argvdata/bhyvexml2argv-input-xhci-tablet.args b/tests/bhyvexml2argvdata/bhyvexml2argv-input-xhci-tablet.args
> index b1c0c94d03..dfe1334edd 100644
> --- a/tests/bhyvexml2argvdata/bhyvexml2argv-input-xhci-tablet.args
> +++ b/tests/bhyvexml2argvdata/bhyvexml2argv-input-xhci-tablet.args
> @@ -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
> diff --git a/tests/bhyvexml2argvdata/bhyvexml2argv-input-xhci-tablet.ldargs b/tests/bhyvexml2argvdata/bhyvexml2argv-input-xhci-tablet.ldargs
> index 32538b558e..91f9658137 100644
> --- a/tests/bhyvexml2argvdata/bhyvexml2argv-input-xhci-tablet.ldargs
> +++ b/tests/bhyvexml2argvdata/bhyvexml2argv-input-xhci-tablet.ldargs
> @@ -1,3 +1,4 @@
> /usr/sbin/bhyveload \
> -m 214 \
> --d /tmp/freebsd.img bhyve
> +-d /tmp/freebsd.img \
> +bhyve
> diff --git a/tests/bhyvexml2argvdata/bhyvexml2argv-isa-controller.args b/tests/bhyvexml2argvdata/bhyvexml2argv-isa-controller.args
> index 910d1bbcfa..498455275a 100644
> --- a/tests/bhyvexml2argvdata/bhyvexml2argv-isa-controller.args
> +++ b/tests/bhyvexml2argvdata/bhyvexml2argv-isa-controller.args
> @@ -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
> diff --git a/tests/bhyvexml2argvdata/bhyvexml2argv-isa-controller.ldargs b/tests/bhyvexml2argvdata/bhyvexml2argv-isa-controller.ldargs
> index 32538b558e..91f9658137 100644
> --- a/tests/bhyvexml2argvdata/bhyvexml2argv-isa-controller.ldargs
> +++ b/tests/bhyvexml2argvdata/bhyvexml2argv-isa-controller.ldargs
> @@ -1,3 +1,4 @@
> /usr/sbin/bhyveload \
> -m 214 \
> --d /tmp/freebsd.img bhyve
> +-d /tmp/freebsd.img \
> +bhyve
> diff --git a/tests/bhyvexml2argvdata/bhyvexml2argv-localtime.args b/tests/bhyvexml2argvdata/bhyvexml2argv-localtime.args
> index 307d888c1f..e4f66080b9 100644
> --- a/tests/bhyvexml2argvdata/bhyvexml2argv-localtime.args
> +++ b/tests/bhyvexml2argvdata/bhyvexml2argv-localtime.args
> @@ -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
> diff --git a/tests/bhyvexml2argvdata/bhyvexml2argv-localtime.ldargs b/tests/bhyvexml2argvdata/bhyvexml2argv-localtime.ldargs
> index 32538b558e..91f9658137 100644
> --- a/tests/bhyvexml2argvdata/bhyvexml2argv-localtime.ldargs
> +++ b/tests/bhyvexml2argvdata/bhyvexml2argv-localtime.ldargs
> @@ -1,3 +1,4 @@
> /usr/sbin/bhyveload \
> -m 214 \
> --d /tmp/freebsd.img bhyve
> +-d /tmp/freebsd.img \
> +bhyve
> diff --git a/tests/bhyvexml2argvdata/bhyvexml2argv-macaddr.args b/tests/bhyvexml2argvdata/bhyvexml2argv-macaddr.args
> index 5e13a9742d..c17f216cb6 100644
> --- a/tests/bhyvexml2argvdata/bhyvexml2argv-macaddr.args
> +++ b/tests/bhyvexml2argvdata/bhyvexml2argv-macaddr.args
> @@ -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
> diff --git a/tests/bhyvexml2argvdata/bhyvexml2argv-macaddr.ldargs b/tests/bhyvexml2argvdata/bhyvexml2argv-macaddr.ldargs
> index 32538b558e..91f9658137 100644
> --- a/tests/bhyvexml2argvdata/bhyvexml2argv-macaddr.ldargs
> +++ b/tests/bhyvexml2argvdata/bhyvexml2argv-macaddr.ldargs
> @@ -1,3 +1,4 @@
> /usr/sbin/bhyveload \
> -m 214 \
> --d /tmp/freebsd.img bhyve
> +-d /tmp/freebsd.img \
> +bhyve
> diff --git a/tests/bhyvexml2argvdata/bhyvexml2argv-msrs.args b/tests/bhyvexml2argvdata/bhyvexml2argv-msrs.args
> index dbe377421b..4b0e28ba41 100644
> --- a/tests/bhyvexml2argvdata/bhyvexml2argv-msrs.args
> +++ b/tests/bhyvexml2argvdata/bhyvexml2argv-msrs.args
> @@ -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
> diff --git a/tests/bhyvexml2argvdata/bhyvexml2argv-msrs.ldargs b/tests/bhyvexml2argvdata/bhyvexml2argv-msrs.ldargs
> index 32538b558e..91f9658137 100644
> --- a/tests/bhyvexml2argvdata/bhyvexml2argv-msrs.ldargs
> +++ b/tests/bhyvexml2argvdata/bhyvexml2argv-msrs.ldargs
> @@ -1,3 +1,4 @@
> /usr/sbin/bhyveload \
> -m 214 \
> --d /tmp/freebsd.img bhyve
> +-d /tmp/freebsd.img \
> +bhyve
> diff --git a/tests/bhyvexml2argvdata/bhyvexml2argv-net-e1000.args b/tests/bhyvexml2argvdata/bhyvexml2argv-net-e1000.args
> index 09e30db46e..f6f45bdf43 100644
> --- a/tests/bhyvexml2argvdata/bhyvexml2argv-net-e1000.args
> +++ b/tests/bhyvexml2argvdata/bhyvexml2argv-net-e1000.args
> @@ -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
> diff --git a/tests/bhyvexml2argvdata/bhyvexml2argv-net-e1000.ldargs b/tests/bhyvexml2argvdata/bhyvexml2argv-net-e1000.ldargs
> index 32538b558e..91f9658137 100644
> --- a/tests/bhyvexml2argvdata/bhyvexml2argv-net-e1000.ldargs
> +++ b/tests/bhyvexml2argvdata/bhyvexml2argv-net-e1000.ldargs
> @@ -1,3 +1,4 @@
> /usr/sbin/bhyveload \
> -m 214 \
> --d /tmp/freebsd.img bhyve
> +-d /tmp/freebsd.img \
> +bhyve
> diff --git a/tests/bhyvexml2argvdata/bhyvexml2argv-serial-grub-nocons.args b/tests/bhyvexml2argvdata/bhyvexml2argv-serial-grub-nocons.args
> index 02846cb893..050452cfa2 100644
> --- a/tests/bhyvexml2argvdata/bhyvexml2argv-serial-grub-nocons.args
> +++ b/tests/bhyvexml2argvdata/bhyvexml2argv-serial-grub-nocons.args
> @@ -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
> diff --git a/tests/bhyvexml2argvdata/bhyvexml2argv-serial-grub-nocons.ldargs b/tests/bhyvexml2argvdata/bhyvexml2argv-serial-grub-nocons.ldargs
> index 7d9a5155a1..9a50cf6537 100644
> --- a/tests/bhyvexml2argvdata/bhyvexml2argv-serial-grub-nocons.ldargs
> +++ b/tests/bhyvexml2argvdata/bhyvexml2argv-serial-grub-nocons.ldargs
> @@ -1,4 +1,5 @@
> /usr/local/sbin/grub-bhyve \
> --root hd0,msdos1 \
> --device-map '<device.map>' \
> ---memory 214 bhyve
> +--memory 214 \
> +bhyve
> diff --git a/tests/bhyvexml2argvdata/bhyvexml2argv-serial-grub.args b/tests/bhyvexml2argvdata/bhyvexml2argv-serial-grub.args
> index e4712b448c..f51fa0834c 100644
> --- a/tests/bhyvexml2argvdata/bhyvexml2argv-serial-grub.args
> +++ b/tests/bhyvexml2argvdata/bhyvexml2argv-serial-grub.args
> @@ -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
> diff --git a/tests/bhyvexml2argvdata/bhyvexml2argv-serial-grub.ldargs b/tests/bhyvexml2argvdata/bhyvexml2argv-serial-grub.ldargs
> index 1ee7fd4cdf..10f8d92e6c 100644
> --- a/tests/bhyvexml2argvdata/bhyvexml2argv-serial-grub.ldargs
> +++ b/tests/bhyvexml2argvdata/bhyvexml2argv-serial-grub.ldargs
> @@ -2,4 +2,5 @@
> --root hd0,msdos1 \
> --device-map '<device.map>' \
> --memory 214 \
> ---cons-dev /dev/nmdm0A bhyve
> +--cons-dev /dev/nmdm0A \
> +bhyve
> diff --git a/tests/bhyvexml2argvdata/bhyvexml2argv-serial.args b/tests/bhyvexml2argvdata/bhyvexml2argv-serial.args
> index f45a190137..df12646a88 100644
> --- a/tests/bhyvexml2argvdata/bhyvexml2argv-serial.args
> +++ b/tests/bhyvexml2argvdata/bhyvexml2argv-serial.args
> @@ -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
> diff --git a/tests/bhyvexml2argvdata/bhyvexml2argv-serial.ldargs b/tests/bhyvexml2argvdata/bhyvexml2argv-serial.ldargs
> index 32538b558e..91f9658137 100644
> --- a/tests/bhyvexml2argvdata/bhyvexml2argv-serial.ldargs
> +++ b/tests/bhyvexml2argvdata/bhyvexml2argv-serial.ldargs
> @@ -1,3 +1,4 @@
> /usr/sbin/bhyveload \
> -m 214 \
> --d /tmp/freebsd.img bhyve
> +-d /tmp/freebsd.img \
> +bhyve
> diff --git a/tests/bhyvexml2argvdata/bhyvexml2argv-sound.args b/tests/bhyvexml2argvdata/bhyvexml2argv-sound.args
> index 05ff4965dd..8a99690ae5 100644
> --- a/tests/bhyvexml2argvdata/bhyvexml2argv-sound.args
> +++ b/tests/bhyvexml2argvdata/bhyvexml2argv-sound.args
> @@ -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
> diff --git a/tests/bhyvexml2argvdata/bhyvexml2argv-sound.ldargs b/tests/bhyvexml2argvdata/bhyvexml2argv-sound.ldargs
> index 32538b558e..91f9658137 100644
> --- a/tests/bhyvexml2argvdata/bhyvexml2argv-sound.ldargs
> +++ b/tests/bhyvexml2argvdata/bhyvexml2argv-sound.ldargs
> @@ -1,3 +1,4 @@
> /usr/sbin/bhyveload \
> -m 214 \
> --d /tmp/freebsd.img bhyve
> +-d /tmp/freebsd.img \
> +bhyve
> diff --git a/tests/bhyvexml2argvdata/bhyvexml2argv-uefi.args b/tests/bhyvexml2argvdata/bhyvexml2argv-uefi.args
> index 937b066e8c..22a21065db 100644
> --- a/tests/bhyvexml2argvdata/bhyvexml2argv-uefi.args
> +++ b/tests/bhyvexml2argvdata/bhyvexml2argv-uefi.args
> @@ -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
> diff --git a/tests/bhyvexml2argvdata/bhyvexml2argv-vnc-autoport.args b/tests/bhyvexml2argvdata/bhyvexml2argv-vnc-autoport.args
> index 551469dabe..8b692c1877 100644
> --- a/tests/bhyvexml2argvdata/bhyvexml2argv-vnc-autoport.args
> +++ b/tests/bhyvexml2argvdata/bhyvexml2argv-vnc-autoport.args
> @@ -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
> diff --git a/tests/bhyvexml2argvdata/bhyvexml2argv-vnc-password.args b/tests/bhyvexml2argvdata/bhyvexml2argv-vnc-password.args
> index b3b1c244be..682b03b2e0 100644
> --- a/tests/bhyvexml2argvdata/bhyvexml2argv-vnc-password.args
> +++ b/tests/bhyvexml2argvdata/bhyvexml2argv-vnc-password.args
> @@ -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
> diff --git a/tests/bhyvexml2argvdata/bhyvexml2argv-vnc-resolution.args b/tests/bhyvexml2argvdata/bhyvexml2argv-vnc-resolution.args
> index 5e54da6ed7..4b4d62a68c 100644
> --- a/tests/bhyvexml2argvdata/bhyvexml2argv-vnc-resolution.args
> +++ b/tests/bhyvexml2argvdata/bhyvexml2argv-vnc-resolution.args
> @@ -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
> diff --git a/tests/bhyvexml2argvdata/bhyvexml2argv-vnc-vgaconf-io.args b/tests/bhyvexml2argvdata/bhyvexml2argv-vnc-vgaconf-io.args
> index 47022e84cf..960b2dfe5e 100644
> --- a/tests/bhyvexml2argvdata/bhyvexml2argv-vnc-vgaconf-io.args
> +++ b/tests/bhyvexml2argvdata/bhyvexml2argv-vnc-vgaconf-io.args
> @@ -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
> diff --git a/tests/bhyvexml2argvdata/bhyvexml2argv-vnc-vgaconf-off.args b/tests/bhyvexml2argvdata/bhyvexml2argv-vnc-vgaconf-off.args
> index 923098f3db..0639161ad0 100644
> --- a/tests/bhyvexml2argvdata/bhyvexml2argv-vnc-vgaconf-off.args
> +++ b/tests/bhyvexml2argvdata/bhyvexml2argv-vnc-vgaconf-off.args
> @@ -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
> diff --git a/tests/bhyvexml2argvdata/bhyvexml2argv-vnc-vgaconf-on.args b/tests/bhyvexml2argvdata/bhyvexml2argv-vnc-vgaconf-on.args
> index 9225f5d133..caa9b0e9a6 100644
> --- a/tests/bhyvexml2argvdata/bhyvexml2argv-vnc-vgaconf-on.args
> +++ b/tests/bhyvexml2argvdata/bhyvexml2argv-vnc-vgaconf-on.args
> @@ -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
> diff --git a/tests/bhyvexml2argvdata/bhyvexml2argv-vnc.args b/tests/bhyvexml2argvdata/bhyvexml2argv-vnc.args
> index cd7a543265..0301aa666e 100644
> --- a/tests/bhyvexml2argvdata/bhyvexml2argv-vnc.args
> +++ b/tests/bhyvexml2argvdata/bhyvexml2argv-vnc.args
> @@ -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
> diff --git a/tests/bhyvexml2argvdata/bhyvexml2argv-wired.args b/tests/bhyvexml2argvdata/bhyvexml2argv-wired.args
> index 13d4f49095..f2c415ece5 100644
> --- a/tests/bhyvexml2argvdata/bhyvexml2argv-wired.args
> +++ b/tests/bhyvexml2argvdata/bhyvexml2argv-wired.args
> @@ -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
> diff --git a/tests/bhyvexml2argvdata/bhyvexml2argv-wired.ldargs b/tests/bhyvexml2argvdata/bhyvexml2argv-wired.ldargs
> index 32538b558e..91f9658137 100644
> --- a/tests/bhyvexml2argvdata/bhyvexml2argv-wired.ldargs
> +++ b/tests/bhyvexml2argvdata/bhyvexml2argv-wired.ldargs
> @@ -1,3 +1,4 @@
> /usr/sbin/bhyveload \
> -m 214 \
> --d /tmp/freebsd.img bhyve
> +-d /tmp/freebsd.img \
> +bhyve
> diff --git a/tests/bhyvexml2argvtest.c b/tests/bhyvexml2argvtest.c
> index 34e40a6438..c4fe4ef17a 100644
> --- a/tests/bhyvexml2argvtest.c
> +++ b/tests/bhyvexml2argvtest.c
> @@ -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) {
> --
> 2.30.2
>
Attachment:
signature.asc
Description: PGP signature
