commit 2a62914bd8209d97e918f30f0de74bec2bf622c4
author Pavel Dovgalyuk <Pavel.Dovgaluk@ispras.ru> Mon Dec 08 10:53:45 2014 +0300
committer Paolo Bonzini <pbonzini@redhat.com> Mon Dec 15 12:21:02 2014 +0100
tree d085c0d5a06f4a9ea4302178b2987a3e2f8628c5
parent 626cf8f4c6157ed133f0daa89b90d4169060bc97

icount: introduce cpu_get_icount_raw

Separate accessing the instruction counter from the compensation for
speed and halting that are introduced by qemu_icount_bias.  This
introduces new infrastructure used by the record/replay patches.

Signed-off-by: Pavel Dovgalyuk <Pavel.Dovgaluk@ispras.ru>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>

cpus.c

diff --git a/cpus.c b/cpus.c
index 615d4ae..5f8acba 100644
--- a/cpus.c
+++ b/cpus.c
@@ -136,8 +136,7 @@
 
 static TimersState timers_state;
 
-/* Return the virtual CPU time, based on the instruction counter.  */
-static int64_t cpu_get_icount_locked(void)
+int64_t cpu_get_icount_raw(void)
 {
     int64_t icount;
     CPUState *cpu = current_cpu;
@@ -145,10 +144,18 @@
     icount = timers_state.qemu_icount;
     if (cpu) {
         if (!cpu_can_do_io(cpu)) {
-            fprintf(stderr, "Bad clock read\n");
+            fprintf(stderr, "Bad icount read\n");
+            exit(1);
         }
         icount -= (cpu->icount_decr.u16.low + cpu->icount_extra);
     }
+    return icount;
+}
+
+/* Return the virtual CPU time, based on the instruction counter.  */
+static int64_t cpu_get_icount_locked(void)
+{
+    int64_t icount = cpu_get_icount_raw();
     return timers_state.qemu_icount_bias + cpu_icount_to_ns(icount);
 }