tests: give more RAM for HVM with in-vm kernel

HVM has disabled memory hotplug (due to incompatibility with QEMU), and
so needs more RAM to fit everything + memory accounting for full maxmem.

While at it, adjust the test to check if kernel-related settings are
correctly inherited from the template.

qubes/tests/integ/grub.py

@@ -129,6 +129,11 @@ def test_000_standalone_vm(self):
         self.loop.run_until_complete(self.testvm1.shutdown(wait=True))
 
         self.testvm1.kernel = self.kernel
+        if self.virt_mode == "hvm":
+            # HVM has disabled memory-hotplug, which means VM is started with
+            # full maxmem and need extra memory for page structures for full
+            # maxmem
+            self.testvm1.memory = 450
         self.loop.run_until_complete(self.testvm1.start())
         (actual_kver, _) = self.loop.run_until_complete(
             self.testvm1.run_for_stdio("uname -r")
@@ -156,15 +161,18 @@ def test_010_template_based_vm(self):
             name=self.make_vm_name("vm1"),
             label="red",
         )
-        self.testvm1.virt_mode = self.virt_mode
         self.loop.run_until_complete(self.testvm1.create_on_disk())
         self.loop.run_until_complete(self.test_template.start())
         self.install_packages(self.test_template)
         kver = self.get_kernel_version(self.test_template)
         self.loop.run_until_complete(self.test_template.shutdown(wait=True))
 
         self.test_template.kernel = self.kernel
-        self.testvm1.kernel = self.kernel
+        if self.virt_mode == "hvm":
+            # HVM has disabled memory-hotplug, which means VM is started with
+            # full maxmem and need extra memory for page structures for full
+            # maxmem
+            self.test_template.memory = 450
 
         # Check if TemplateBasedVM boots and has the right kernel
         self.loop.run_until_complete(self.testvm1.start())