From b2332e1250283158fdb49e8150f07733dcd31c76 Mon Sep 17 00:00:00 2001 From: Javi Fontan Date: Thu, 6 Feb 2014 15:29:43 +0100 Subject: [PATCH] feature #2143: add machine type to KVM deployment file Based on a patch submited by Vladislav Gorbunov in http://dev.opennebula.org/issues/2143#note-2 --- src/vmm/LibVirtDriverKVM.cc | 16 +++++++++++++++- src/vmm_mad/exec/vmm_exec_kvm.conf | 2 +- 2 files changed, 16 insertions(+), 2 deletions(-) diff --git a/src/vmm/LibVirtDriverKVM.cc b/src/vmm/LibVirtDriverKVM.cc index fb64704792..d404e8e8dd 100644 --- a/src/vmm/LibVirtDriverKVM.cc +++ b/src/vmm/LibVirtDriverKVM.cc @@ -46,6 +46,7 @@ int LibVirtDriver::deployment_description_kvm( string kernel_cmd = ""; string bootloader = ""; string arch = ""; + string machine = ""; vector boots; @@ -190,6 +191,7 @@ int LibVirtDriver::deployment_description_kvm( kernel_cmd = os->vector_value("KERNEL_CMD"); bootloader = os->vector_value("BOOTLOADER"); arch = os->vector_value("ARCH"); + machine = os->vector_value("MACHINE"); } } @@ -203,7 +205,19 @@ int LibVirtDriver::deployment_description_kvm( } } - file << "\t\thvm" << endl; + if ( machine.empty() ) + { + get_default("OS", "MACHINE", machine); + } + + file << "\t\thvm" << endl; if ( kernel.empty() ) { diff --git a/src/vmm_mad/exec/vmm_exec_kvm.conf b/src/vmm_mad/exec/vmm_exec_kvm.conf index 07764bd559..c3c1961498 100644 --- a/src/vmm_mad/exec/vmm_exec_kvm.conf +++ b/src/vmm_mad/exec/vmm_exec_kvm.conf @@ -18,7 +18,7 @@ # (all domains will use these values as defaults). These values can # be overridden in each VM template. Valid atributes are: # - emulator -# - os [kernel,initrd,boot,root,kernel_cmd,arch] +# - os [kernel,initrd,boot,root,kernel_cmd,arch,machine] # - vcpu # - features [acpi, pae, apic] # - disk [driver, cache, io]