From patchwork Fri Nov 11 07:09:39 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Mars.cao" X-Patchwork-Id: 125382 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [140.186.70.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id C8647B71FB for ; Sun, 13 Nov 2011 18:54:25 +1100 (EST) Received: from localhost ([::1]:33596 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1RPUtQ-0006Tw-F9 for incoming@patchwork.ozlabs.org; Sun, 13 Nov 2011 02:54:20 -0500 Received: from eggs.gnu.org ([140.186.70.92]:42951) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1RPUtL-0006Tq-BS for qemu-devel@nongnu.org; Sun, 13 Nov 2011 02:54:16 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1RPUtK-0005og-JP for qemu-devel@nongnu.org; Sun, 13 Nov 2011 02:54:15 -0500 Received: from [118.186.202.32] (port=58802 helo=oc2115466153.ibm.com) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1RPUtK-0005oH-6D for qemu-devel@nongnu.org; Sun, 13 Nov 2011 02:54:14 -0500 Received: by oc2115466153.ibm.com (Postfix, from userid 500) id 59F183FD5E; Fri, 11 Nov 2011 15:09:51 +0800 (CST) From: "Cao,Bing Bu" To: pbonzini@redhat.com, jcmvbkbc@gmail.com Date: Fri, 11 Nov 2011 15:09:39 +0800 Message-Id: <1320995379-20861-1-git-send-email-mars@linux.vnet.ibm.com> X-Mailer: git-send-email 1.7.1 In-Reply-To: <4EBBB4B4.8030103@redhat.com> References: <4EBBB4B4.8030103@redhat.com> X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 3) X-Received-From: 118.186.202.32 Cc: mars@linux.vnet.ibm.com, qemu-devel@nongnu.org Subject: [Qemu-devel] [PATCH] Give an error when using -icount option with kvm accelerator X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org 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: Cao,Bing Bu --- vl.c | 8 ++++++-- 1 files changed, 6 insertions(+), 2 deletions(-) diff --git a/vl.c b/vl.c index f169aac..d2857a4 100644 --- a/vl.c +++ b/vl.c @@ -3226,8 +3226,12 @@ int main(int argc, char **argv, char **envp) fprintf(stderr, "could not initialize alarm timer\n"); exit(1); } - configure_icount(icount_option); - + if (!kvm_enabled()) { + configure_icount(icount_option); + } else { + fprintf(stderr, "-icount option only allowed without kvm accelerator\n"); + exit(1); + } if (net_init_clients() < 0) { exit(1); }