From: Max Filippov <jcmvbkbc@gmail.com>
Date: Thu, 10 Nov 2011 11:38:42 +0000 (+0400)
Subject: vl.c: prohibit simultaneous use of -icount with kvm or xen
X-Git-Tag: TizenStudio_2.0_p2.3.2~208^2~5016
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=0abe905d29f556128c5fb2ea8d93e982e94aaa67;p=sdk%2Femulator%2Fqemu.git

vl.c: prohibit simultaneous use of -icount with kvm or xen

With -icount, The vm_clock is updated with help from TCG (it counts
instructions at 2^ICOUNT ns/instructions). With KVM, the instruction
count is not available so KVM cannot provide this help.

Signed-off-by: Max Filippov <jcmvbkbc@gmail.com>
Acked-by: Paolo Bonzini <pbonzini@redhat.com>
Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
---

diff --git a/vl.c b/vl.c
index 16fa222..f5afed4 100644
--- a/vl.c
+++ b/vl.c
@@ -3231,6 +3231,11 @@ int main(int argc, char **argv, char **envp)
         fprintf(stderr, "could not initialize alarm timer\n");
         exit(1);
     }
+
+    if (icount_option && (kvm_enabled() || xen_enabled())) {
+        fprintf(stderr, "-icount is not allowed with kvm or xen\n");
+        exit(1);
+    }
     configure_icount(icount_option);
 
     if (net_init_clients() < 0) {