[Ovirt-devel] [PATCH] Since cpus is now it's own table, we no longer have a "num_cpus" column to

Chris Lalancette clalance at redhat.com
Thu Jul 10 17:00:16 UTC 2008


Signed-off-by: Chris Lalancette <clalance at redhat.com>
---
 wui/src/app/models/vm_resource_pool.rb |    3 +++
 1 files changed, 3 insertions(+), 0 deletions(-)

diff --git a/wui/src/app/models/vm_resource_pool.rb b/wui/src/app/models/vm_resource_pool.rb
index 85e3661..de8bcb3 100644
--- a/wui/src/app/models/vm_resource_pool.rb
+++ b/wui/src/app/models/vm_resource_pool.rb
@@ -97,6 +97,9 @@ class VmResourcePool < Pool
                         :conditions => "hardware_pool_id = #{hw_pool.id}")
     host_mem_limit = (memhost.nil? ? 0 : memhost.memory)
     cpuhost = Host.find(:first, :order => "num_cpus DESC",
+                        :select => "hosts.id, count (cpus) as num_cpus",
+                        :joins => "LEFT OUTER JOIN cpus ON hosts.id = cpus.host_id",
+                        :group => "hosts.id",
                         :conditions => "hardware_pool_id = #{hw_pool.id}")
     host_cpu_limit = cpuhost.nil? ? 0 : cpuhost.num_cpus
     resources[:memory] = host_mem_limit if resources[:memory].nil? or host_mem_limit < resources[:memory]
-- 
1.5.5.1




More information about the ovirt-devel mailing list