From 1ed0b14d934e1f05fbf6178e16108f9358ad33ef Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marek=20Marczykowski-G=C3=B3recki?=
 <marmarek@invisiblethingslab.com>
Date: Thu, 1 Jun 2017 03:51:24 +0200
Subject: [PATCH] vm: make vm.hvm=True by default

QubesOS/qubes-issues#2185
---
 qubes/config.py           | 2 +-
 qubes/tests/vm/qubesvm.py | 2 +-
 qubes/vm/qubesvm.py       | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/qubes/config.py b/qubes/config.py
index 0663f8dd8..5ef2e047f 100644
--- a/qubes/config.py
+++ b/qubes/config.py
@@ -69,7 +69,7 @@
 defaults = {
     'libvirt_uri': 'xen:///',
     'memory': 400,
-    'hvm_memory': 512,
+    'hvm_memory': 400,
     'kernelopts': "nopat",
     'kernelopts_pcidevs': "nopat iommu=soft swiotlb=8192",
 
diff --git a/qubes/tests/vm/qubesvm.py b/qubes/tests/vm/qubesvm.py
index f7a081604..b3291ef2d 100644
--- a/qubes/tests/vm/qubesvm.py
+++ b/qubes/tests/vm/qubesvm.py
@@ -274,7 +274,7 @@ def test_131_label_invalid(self):
 
     def test_150_hvm(self):
         vm = self.get_vm()
-        self._test_generic_bool_property(vm, 'hvm')
+        self._test_generic_bool_property(vm, 'hvm', default=True)
 
     def test_160_memory(self):
         vm = self.get_vm()
diff --git a/qubes/vm/qubesvm.py b/qubes/vm/qubesvm.py
index 6c206757b..a9c899ec6 100644
--- a/qubes/vm/qubesvm.py
+++ b/qubes/vm/qubesvm.py
@@ -401,7 +401,7 @@ class QubesVM(qubes.vm.mix.net.NetVMMixin, qubes.vm.BaseVM):
 
     hvm = qubes.property('hvm',
         type=bool, setter=qubes.property.bool,
-        default=False,
+        default=True,
         doc='''Use full virtualisation (HVM) for this qube,
             instead of paravirtualisation (PV)''')