From 16e89bad15f5665a5f46c0bdcdfab1b7f3df4039 Mon Sep 17 00:00:00 2001
From: Vishvananda Ishaya <vishvananda@gmail.com>
Date: Thu, 29 Jul 2010 17:58:44 -0700
Subject: flag for libvirt type

---
 nova/compute/libvirt.xml.template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'nova/compute')

diff --git a/nova/compute/libvirt.xml.template b/nova/compute/libvirt.xml.template
index a763e8a4d..a17cd8fae 100644
--- a/nova/compute/libvirt.xml.template
+++ b/nova/compute/libvirt.xml.template
@@ -1,7 +1,7 @@
 <domain type='kvm'>
     <name>%(name)s</name>
     <os>
-    <type>hvm</type>
+    <type>%(type)s</type>
         <kernel>%(basepath)s/kernel</kernel>
         <initrd>%(basepath)s/ramdisk</initrd>
         <cmdline>root=/dev/vda1 console=ttyS0</cmdline>
-- 
cgit 


From 80b79a923bc6fb331daaf6960e6353c700b89c41 Mon Sep 17 00:00:00 2001
From: Vishvananda Ishaya <vishvananda@gmail.com>
Date: Fri, 30 Jul 2010 11:19:03 -0700
Subject: use the right tag

---
 nova/compute/libvirt.xml.template | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

(limited to 'nova/compute')

diff --git a/nova/compute/libvirt.xml.template b/nova/compute/libvirt.xml.template
index a17cd8fae..307f9d03a 100644
--- a/nova/compute/libvirt.xml.template
+++ b/nova/compute/libvirt.xml.template
@@ -1,7 +1,7 @@
-<domain type='kvm'>
+<domain type='%(type)s'>
     <name>%(name)s</name>
     <os>
-    <type>%(type)s</type>
+    <type>hvm</type>
         <kernel>%(basepath)s/kernel</kernel>
         <initrd>%(basepath)s/ramdisk</initrd>
         <cmdline>root=/dev/vda1 console=ttyS0</cmdline>
@@ -12,7 +12,6 @@
     <memory>%(memory_kb)s</memory>
     <vcpu>%(vcpus)s</vcpu>
     <devices>
-        <emulator>/usr/bin/kvm</emulator>
         <disk type='file'>
             <source file='%(basepath)s/disk'/>
             <target dev='vda' bus='virtio'/>
-- 
cgit