diff --git a/qubes/vm/appvm.py b/qubes/vm/appvm.py index 8544335b..bff48105 100644 --- a/qubes/vm/appvm.py +++ b/qubes/vm/appvm.py @@ -16,7 +16,6 @@ class AppVM(qubes.vm.qubesvm.QubesVM): doc='Template, on which this AppVM is based.') def __init__(self, *args, **kwargs): - self.volumes = {} self.volume_config = { 'root': { 'name': 'root', diff --git a/qubes/vm/dispvm.py b/qubes/vm/dispvm.py index 84ba9d15..4a6b6738 100644 --- a/qubes/vm/dispvm.py +++ b/qubes/vm/dispvm.py @@ -20,7 +20,6 @@ class DispVM(qubes.vm.qubesvm.QubesVM): doc='''Internal, persistent identifier of particular DispVM.''') def __init__(self, *args, **kwargs): - self.volumes = {} self.volume_config = { 'root': { 'name': 'root', diff --git a/qubes/vm/qubesvm.py b/qubes/vm/qubesvm.py index 985f4635..043fe0ce 100644 --- a/qubes/vm/qubesvm.py +++ b/qubes/vm/qubesvm.py @@ -434,6 +434,7 @@ class QubesVM(qubes.vm.mix.net.NetVMMixin, qubes.vm.BaseVM): def __init__(self, app, xml, volume_config={}, **kwargs): super(QubesVM, self).__init__(app, xml, **kwargs) + self.volumes = {} if hasattr(self, 'volume_config'): if xml is not None: for node in xml.xpath('volume-config/volume'): diff --git a/qubes/vm/templatevm.py b/qubes/vm/templatevm.py index 39432ac8..611b21cb 100644 --- a/qubes/vm/templatevm.py +++ b/qubes/vm/templatevm.py @@ -30,7 +30,6 @@ class TemplateVM(QubesVM): def __init__(self, *args, **kwargs): assert 'template' not in kwargs, "A TemplateVM can not have a template" - self.volumes = {} self.volume_config = { 'root': { 'name': 'root',