From f8fa85b34158790494f267585bb56125bb2706f4 Mon Sep 17 00:00:00 2001 From: Marek Marczykowski Date: Wed, 27 Feb 2013 11:07:33 +0100 Subject: [PATCH 1/2] dom0/core: clone/backup-restore HVM-specific properties --- dom0/qvm-core/qubes.py | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dom0/qvm-core/qubes.py b/dom0/qvm-core/qubes.py index 03cd601e..8c244ed7 100755 --- a/dom0/qvm-core/qubes.py +++ b/dom0/qvm-core/qubes.py @@ -2412,6 +2412,8 @@ class QubesHVm(QubesVm): attrs.remove('kernelopts') attrs.remove('uses_default_kernelopts') attrs += [ 'timezone' ] + attrs += [ 'qrexec_installed' ] + attrs += [ 'guiagent_installed' ] return attrs def create_on_disk(self, verbose, source_template = None): From c20245c4f85a2a250d949a68dc2fc332d56be870 Mon Sep 17 00:00:00 2001 From: Marek Marczykowski Date: Wed, 27 Feb 2013 11:11:31 +0100 Subject: [PATCH 2/2] dom0/core: fix qrexec startup for HVM Pass only 'notify_function' parameter - wait_for_session doesn't take any other (especially not 'verbose'). --- dom0/qvm-core/qubes.py | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/dom0/qvm-core/qubes.py b/dom0/qvm-core/qubes.py index 8c244ed7..6edaebfd 100755 --- a/dom0/qvm-core/qubes.py +++ b/dom0/qvm-core/qubes.py @@ -2584,8 +2584,7 @@ class QubesHVm(QubesVm): if kwargs.get('verbose'): print >> sys.stderr, "--> Waiting for user '%s' login..." % self.default_user - # TODO retrieve the notify_function from kwargs ? - self.wait_for_session(**kwargs) + self.wait_for_session(notify_function=kwargs.get('notify_function', None)) def pause(self): if dry_run: