From dbebf6a10eefb9f566279caa288671dea8abc2bf Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Carlos=20Mart=C3=ADn?= Date: Wed, 4 Jul 2012 17:23:53 +0200 Subject: [PATCH] Feature #1288: Similar fix to commit:20d76f92, make quotas work for VMs migrated from previous verions (cherry picked from commit 500a7d80905edc4e1dfaef9094d94f057cfab33f) --- src/um/QuotaVirtualMachine.cc | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/src/um/QuotaVirtualMachine.cc b/src/um/QuotaVirtualMachine.cc index 77624b6970..f0af2f6cbf 100644 --- a/src/um/QuotaVirtualMachine.cc +++ b/src/um/QuotaVirtualMachine.cc @@ -57,14 +57,12 @@ bool QuotaVirtualMachine::check(Template * tmpl, string& error) if ( tmpl->get("MEMORY", memory) == false ) { - error = "MEMORY not defined for VM"; - return false; + memory = 0; } if ( tmpl->get("CPU", cpu) == false ) { - error = "CPU not defined for VM"; - return false; + cpu = 0; } vm_request.insert(make_pair("VMS",1));