virt-install: Fix cpuset=auto

Some refactoring broke it a while back :(

Author: crobinso

virt-image

@@ -164,7 +164,7 @@ def main(conn=None):
     cli.get_memory(options.memory, guest, image.domain.memory)
     cli.get_uuid(options.uuid, guest)
     cli.get_vcpus(guest, options.vcpus, options.check_cpu, image.domain.vcpu)
-    cli.get_cpuset(guest, options.cpuset)
+    cli.get_cpuset(guest, options.cpuset, guest.memory)
     cli.parse_cpu(guest, options.cpu)
     get_networks(image.domain, guest, options)
 

virt-install

@@ -478,7 +478,6 @@ def build_guest_instance(conn, options):
     # Guest configuration
     cli.get_uuid(options.uuid, guest)
     cli.get_vcpus(guest, options.vcpus, options.check_cpu)
-    cli.get_cpuset(guest, options.cpuset)
     cli.parse_numatune(guest, options.numatune)
     cli.parse_cpu(guest, options.cpu)
     cli.parse_security(guest, options.security)
@@ -534,6 +533,9 @@ def build_guest_instance(conn, options):
     # this after setting guest.installer at least
     check_option_collisions(options, guest)
 
+    # Needs to come after setting memory
+    cli.get_cpuset(guest, options.cpuset, guest.memory)
+
     # Warnings
     if options.pxe and not supports_pxe(guest):
         logging.warn(_("The guest's network configuration does not support "

virtinst/cli.py

@@ -822,15 +822,15 @@ def get_vcpus(guest, vcpus, check_cpu, image_vcpus=None):
             if not prompt_for_yes_or_no(msg, askmsg):
                 nice_exit()
 
-def get_cpuset(guest, cpuset):
+def get_cpuset(guest, cpuset, memory):
     conn = guest.conn
     if cpuset and cpuset != "auto":
         guest.cpuset = cpuset
 
     elif cpuset == "auto":
         tmpset = None
         try:
-            tmpset = Guest.generate_cpuset(conn, guest.memory)
+            tmpset = Guest.generate_cpuset(conn, memory)
         except Exception, e:
             logging.debug("Not setting cpuset: %s", str(e))