From patchwork Thu Oct 29 08:06:55 2009 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jan Kiszka X-Patchwork-Id: 56408 Received: from vger.kernel.org (vger.kernel.org [209.132.176.167]) by demeter.kernel.org (8.14.2/8.14.2) with ESMTP id n9T87tcC017646 for ; Thu, 29 Oct 2009 08:07:55 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752488AbZJ2IHE (ORCPT ); Thu, 29 Oct 2009 04:07:04 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1752398AbZJ2IHE (ORCPT ); Thu, 29 Oct 2009 04:07:04 -0400 Received: from fmmailgate02.web.de ([217.72.192.227]:40220 "EHLO fmmailgate02.web.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752502AbZJ2IG5 (ORCPT ); Thu, 29 Oct 2009 04:06:57 -0400 Received: from smtp06.web.de (fmsmtp06.dlan.cinetic.de [172.20.5.172]) by fmmailgate02.web.de (Postfix) with ESMTP id D1EFD13AA1540; Thu, 29 Oct 2009 09:07:01 +0100 (CET) Received: from [92.74.55.175] (helo=[192.168.1.10]) by smtp06.web.de with asmtp (TLSv1:AES256-SHA:256) (WEB.DE 4.110 #314) id 1N3Q28-0008TH-00; Thu, 29 Oct 2009 09:07:00 +0100 Message-ID: <4AE94D1F.2060503@web.de> Date: Thu, 29 Oct 2009 09:06:55 +0100 From: Jan Kiszka User-Agent: Mozilla/5.0 (X11; U; Linux i686 (x86_64); de; rv:1.8.1.12) Gecko/20080226 SUSE/2.0.0.12-1.1 Thunderbird/2.0.0.12 Mnenhy/0.7.5.666 MIME-Version: 1.0 To: Avi Kivity CC: kvm-devel Subject: Re: BUG with Win7 and user-return-notifier References: <4AE6ED18.9040901@siemens.com> <4AE6F17C.1070403@redhat.com> <4AE6F1EE.5090207@siemens.com> <4AE6F4A3.3050903@redhat.com> <4AE6F4C4.3000802@redhat.com> <4AE7FE3B.2070802@redhat.com> <4AE84EB4.1010603@siemens.com> <4AE86AA0.1060802@redhat.com> <4AE8AC20.50506@web.de> <4AE9462E.5050409@redhat.com> <4AE94C63.2070300@web.de> In-Reply-To: <4AE94C63.2070300@web.de> X-Enigmail-Version: 0.95.7 X-Sender: jan.kiszka@web.de X-Provags-ID: V01U2FsdGVkX18I6PiEMSZeWPjDXfOPuJGJMAlcfid0wFAxqX9g QvkdXRPaebz8I6yedV3DHJj8MRGUG2FkMYCxXnNVVA9PIOYrUl MB/6r720c= Sender: kvm-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: kvm@vger.kernel.org diff --git a/arch/x86/kvm/vmx.c b/arch/x86/kvm/vmx.c index 4264e09..0b1f461 100644 --- a/arch/x86/kvm/vmx.c +++ b/arch/x86/kvm/vmx.c @@ -928,8 +928,10 @@ static void setup_msrs(struct vcpu_vmx *vmx) } #endif vmx->msr_offset_efer = index = __find_msr_index(vmx, MSR_EFER); - if (index >= 0 && update_transition_efer(vmx)) + if (index >= 0 && update_transition_efer(vmx)) { + vmx->msr_offset_efer = save_nmsrs; move_msr_up(vmx, index, save_nmsrs++); + } vmx->save_nmsrs = save_nmsrs;