Use start utility instead of main from tool

Author: ben-grande

qubesmanager/bootfromdevice.py

@@ -24,7 +24,7 @@
 from PyQt6 import QtWidgets, QtGui, QtCore  # pylint: disable=import-error
 from qubesadmin import tools
 from qubesadmin import exc
-from qubesadmin.tools import qvm_start
+from qubesadmin import utils as admin_utils
 
 # this is needed for icons to actually work
 # pylint: disable=unused-import, no-name-in-module
@@ -178,7 +178,7 @@ def main(args=None):
     window = utils.run_synchronous(
         functools.partial(VMBootFromDeviceWindow, vm))
     if window.result() == 1 and window.cdrom_location is not None:
-        qvm_start.main(['--cdrom', window.cdrom_location, vm.name])
+        admin_utils.start_expert(domain=vm, drive="cdrom:" + window.cdrom_location)
 
 if __name__ == "__main__":
     main()

qubesmanager/qube_manager.py

@@ -31,7 +31,6 @@
 
 from qubesadmin import exc
 from qubesadmin import utils
-from qubesadmin.tools import qvm_start
 
 # pylint: disable=import-error
 from PyQt6 import QtWidgets
@@ -1613,8 +1612,9 @@ def action_startvm_tools_install_triggered(self):
                     self.tr("'qubes-windows-tools' is not installed in dom0."))
         for vm_info in self.get_selected_vms():
             vm = vm_info.vm
-            qvm_start.main(['--cdrom',
-                'dom0:/usr/lib/qubes/qubes-windows-tools.iso', vm.name])
+            utils.start_expert(
+                domain=vm, drive="cdrom:dom0:/usr/lib/qubes/qubes-windows-tools.iso"
+            )
 
     @pyqtSlot(name='on_action_pausevm_triggered')
     def action_pausevm_triggered(self):

qubesmanager/settings.py

@@ -34,7 +34,6 @@
 from qubesadmin import device_protocol
 from qubesadmin.device_protocol import DeviceCategory
 from qubesadmin import utils as admin_utils
-from qubesadmin.tools import qvm_start
 import qubesadmin.exc
 
 from . import bootfromdevice
@@ -1393,7 +1392,9 @@ def boot_from_cdrom_button_pressed(self):
         )
         if boot_dialog.exec():
             self.save_and_apply()
-            qvm_start.main(["--cdrom", boot_dialog.cdrom_location, self.vm.name])
+            admin_utils.start_expert(
+                domain=self.vm, drive="cdrom:" + boot_dialog.cdrom_location
+            )
 
     def virt_mode_changed(self, new_idx):  # pylint: disable=unused-argument
         self.update_pv_warning()

qubesmanager/tests/test_vm_settings.py

@@ -1101,7 +1101,7 @@ def test_211_virtmode(settings_fixture):
     assert expected_call in settings_window.qubesapp.actual_calls
 
 
-@mock.patch("qubesadmin.tools.qvm_start.main")
+@mock.patch("qubesadmin.utils.start_expert")
 @mock.patch("qubesmanager.bootfromdevice.VMBootFromDeviceWindow")
 @check_errors
 @pytest.mark.parametrize("settings_fixture", TEST_VMS, indirect=True)
@@ -1120,7 +1120,7 @@ def test_212_boot_from_device(mock_boot, mock_start, settings_fixture):
         parent=settings_window,
     )
 
-    mock_start.assert_called_with(["--cdrom", mock.ANY, vm.name])
+    mock_start.assert_called_with(domain=vm, drive=mock.ANY)
 
 
 @check_errors