From patchwork Sat Mar 5 17:14:13 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Paolo Bonzini X-Patchwork-Id: 85538 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [199.232.76.165]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id C2672B70D6 for ; Sun, 6 Mar 2011 04:19:00 +1100 (EST) Received: from localhost ([127.0.0.1]:42112 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1Pvv85-0001cn-FI for incoming@patchwork.ozlabs.org; Sat, 05 Mar 2011 12:18:57 -0500 Received: from [140.186.70.92] (port=46671 helo=eggs.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1Pvv3j-00080s-Ac for qemu-devel@nongnu.org; Sat, 05 Mar 2011 12:14:28 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Pvv3h-0004SL-UD for qemu-devel@nongnu.org; Sat, 05 Mar 2011 12:14:27 -0500 Received: from mail-qy0-f180.google.com ([209.85.216.180]:64148) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Pvv3h-0004Ry-RW for qemu-devel@nongnu.org; Sat, 05 Mar 2011 12:14:25 -0500 Received: by qyk10 with SMTP id 10so3368961qyk.4 for ; Sat, 05 Mar 2011 09:14:25 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=domainkey-signature:sender:from:to:cc:subject:date:message-id :x-mailer:in-reply-to:references; bh=aRLVLxHBNoAcaTP7Nq+xEPeMWQlzkrF1gYuC6hDgvwY=; b=tUqZ4K1pFUULR6jArWvqYUhjcB6Wm9xkiOm7uIN1Af6PJ7566QbD5aV+h8J21s5sFY GO+ehllMX5G5n3nLpp2fXMSItA+uwQJSFzzlCRODkncwAT3pGMtu6/MzWAp0Aw2Nslnb EjCFxLGm+VbNUvObRZjBbdqz2LK6hW4tJt1SQ= DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=gamma; h=sender:from:to:cc:subject:date:message-id:x-mailer:in-reply-to :references; b=W9fvugWZFxhPxglfS9KGbVs3Kqv/pf3Dj45zLsCrlNa22xPJAIPX2nlqwZGLHDcKQE brgqWTUs6qXaDxJvHf5E7IwqZW2ZTkF9DKdHJiP32CorD5h8q9rvX9jHM+MHg/SbgYAa 7USGc+/j+LRxGrhbsKnf4rRVpf618ATq2dSus= Received: by 10.224.86.130 with SMTP id s2mr1733117qal.138.1299345265341; Sat, 05 Mar 2011 09:14:25 -0800 (PST) Received: from localhost.localdomain (93-34-197-200.ip51.fastwebnet.it [93.34.197.200]) by mx.google.com with ESMTPS id l17sm488500qck.8.2011.03.05.09.14.23 (version=TLSv1/SSLv3 cipher=OTHER); Sat, 05 Mar 2011 09:14:24 -0800 (PST) From: Paolo Bonzini To: qemu-devel@nongnu.org Date: Sat, 5 Mar 2011 18:14:13 +0100 Message-Id: <1299345255-577-2-git-send-email-pbonzini@redhat.com> X-Mailer: git-send-email 1.7.4 In-Reply-To: <1299345255-577-1-git-send-email-pbonzini@redhat.com> References: <1299345255-577-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.216.180 Cc: edgar.iglesias@gmail.com, mtosatti@redhat.com, jan.kiszka@web.de Subject: [Qemu-devel] [PATCH 1/3] qemu_next_deadline should not consider host-time timers X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: qemu-devel.nongnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org It is purely for icount-based virtual timers. Signed-off-by: Paolo Bonzini --- qemu-timer.c | 7 +------ 1 files changed, 1 insertions(+), 6 deletions(-) diff --git a/qemu-timer.c b/qemu-timer.c index 88c7b28..06fa507 100644 --- a/qemu-timer.c +++ b/qemu-timer.c @@ -689,16 +689,11 @@ int64_t qemu_next_deadline(void) /* To avoid problems with overflow limit this to 2^32. */ int64_t delta = INT32_MAX; + assert(use_icount); if (active_timers[QEMU_CLOCK_VIRTUAL]) { delta = active_timers[QEMU_CLOCK_VIRTUAL]->expire_time - qemu_get_clock_ns(vm_clock); } - if (active_timers[QEMU_CLOCK_HOST]) { - int64_t hdelta = active_timers[QEMU_CLOCK_HOST]->expire_time - - qemu_get_clock_ns(host_clock); - if (hdelta < delta) - delta = hdelta; - } if (delta < 0) delta = 0;