X-Git-Url: http://v3vee.org/palacios/gitweb/gitweb.cgi?a=blobdiff_plain;f=utils%2Fguest_creator%2Fdefault.xml;h=f02b71a176630430fb626b91db52973d856ed390;hb=e895aea7212e8cd9e1ba9555f3313fbf90f83d7f;hp=5635dbd2e5f17e6c18db1fe53c30663439f0f8bf;hpb=1f7a670397e97ea1028294d7b7b45d6ef1797d65;p=palacios.git

diff --git a/utils/guest_creator/default.xml b/utils/guest_creator/default.xml
index 5635dbd..f02b71a 100644
--- a/utils/guest_creator/default.xml
+++ b/utils/guest_creator/default.xml
@@ -3,13 +3,23 @@
 <vm class="PC"> 
 
 	<!-- Memory in MB -->
-	<memory>256</memory> 
+	<memory alignment="2MB">256</memory> 
 
 	<!-- Basic VMM system flags -->
 	<telemetry>enable</telemetry>
-	<paging>nested</paging>
+	<paging mode="shadow">
+		<strategy>VTLB</strategy>
+		<large_pages>true</large_pages>
+	</paging>
+<!--
+	<paging mode="nested">
+		<large_pages>true<large_pages/>
+	</paging>
+-->
 	<schedule_hz>100</schedule_hz>
 
+	<cores count="1"><core /></cores>
+
 
 	<!-- Memory redirections -->
 	<!-- Redirects a guest's memory region to a host physical address -->
@@ -27,69 +37,71 @@
 	<!-- This is where you add disk images -->
 	<files>
 		<!-- The file 'id' is used as a reference for other configuration components -->
-		<file id="boot-cd" filename="/home/ktpedre/google_code/smp_guest/kitten_guest/arch/x86_64/boot/image.iso" />
+		<file id="boot-cd" filename="image.iso" />
 		<!--<file id="harddisk" filename="firefox.img" />-->
 	</files>
 
 
 	<!-- List of devices attached to guest -->
-	<!-- The device 'ID' is the device name in the global device registry -->
-	<!-- The device 'name' is the reference to the device instance associated with a VM -->
+	<!-- The device 'class' is the device name in the global device registry -->
+	<!-- The device 'id' is the reference to the device instance associated with a VM -->
 	<!--	The name can be used as a reference by other devices -->
 	<devices>
-		<device id="8259A" name="PIC"/>
-		<device id="KEYBOARD" name="keyboard"/>
-		<device id="8254_PIT" name="PIC" />
-		<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>
+		<device class="8259A" id="PIC"/>
+		<device class="KEYBOARD" id="keyboard"/>
+		<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>
 		</device>
-
 <!--
-		<device id="CGA_VIDEO" name="cga" passthrough="enable" />
-		<device id="TELNET_CONSOLE" name="telnet console">
+		<device class="CGA_VIDEO" id="cga" passthrough="enable" />
+		<device class="TELNET_CONSOLE" id="telnet console">
                        <frontend tag="CGA_VIDEO" />
                        <port>19997</port>
 		</device>
 -->
-		<device id="PCI" name="pci0" />
+		<device class="PCI" id="pci0" />
 
-		<device id="i440FX" name="northbridge">
+		<device class="i440FX" id="northbridge">
 			<bus>pci0</bus>
 		</device>
 
-		<device id="PIIX3" name="southbridge">
+		<device class="PIIX3" id="southbridge">
 			<bus>pci0</bus>
 		</device>
 
-		<device id="IDE" name="ide">
+		<device class="IDE" id="ide">
 			<bus>pci0</bus>
 			<controller>southbridge</controller>
 		</device>
+                 
+
 
 <!--
-		<device id="LNX_VIRTIO_SYM" name="sym_pci">
+		<device class="LNX_VIRTIO_SYM" id="sym_pci">
 			<bus>pci0</bus>
 		</device>
 
-		<device id="LNX_VIRTIO_BLK" name="blk_virtio">
+		<device class="LNX_VIRTIO_BLK" id="blk_virtio">
 			<bus>pci0</bus>
 		</device>
 
-		<device id="LNX_VIRTIO_BALLOON" name="balloon">
+		<device class="LNX_VIRTIO_BALLOON" id="balloon">
 			<bus>pci0</bus>
 		</device>
 
-		<device id="PCI_PASSTHROUGH" name="e1000">
+		<device class="PCI_PASSTHROUGH" id="e1000">
 			<bus>pci0</bus>
 			<vendor_id>0x8086</vendor_id>
 			<device_id>0x100e</device_id>
 			<irq>59</irq>
 		</device>
 
-		<device id="PCI_PASSTHROUGH" name="e1000-hw">
+		<device class="PCI_PASSTHROUGH" id="e1000-hw">
 			<bus>pci0</bus>
 			<vendor_id>0x8086</vendor_id>
 			<device_id>0x107c</device_id>
@@ -101,7 +113,7 @@
 		<!-- This is a Storage Backend that connects to a frontend -->
 		<!-- The frontend section is passed to the frontend when the backend connects -->
 		<!-- The file tag refers to an 'id' already listed in the file list section above -->
-		<device id="RAMDISK" name="CD0">
+		<device class="RAMDISK" id="CD0">
 			<file>boot-cd</file>
 			<frontend tag="ide">
 				<model>V3Vee CDROM</model>
@@ -111,26 +123,30 @@
 			</frontend>
 		</device>
 
+
 <!---
-		<device id="SYM_SWAP" name="sym swap">
+		<device class="SYM_SWAP" id="sym swap">
 			<frontend tag="blk_virtio" />
 			<size>150</size>
 		</device>
--->
 
-
-<!--
-		<device id="RAMDISK" name="HD0">
+		<device class="RAMDISK" id="HD0">
 			<file>harddisk</file>
 			<frontend tag="blk_virtio" />
 		</device>
 -->
 
-		<device id="NVRAM" name="nvram">
+	<!-- Machine-check device -->
+<!--
+        <device class="MCHECK" id="MCHECK" />
+-->
+
+
+		<device class="NVRAM" id="nvram">
 			<storage>ide</storage>
 		</device>
 
-		<device id="GENERIC" name="generic">
+		<device class="GENERIC" id="generic">
 			<ports>
                                <start>0x00</start>
                                <end>0x07</end>