|
@@ -1,6 +1,8 @@
|
|
|
#!/usr/bin/python2 -O
|
|
|
# vim: fileencoding=utf-8
|
|
|
|
|
|
+import random
|
|
|
+
|
|
|
import qubes.vm.qubesvm
|
|
|
import qubes.vm.appvm
|
|
|
import qubes.config
|
|
@@ -44,6 +46,7 @@ class DispVM(qubes.vm.qubesvm.QubesVM):
|
|
|
'volume_type': 'read-only',
|
|
|
}
|
|
|
}
|
|
|
+
|
|
|
super(DispVM, self).__init__(*args, **kwargs)
|
|
|
|
|
|
@qubes.events.handler('domain-load')
|
|
@@ -52,3 +55,49 @@ class DispVM(qubes.vm.qubesvm.QubesVM):
|
|
|
# Some additional checks for template based VM
|
|
|
assert self.template
|
|
|
# self.template.appvms.add(self) # XXX
|
|
|
+
|
|
|
+
|
|
|
+ @classmethod
|
|
|
+ def from_appvm(cls, appvm, **kwargs):
|
|
|
+ '''Create a new instance from given AppVM
|
|
|
+
|
|
|
+ :param qubes.vm.appvm.AppVM appvm: template from which the VM should \
|
|
|
+ be created (could also be name or qid)
|
|
|
+ :returns: new disposable vm
|
|
|
+
|
|
|
+ *kwargs* are passed to the newly created VM
|
|
|
+
|
|
|
+ >>> import qubes.vm.dispvm.DispVM
|
|
|
+ >>> dispvm = qubes.vm.dispvm.DispVM.from_appvm(appvm).start()
|
|
|
+ >>> dispvm.run_service('qubes.VMShell', input='firefox')
|
|
|
+ >>> dispvm.cleanup()
|
|
|
+
|
|
|
+ This method modifies :file:`qubes.xml` file. In fact, the newly created
|
|
|
+ vm belongs to other :py:class:`qubes.Qubes` instance than the *app*.
|
|
|
+ The qube returned is not started.
|
|
|
+ '''
|
|
|
+ store = appvm.app.store if isinstance(appvm, qubes.vm.BaseVM) else None
|
|
|
+ app = qubes.Qubes(store)
|
|
|
+ dispvm = app.add_new_vm(
|
|
|
+ cls,
|
|
|
+ dispid=app.domains.get_new_unused_dispid(),
|
|
|
+ template=app.domains[appvm],
|
|
|
+ **kwargs)
|
|
|
+ dispvm.create_on_disk()
|
|
|
+ app.save()
|
|
|
+ return dispvm
|
|
|
+
|
|
|
+
|
|
|
+ def cleanup(self):
|
|
|
+ '''Clean up after the DispVM
|
|
|
+
|
|
|
+ This stops the disposable qube and removes it from the store.
|
|
|
+
|
|
|
+ This method modifies :file:`qubes.xml` file.
|
|
|
+ '''
|
|
|
+ app = qubes.Qubes(self.app.store)
|
|
|
+ self = app.domains[self.uuid]
|
|
|
+ self.force_shutdown()
|
|
|
+ self.remove_from_disk()
|
|
|
+ del app.domains[self]
|
|
|
+ app.save()
|