From d3b8fea0d9d1a4ab8a8a2f2dc7daea1c512b1ea8 Mon Sep 17 00:00:00 2001
From: Soren Hansen <soren.hansen@rackspace.com>
Date: Thu, 26 Aug 2010 15:20:01 +0200
Subject: Set UML guests to use a file as their console. This halfway fixes
 get-console-output for them.

---
 nova/virt/libvirt.qemu.xml.template | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

(limited to 'nova/virt')

diff --git a/nova/virt/libvirt.qemu.xml.template b/nova/virt/libvirt.qemu.xml.template
index 307f9d03a..6cba84f3f 100644
--- a/nova/virt/libvirt.qemu.xml.template
+++ b/nova/virt/libvirt.qemu.xml.template
@@ -4,7 +4,7 @@
     <type>hvm</type>
         <kernel>%(basepath)s/kernel</kernel>
         <initrd>%(basepath)s/ramdisk</initrd>
-        <cmdline>root=/dev/vda1 console=ttyS0</cmdline>
+        <cmdline>root=/dev/vda1</cmdline>
     </os>
     <features>
         <acpi/>
@@ -21,10 +21,9 @@
             <mac address='%(mac_address)s'/>
             <!--   <model type='virtio'/>  CANT RUN virtio network right now -->
         </interface>
-        <serial type="file">
+        <console type="file">
             <source path='%(basepath)s/console.log'/>
-            <target port='1'/>
-        </serial>
+        </console>
     </devices>
     <nova>%(nova)s</nova>
 </domain>
-- 
cgit