From patchwork Tue Sep 27 16:31:44 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Paolo Bonzini X-Patchwork-Id: 116631 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [140.186.70.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id A29ECB6F75 for ; Wed, 28 Sep 2011 02:52:55 +1000 (EST) Received: from localhost ([::1]:37129 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1R8aaK-0002QV-Pq for incoming@patchwork.ozlabs.org; Tue, 27 Sep 2011 12:32:44 -0400 Received: from eggs.gnu.org ([140.186.70.92]:42387) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1R8aZt-0001AD-3J for qemu-devel@nongnu.org; Tue, 27 Sep 2011 12:32:18 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1R8aZn-0002RA-Ax for qemu-devel@nongnu.org; Tue, 27 Sep 2011 12:32:16 -0400 Received: from mail-bw0-f45.google.com ([209.85.214.45]:60225) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1R8aZn-0002Pr-4S for qemu-devel@nongnu.org; Tue, 27 Sep 2011 12:32:11 -0400 Received: by mail-bw0-f45.google.com with SMTP id zv15so7356448bkb.4 for ; Tue, 27 Sep 2011 09:32:10 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=sender:from:to:subject:date:message-id:x-mailer:in-reply-to :references; bh=e6RRYl9HkI1fNUZxglc3AwU2venoRGjPhdDIYqyxSrQ=; b=tVFNPzLSvAkUQnGzdZhtwkty0L5UzV4GU7sSzXNwHlRkgNtHT93DtrabVocngxXSde K4dqe2NEnEVe9SnwQQ1vy1bj4hLUqM7413ZGdCPBLII6qQUNzCf/43j2ENbuIBRKgmy7 0ucbtJljenSqlfVAj1kwWLYVdDFHyvlkzTt7o= Received: by 10.204.133.138 with SMTP id f10mr4128907bkt.379.1317141130762; Tue, 27 Sep 2011 09:32:10 -0700 (PDT) Received: from localhost.localdomain (93-34-218-143.ip51.fastwebnet.it. [93.34.218.143]) by mx.google.com with ESMTPS id d1sm25178167bku.1.2011.09.27.09.32.09 (version=TLSv1/SSLv3 cipher=OTHER); Tue, 27 Sep 2011 09:32:10 -0700 (PDT) From: Paolo Bonzini To: qemu-devel@nongnu.org Date: Tue, 27 Sep 2011 18:31:44 +0200 Message-Id: <1317141111-27701-6-git-send-email-pbonzini@redhat.com> X-Mailer: git-send-email 1.7.6 In-Reply-To: <1317141111-27701-1-git-send-email-pbonzini@redhat.com> References: <1317141111-27701-1-git-send-email-pbonzini@redhat.com> X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 2) X-Received-From: 209.85.214.45 Subject: [Qemu-devel] [PATCH 05/12] qemu-timer: do not refer to runstate_is_running() 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+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Signed-off-by: Paolo Bonzini --- cpus.c | 1 + qemu-timer.c | 5 +---- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/cpus.c b/cpus.c index 58d353f..751833d 100644 --- a/cpus.c +++ b/cpus.c @@ -1060,6 +1060,7 @@ void pause_all_vcpus(void) { CPUState *penv = first_cpu; + qemu_clock_enable(vm_clock, false); while (penv) { penv->stop = 1; qemu_cpu_kick(penv); diff --git a/qemu-timer.c b/qemu-timer.c index 8129af6..d8507e3 100644 --- a/qemu-timer.c +++ b/qemu-timer.c @@ -504,10 +504,7 @@ void qemu_run_all_timers(void) } /* vm time timers */ - if (runstate_is_running()) { - qemu_run_timers(vm_clock); - } - + qemu_run_timers(vm_clock); qemu_run_timers(rt_clock); qemu_run_timers(host_clock); }