From patchwork Mon Jan 3 08:32:59 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jan Kiszka X-Patchwork-Id: 77223 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 370A0B6F14 for ; Mon, 3 Jan 2011 19:39:14 +1100 (EST) Received: from localhost ([127.0.0.1]:35598 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1PZfuO-0001yQ-Kx for incoming@patchwork.ozlabs.org; Mon, 03 Jan 2011 03:36:52 -0500 Received: from [140.186.70.92] (port=52241 helo=eggs.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1PZfr9-0000iE-54 for qemu-devel@nongnu.org; Mon, 03 Jan 2011 03:33:33 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1PZfr5-0008Ke-Pa for qemu-devel@nongnu.org; Mon, 03 Jan 2011 03:33:28 -0500 Received: from fmmailgate03.web.de ([217.72.192.234]:50556) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1PZfr5-0008KM-7i for qemu-devel@nongnu.org; Mon, 03 Jan 2011 03:33:27 -0500 Received: from smtp01.web.de ( [172.20.0.243]) by fmmailgate03.web.de (Postfix) with ESMTP id A026018393CEF; Mon, 3 Jan 2011 09:33:26 +0100 (CET) Received: from [88.64.22.98] (helo=localhost.localdomain) by smtp01.web.de with asmtp (TLSv1:AES256-SHA:256) (WEB.DE 4.110 #2) id 1PZfr4-0007fO-01; Mon, 03 Jan 2011 09:33:26 +0100 From: Jan Kiszka To: Avi Kivity , Marcelo Tosatti Date: Mon, 3 Jan 2011 09:32:59 +0100 Message-Id: X-Mailer: git-send-email 1.7.1 In-Reply-To: References: In-Reply-To: References: X-Sender: jan.kiszka@web.de X-Provags-ID: V01U2FsdGVkX18AV6tUwrms37jrKQ5bU39MrIbEDSBxoGIXejBR y2YPlGoOZTWibhEVC2Vg1pf+8JmyesrlcE9ieMg7yoA36i4fPJ Lvg3Kqb0Y= X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.4-2.6 Cc: Jan Kiszka , qemu-devel@nongnu.org, kvm@vger.kernel.org Subject: [Qemu-devel] [PATCH v2 09/17] kvm: x86: Fix xcr0 reset mismerge 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 From: Jan Kiszka For unknown reasons, xcr0 reset ended up in kvm_arch_update_guest_debug on upstream merge. Fix this and also remove the misleading comment (1 is THE reset value). Signed-off-by: Jan Kiszka --- target-i386/kvm.c | 3 +-- 1 files changed, 1 insertions(+), 2 deletions(-) diff --git a/target-i386/kvm.c b/target-i386/kvm.c index 1403327..e46b901 100644 --- a/target-i386/kvm.c +++ b/target-i386/kvm.c @@ -450,6 +450,7 @@ void kvm_arch_reset_vcpu(CPUState *env) env->interrupt_injected = -1; env->nmi_injected = 0; env->nmi_pending = 0; + env->xcr0 = 1; if (kvm_irqchip_in_kernel()) { env->mp_state = cpu_is_bsp(env) ? KVM_MP_STATE_RUNNABLE : KVM_MP_STATE_UNINITIALIZED; @@ -1756,8 +1757,6 @@ void kvm_arch_update_guest_debug(CPUState *env, struct kvm_guest_debug *dbg) ((uint32_t)len_code[hw_breakpoint[n].len] << (18 + n*4)); } } - /* Legal xcr0 for loading */ - env->xcr0 = 1; } #endif /* KVM_CAP_SET_GUEST_DEBUG */