From e66bcbd58a1a4691023c0d3c466d3ad4bd28255f Mon Sep 17 00:00:00 2001
From: Shea Levy <shea@shealevy.com>
Date: Mon, 6 Aug 2012 08:13:06 -0400
Subject: [PATCH] The kernel needs SERIAL_8250_CONSOLE when using a real serial
 port as a console

---
 modules/testing/test-instrumentation.nix | 4 ++++
 modules/virtualisation/qemu-vm.nix       | 5 +++++
 2 files changed, 9 insertions(+)

diff --git a/modules/testing/test-instrumentation.nix b/modules/testing/test-instrumentation.nix
index b18e4263c2d..6a7f559c379 100644
--- a/modules/testing/test-instrumentation.nix
+++ b/modules/testing/test-instrumentation.nix
@@ -94,6 +94,10 @@ in
 
     system.upstartEnvironment.GCOV_PREFIX = "/tmp/xchg/coverage-data";
 
+    system.requiredKernelConfig = with config.lib.kernelConfig; [
+      (isYes "SERIAL_8250_CONSOLE")
+      (isYes "SERIAL_8250")
+    ];
   };
 
 }
diff --git a/modules/virtualisation/qemu-vm.nix b/modules/virtualisation/qemu-vm.nix
index dd8b457d43c..0e9804751be 100644
--- a/modules/virtualisation/qemu-vm.nix
+++ b/modules/virtualisation/qemu-vm.nix
@@ -385,4 +385,9 @@ in
 
   # Wireless won't work in the VM.
   networking.wireless.enable = mkOverride 50 false;
+
+  system.requiredKernelConfig = optional (!cfg.graphics) (with config.lib.kernelConfig; [
+    (isYes "SERIAL_8250_CONSOLE")
+    (isYes "SERIAL_8250")
+  ]);
 }