core: remove kernel properties from DispVM and Dom0 (#948)

Qubes does not keep track of those kernel versions.

Conflicts:
	core-modules/01QubesDisposableVm.py

core-modules/006QubesAdminVm.py

@@ -32,6 +32,15 @@ class QubesAdminVm(QubesNetVm):
     # In which order load this VM type from qubes.xml
     load_order = 10
 
+    def get_attrs_config(self):
+        attrs = super(QubesAdminVm, self).get_attrs_config()
+        attrs.pop('kernel')
+        attrs.pop('kernels_dir')
+        attrs.pop('kernelopts')
+        attrs.pop('uses_default_kernel')
+        attrs.pop('uses_default_kernelopts')
+        return attrs
+
     def __init__(self, **kwargs):
         super(QubesAdminVm, self).__init__(qid=0, name="dom0", netid=0,
                                              dir_path=None,

core-modules/01QubesDisposableVm.py

@@ -48,6 +48,11 @@ class QubesDisposableVm(QubesVm):
         attrs_config = super(QubesDisposableVm, self).get_attrs_config()
 
         attrs_config['name']['eval'] = '"disp%d" % self._qid if value is None else value'
+        attrs_config.pop('kernel')
+        attrs_config.pop('kernels_dir')
+        attrs_config.pop('kernelopts')
+        attrs_config.pop('uses_default_kernel')
+        attrs_config.pop('uses_default_kernelopts')
 
         # New attributes
         attrs_config['dispid'] = { 'func': lambda x: self._qid if x is None else int(x),