From: Jack Lange <jarusl@cs.northwestern.edu>
Date: Wed, 3 Feb 2010 01:25:44 +0000 (-0600)
Subject: Merge branch 'devel' of ssh://palacios@newskysaw.cs.northwestern.edu/home/palacios... 
X-Git-Url: http://v3vee.org/palacios/gitweb/gitweb.cgi?a=commitdiff_plain;h=21baca3637cb3264e97ebc35c1cabfe197b28bbd;hp=48aeb8816a1633ab97dd145289d5d0acd75387bb;p=palacios-OLD.git

Merge branch 'devel' of ssh://palacios@newskysaw.cs.northwestern.edu/home/palacios/palacios into devel
---

diff --git a/utils/guest_creator/default.xml b/utils/guest_creator/default.xml
index eb25cde..11326fc 100644
--- a/utils/guest_creator/default.xml
+++ b/utils/guest_creator/default.xml
@@ -41,7 +41,7 @@
 	<devices>
 		<device id="8259A" name="PIC"/>
 		<device id="KEYBOARD" name="keyboard"/>
-		<device id="8254_PIT" name="PIC" />
+		<device id="8254_PIT" name="PIT" />
 		<device id="BOCHS_DEBUG" name="bochs debug"/>
 		<device id="OS_DEBUG" name="os debug" />
 <!--
@@ -123,12 +123,12 @@
 -->
 
 
-<!--
+
 		<device id="RAMDISK" name="HD0">
 			<file>harddisk</file>
 			<frontend tag="blk_virtio" />
 		</device>
--->
+
 
 		<device id="NVRAM" name="nvram">
 			<storage>ide</storage>