From patchwork Thu Nov 10 10:19:40 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Max Filippov X-Patchwork-Id: 124840 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 2F49F1007D1 for ; Thu, 10 Nov 2011 21:20:21 +1100 (EST) Received: from localhost ([::1]:60575 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1RORjv-0002U7-Dg for incoming@patchwork.ozlabs.org; Thu, 10 Nov 2011 05:20:11 -0500 Received: from eggs.gnu.org ([140.186.70.92]:53064) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1RORjk-0002Qp-MC for qemu-devel@nongnu.org; Thu, 10 Nov 2011 05:20:06 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1RORjj-0005cm-Ts for qemu-devel@nongnu.org; Thu, 10 Nov 2011 05:20:00 -0500 Received: from [195.131.132.186] (port=42070 helo=shelob.oktetlabs.ru) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1RORjj-0005cP-Ha for qemu-devel@nongnu.org; Thu, 10 Nov 2011 05:19:59 -0500 Received: by shelob.oktetlabs.ru (Postfix, from userid 122) id A2D347F528; Thu, 10 Nov 2011 14:19:52 +0400 (MSK) Received: from marish.oktetlabs.ru (marish.oktetlabs.ru [192.168.38.66]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by shelob.oktetlabs.ru (Postfix) with ESMTPS id 0CD557F4EF; Thu, 10 Nov 2011 14:19:49 +0400 (MSK) X-DKIM: Sendmail DKIM Filter v2.8.2 shelob.oktetlabs.ru 0CD557F4EF Authentication-Results: shelob.oktetlabs.ru/0CD557F4EF; dkim=none (no signature) header.i=unknown; dkim-adsp=none Received: from jcmvbkbc by marish.oktetlabs.ru with local (Exim 4.72) (envelope-from ) id 1RORjZ-0000tC-MW; Thu, 10 Nov 2011 14:19:49 +0400 From: Max Filippov To: Date: Thu, 10 Nov 2011 14:19:40 +0400 Message-Id: <1320920380-3386-1-git-send-email-jcmvbkbc@gmail.com> X-Mailer: git-send-email 1.7.2.5 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 195.131.132.186 Cc: Paolo Bonzini , Max Filippov Subject: [Qemu-devel] [PATCH] vl.c: prohibit simultaneous use of -icount and kvm 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 Signed-off-by: Max Filippov --- 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);