X-Git-Url: http://xvm.mit.edu/gitweb/invirt/packages/invirt-xen-config.git/blobdiff_plain/ff3f01ccac99975968c562cca4646c35b83b3577..18f0d4c89f941272c8da5eb3d0ee19cafbca49ac:/invirt-database

diff --git a/invirt-database b/invirt-database
index 599d0b7..9350316 100644
--- a/invirt-database
+++ b/invirt-database
@@ -23,7 +23,11 @@ if 'cdrom_image' in locals():
     check(cdrom is not None)
 
 memory = machine.memory
-maxmem = '2048'
+if machine_type.hvm:
+    # Disable populate-on-demand
+    maxmem = memory
+else:
+    maxmem = '2048'
 check(re.match('^[A-Za-z0-9][A-Za-z0-9._-]*$', machine.name))
 name = prefix + machine_name
 check(re.match('^[0-9a-f-]+$', machine.uuid))
@@ -103,8 +107,10 @@ elif cdrom is not None:
     codepath = 'hvm'
 
 if codepath == 'hvm':
+    # Disable PVHVM for now until we figure out the best way to do this
+    xen_platform_pci = 0
     ioemu = "ioemu:"
-    viftype = "type=ioemu, "
+    viftype = "type=ioemu,model=pcnet, "
     kernel = '/usr/lib/xen-4.1/boot/hvmloader'
     builder = 'hvm'
     vnc = 1