qemu-devel.nongnu.org archive mirror
 help / color / mirror / Atom feed
From: Paolo Bonzini <pbonzini@redhat.com>
To: qemu-devel@nongnu.org
Cc: Sebastian Tanase <sebastian.tanase@openwide.fr>
Subject: [Qemu-devel] [PATCH 1/2] cpu-exec: simplify align_clocks
Date: Wed, 28 Jan 2015 10:36:32 +0100	[thread overview]
Message-ID: <1422437793-14843-2-git-send-email-pbonzini@redhat.com> (raw)
In-Reply-To: <1422437793-14843-1-git-send-email-pbonzini@redhat.com>

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 <sebastian.tanase@openwide.fr>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
---
 cpu-exec.c | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/cpu-exec.c b/cpu-exec.c
index a4f0eff..ef0f12c 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;
         }
-- 
2.1.0

  reply	other threads:[~2015-01-28  9:36 UTC|newest]

Thread overview: 3+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2015-01-28  9:36 [Qemu-devel] [PATCH 0/2] cpu-exec: simplify -icount align Paolo Bonzini
2015-01-28  9:36 ` Paolo Bonzini [this message]
2015-01-28  9:36 ` [Qemu-devel] [PATCH 2/2] cpu-exec: simplify init_delay_params Paolo Bonzini

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1422437793-14843-2-git-send-email-pbonzini@redhat.com \
    --to=pbonzini@redhat.com \
    --cc=qemu-devel@nongnu.org \
    --cc=sebastian.tanase@openwide.fr \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).