[Qemu-devel] [PATCH] vl.c: prohibit simultaneous use of -icount and kvm

[Max Filippov]

Signed-off-by: Max Filippov <address@hidden>
---
 vl.c |    8 +++++++-
 1 files changed, 7 insertions(+), 1 deletions(-)

diff --git a/vl.c b/vl.c
index f169aac..cac665e 100644
--- a/vl.c
+++ b/vl.c
@@ -3226,7 +3226,13 @@ int main(int argc, char **argv, char **envp)
         fprintf(stderr, "could not initialize alarm timer\n");
         exit(1);
     }
-    configure_icount(icount_option);
+
+    if (icount_option && kvm_enabled()) {
+        fprintf(stderr, "-icount is not allowed with kvm acceleration\n");
+        exit(1);
+    } else {
+        configure_icount(icount_option);
+    }
 
     if (net_init_clients() < 0) {
         exit(1);
-- 
1.7.2.5