summaryrefslogtreecommitdiffstats
path: root/scripts/qemucommand.py
diff options
context:
space:
mode:
authorEugene Smirnov <30469026+eu-smirnov@users.noreply.github.com>2019-08-12 14:42:13 +0200
committerGitHub <noreply@github.com>2019-08-12 14:42:13 +0200
commit992180365c03993cb74b4206d6a119e1e8bd9a2f (patch)
treeeea6e6c3c69c2ce5f1caf13bde6197b7195d7868 /scripts/qemucommand.py
parentb8215f4512dc5a5e92da738bb44eb974a7e0d11a (diff)
parentc6ad1d288b8f930bbc3fa6de9e102209e3304c66 (diff)
downloadmeta-updater-992180365c03993cb74b4206d6a119e1e8bd9a2f.tar.gz
Merge pull request #578 from advancedtelematic/fix/qemucommand
qemucommand.py: redirect qemu monitor to null chardev
Diffstat (limited to 'scripts/qemucommand.py')
-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: