From dc9f764baa52d77b7b571f42c2a118d14971faad Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marta=20Marczykowska-G=C3=B3recka?= Date: Tue, 6 Feb 2018 15:47:00 +0100 Subject: [PATCH 1/2] Fixed error in creating new VMs from GUI Virt mode was forcibly set to HVM. Now, the virt mode is left as default, unless a standalone VM with system installed from elsewhere is selected. fixes QubesOS/qubes-issues#3515 --- qubesmanager/create_new_vm.py | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/qubesmanager/create_new_vm.py b/qubesmanager/create_new_vm.py index f33e8fe..d8f22a4 100644 --- a/qubesmanager/create_new_vm.py +++ b/qubesmanager/create_new_vm.py @@ -120,8 +120,10 @@ class NewVmDlg(QtGui.QDialog, Ui_NewVMDlg): properties = {} properties['provides_network'] = self.provides_network.isChecked() - properties['virt_mode'] = 'hvm' properties['netvm'] = self.netvm_list[self.netvm.currentIndex()] + if self.install_system.isChecked(): + properties['virt_mode'] = 'hvm' + properties['kernel'] = 'none' thread_monitor = ThreadMonitor() thread = threading.Thread(target=self.do_create_vm, From c1bb8ba2ad2b4959d151ea97ba72238e0e061372 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marta=20Marczykowska-G=C3=B3recka?= Date: Sat, 10 Feb 2018 23:34:59 +0100 Subject: [PATCH 2/2] Bugfixed According to @marmarek's request --- qubesmanager/create_new_vm.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/qubesmanager/create_new_vm.py b/qubesmanager/create_new_vm.py index d8f22a4..97bba22 100644 --- a/qubesmanager/create_new_vm.py +++ b/qubesmanager/create_new_vm.py @@ -123,7 +123,7 @@ class NewVmDlg(QtGui.QDialog, Ui_NewVMDlg): properties['netvm'] = self.netvm_list[self.netvm.currentIndex()] if self.install_system.isChecked(): properties['virt_mode'] = 'hvm' - properties['kernel'] = 'none' + properties['kernel'] = None thread_monitor = ThreadMonitor() thread = threading.Thread(target=self.do_create_vm,