From: Patrick G. Bridges <bridges@cs.unm.edu>
Date: Thu, 3 Nov 2011 18:27:19 +0000 (-0600)
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=4802f102fc2df8435399eb26cebd34e681cb41ad;hp=21e93d7fc021590c20ab5fecef03374e008d15e9

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>