From patchwork Fri Feb 26 15:16:51 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Pranith Kumar X-Patchwork-Id: 8438531 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 BC62C9F52D for ; Fri, 26 Feb 2016 15:31:46 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 159F32038F for ; Fri, 26 Feb 2016 15:31:46 +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 651FC203B1 for ; Fri, 26 Feb 2016 15:31:45 +0000 (UTC) Received: from localhost ([::1]:50534 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aZKMq-0000n2-Lo for patchwork-qemu-devel@patchwork.kernel.org; Fri, 26 Feb 2016 10:31:44 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:35695) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aZK6M-0005rS-1H for qemu-devel@nongnu.org; Fri, 26 Feb 2016 10:14:42 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1aZK6I-0003P9-Nv for qemu-devel@nongnu.org; Fri, 26 Feb 2016 10:14:41 -0500 Received: from mail-yw0-x22d.google.com ([2607:f8b0:4002:c05::22d]:36468) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aZK6I-0003P2-FF for qemu-devel@nongnu.org; Fri, 26 Feb 2016 10:14:38 -0500 Received: by mail-yw0-x22d.google.com with SMTP id e63so70858251ywc.3 for ; Fri, 26 Feb 2016 07:14:38 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:subject:date:message-id; bh=EQ6r/rYuSYBRj4ZagSRuthJsa4T9B0VjNcp+XuDhhDk=; b=J2lG745JmS7BHdbgqKGFdajT7lboFeSkli7ymfhLaDfO3T63EAEsVkuzleauQVAqKF OgJYQLnnqrEhF5xNMpyr7fNaQWKSWJobz7Fva0uLoXerdTZSZcrLnXL51BkVmlJF3vsa otPgyLmti/nSFBTIH5nVdj9jXYakZQFTVSTL+3lTkGgtkkzT6HO7xSLt2neSCYEQ7Em4 WitnqyGdZ5IXajhExF6/RtQaEWz3D7knk87zkqGikKi/44XY7r4G3tXf9qw34ArKoMoN GnnowhfEk/ejCzN5QGIy53WLkmVpg0X70/e2SFcb0Iaa6/gVYYA1pmln5zwW0E77hvqD ZHiw== 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; bh=EQ6r/rYuSYBRj4ZagSRuthJsa4T9B0VjNcp+XuDhhDk=; b=BulmNrg8neK3NU9d4rWYOvE/c+XJNHKPaLHaeBO4AShkG1Otg7+NGq9pCK4TXRxt+e El3k1DlhwOIwOn+aOSE0PH2JJu5baRYl/h9xGYBfGCXa90BXpXBD3toPcyQdXCxfoQG6 9r2gceWR+kaRmj/5z7IgVN23NfNZxPsVdYzP7/EmfG3eprpRd7oGwN4acQH5KlKeRBts ys+t6VvTbYryxSkBofBaAcV9dcXGimbgk4foxVEoj1dSbCTh+a/MCoeVvZD9flAxBTKq cJ7tSUHXBllyF6XdkcqE0M2wHmZJv+3nSeUkUpbPi0iv57fW5W2Cxx1Cf1q6ThllCC/a UAvw== X-Gm-Message-State: AD7BkJLcqfQuhBbWMWHigZ4J2Cz7NPmZ3JIjveLMpDcl7qv9d74z8fF7Bo2Jf6HMN5QdRg== X-Received: by 10.129.48.137 with SMTP id w131mr1120999yww.82.1456499677748; Fri, 26 Feb 2016 07:14:37 -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 u190sm10128865ywd.17.2016.02.26.07.14.37 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Fri, 26 Feb 2016 07:14:37 -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:16:51 -0500 Message-Id: <1456499811-16819-1-git-send-email-bobby.prani@gmail.com> X-Mailer: git-send-email 2.7.1 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 2607:f8b0:4002:c05::22d Subject: [Qemu-devel] [PATCH] icount: possible options for sleep 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 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 --- 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..bbe0e51 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=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.