From d4353c2a306e7fd75e3af0da3099925d0a5a79a1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marek=20Marczykowski-G=C3=B3recki?=
 <marmarek@invisiblethingslab.com>
Date: Tue, 16 May 2017 09:01:40 +0200
Subject: [PATCH] Enable linux-stubdom by default

Also, make it possible to set default on a template for its VMs.

QubesOS/qubes-issues#2185
---
 qubes/vm/qubesvm.py       | 2 +-
 templates/libvirt/xen.xml | 9 +++++----
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/qubes/vm/qubesvm.py b/qubes/vm/qubesvm.py
index af4e1b41..18ef63f4 100644
--- a/qubes/vm/qubesvm.py
+++ b/qubes/vm/qubesvm.py
@@ -1145,7 +1145,7 @@ class QubesVM(qubes.vm.mix.net.NetVMMixin, qubes.vm.BaseVM):
                 if self.stubdom_mem:
                     stubdom_mem = self.stubdom_mem
                 else:
-                    if self.features.get('linux-stubdom', False):
+                    if self.features.check_with_template('linux-stubdom', True):
                         stubdom_mem = 128 # from libxl_create.c
                     else:
                         stubdom_mem = 28 # from libxl_create.c
diff --git a/templates/libvirt/xen.xml b/templates/libvirt/xen.xml
index 84ae0b07..a494e2b0 100644
--- a/templates/libvirt/xen.xml
+++ b/templates/libvirt/xen.xml
@@ -112,12 +112,13 @@
 
             {% if vm.hvm %}
                 <emulator
-                    {% if vm.features.get('linux-stubdom', False) %}
+                    {% if vm.features.check_with_template('linux-stubdom', True) %}
                         type="stubdom-linux"
                     {% else %}
                         type="stubdom"
                     {% endif %}
-                    {% if vm.netvm and not vm.features.get('linux-stubdom', False) %}
+                    {% if vm.netvm and not
+                        vm.features.check_with_template('linux-stubdom', True) %}
                         cmdline="-net lwip,client_ip={{ vm.ip -}}
                             ,server_ip={{ vm.dns[1] -}}
                             ,dns={{ vm.netvm.gateway -}}
@@ -129,12 +130,12 @@
                     {% endif %}
                     />
                 <input type="tablet" bus="usb"/>
-                {% if vm.features.get('linux-stubdom', False) %}
+                {% if vm.features.check_with_template('linux-stubdom', True) %}
                     <video type="cirrus"/>
                 {% else %}
                     <video type="vga"/>
                 {% endif %}
-                {% if vm.features.get('linux-stubdom', False) %}
+                {% if vm.features.check_with_template('linux-stubdom', True) %}
                     {# TODO only add qubes gui if gui-agent is not installed in HVM #}
                     <graphics type="qubes"/>
                 {% endif %}