aboutgitcodebugslistschat
path: root/test/demo
diff options
context:
space:
mode:
authorDavid Gibson <david@gibson.dropbear.id.au>2022-07-06 17:28:58 +1000
committerStefano Brivio <sbrivio@redhat.com>2022-07-14 01:32:42 +0200
commit7bcc5930a66ed8d6ba692a2463547d17390531e7 (patch)
tree5e02a9a14eb0b365b0899185cac55bfc4c20e15a /test/demo
parentc4d8a77512bf7e8224f3aff930ed48a680b4ea53 (diff)
downloadpasst-7bcc5930a66ed8d6ba692a2463547d17390531e7.tar
passt-7bcc5930a66ed8d6ba692a2463547d17390531e7.tar.gz
passt-7bcc5930a66ed8d6ba692a2463547d17390531e7.tar.bz2
passt-7bcc5930a66ed8d6ba692a2463547d17390531e7.tar.lz
passt-7bcc5930a66ed8d6ba692a2463547d17390531e7.tar.xz
passt-7bcc5930a66ed8d6ba692a2463547d17390531e7.tar.zst
passt-7bcc5930a66ed8d6ba692a2463547d17390531e7.zip
Invoke specific qemu-system-* binaries
A lot of tests and examples invoke qemu with the command "kvm". However, as far as I can tell, "kvm" being aliased to the appropriate qemu system binary is Debian specific. The binary names from qemu upstream - qemu-system-$ARCH - also aren't universal, but they are more common (they should be good for both Debian and Fedora at least). In order to still get KVM acceleration when available, we use the option "-M accel=kvm:tcg" to tell qemu to try using either KVM or TCG in that order A number of the places we invoked "kvm" are expecting specifically an x86 guest, and so it's also safer to explicitly invoke qemu-system-x86_64. Some others appear to be independent of the target arch (just wanting the same arch as the host to allow KVM acceleration). Although I suspect there may be more subtle x86 specific options in the qemu command lines, attempt to preserve arch independence by using $(uname -m). Signed-off-by: David Gibson <david@gibson.dropbear.id.au>
Diffstat (limited to 'test/demo')
-rw-r--r--test/demo/passt2
1 files changed, 1 insertions, 1 deletions
diff --git a/test/demo/passt b/test/demo/passt
index 7c69e94..b67ed26 100644
--- a/test/demo/passt
+++ b/test/demo/passt
@@ -103,7 +103,7 @@ nl
say back-end to passt's UNIX domain socket.
sleep 2
hout VMLINUZ echo "/boot/vmlinuz-$(uname -r)"
-guest ../passt/qrap 5 kvm -m 4096 -cpu host -smp 4 -kernel __VMLINUZ__ -initrd passt.img -nographic -serial stdio -nodefaults -append "console=ttyS0 virtio-net.napi_tx=1" -device virtio-net-pci,netdev=hostnet0,x-txburst=16384 -netdev socket,fd=5,id=hostnet0
+guest ../passt/qrap 5 qemu-system-x86_64 -enable-kvm -m 4096 -cpu host -smp 4 -kernel __VMLINUZ__ -initrd passt.img -nographic -serial stdio -nodefaults -append "console=ttyS0 virtio-net.napi_tx=1" -device virtio-net-pci,netdev=hostnet0,x-txburst=16384 -netdev socket,fd=5,id=hostnet0
sleep 10
nl