Update vif-invirtroute for Xen 4's scripts.

[invirt/packages/invirt-xen-config.git] / invirt-database

diff --git a/invirt-database b/invirt-database
index 92600e7..095fe4d 100644 (file)
--- a/invirt-database
+++ b/invirt-database
@@ -23,9 +23,13 @@ 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
+name = prefix + machine_name
 check(re.match('^[0-9a-f-]+$', machine.uuid))
 uuid = machine.uuid
 
@@ -105,7 +109,7 @@ elif cdrom is not None:
 if codepath == 'hvm':
     ioemu = "ioemu:"
     viftype = "type=ioemu, "
-    kernel = '/usr/lib/xen/boot/hvmloader'
+    kernel = '/usr/lib/xen-4.1/boot/hvmloader'
     builder = 'hvm'
     vnc = 1
     device_model = '/usr/sbin/qemu-dm-invirt'