Fixed nested paging to work again, minor change to configuration syntax of shadow...

[palacios-OLD.git] / utils / guest_creator / default.xml

diff --git a/utils/guest_creator/default.xml b/utils/guest_creator/default.xml
index da43f53..cc0bc98 100644 (file)
--- a/utils/guest_creator/default.xml
+++ b/utils/guest_creator/default.xml
@@ -3,12 +3,13 @@
 <vm class="PC"> 
 
        <!-- Memory in MB -->
-       <memory>512</memory> 
+       <memory>256</memory> 
 
        <!-- Basic VMM system flags -->
        <telemetry>enable</telemetry>
-       <paging mode="VTLB" />
-       <schedule_hz>1000</schedule_hz>
+       <paging mode="VTLB">shadow</paging>
+       <!-- <paging mode="4KB">nested</paging> -->
+       <schedule_hz>100</schedule_hz>
 
        <cores count="1"><core /></cores>
 
@@ -44,12 +45,13 @@
                <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>
--->
 
 <!--
                <device id="CGA_VIDEO" name="cga" passthrough="enable" />
@@ -73,24 +75,6 @@
                        <controller>southbridge</controller>
                </device>
                  
-                <device id="LNX_VIRTIO_NIC" name="net_virtio0">
-                        <bus>pci0</bus>
-                </device>
-
-                <device id="LNX_VIRTIO_NIC" name="net_virtio1">
-                        <bus>pci0</bus>
-                </device>
-
-                <device id="LNX_VIRTIO_NIC" name="net_virtio2">
-                        <bus>pci0</bus>
-                </device>
-
-                <device id="PCI_PASSTHROUGH" name="e1000">
-                        <bus>pci0</bus>
-                        <vendor_id>0x8086</vendor_id>
-                        <device_id>0x100e</device_id>
-                        <irq>59</irq>
-                </device>
 
 
 <!--
@@ -135,23 +119,6 @@
                        </frontend>
                </device>
 
-               <device id="VNET_NIC", name="vnet_nic0">
-                       <frontend tag="net_virtio0">
-                               <mac>10:20:30:40:50:60</mac>
-                       </frontend>
-               </device>
-
-               <device id="VNET_NIC", name="vnet_nic1">
-                        <frontend tag="net_virtio1">
-                                        <mac>10:20:30:40:50:61</mac>
-                        </frontend>
-                </device>
-
-                <device id="VNET_NIC", name="vnet_nic2">
-                        <frontend tag="net_virtio2">
-                                <mac>10:20:30:40:50:62</mac>
-                        </frontend>
-                </device>
 
 <!---
                <device id="SYM_SWAP" name="sym swap">