From patchwork Fri Mar 4 10:20:07 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jan Kiszka X-Patchwork-Id: 608411 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 p24ALUAm024803 for ; Fri, 4 Mar 2011 10:21:30 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1759357Ab1CDKUu (ORCPT ); Fri, 4 Mar 2011 05:20:50 -0500 Received: from goliath.siemens.de ([192.35.17.28]:32653 "EHLO goliath.siemens.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1759348Ab1CDKU3 (ORCPT ); Fri, 4 Mar 2011 05:20:29 -0500 Received: from mail1.siemens.de (localhost [127.0.0.1]) by goliath.siemens.de (8.13.6/8.13.6) with ESMTP id p24AKFbp018916; Fri, 4 Mar 2011 11:20:15 +0100 Received: from mchn199C.mchp.siemens.de ([139.25.109.49]) by mail1.siemens.de (8.13.6/8.13.6) with ESMTP id p24AKCXP008671; Fri, 4 Mar 2011 11:20:14 +0100 From: Jan Kiszka To: Avi Kivity , Marcelo Tosatti Cc: kvm@vger.kernel.org, qemu-devel@nongnu.org Subject: [PATCH 10/15] kvm: Consider EXIT_DEBUG unknown without CAP_SET_GUEST_DEBUG Date: Fri, 4 Mar 2011 11:20:07 +0100 Message-Id: <5e25fb47b24080e10d204c27f9f1d0176eaa1495.1299233998.git.jan.kiszka@siemens.com> X-Mailer: git-send-email 1.7.1 In-Reply-To: References: In-Reply-To: References: Sender: kvm-owner@vger.kernel.org Precedence: bulk List-ID: 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]); Fri, 04 Mar 2011 10:21:30 +0000 (UTC) diff --git a/kvm-all.c b/kvm-all.c index 07a1a9c..2952499 100644 --- a/kvm-all.c +++ b/kvm-all.c @@ -992,17 +992,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);