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

Fix potential race condition in remove_vm

Browse Source 
Ensure current "vm" object.
This commit is contained in:
Marek Marczykowski 2012-07-05 01:11:39 +02:00
parent 8fbea00975
commit d02fed6fef
1 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
qubesmanager/main.py
View File

@ -1152,6 +1152,7 @@ class VmManagerWindow(Ui_VmManagerWindow, QMainWindow):
self.qvm_collection.lock_db_for_reading() self.qvm_collection.lock_db_for_reading()
self.qvm_collection.load() self.qvm_collection.load()
self.qvm_collection.unlock_db() self.qvm_collection.unlock_db()
vm = self.qvm_collection[vm.qid]
if vm.is_template(): if vm.is_template():
dependent_vms = self.qvm_collection.get_vms_based_on(vm.qid) dependent_vms = self.qvm_collection.get_vms_based_on(vm.qid)
@ -1196,6 +1197,7 @@ class VmManagerWindow(Ui_VmManagerWindow, QMainWindow):
try: try:
self.qvm_collection.lock_db_for_writing() self.qvm_collection.lock_db_for_writing()
self.qvm_collection.load() self.qvm_collection.load()
vm = self.qvm_collection[vm.qid]
#TODO: the following two conditions should really be checked by qvm_collection.pop() overload... #TODO: the following two conditions should really be checked by qvm_collection.pop() overload...
if vm.is_template() and self.qvm_collection.default_template_qid == vm.qid: if vm.is_template() and self.qvm_collection.default_template_qid == vm.qid: