vm: init vm.storage and vm.volumes in BaseVM

This way also AdminVM will have (empty) properties there. It is much
cleaner than adding `if hasattr` or catching AttributeError everywhere.

qubes/vm/__init__.py

@@ -283,6 +283,12 @@ def __init__(self, app, xml, features=None, devices=None, tags=None,
         #: logger instance for logging messages related to this VM
         self.log = None
 
+        #: storage volumes
+        self.volumes = {}
+
+        #: storage manager
+        self.storage = None
+
         if hasattr(self, 'name'):
             self.init_log()
 

qubes/vm/qubesvm.py

@@ -631,8 +631,6 @@ def conf_file(self):
 
     def __init__(self, app, xml, volume_config=None, **kwargs):
         super(QubesVM, self).__init__(app, xml, **kwargs)
-        self.volumes = {}
-        self.storage = None
 
         if volume_config is None:
             volume_config = {}