From ad7c8f60007d89cb9b4500c5af7070a388a9647c Mon Sep 17 00:00:00 2001 From: Eugene Smirnov Date: Tue, 6 Aug 2019 12:31:36 +0200 Subject: qemucommand.py: redirect qemu monitor to null chardev By default qemu monitor gets attached to stdio, and that interferes with the test output. We also don't need vga options in nographic mode. Signed-off-by: Eugene Smirnov (cherry-picked from commit c6ad1d288b8f930bbc3fa6de9e102209e3304c66) --- scripts/qemucommand.py | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) (limited to 'scripts') diff --git a/scripts/qemucommand.py b/scripts/qemucommand.py index daf2dd1..df6907c 100644 --- a/scripts/qemucommand.py +++ b/scripts/qemucommand.py @@ -102,12 +102,8 @@ class QemuCommand(object): cmdline += [ "-serial", "tcp:127.0.0.1:%d,server,nowait" % self.serial_port, "-m", self.mem, - "-usb", "-object", "rng-random,id=rng0,filename=/dev/urandom", "-device", "virtio-rng-pci,rng=rng0", - "-device", "usb-tablet", - "-show-cursor", - "-vga", "std", "-net", netuser, "-net", "nic,macaddr=%s" % self.mac_address ] @@ -119,9 +115,17 @@ class QemuCommand(object): '-device', 'e1000,netdev=vlan1,mac='+random_mac(), ] if self.gui: - cmdline += ["-serial", "stdio"] + cmdline += [ + "-usb", + "-device", "usb-tablet", + "-show-cursor", + "-vga", "std" + ] else: - cmdline.append('-nographic') + cmdline += [ + "-nographic", + "-monitor", "null", + ] if self.kvm: cmdline += ['-enable-kvm', '-cpu', 'host'] else: -- cgit v1.2.3-54-g00ecf