From patchwork Fri Feb 26 15:20:43 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Pranith Kumar X-Patchwork-Id: 8438801 Return-Path: X-Original-To: patchwork-qemu-devel@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork1.web.kernel.org (Postfix) with ESMTP id 7A0629F88A for ; Fri, 26 Feb 2016 15:43:36 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id B9BF7203B4 for ; Fri, 26 Feb 2016 15:43:35 +0000 (UTC) Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 1196E20392 for ; Fri, 26 Feb 2016 15:43:35 +0000 (UTC) Received: from localhost ([::1]:50664 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aZKYI-0003e1-DD for patchwork-qemu-devel@patchwork.kernel.org; Fri, 26 Feb 2016 10:43:34 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:36851) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aZKA5-0003vS-Tw for qemu-devel@nongnu.org; Fri, 26 Feb 2016 10:18:39 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1aZKA3-0004QE-0l for qemu-devel@nongnu.org; Fri, 26 Feb 2016 10:18:33 -0500 Received: from mail-yw0-x22f.google.com ([2607:f8b0:4002:c05::22f]:34317) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aZKA2-0004QA-T1 for qemu-devel@nongnu.org; Fri, 26 Feb 2016 10:18:30 -0500 Received: by mail-yw0-x22f.google.com with SMTP id h129so71203894ywb.1 for ; Fri, 26 Feb 2016 07:18:30 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:subject:date:message-id:in-reply-to:references; bh=85cGQtKEzwillmSesLizEeY89LhP2TzXaeZOpwW0Iwo=; b=NLg4lLgzHkfyGmbgFZ6eEnjkXqrEEtYmsdm9W/YvKsACvuP2cihZFlfxD0juhyIceH ussBU/HJG7/vHa9Cx1hzrzllXkCJZYrOHqBNgNzCP3KvE6eXiZAfo5gx+oMEBiJGzay2 u+jiPuCE3l3uzJeI1fJ6tiPCF2WkyjmtYDicTAr2/XGQZe/7e0R4Vx/zwrOMJ5eyISoa Cc3OCQJHOjDyOF/hTzXMuwwwxcc1VXMpZB/RK/+ZL/jVi5wOqcLKRXJrpkl3ORS6/VV+ PL6dtnsCHuCpLDNiRlR2KMRggwavvcR14YxLiDusYlNAzTi1r6o2uPcMfB9QFH/JWXIW 0o6A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references; bh=85cGQtKEzwillmSesLizEeY89LhP2TzXaeZOpwW0Iwo=; b=fkB/G4TQXXP6+n/euHObkawNvNILRB3RrFTctcZ7mvH/CYH87cynwmAWQkrRw5OKub t3l6LF3xFmgFZbsKDZR3GovJaRb1djzc8sjI01ErZsk+0NrVjPUuBEPaSU19/CjKroYm GySprjS3PMurf3ZiwHvB6w3heJY7ygscpwVZetv8Fjb/K1/6+eeMtfgNJEDOOdjStEFR LlIBlvqTEySuJhhIub40DK+xUApHcUmKyvjtsd1sptGWig9TY3wRJNb6iFdTOEHTVZU3 PYSLDwq2r59ffuj6dRqEQYnz7fKXU3X/3lBrOWd48xtcXdMxvBdVXEd7dqL20okTsLzY 948w== X-Gm-Message-State: AD7BkJKURVE9pI4VDRk8zB45DSZ2itb/ykGtb1XcxNsWb/BRbAHaeHaKD9Qr6/3NsxSV1Q== X-Received: by 10.129.86.131 with SMTP id k125mr1151583ywb.158.1456499910572; Fri, 26 Feb 2016 07:18:30 -0800 (PST) Received: from evgadesktop.attlocal.net (108-232-152-155.lightspeed.tukrga.sbcglobal.net. [108.232.152.155]) by smtp.gmail.com with ESMTPSA id t64sm10113953ywa.45.2016.02.26.07.18.29 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Fri, 26 Feb 2016 07:18:30 -0800 (PST) From: Pranith Kumar To: Paolo Bonzini , Peter Crosthwaite , Richard Henderson , qemu-devel@nongnu.org (open list:Overall) Date: Fri, 26 Feb 2016 10:20:43 -0500 Message-Id: <1456500043-20515-2-git-send-email-bobby.prani@gmail.com> X-Mailer: git-send-email 2.7.1 In-Reply-To: <1456500043-20515-1-git-send-email-bobby.prani@gmail.com> References: <1456500043-20515-1-git-send-email-bobby.prani@gmail.com> X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 2607:f8b0:4002:c05::22f Subject: [Qemu-devel] [PATCH 1/1] icount: possible options are on or off X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Sender: qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org X-Spam-Status: No, score=-6.8 required=5.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED, FREEMAIL_FROM, RCVD_IN_DNSWL_HI, T_DKIM_INVALID, UNPARSEABLE_RELAY autolearn=ham version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP Signed-off-by: Pranith Kumar --- 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 599db94..b7a6e65 100644 --- a/qemu-options.hx +++ b/qemu-options.hx @@ -3275,7 +3275,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=]\n" \ + "-icount [shift=N|auto][,align=on|off][,sleep=on|off,rr=record|replay,rrfile=]\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) @@ -3288,8 +3288,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=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.