From patchwork Fri Sep 16 15:09:02 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Paolo Bonzini X-Patchwork-Id: 114989 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 B1A7DB6FA1 for ; Sat, 17 Sep 2011 02:39:48 +1000 (EST) Received: from localhost ([::1]:49094 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1R4a3d-0006oh-To for incoming@patchwork.ozlabs.org; Fri, 16 Sep 2011 11:10:25 -0400 Received: from eggs.gnu.org ([140.186.70.92]:41162) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1R4a2f-0004Qw-Sf for qemu-devel@nongnu.org; Fri, 16 Sep 2011 11:09:30 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1R4a2e-00081F-CS for qemu-devel@nongnu.org; Fri, 16 Sep 2011 11:09:25 -0400 Received: from mail-ww0-f53.google.com ([74.125.82.53]:51127) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1R4a2e-000805-89 for qemu-devel@nongnu.org; Fri, 16 Sep 2011 11:09:24 -0400 Received: by mail-ww0-f53.google.com with SMTP id 14so4687113wwg.10 for ; Fri, 16 Sep 2011 08:09:24 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=sender:from:to:cc:subject:date:message-id:x-mailer:in-reply-to :references; bh=ikFh1AolJVQfmSvtsBpm9YtoOWKXgkdHS/eSFKyo45Q=; b=pwjX+GKexpxXXLPeD0u3a8Fm7bqJXxxTrQ/+O0lFt7NgVYheOlDvxfHtVG6JDMog4q lph3ay2gVuCqLKHodyXMbsuHxnP+eBYvBvctGj/G05x92lTcFuqTp+5UVWFkWAaUbUpe mQJyDxACT7XIdLj15ZqQa5d4fn4aMAphEOpmI= Received: by 10.227.36.197 with SMTP id u5mr165376wbd.36.1316185763966; Fri, 16 Sep 2011 08:09:23 -0700 (PDT) Received: from localhost.localdomain (93-34-199-31.ip51.fastwebnet.it. [93.34.199.31]) by mx.google.com with ESMTPS id fd4sm12872738wbb.21.2011.09.16.08.09.23 (version=TLSv1/SSLv3 cipher=OTHER); Fri, 16 Sep 2011 08:09:23 -0700 (PDT) From: Paolo Bonzini To: qemu-devel@nongnu.org Date: Fri, 16 Sep 2011 17:09:02 +0200 Message-Id: <1316185750-9187-7-git-send-email-pbonzini@redhat.com> X-Mailer: git-send-email 1.7.6 In-Reply-To: <1316185750-9187-1-git-send-email-pbonzini@redhat.com> References: <1316185750-9187-1-git-send-email-pbonzini@redhat.com> X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 2) X-Received-From: 74.125.82.53 Cc: aliguori@us.ibm.com Subject: [Qemu-devel] [RFC PATCH 06/14] qemu-timer: do not refer to vm_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 31d450c..f8799f5 100644 --- a/cpus.c +++ b/cpus.c @@ -1065,6 +1065,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 9238458..0c7cfd2 100644 --- a/qemu-timer.c +++ b/qemu-timer.c @@ -504,10 +504,7 @@ void qemu_run_all_timers(void) } /* vm time timers */ - if (vm_running) { - qemu_run_timers(vm_clock); - } - + qemu_run_timers(vm_clock); qemu_run_timers(rt_clock); qemu_run_timers(host_clock); }