Qubes/manager
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fix logic about VM "running" state

Browse Source 
Qubes manager used different logic what it considers as "running VM",
than qubes core.
Here it was "running or starting/stopping", while qubes core uses the
same as libvirt (isActive()), which effectively means "not halted" -
which includes also "paused" and "suspended". This creates a lot
confusion in which action should be available when.

The actual detected bug was about resuming paused VM. There was assert
"not vm.is_running()", while the paused VM _is_ running in terms of
qubes core.

Fixes qubesos/qubes-issues#981
This commit is contained in:
Marek Marczykowski-Górecki 2015-05-04 01:29:20 +02:00
parent f6941bd3d3
commit 14c7a9250c
2 changed files with 21 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
qubesmanager/main.py
View File

@ -597,7 +597,7 @@ class VmManagerWindow(Ui_VmManagerWindow, QMainWindow):
vms_list = [vm for vm in self.qvm_collection.values()] vms_list = [vm for vm in self.qvm_collection.values()]
for vm in vms_list: for vm in vms_list:
vm.last_power_state = vm.get_power_state() vm.last_power_state = vm.get_power_state()
vm.last_running = vm.last_power_state in ["Running", "Transient"] vm.last_running = vm.is_running()
if vm.last_running: if vm.last_running:
running_count += 1 running_count += 1
if vm.internal: if vm.internal:
@ -691,7 +691,7 @@ class VmManagerWindow(Ui_VmManagerWindow, QMainWindow):
self.clear_error(vm.qid) self.clear_error(vm.qid)
prev_running = vm.last_running prev_running = vm.last_running
vm.last_power_state = state vm.last_power_state = state
vm.last_running = (state in ["Running", "Transient"]) vm.last_running = vm.is_running()
self.update_audio_rec_info(vm) self.update_audio_rec_info(vm)
if not prev_running and vm.last_running: if not prev_running and vm.last_running:
self.running_vms_count += 1 self.running_vms_count += 1
@ -850,7 +850,8 @@ class VmManagerWindow(Ui_VmManagerWindow, QMainWindow):
not vm.installed_by_rpm and not vm.last_running) not vm.installed_by_rpm and not vm.last_running)
self.action_clonevm.setEnabled( self.action_clonevm.setEnabled(
not vm.last_running and not vm.is_netvm()) not vm.last_running and not vm.is_netvm())
self.action_resumevm.setEnabled(not vm.last_running) self.action_resumevm.setEnabled(not vm.last_running or
vm.last_power_state == "Paused")
try: try:
self.action_startvm_tools_install.setVisible( self.action_startvm_tools_install.setVisible(
isinstance(vm, QubesHVm)) isinstance(vm, QubesHVm))
@ -858,12 +859,19 @@ class VmManagerWindow(Ui_VmManagerWindow, QMainWindow):
# ignore non existing QubesHVm # ignore non existing QubesHVm
pass pass
self.action_startvm_tools_install.setEnabled(not vm.last_running) self.action_startvm_tools_install.setEnabled(not vm.last_running)
self.action_pausevm.setEnabled(vm.last_running and vm.qid != 0) self.action_pausevm.setEnabled(
self.action_shutdownvm.setEnabled(vm.last_running and vm.qid != 0) vm.last_running and
vm.last_power_state != "Paused" and
vm.qid != 0)
self.action_shutdownvm.setEnabled(
vm.last_running and
vm.last_power_state != "Paused" and
vm.qid != 0)
self.action_killvm.setEnabled((vm.last_running or self.action_killvm.setEnabled((vm.last_running or
vm.last_power_state == "Paused") and vm.last_power_state == "Paused") and
vm.qid != 0) vm.qid != 0)
self.action_appmenus.setEnabled(not vm.is_netvm()) self.action_appmenus.setEnabled(not vm.internal and
not vm.is_disposablevm())
self.action_editfwrules.setEnabled(vm.is_networked() and not ( self.action_editfwrules.setEnabled(vm.is_networked() and not (
vm.is_netvm() and not vm.is_proxyvm())) vm.is_netvm() and not vm.is_proxyvm()))
self.action_updatevm.setEnabled(vm.is_updateable() or vm.qid == 0) self.action_updatevm.setEnabled(vm.is_updateable() or vm.qid == 0)
@ -872,7 +880,9 @@ class VmManagerWindow(Ui_VmManagerWindow, QMainWindow):
self.action_run_command_in_vm.setEnabled( self.action_run_command_in_vm.setEnabled(
not vm.last_power_state == "Paused" and vm.qid != 0) not vm.last_power_state == "Paused" and vm.qid != 0)
self.action_set_keyboard_layout.setEnabled( self.action_set_keyboard_layout.setEnabled(
vm.qid != 0 and vm.last_running) vm.qid != 0 and
vm.last_running and
vm.last_power_state != "Paused")
else: else:
self.action_settings.setEnabled(False) self.action_settings.setEnabled(False)
self.action_removevm.setEnabled(False) self.action_removevm.setEnabled(False)
@ -1097,16 +1107,16 @@ class VmManagerWindow(Ui_VmManagerWindow, QMainWindow):
@pyqtSlot(name='on_action_resumevm_triggered') @pyqtSlot(name='on_action_resumevm_triggered')
def action_resumevm_triggered(self): def action_resumevm_triggered(self):
vm = self.get_selected_vm() vm = self.get_selected_vm()
assert not vm.is_running() or vm.is_paused()
if vm.is_paused(): if vm.get_power_state() in ["Paused", "Suspended"]:
try: try:
vm.unpause() vm.resume()
except Exception as ex: except Exception as ex:
QMessageBox.warning(None, "Error unpausing VM!", QMessageBox.warning(None, "Error unpausing VM!",
"ERROR: {0}".format(ex)) "ERROR: {0}".format(ex))
return return
assert not vm.is_running()
thread_monitor = ThreadMonitor() thread_monitor = ThreadMonitor()
thread = threading.Thread(target=self.do_start_vm, thread = threading.Thread(target=self.do_start_vm,
args=(vm, thread_monitor)) args=(vm, thread_monitor))

2
qubesmanager/table_widgets.py
View File

@ -183,7 +183,7 @@ class VmStatusIcon(QLabel):
def set_on_icon(self): def set_on_icon(self):
if self.vm.last_power_state == "Running": if self.vm.last_power_state == "Running":
icon = QIcon (":/on.png") icon = QIcon (":/on.png")
elif self.vm.last_power_state in ["Paused"]: elif self.vm.last_power_state in ["Paused", "Suspended"]:
icon = QIcon (":/paused.png") icon = QIcon (":/paused.png")
elif self.vm.last_power_state in ["Transient", "Halting", "Dying"]: elif self.vm.last_power_state in ["Transient", "Halting", "Dying"]:
icon = QIcon (":/transient.png") icon = QIcon (":/transient.png")