From ed88b5a9a381cd1f297456fa6999b5d5d5a526bc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marek=20Marczykowski-G=C3=B3recki?= Date: Sun, 3 Apr 2016 03:19:30 +0200 Subject: [PATCH] backup: use vm.run_service instead of vm.run This should be the only way used to call services. --- qubes/backup.py | 13 ++++--------- 1 file changed, 4 insertions(+), 9 deletions(-) diff --git a/qubes/backup.py b/qubes/backup.py index 2cbe6cb4..235123e3 100644 --- a/qubes/backup.py +++ b/qubes/backup.py @@ -531,11 +531,9 @@ class Backup(object): tar_sparse = None if self.target_vm is not None: # Prepare the backup target (Qubes service call) - backup_target = "QUBESRPC qubes.Backup dom0" - # If APPVM, STDOUT is a PIPE - vmproc = self.target_vm.run( - command=backup_target, passio_popen=True, passio_stderr=True) + vmproc = self.target_vm.run_service('qubes.Backup', + passio_popen=True, passio_stderr=True) vmproc.stdin.write(self.target_dir. replace("\r", "").replace("\n", "") + "\n") backup_stdout = vmproc.stdin @@ -1340,12 +1338,9 @@ class BackupRestore(object): vmproc = None if self.backup_vm is not None: - # Prepare the backup target (Qubes service call) - backup_target = "QUBESRPC qubes.Restore dom0" - # If APPVM, STDOUT is a PIPE - vmproc = self.backup_vm.run( - command=backup_target, passio_popen=True, passio_stderr=True) + vmproc = self.backup_vm.run_service('qubes.Restore', + passio_popen=True, passio_stderr=True) vmproc.stdin.write( self.backup_location.replace("\r", "").replace("\n", "") + "\n")