Merge branch 'master' into hvm

This commit is contained in:
Marek Marczykowski 2012-03-02 16:31:01 +01:00
commit c40bb7fd69

View File

@ -951,7 +951,8 @@ class QubesVm(object):
def get_clone_attrs(self): def get_clone_attrs(self):
return ['kernel', 'uses_default_kernel', 'netvm_vm', 'uses_default_netvm', \ return ['kernel', 'uses_default_kernel', 'netvm_vm', 'uses_default_netvm', \
'memory', 'maxmem', 'kernelopts', 'uses_default_kernelopts', 'services', 'vcpus'] 'memory', 'maxmem', 'kernelopts', 'uses_default_kernelopts', 'services', 'vcpus', \
'_mac']
def clone_attrs(self, src_vm): def clone_attrs(self, src_vm):
for prop in self.get_clone_attrs(): for prop in self.get_clone_attrs():