Merge branch 'master' into 1.5

This commit is contained in:
Julien Duponchelle
2016-02-08 13:14:30 +01:00
29 changed files with 167 additions and 85 deletions

View File

@ -58,6 +58,7 @@ class BaseVM:
self._hw_virtualization = False
self._ubridge_hypervisor = None
self._vm_status = "stopped"
self._command_line = ""
if self._console is not None:
if console_type == "vnc":
@ -94,6 +95,17 @@ class BaseVM:
self._vm_status = status
self._project.emit("vm.{}".format(status), self)
@property
def command_line(self):
"""Return command used to start the VM"""
return self._command_line
@command_line.setter
def command_line(self, command_line):
self._command_line = command_line
@property
def project(self):
"""