← Back to branch summary

~ubuntu-branches/ubuntu/raring/virtinst/raring-proposed

« back to all changes in this revision

Viewing changes to virtinst/cli.py

  • Committer: Package Import Robot
  • Author(s): Laurent Léonard
  • Date: 2012-08-26 18:13:38 UTC
  • mto: (1.6.9 sid)
  • mto: This revision was merged to the branch mainline in revision 44.
  • Revision ID: package-import@ubuntu.com-20120826181338-h0b25o7jx2nbm2sm
Tags: upstream-0.600.3
Import upstream version 0.600.3

Show diffs side-by-side

added added

removed removed

Lines of Context:
virtinst/cli.py
822
822
            if not prompt_for_yes_or_no(msg, askmsg):
823
823
                nice_exit()
824
824
 
825
 
def get_cpuset(guest, cpuset):
 
825
def get_cpuset(guest, cpuset, memory):
826
826
    conn = guest.conn
827
827
    if cpuset and cpuset != "auto":
828
828
        guest.cpuset = cpuset
830
830
    elif cpuset == "auto":
831
831
        tmpset = None
832
832
        try:
833
 
            tmpset = Guest.generate_cpuset(conn, guest.memory)
 
833
            tmpset = Guest.generate_cpuset(conn, memory)
834
834
        except Exception, e:
835
835
            logging.debug("Not setting cpuset: %s", str(e))
836
836
 
1126
1126
                           "--redirdev usb,type=tcp,server=192.168.1.1:4000"))
1127
1127
    devg.add_option("", "--memballoon", dest="memballoon", action="append",
1128
1128
                    help=_("Configure a guest memballoon device. Ex:\n"
1129
 
                           "--memballoon medel=virtio"))
 
1129
                           "--memballoon model=virtio"))
1130
1130
 
1131
1131
def add_gfx_option(devg):
1132
1132
    devg.add_option("", "--graphics", dest="graphics", action="append",