From patchwork Fri Jan 30 15:01:15 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Paolo Bonzini X-Patchwork-Id: 434924 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id AB6441402A3 for ; Sat, 31 Jan 2015 02:06:17 +1100 (AEDT) Received: from localhost ([::1]:37184 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YHD9D-0002iq-PY for incoming@patchwork.ozlabs.org; Fri, 30 Jan 2015 10:06:15 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:52704) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YHD4o-0003OJ-6A for qemu-devel@nongnu.org; Fri, 30 Jan 2015 10:01:42 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1YHD4n-0005dZ-Bz for qemu-devel@nongnu.org; Fri, 30 Jan 2015 10:01:42 -0500 Received: from mail-wi0-x230.google.com ([2a00:1450:400c:c05::230]:46200) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YHD4n-0005dP-5Y for qemu-devel@nongnu.org; Fri, 30 Jan 2015 10:01:41 -0500 Received: by mail-wi0-f176.google.com with SMTP id bs8so3676930wib.3 for ; Fri, 30 Jan 2015 07:01:40 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references; bh=zjxccKhMJ0hEKP2hdBqtbYdJHgu+xCBDEmUdLiRiRwY=; b=wveDC9y9pZg3tCqfKbf3wu4bAGkAUaBMUsNlNeqP5ZBRS5uPyvqpuQlAySF1Z9Qsj3 KjgUIBCjhN3YA7Gk9mjkCTr+ojfpkAr/ZnjnuazyOEUyiXC8gzJN7ULSJcRolAZw7IVF yeexrdnCnstyeBA3ExU7UZPetrBMj8vZVL5VcikdGAs5JTVfPcV2jEx1xhJG8Bk8c/GQ dACAcQiHq0mPb3duEcDNhshQpp0+VvsRO/rdOtFIcCr/13r0TD3bSAWqonOiSsvxKana 56oHgxP3vMLKyxDybCF7r0iRJRpPaIoFuu1895LjVoEX8VNrIRLluBBnMz/QD1c8Avgq T5qA== X-Received: by 10.180.74.114 with SMTP id s18mr5632568wiv.29.1422630100514; Fri, 30 Jan 2015 07:01:40 -0800 (PST) Received: from playground.station (net-93-66-105-136.cust.vodafonedsl.it. [93.66.105.136]) by mx.google.com with ESMTPSA id q10sm15273370wjr.41.2015.01.30.07.01.38 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 30 Jan 2015 07:01:39 -0800 (PST) From: Paolo Bonzini To: qemu-devel@nongnu.org Date: Fri, 30 Jan 2015 16:01:15 +0100 Message-Id: <1422630078-18704-9-git-send-email-pbonzini@redhat.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1422630078-18704-1-git-send-email-pbonzini@redhat.com> References: <1422630078-18704-1-git-send-email-pbonzini@redhat.com> X-detected-operating-system: by eggs.gnu.org: Error: Malformed IPv6 address (bad octet value). X-Received-From: 2a00:1450:400c:c05::230 Cc: Sebastian Tanase Subject: [Qemu-devel] [PULL 08/11] cpu-exec: simplify align_clocks 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 sc->diff_clk is already equal to sleep_delay (split in a second and a nanosecond part). If you subtract sleep_delay - rem_delay, the result is exactly rem_delay. Cc: Sebastian Tanase Signed-off-by: Paolo Bonzini --- cpu-exec.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/cpu-exec.c b/cpu-exec.c index a4f0eff..9dd1ca5 100644 --- a/cpu-exec.c +++ b/cpu-exec.c @@ -61,8 +61,7 @@ static void align_clocks(SyncClocks *sc, const CPUState *cpu) sleep_delay.tv_sec = sc->diff_clk / 1000000000LL; sleep_delay.tv_nsec = sc->diff_clk % 1000000000LL; if (nanosleep(&sleep_delay, &rem_delay) < 0) { - sc->diff_clk -= (sleep_delay.tv_sec - rem_delay.tv_sec) * 1000000000LL; - sc->diff_clk -= sleep_delay.tv_nsec - rem_delay.tv_nsec; + sc->diff_clk = rem_delay.tv_sec * 1000000000LL + rem_delay.tv_nsec; } else { sc->diff_clk = 0; }