"-display none" is a more generic option that is always available,
unlike "-vnc none", so use it instead of probing for the existence
of -vnc.
This mostly reverts commit 0f982a8c1e2242483a9bf53b15f825d1ff0bccc6,
"x86/run: Specify "-vnc none" for QEMU if and only if QEMU supports VNC",
though without reintroducing the bug and with some conflicts that
happened in the meanwhile.
Signed-off-by: Paolo Bonzini <pbonzini@xxxxxxxxxx>
---
x86/run | 10 +---------
1 file changed, 1 insertion(+), 9 deletions(-)
diff --git a/x86/run b/x86/run
index 2e2afbe0..dd38f14c 100755
--- a/x86/run
+++ b/x86/run
@@ -37,20 +37,12 @@ else
pc_testdev="-device testdev,chardev=testlog -chardev file,id=testlog,path=msr.out"
fi
-if
- ${qemu} -vnc '?' 2>&1 | grep -F "vnc options" > /dev/null;
-then
- vnc_none="-vnc none"
-else
- vnc_none=""
-fi
-
# Discard lost ticks from the Programmable Interval Timer (PIT, a.k.a 8254), as
# enabling KVM's re-injection mode inhibits (x2)AVIC, i.e. prevents validating
# (x2)AVIC. Note, the realmode test relies on the PIT, but not re-injection.
pit="-global kvm-pit.lost_tick_policy=discard"
-command="${qemu} --no-reboot -nodefaults $pit $pc_testdev $vnc_none -serial stdio $pci_testdev"
+command="${qemu} --no-reboot -nodefaults $pit $pc_testdev -display none -serial stdio $pci_testdev"
command+=" -machine accel=$ACCEL$ACCEL_PROPS"
if [ "${CONFIG_EFI}" != y ]; then
command+=" -kernel"
--
2.50.0
