From: Patrick G. Bridges <bridges@cs.unm.edu>
Date: Thu, 10 Nov 2011 16:50:30 +0000 (-0700)
Subject: Merge branch 'devel' of ssh://newskysaw.cs.northwestern.edu/home/palacios/palacios... 
X-Git-Url: http://v3vee.org/palacios/gitweb/gitweb.cgi?p=palacios.git;a=commitdiff_plain;h=c4a5479be0c0cf9fc084bf26e25f7ba4c020b113;hp=9ee97b3c6e193a59660973da0ec5ed7a743931e4

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

diff --git a/utils/guest_creator/default.xml b/utils/guest_creator/default.xml
index 1d44067..f02b71a 100644
--- a/utils/guest_creator/default.xml
+++ b/utils/guest_creator/default.xml
@@ -52,6 +52,7 @@
 		<device class="8254_PIT" id="PIT" />
 		<device class="BOCHS_DEBUG" id="bochs debug"/>
 		<device class="OS_DEBUG" id="os debug" />
+		<device class="MPTABLE" id="mptable"/>
 		<device class="LAPIC" id="apic"/>
 		<device class="IOAPIC" id="ioapic">
                 	<apic>apic</apic>