summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEugene Smirnov <evgenii.smirnov@here.com>2019-08-06 12:31:36 +0200
committerEugene Smirnov <evgenii.smirnov@here.com>2019-08-12 13:49:08 +0200
commitc6ad1d288b8f930bbc3fa6de9e102209e3304c66 (patch)
tree83ca7089d9407f55745d6de3a84c393731f1b486
parent558c25c0f0da4ca9456162844d05b7b00b3629da (diff)
downloadmeta-updater-c6ad1d288b8f930bbc3fa6de9e102209e3304c66.tar.gz
qemucommand.py: redirect qemu monitor to null chardevfix/qemucommand
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 <evgenii.smirnov@here.com>
-rw-r--r--scripts/qemucommand.py16
1 files changed, 10 insertions, 6 deletions
diff --git a/scripts/qemucommand.py b/scripts/qemucommand.py
index 6f744e2..a869d4d 100644
--- a/scripts/qemucommand.py
+++ b/scripts/qemucommand.py
@@ -102,12 +102,8 @@ class QemuCommand(object):
102 cmdline += [ 102 cmdline += [
103 "-serial", "tcp:127.0.0.1:%d,server,nowait" % self.serial_port, 103 "-serial", "tcp:127.0.0.1:%d,server,nowait" % self.serial_port,
104 "-m", self.mem, 104 "-m", self.mem,
105 "-usb",
106 "-object", "rng-random,id=rng0,filename=/dev/urandom", 105 "-object", "rng-random,id=rng0,filename=/dev/urandom",
107 "-device", "virtio-rng-pci,rng=rng0", 106 "-device", "virtio-rng-pci,rng=rng0",
108 "-device", "usb-tablet",
109 "-show-cursor",
110 "-vga", "std",
111 "-net", netuser, 107 "-net", netuser,
112 "-net", "nic,macaddr=%s" % self.mac_address 108 "-net", "nic,macaddr=%s" % self.mac_address
113 ] 109 ]
@@ -119,9 +115,17 @@ class QemuCommand(object):
119 '-device', 'e1000,netdev=vlan1,mac='+random_mac(), 115 '-device', 'e1000,netdev=vlan1,mac='+random_mac(),
120 ] 116 ]
121 if self.gui: 117 if self.gui:
122 cmdline += ["-serial", "stdio"] 118 cmdline += [
119 "-usb",
120 "-device", "usb-tablet",
121 "-show-cursor",
122 "-vga", "std"
123 ]
123 else: 124 else:
124 cmdline.append('-nographic') 125 cmdline += [
126 "-nographic",
127 "-monitor", "null",
128 ]
125 if self.kvm: 129 if self.kvm:
126 cmdline += ['-enable-kvm', '-cpu', 'host'] 130 cmdline += ['-enable-kvm', '-cpu', 'host']
127 else: 131 else: