From: Paolo Bonzini <pbonzini@redhat.com>
To: qemu-devel@nongnu.org
Cc: Pranith Kumar <bobby.prani@gmail.com>
Subject: [Qemu-devel] [PULL 10/15] icount: possible options for sleep are on or off
Date: Mon, 7 Mar 2016 18:36:56 +0100 [thread overview]
Message-ID: <1457372221-19285-11-git-send-email-pbonzini@redhat.com> (raw)
In-Reply-To: <1457372221-19285-1-git-send-email-pbonzini@redhat.com>
From: Pranith Kumar <bobby.prani@gmail.com>
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: Pranith Kumar <bobby.prani@gmail.com>
Message-Id: <1456499811-16819-1-git-send-email-bobby.prani@gmail.com>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
---
cpus.c | 4 ++--
qemu-options.hx | 6 +++---
2 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/cpus.c b/cpus.c
index 9592163..bc774e2 100644
--- a/cpus.c
+++ b/cpus.c
@@ -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;
diff --git a/qemu-options.hx b/qemu-options.hx
index 144e6a9..2aa6577 100644
--- a/qemu-options.hx
+++ b/qemu-options.hx
@@ -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.
--
2.5.0
next prev parent reply other threads:[~2016-03-07 17:37 UTC|newest]
Thread overview: 17+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-03-07 17:36 [Qemu-devel] [PULL 00/15] Memory changes and misc bug fixes for 2016-03-07 Paolo Bonzini
2016-03-07 17:36 ` [Qemu-devel] [PULL 01/15] log: do not log if QEMU is daemonized but without -D Paolo Bonzini
2016-03-07 17:36 ` [Qemu-devel] [PULL 02/15] i8257: fix Terminal Count status Paolo Bonzini
2016-03-07 17:36 ` [Qemu-devel] [PULL 03/15] exec: Return RAMBlock pointer from allocating functions Paolo Bonzini
2016-03-07 17:36 ` [Qemu-devel] [PULL 04/15] memory: Move assignment to ram_block to memory_region_init_* Paolo Bonzini
2016-03-07 17:36 ` [Qemu-devel] [PULL 05/15] memory: Implement memory_region_get_ram_addr with mr->ram_block Paolo Bonzini
2016-03-07 17:36 ` [Qemu-devel] [PULL 06/15] memory: Drop MemoryRegion.ram_addr Paolo Bonzini
2016-03-07 17:36 ` [Qemu-devel] [PULL 07/15] exec: Pass RAMBlock pointer to qemu_ram_free Paolo Bonzini
2016-03-07 17:36 ` [Qemu-devel] [PULL 08/15] exec: Factor out section_covers_addr Paolo Bonzini
2016-03-07 17:36 ` [Qemu-devel] [PULL 09/15] exec: Introduce AddressSpaceDispatch.mru_section Paolo Bonzini
2016-03-07 17:36 ` Paolo Bonzini [this message]
2016-03-07 17:36 ` [Qemu-devel] [PULL 11/15] doc/memory.txt: correct a logic error Paolo Bonzini
2016-03-07 17:36 ` [Qemu-devel] [PULL 12/15] doc/memory.txt: correct description of MemoryRegionOps fields Paolo Bonzini
2016-03-07 17:36 ` [Qemu-devel] [PULL 13/15] MAINTAINERS: Add entry for include/sysemu/kvm*.h Paolo Bonzini
2016-03-07 17:37 ` [Qemu-devel] [PULL 14/15] kvm/irqchip: use bitmap utility for gsi tracking Paolo Bonzini
2016-03-07 17:37 ` [Qemu-devel] [PULL 15/15] scsi-bus: Remove tape command from scsi_req_xfer Paolo Bonzini
2016-03-08 5:48 ` [Qemu-devel] [PULL 00/15] Memory changes and misc bug fixes for 2016-03-07 Peter Maydell
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1457372221-19285-11-git-send-email-pbonzini@redhat.com \
--to=pbonzini@redhat.com \
--cc=bobby.prani@gmail.com \
--cc=qemu-devel@nongnu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).