From patchwork Fri Mar 12 14:20:50 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jan Kiszka X-Patchwork-Id: 47681 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [199.232.76.165]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id 57301B7D18 for ; Sat, 13 Mar 2010 01:24:54 +1100 (EST) Received: from localhost ([127.0.0.1]:45939 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1Nq5nH-00089Q-Ff for incoming@patchwork.ozlabs.org; Fri, 12 Mar 2010 09:24:51 -0500 Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1Nq5jY-0006om-1g for qemu-devel@nongnu.org; Fri, 12 Mar 2010 09:21:00 -0500 Received: from [199.232.76.173] (port=54035 helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1Nq5jX-0006oC-4G for qemu-devel@nongnu.org; Fri, 12 Mar 2010 09:20:59 -0500 Received: from Debian-exim by monty-python.gnu.org with spam-scanned (Exim 4.60) (envelope-from ) id 1Nq5jU-0006bo-BC for qemu-devel@nongnu.org; Fri, 12 Mar 2010 09:20:58 -0500 Received: from david.siemens.de ([192.35.17.14]:23152) by monty-python.gnu.org with esmtps (TLS-1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.60) (envelope-from ) id 1Nq5jT-0006b3-NY for qemu-devel@nongnu.org; Fri, 12 Mar 2010 09:20:56 -0500 Received: from mail3.siemens.de (localhost [127.0.0.1]) by david.siemens.de (8.12.11.20060308/8.12.11) with ESMTP id o2CEKpE8024892; Fri, 12 Mar 2010 15:20:51 +0100 Received: from localhost.localdomain (mchn012c.ww002.siemens.net [139.25.109.167] (may be forged)) by mail3.siemens.de (8.12.11.20060308/8.12.11) with ESMTP id o2CEKpdD000964; Fri, 12 Mar 2010 15:20:51 +0100 From: Jan Kiszka To: Avi Kivity , Marcelo Tosatti Date: Fri, 12 Mar 2010 15:20:50 +0100 Message-Id: X-Mailer: git-send-email 1.6.0.2 In-Reply-To: References: In-Reply-To: References: X-detected-operating-system: by monty-python.gnu.org: GNU/Linux 2.4-2.6 Cc: qemu-devel@nongnu.org, kvm@vger.kernel.org Subject: [Qemu-devel] [PATCH v4 2/2] qemu-kvm: x86: Add support for saving&restoring debug registers X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: qemu-devel.nongnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Corresponding support for qemu-kvm. Signed-off-by: Jan Kiszka --- qemu-kvm-x86.c | 2 ++ qemu-kvm.c | 5 +++++ qemu-kvm.h | 1 + target-i386/kvm.c | 2 +- 4 files changed, 9 insertions(+), 1 deletions(-) diff --git a/qemu-kvm-x86.c b/qemu-kvm-x86.c index 0160fe9..65a3cfc 100644 --- a/qemu-kvm-x86.c +++ b/qemu-kvm-x86.c @@ -1012,6 +1012,7 @@ void kvm_arch_load_regs(CPUState *env, int level) } kvm_put_vcpu_events(env, level); + kvm_put_debugregs(env); /* must be last */ kvm_guest_debug_workarounds(env); @@ -1185,6 +1186,7 @@ void kvm_arch_save_regs(CPUState *env) kvm_arch_save_mpstate(env); kvm_save_lapic(env); kvm_get_vcpu_events(env); + kvm_get_debugregs(env); } static void do_cpuid_ent(struct kvm_cpuid_entry2 *e, uint32_t function, diff --git a/qemu-kvm.c b/qemu-kvm.c index e417f21..0e7d594 100644 --- a/qemu-kvm.c +++ b/qemu-kvm.c @@ -2115,6 +2115,11 @@ static int kvm_create_context(void) kvm_state->vcpu_events = kvm_check_extension(kvm_state, KVM_CAP_VCPU_EVENTS); #endif + kvm_state->debugregs = 0; +#ifdef KVM_CAP_DEBUGREGS + kvm_state->debugregs = kvm_check_extension(kvm_state, KVM_CAP_DEBUGREGS); +#endif + kvm_init_ap(); if (kvm_irqchip) { if (!qemu_kvm_has_gsi_routing()) { diff --git a/qemu-kvm.h b/qemu-kvm.h index f5db9e6..0cbc6f7 100644 --- a/qemu-kvm.h +++ b/qemu-kvm.h @@ -970,6 +970,7 @@ struct KVMState { int migration_log; int vcpu_events; int robust_singlestep; + int debugregs; #ifdef KVM_CAP_SET_GUEST_DEBUG QTAILQ_HEAD(, kvm_sw_breakpoint) kvm_sw_breakpoints; #endif diff --git a/target-i386/kvm.c b/target-i386/kvm.c index b5c3c27..8d00774 100644 --- a/target-i386/kvm.c +++ b/target-i386/kvm.c @@ -902,7 +902,6 @@ static int kvm_guest_debug_workarounds(CPUState *env) return ret; } -#ifdef KVM_UPSTREAM static int kvm_put_debugregs(CPUState *env) { #ifdef KVM_CAP_DEBUGREGS @@ -950,6 +949,7 @@ static int kvm_get_debugregs(CPUState *env) return 0; } +#ifdef KVM_UPSTREAM int kvm_arch_put_registers(CPUState *env, int level) { int ret;