arno/gns3-server
1
0
Fork 0
mirror of https://github.com/GNS3/gns3-server synced 2024-11-28 11:18:11 +00:00
Code Issues Releases Wiki Activity

Catch error when qemuy can't connect to his console

Browse Source 
Fix #803
This commit is contained in:
Julien Duponchelle 2016-11-28 13:18:04 +01:00
parent b3d83b1b0b
commit 2b15da3d19
No known key found for this signature in database
GPG Key ID: CE8B29639E07F5E8
1 changed files with 53 additions and 52 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

105
gns3server/compute/qemu/qemu_vm.py
View File

@ -852,63 +852,64 @@ class QemuVM(BaseNode):
yield from self.resume() yield from self.resume()
return return
else: if self._manager.config.get_section_config("Qemu").getboolean("monitor", True):
if self._manager.config.get_section_config("Qemu").getboolean("monitor", True):
try:
info = socket.getaddrinfo(self._monitor_host, 0, socket.AF_UNSPEC, socket.SOCK_STREAM, 0, socket.AI_PASSIVE)
if not info:
raise QemuError("getaddrinfo returns an empty list on {}".format(self._monitor_host))
for res in info:
af, socktype, proto, _, sa = res
# let the OS find an unused port for the Qemu monitor
with socket.socket(af, socktype, proto) as sock:
sock.bind(sa)
self._monitor = sock.getsockname()[1]
except OSError as e:
raise QemuError("Could not find free port for the Qemu monitor: {}".format(e))
# check if there is enough RAM to run
self.check_available_ram(self.ram)
command = yield from self._build_command()
command_string = " ".join(shlex.quote(s) for s in command)
try: try:
log.info("Starting QEMU with: {}".format(command_string)) info = socket.getaddrinfo(self._monitor_host, 0, socket.AF_UNSPEC, socket.SOCK_STREAM, 0, socket.AI_PASSIVE)
self._stdout_file = os.path.join(self.working_dir, "qemu.log") if not info:
log.info("logging to {}".format(self._stdout_file)) raise QemuError("getaddrinfo returns an empty list on {}".format(self._monitor_host))
with open(self._stdout_file, "w", encoding="utf-8") as fd: for res in info:
fd.write("Start QEMU with {}\n\nExecution log:\n".format(command_string)) af, socktype, proto, _, sa = res
self.command_line = ' '.join(command) # let the OS find an unused port for the Qemu monitor
self._process = yield from asyncio.create_subprocess_exec(*command, with socket.socket(af, socktype, proto) as sock:
stdout=fd, sock.bind(sa)
stderr=subprocess.STDOUT, self._monitor = sock.getsockname()[1]
cwd=self.working_dir) except OSError as e:
raise QemuError("Could not find free port for the Qemu monitor: {}".format(e))
if self.use_ubridge: # check if there is enough RAM to run
yield from self._start_ubridge() self.check_available_ram(self.ram)
for adapter_number, adapter in enumerate(self._ethernet_adapters):
nio = adapter.get_nio(0)
if nio:
yield from self._add_ubridge_udp_connection("QEMU-{}-{}".format(self._id, adapter_number),
self._local_udp_tunnels[adapter_number][1],
nio)
log.info('QEMU VM "{}" started PID={}'.format(self._name, self._process.pid)) command = yield from self._build_command()
self.status = "started" command_string = " ".join(shlex.quote(s) for s in command)
monitor_process(self._process, self._termination_callback) try:
except (OSError, subprocess.SubprocessError, UnicodeEncodeError) as e: log.info("Starting QEMU with: {}".format(command_string))
stdout = self.read_stdout() self._stdout_file = os.path.join(self.working_dir, "qemu.log")
log.error("Could not start QEMU {}: {}\n{}".format(self.qemu_path, e, stdout)) log.info("logging to {}".format(self._stdout_file))
raise QemuError("Could not start QEMU {}: {}\n{}".format(self.qemu_path, e, stdout)) with open(self._stdout_file, "w", encoding="utf-8") as fd:
fd.write("Start QEMU with {}\n\nExecution log:\n".format(command_string))
self.command_line = ' '.join(command)
self._process = yield from asyncio.create_subprocess_exec(*command,
stdout=fd,
stderr=subprocess.STDOUT,
cwd=self.working_dir)
yield from self._set_process_priority() if self.use_ubridge:
if self._cpu_throttling: yield from self._start_ubridge()
self._set_cpu_throttling() for adapter_number, adapter in enumerate(self._ethernet_adapters):
nio = adapter.get_nio(0)
if nio:
yield from self._add_ubridge_udp_connection("QEMU-{}-{}".format(self._id, adapter_number),
self._local_udp_tunnels[adapter_number][1],
nio)
if "-enable-kvm" in command_string: log.info('QEMU VM "{}" started PID={}'.format(self._name, self._process.pid))
self._hw_virtualization = True self.status = "started"
yield from self.start_wrap_console() monitor_process(self._process, self._termination_callback)
except (OSError, subprocess.SubprocessError, UnicodeEncodeError) as e:
stdout = self.read_stdout()
log.error("Could not start QEMU {}: {}\n{}".format(self.qemu_path, e, stdout))
raise QemuError("Could not start QEMU {}: {}\n{}".format(self.qemu_path, e, stdout))
yield from self._set_process_priority()
if self._cpu_throttling:
self._set_cpu_throttling()
if "-enable-kvm" in command_string:
self._hw_virtualization = True
try:
yield from self.start_wrap_console()
except OSError as e:
raise QemuError("Could not start QEMU console {}\n".format(e))
def _termination_callback(self, returncode): def _termination_callback(self, returncode):
""" """