Commit 778d9f9b authored by Pranith Kumar's avatar Pranith Kumar Committed by Paolo Bonzini
Browse files

icount: possible options for sleep are on or off 



icount sleep takes on or off as options. A few places mention sleep=no
which is not accepted. This patch corrects them.

Signed-off-by: default avatarPranith Kumar <bobby.prani@gmail.com>
Message-Id: <1456499811-16819-1-git-send-email-bobby.prani@gmail.com>
Signed-off-by: default avatarPaolo Bonzini <pbonzini@redhat.com>
parent 729633c2

cpus.c

+2 −2
Original line number Diff line number Diff line
@@ -630,7 +630,7 @@ void configure_icount(QemuOpts *opts, Error **errp) 
    icount_align_option = qemu_opt_get_bool(opts, "align", false);



    if (icount_align_option && !icount_sleep) {

        error_setg(errp, "align=on and sleep=no are incompatible");

        error_setg(errp, "align=on and sleep=off are incompatible");

    }

    if (strcmp(option, "auto") != 0) {

        errno = 0;
@@ -643,7 +643,7 @@ void configure_icount(QemuOpts *opts, Error **errp) 
    } else if (icount_align_option) {

        error_setg(errp, "shift=auto and align=on are incompatible");

    } else if (!icount_sleep) {

        error_setg(errp, "shift=auto and sleep=no are incompatible");

        error_setg(errp, "shift=auto and sleep=off are incompatible");

    }



    use_icount = 2;

qemu-options.hx

+3 −3
Original line number Diff line number Diff line
@@ -3276,7 +3276,7 @@ re-inject them. 
ETEXI



DEF("icount", HAS_ARG, QEMU_OPTION_icount, \

    "-icount [shift=N|auto][,align=on|off][,sleep=no,rr=record|replay,rrfile=<filename>]\n" \

    "-icount [shift=N|auto][,align=on|off][,sleep=on|off,rr=record|replay,rrfile=<filename>]\n" \

    "                enable virtual instruction counter with 2^N clock ticks per\n" \

    "                instruction, enable aligning the host and virtual clocks\n" \

    "                or disable real time cpu sleeping\n", QEMU_ARCH_ALL)
@@ -3289,8 +3289,8 @@ then the virtual cpu speed will be automatically adjusted to keep virtual 
time within a few seconds of real time.



When the virtual cpu is sleeping, the virtual time will advance at default

speed unless @option{sleep=no} is specified.

With @option{sleep=no}, the virtual time will jump to the next timer deadline

speed unless @option{sleep=on|off} is specified.

With @option{sleep=on|off}, the virtual time will jump to the next timer deadline

instantly whenever the virtual cpu goes to sleep mode and will not advance

if no timer is enabled. This behavior give deterministic execution times from

the guest point of view.