Merge branch 'master' of git.qubes-os.org:/var/lib/qubes/git/marmarek/core

common/qubes_core

@@ -15,6 +15,8 @@ start()
 		exit 1
 	fi
 
+    modprobe u2mfn
+
     # Set permissions to /proc/xen/xenbus, so normal user can use xenstore-read
     chmod 666 /proc/xen/xenbus
 

dom0/qvm-tools/qvm-prefs

@@ -175,6 +175,10 @@ def set_nonupdateable(vms, vm, args):
     return True
 
 def set_kernel(vms, vm, args):
+    if vm.template_vm is not None:
+        print "Cannot set kernel for template-based VM. Set it for template instead."
+        return False
+
     if len (args) != 1:
         print "Missing kernel version argument!"
         print "Possible values:"