From 95f7f037980eaee9dc44c06c3d57a6060f462f2c Mon Sep 17 00:00:00 2001 From: "Ruben S. Montero" Date: Sat, 13 Nov 2010 00:58:03 +0100 Subject: [PATCH] bug #399: Added test for no arch and no default provided --- src/vmm/LibVirtDriverKVM.cc | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/src/vmm/LibVirtDriverKVM.cc b/src/vmm/LibVirtDriverKVM.cc index 641617ed3f..2a8e71f614 100644 --- a/src/vmm/LibVirtDriverKVM.cc +++ b/src/vmm/LibVirtDriverKVM.cc @@ -168,6 +168,11 @@ int LibVirtDriver::deployment_description_kvm( if ( arch.empty() ) { get_default("OS","ARCH",arch); + + if ( arch.empty() ) + { + goto error_arch; + } } if (emulator == "kvm") @@ -628,6 +633,11 @@ error_memory: file.close(); return -1; +error_arch: + vm->log("VMM", Log::ERROR, "No ARCH defined and no default provided."); + file.close(); + return -1; + error_boot: vm->log("VMM", Log::ERROR, "No BOOT device defined and no default provided."); file.close();