From 631a4c02f737ca8fcec40cd7af0f00abedb5b9a0 Mon Sep 17 00:00:00 2001 From: "Ruben S. Montero" Date: Fri, 19 Nov 2010 17:37:03 +0100 Subject: [PATCH 1/2] bug #406: Removed default Werror option for compiling OpenNebula --- SConstruct | 3 +-- src/scheduler/SConstruct | 3 +-- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/SConstruct b/SConstruct index 89a2747034..ef4d462bbb 100644 --- a/SConstruct +++ b/SConstruct @@ -76,8 +76,7 @@ main_env.Append(LIBPATH=[ # Compile flags main_env.Append(CPPFLAGS=[ "-g", - "-Wall", - "-Werror", + "-Wall" ]) # Linking flags diff --git a/src/scheduler/SConstruct b/src/scheduler/SConstruct index 4c78abb358..e1b03a2f14 100644 --- a/src/scheduler/SConstruct +++ b/src/scheduler/SConstruct @@ -50,8 +50,7 @@ main_env.Append(LIBPATH=[ # Compile flags main_env.Append(CPPFLAGS=[ "-g", - "-Wall", - "-Werror" + "-Wall" ]) # Linking flags From a8f794bdde72d8392c1151a30906a215f80acb90 Mon Sep 17 00:00:00 2001 From: Daniel Molina Date: Fri, 19 Nov 2010 18:20:35 +0100 Subject: [PATCH 2/2] Add Xen conf IP address for NIC --- src/vmm/XenDriver.cc | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/src/vmm/XenDriver.cc b/src/vmm/XenDriver.cc index 01b528d5c2..4ed1d87c96 100644 --- a/src/vmm/XenDriver.cc +++ b/src/vmm/XenDriver.cc @@ -55,6 +55,7 @@ int XenDriver::deployment_description( const VectorAttribute * nic; + string ip = ""; string mac = ""; string bridge = ""; string model = ""; @@ -346,6 +347,7 @@ int XenDriver::deployment_description( file << " '"; + ip = nic->vector_value("IP"); mac = nic->vector_value("MAC"); bridge = nic->vector_value("BRIDGE"); model = nic->vector_value("MODEL"); @@ -362,6 +364,12 @@ int XenDriver::deployment_description( pre_char = ','; } + if( !ip.empty() ) + { + file << pre_char << "ip=" << ip; + pre_char = ','; + } + if( !bridge.empty() ) { file << pre_char << "bridge=" << bridge;