From patchwork Tue Mar 15 11:26:24 2011
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
X-Patchwork-Submitter: Jan Kiszka <jan.kiszka@siemens.com>
X-Patchwork-Id: 635871
Received: from vger.kernel.org (vger.kernel.org [209.132.180.67])
	by demeter1.kernel.org (8.14.4/8.14.3) with ESMTP id p2FBR7wI017942
	for <patchwork-kvm@patchwork.kernel.org>;
	Tue, 15 Mar 2011 11:27:08 GMT
Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand
	id S1757404Ab1COL1E (ORCPT
	<rfc822;patchwork-kvm@patchwork.kernel.org>);
	Tue, 15 Mar 2011 07:27:04 -0400
Received: from david.siemens.de ([192.35.17.14]:26579 "EHLO david.siemens.de"
	rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP
	id S1757298Ab1COL0u (ORCPT <rfc822;kvm@vger.kernel.org>);
	Tue, 15 Mar 2011 07:26:50 -0400
Received: from mail1.siemens.de (localhost [127.0.0.1])
	by david.siemens.de (8.13.6/8.13.6) with ESMTP id p2FBQcsV010937;
	Tue, 15 Mar 2011 12:26:38 +0100
Received: from mchn199C.mchp.siemens.de ([146.254.215.103])
	by mail1.siemens.de (8.13.6/8.13.6) with ESMTP id p2FBQVg7000888;
	Tue, 15 Mar 2011 12:26:37 +0100
From: Jan Kiszka <jan.kiszka@siemens.com>
To: Avi Kivity <avi@redhat.com>, Marcelo Tosatti <mtosatti@redhat.com>
Cc: kvm@vger.kernel.org, qemu-devel@nongnu.org
Subject: [PATCH v2 13/20] kvm: Consider EXIT_DEBUG unknown without
	CAP_SET_GUEST_DEBUG
Date: Tue, 15 Mar 2011 12:26:24 +0100
Message-Id: 
 <f50107a108b298d9bf40cb3fd8a999ee28e56bb2.1300188374.git.jan.kiszka@siemens.com>
X-Mailer: git-send-email 1.7.1
In-Reply-To: <cover.1300188374.git.jan.kiszka@siemens.com>
References: <cover.1300188374.git.jan.kiszka@siemens.com>
In-Reply-To: <cover.1300188374.git.jan.kiszka@siemens.com>
References: <cover.1300188374.git.jan.kiszka@siemens.com>
Sender: kvm-owner@vger.kernel.org
Precedence: bulk
List-ID: <kvm.vger.kernel.org>
X-Mailing-List: kvm@vger.kernel.org
X-Greylist: IP, sender and recipient auto-whitelisted, not delayed by
	milter-greylist-4.2.6 (demeter1.kernel.org [140.211.167.41]);
	Tue, 15 Mar 2011 11:27:08 +0000 (UTC)


diff --git a/kvm-all.c b/kvm-all.c
index 36553fe..982e5cc 100644
--- a/kvm-all.c
+++ b/kvm-all.c
@@ -986,17 +986,17 @@ int kvm_cpu_exec(CPUState *env)
             ret = kvm_handle_internal_error(env, run);
             break;
 #endif
+#ifdef KVM_CAP_SET_GUEST_DEBUG
         case KVM_EXIT_DEBUG:
             DPRINTF("kvm_exit_debug\n");
-#ifdef KVM_CAP_SET_GUEST_DEBUG
             if (kvm_arch_debug(&run->debug.arch)) {
                 ret = EXCP_DEBUG;
                 goto out;
             }
             /* re-enter, this exception was guest-internal */
             ret = 1;
-#endif /* KVM_CAP_SET_GUEST_DEBUG */
             break;
+#endif /* KVM_CAP_SET_GUEST_DEBUG */
         default:
             DPRINTF("kvm_arch_handle_exit\n");
             ret = kvm_arch_handle_exit(env, run);