From mboxrd@z Thu Jan  1 00:00:00 1970
From: Stefano Brivio <sbrivio@redhat.com>
To: passt-dev@passt.top
Subject: [PATCH 17/22] test/lib/setup: Don't rely on IFS to properly separate
 qemu arguments
Date: Fri, 28 Jan 2022 19:33:52 +0100
Message-ID: <20220128183357.3407606-18-sbrivio@redhat.com>
In-Reply-To: <20220128183357.3407606-1-sbrivio@redhat.com>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============7369193239674116890=="

--===============7369193239674116890==
Content-Type: text/plain; charset="utf-8"
Content-Transfer-Encoding: quoted-printable

...this gets needlessly annoying while playing with test cases.

Signed-off-by: Stefano Brivio <sbrivio(a)redhat.com>
---
 test/lib/setup | 64 +++++++++++++++++++++++++-------------------------
 1 file changed, 32 insertions(+), 32 deletions(-)

diff --git a/test/lib/setup b/test/lib/setup
index 124e35b..ab51787 100755
--- a/test/lib/setup
+++ b/test/lib/setup
@@ -52,14 +52,14 @@ setup_passt() {
 	pane_run PASST "./passt ${__opts} -f -t 10001 -u 10001"
 	sleep 1
=20
-	pane_run GUEST './qrap 5 kvm -m '${VMEM}' -cpu host -smp '${VCPUS}	\
-		'-kernel' "/boot/vmlinuz-$(uname -r)"			\
-		'-initrd mbuto.img -nographic -serial stdio'		\
-		'-nodefaults '						\
-		'-append "console=3DttyS0 mitigations=3Doff apparmor=3D0 '	\
-		'virtio-net.napi_tx=3D1"'					\
-		"-device virtio-net-pci,netdev=3Dhostnet0,x-txburst=3D16384"\
-		"-netdev socket,fd=3D5,id=3Dhostnet0"
+	pane_run GUEST './qrap 5 kvm -m '${VMEM}' -cpu host -smp '${VCPUS} \
+		' -kernel ' "/boot/vmlinuz-$(uname -r)"			   \
+		' -initrd mbuto.img -nographic -serial stdio'		   \
+		' -nodefaults'						   \
+		' -append "console=3DttyS0 mitigations=3Doff apparmor=3D0 '	   \
+		'virtio-net.napi_tx=3D1"'					   \
+		" -device virtio-net-pci,netdev=3Dhostnet0,x-txburst=3D16384"  \
+		" -netdev socket,fd=3D5,id=3Dhostnet0"
 	pane_wait GUEST
 }
=20
@@ -145,14 +145,14 @@ setup_passt_in_ns() {
 	pane_run PASST "./passt -f ${__opts} -t 10001,10011,10021,10031 -u 10001,10=
011,10021,10031"
 	sleep 1
=20
-	pane_run GUEST './qrap 5 kvm -m '${VMEM}' -cpu host -smp '${VCPUS}	\
-		'-kernel' "/boot/vmlinuz-$(uname -r)"			\
-		'-initrd mbuto.img -nographic -serial stdio'		\
-		'-nodefaults '						\
-		'-append "console=3DttyS0 mitigations=3Doff apparmor=3D0 '	\
-		'virtio-net.napi_tx=3D1"'					\
-		"-device virtio-net-pci,netdev=3Dhostnet0,x-txburst=3D262144"\
-		"-netdev socket,fd=3D5,id=3Dhostnet0"
+	pane_run GUEST './qrap 5 kvm -m '${VMEM}' -cpu host -smp '${VCPUS} \
+		' -kernel ' "/boot/vmlinuz-$(uname -r)"			   \
+		' -initrd mbuto.img -nographic -serial stdio'		   \
+		' -nodefaults'						   \
+		' -append "console=3DttyS0 mitigations=3Doff apparmor=3D0 '	   \
+		'virtio-net.napi_tx=3D1"'					   \
+		" -device virtio-net-pci,netdev=3Dhostnet0,x-txburst=3D524288" \
+		" -netdev socket,fd=3D5,id=3Dhostnet0"
 	pane_wait GUEST
 }
=20
@@ -226,22 +226,22 @@ setup_two_guests() {
 	pane_run GUEST_2 'cp mbuto.img mbuto_2.img'
 	pane_wait GUEST_2
=20
-	pane_run GUEST_1 './qrap 5 kvm -m '${VMEM}' -cpu host -smp '${VCPUS}	\
-		'-kernel' "/boot/vmlinuz-$(uname -r)"			\
-		'-initrd mbuto.img -nographic -serial stdio'		\
-		'-nodefaults '						\
-		'-append "console=3DttyS0 mitigations=3Doff apparmor=3D0 '	\
-		'virtio-net.napi_tx=3D1"'					\
-		"-device virtio-net-pci,netdev=3Dhostnet0,x-txburst=3D16384"\
-		"-netdev socket,fd=3D5,id=3Dhostnet0"
-	pane_run GUEST_2 './qrap 5 kvm -m '${VMEM}' -cpu host -smp '${VCPUS}	\
-		'-kernel' "/boot/vmlinuz-$(uname -r)"			\
-		'-initrd mbuto_2.img -nographic -serial stdio'		\
-		'-nodefaults '						\
-		'-append "console=3DttyS0 mitigations=3Doff apparmor=3D0 '	\
-		'virtio-net.napi_tx=3D1"'					\
-		"-device virtio-net-pci,netdev=3Dhostnet0,x-txburst=3D16384"\
-		"-netdev socket,fd=3D5,id=3Dhostnet0"
+	pane_run GUEST_1 './qrap 5 kvm -m '${VMEM}' -cpu host -smp '${VCPUS} \
+		' -kernel ' "/boot/vmlinuz-$(uname -r)"			     \
+		' -initrd mbuto.img -nographic -serial stdio'		     \
+		' -nodefaults'						     \
+		' -append "console=3DttyS0 mitigations=3Doff apparmor=3D0 '	     \
+		'virtio-net.napi_tx=3D1"'					     \
+		" -device virtio-net-pci,netdev=3Dhostnet0,x-txburst=3D16384"    \
+		" -netdev socket,fd=3D5,id=3Dhostnet0"
+	pane_run GUEST_2 './qrap 5 kvm -m '${VMEM}' -cpu host -smp '${VCPUS} \
+		' -kernel ' "/boot/vmlinuz-$(uname -r)"			     \
+		' -initrd mbuto_2.img -nographic -serial stdio'		     \
+		' -nodefaults'						     \
+		' -append "console=3DttyS0 mitigations=3Doff apparmor=3D0 '	     \
+		'virtio-net.napi_tx=3D1"'					     \
+		" -device virtio-net-pci,netdev=3Dhostnet0,x-txburst=3D16384"    \
+		" -netdev socket,fd=3D5,id=3Dhostnet0"
 	pane_wait GUEST_1
 	pane_wait GUEST_2
 }
--=20
2.33.0


--===============7369193239674116890==--