Qubes/core-admin-client
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Cloning a vm now clones persistent PCI device assignments

Browse Source 
fixes QubesOS/qubes-issues#4992
This commit is contained in:
Marta Marczykowska-Górecka 2020-03-24 21:12:53 +01:00
parent a1ddbb054f
commit c0a8c6528a
No known key found for this signature in database
GPG Key ID: 9A752C30B26FD04B
1 changed files with 21 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
qubesadmin/app.py
View File

@ -38,6 +38,7 @@ import qubesadmin.storage
import qubesadmin.utils import qubesadmin.utils
import qubesadmin.vm import qubesadmin.vm
import qubesadmin.config import qubesadmin.config
import qubesadmin.devices
class VMCollection(object): class VMCollection(object):
@ -316,7 +317,9 @@ class QubesBase(qubesadmin.base.PropertyHolder):
return self.domains[name] return self.domains[name]
def clone_vm(self, src_vm, new_name, new_cls=None, pool=None, pools=None, def clone_vm(self, src_vm, new_name, new_cls=None, pool=None, pools=None,
ignore_errors=False, ignore_volumes=None): ignore_errors=False, ignore_volumes=None,
ignore_devices=False):
# pylint: disable=too-many-statements
"""Clone Virtual Machine """Clone Virtual Machine
Example usage with custom storage pools: Example usage with custom storage pools:
@ -337,6 +340,7 @@ class QubesBase(qubesadmin.base.PropertyHolder):
logged, or abort the whole operation? logged, or abort the whole operation?
:param list ignore_volumes: do not clone volumes on this list, :param list ignore_volumes: do not clone volumes on this list,
like 'private' or 'root' like 'private' or 'root'
:param bool ignore_devices: if True, do not copy device assignments
:return new VM object :return new VM object
""" """
@ -472,6 +476,22 @@ class QubesBase(qubesadmin.base.PropertyHolder):
del self.domains[dst_vm.name] del self.domains[dst_vm.name]
raise raise
if not ignore_devices:
try:
for devclass in src_vm.devices:
for assignment in src_vm.devices[devclass].assignments(
persistent=True):
new_assignment = qubesadmin.devices.DeviceAssignment(
backend_domain=assignment.backend_domain,
ident=assignment.ident,
options=assignment.options,
persistent=assignment.persistent)
dst_vm.devices[devclass].attach(new_assignment)
except qubesadmin.exc.QubesException:
if not ignore_errors:
del self.domains[dst_vm.name]
raise
return dst_vm return dst_vm
def qubesd_call(self, dest, method, arg=None, payload=None, def qubesd_call(self, dest, method, arg=None, payload=None,