Pass type to util.get_max_vcpus. Gives accurate value if ex. installing kvm guest on qemu connection.

Author: crobinso

virtinst/Guest.py

@@ -602,7 +602,7 @@ def set_uuid(self, val):
     def get_vcpus(self):
         return self._vcpus
     def set_vcpus(self, val):
-        maxvcpus = util.get_max_vcpus(self.conn)
+        maxvcpus = util.get_max_vcpus(self.conn, self.type)
         if val < 1 or val > maxvcpus:
             raise ValueError, \
                   _("Number of vcpus must be in the range of 1-%d") % (maxvcpus,)

virtinst/util.py

@@ -192,11 +192,12 @@ def get_host_network_devices():
                         device.append(words)
     return device
 
-def get_max_vcpus(conn):
-    """@conn libvirt connection to poll for max possible vcpus"""
+def get_max_vcpus(conn, type=None):
+    """@conn libvirt connection to poll for max possible vcpus
+       @type optional guest type (kvm, etc.)"""
     try:
-        max = conn.getMaxVcpus(conn.getType().lower())
-    except Exception, e:
+        max = conn.getMaxVcpus(type.lower())
+    except libvirt.libvirtError:
         max = 32
     return max