From: Jack Lange <jarusl@cs.northwestern.edu>
Date: Tue, 2 Feb 2010 00:20:52 +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=01d34613a95ac3ee5e82d7ecd03e4f79c98125ef;p=palacios-OLD.git

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

01d34613a95ac3ee5e82d7ecd03e4f79c98125ef
diff --cc utils/guest_creator/default.xml
index c022473,eb25cde..11326fc
--- a/utils/guest_creator/default.xml
+++ b/utils/guest_creator/default.xml
@@@ -39,9 -41,10 +41,10 @@@
  	<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" />
+ <!--
  		<device id="LAPIC" name="apic"/>
  		<device id="IOAPIC" name="ioapic">
                         <irq_bus>apic</irq_bus>
@@@ -113,9 -120,10 +120,10 @@@
  			<frontend tag="blk_virtio" />
  			<size>150</size>
  		</device>
+ -->
  
  
 -<!--
 +
  		<device id="RAMDISK" name="HD0">
  			<file>harddisk</file>
  			<frontend tag="blk_virtio" />