From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:59390) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YHDMp-0006dF-BJ for qemu-devel@nongnu.org; Fri, 30 Jan 2015 10:20:20 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1YHDMo-0005E3-Ao for qemu-devel@nongnu.org; Fri, 30 Jan 2015 10:20:19 -0500 Received: from mail-wg0-x22d.google.com ([2a00:1450:400c:c00::22d]:40297) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YHDMo-0005Dx-45 for qemu-devel@nongnu.org; Fri, 30 Jan 2015 10:20:18 -0500 Received: by mail-wg0-f45.google.com with SMTP id x12so27458549wgg.4 for ; Fri, 30 Jan 2015 07:20:17 -0800 (PST) Sender: Paolo Bonzini From: Paolo Bonzini Date: Fri, 30 Jan 2015 16:19:54 +0100 Message-Id: <1422631197-26063-9-git-send-email-pbonzini@redhat.com> In-Reply-To: <1422631197-26063-1-git-send-email-pbonzini@redhat.com> References: <1422631197-26063-1-git-send-email-pbonzini@redhat.com> Subject: [Qemu-devel] [PULL 08/11] cpu-exec: simplify align_clocks List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: Sebastian Tanase 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; } -- 1.8.3.1