From: Paolo Bonzini Date: Wed, 28 Jan 2015 09:09:55 +0000 (+0100) Subject: cpu-exec: simplify align_clocks X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=a498d0ef37cf23e1776240af61f558d113afdf4f;p=qemu.git cpu-exec: simplify align_clocks 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 --- diff --git a/cpu-exec.c b/cpu-exec.c index a4f0effaf4..9dd1ca5bb8 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; }