Merge remote-tracking branch 'origin/master' into 2.1

This commit is contained in:
Julien Duponchelle
2017-06-21 15:13:04 +02:00
7 changed files with 15 additions and 30 deletions

View File

@ -1305,14 +1305,6 @@ class QemuVM(BaseNode):
else:
return []
def _spice_options(self):
if self._console:
return ["-spice",
"addr={},port={},disable-ticketing".format(self._manager.port_manager.console_host, self._console)]
else:
return []
def _monitor_options(self):
if self._monitor:
@ -1592,8 +1584,6 @@ class QemuVM(BaseNode):
command.extend(self._serial_options())
elif self._console_type == "vnc":
command.extend(self._vnc_options())
elif self._console_type == "spice":
command.extend(self._spice_options())
else:
raise QemuError("Console type {} is unknown".format(self._console_type))
command.extend(self._monitor_options())