X-Git-Url: http://v3vee.org/palacios/gitweb/gitweb.cgi?a=blobdiff_plain;f=utils%2Fguest_creator%2Fdefault.xml;h=db20b2cc5ec654c5986b9d0ed1a23490314121d5;hb=fc423a5a59fba0b24c90167dd48234f1fe6ec6cc;hp=9d8414a6758d6e191e3d0aac058f2fd1aeb16144;hpb=e94e38127240269fb1566eb4a5698ed7716a1656;p=palacios.git

diff --git a/utils/guest_creator/default.xml b/utils/guest_creator/default.xml
index 9d8414a..db20b2c 100644
--- a/utils/guest_creator/default.xml
+++ b/utils/guest_creator/default.xml
@@ -3,13 +3,22 @@
 <vm class="PC"> 
 
 	<!-- Memory in MB -->
-	<memory>1024</memory> 
+	<memory alignment="4KB">256</memory> 
 
 	<!-- Basic VMM system flags -->
 	<telemetry>enable</telemetry>
-	<paging>nested</paging>
+	<paging mode="shadow">
+		<strategy>VTLB</strategy>
+	</paging>
+<!--
+	<paging mode="nested">
+		<pagesize>4KB</pagesize>
+	</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,7 +36,7 @@
 	<!-- 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/jarusl/image.iso" />
+		<file id="boot-cd" filename="image.iso" />
 		<!--<file id="harddisk" filename="firefox.img" />-->
 	</files>
 
@@ -39,12 +48,15 @@
 	<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="ICC_BUS" name="icc"/>
+		<device id="LAPIC" name="apic">
+			<bus>icc</bus>
+		</device>
 		<device id="IOAPIC" name="ioapic">
-                       <irq_bus>apic</irq_bus>
+                	<bus>icc</bus>
 		</device>
 
 <!--
@@ -64,35 +76,40 @@
 			<bus>pci0</bus>
 		</device>
 
-		<device id="LNX_VIRTIO_SYM" name="sym_pci">
+		<device id="IDE" name="ide">
 			<bus>pci0</bus>
+			<controller>southbridge</controller>
 		</device>
+                 
 
-		<device id="LNX_VIRTIO_BLK" name="blk_virtio">
+
+<!--
+		<device id="LNX_VIRTIO_SYM" name="sym_pci">
 			<bus>pci0</bus>
 		</device>
 
-		<device id="LNX_VIRTIO_BALLOON" name="balloon">
+		<device id="LNX_VIRTIO_BLK" name="blk_virtio">
 			<bus>pci0</bus>
 		</device>
 
-		<device id="IDE" name="ide">
+		<device id="LNX_VIRTIO_BALLOON" name="balloon">
 			<bus>pci0</bus>
-			<controller>southbridge</controller>
 		</device>
 
 		<device id="PCI_PASSTHROUGH" name="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">
 			<bus>pci0</bus>
 			<vendor_id>0x8086</vendor_id>
 			<device_id>0x107c</device_id>
-			<irq>59</irq>
+			<irq>64</irq>
 		</device>
+-->
 
 
 		<!-- This is a Storage Backend that connects to a frontend -->
@@ -108,13 +125,13 @@
 			</frontend>
 		</device>
 
+
+<!---
 		<device id="SYM_SWAP" name="sym swap">
 			<frontend tag="blk_virtio" />
 			<size>150</size>
 		</device>
 
-
-<!--
 		<device id="RAMDISK" name="HD0">
 			<file>harddisk</file>
 			<frontend tag="blk_virtio" />