From patchwork Wed Mar 9 22:36:51 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Nikola Ciprich X-Patchwork-Id: 622741 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 p29MegWB019586 for ; Wed, 9 Mar 2011 22:40:43 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751237Ab1CIWjw (ORCPT ); Wed, 9 Mar 2011 17:39:52 -0500 Received: from gwu.lbox.cz ([62.245.111.132]:39935 "EHLO gwu.lbox.cz" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750750Ab1CIWjv (ORCPT ); Wed, 9 Mar 2011 17:39:51 -0500 Received: from linuxbox.linuxbox.cz (server.linuxbox.cz [10.76.66.10]) by gwu.lbox.cz (Sendmail) with ESMTP id p29MdbGQ024387 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=NO); Wed, 9 Mar 2011 23:39:37 +0100 Received: from pcnci.linuxbox.cz (pcnci.linuxbox.cz [10.76.3.14]) (authenticated bits=0) by linuxbox.linuxbox.cz (Sendmail) with ESMTP id p29Mdanm000967; Wed, 9 Mar 2011 23:39:37 +0100 Date: Wed, 9 Mar 2011 23:36:51 +0100 From: Nikola Ciprich To: Zachary Amsden Cc: KVM list , Linux kernel list , nikola.ciprich@linuxbox.cz, Avi Kivity , Glauber Costa Subject: [PATCHv2] fix regression caused by e48672fa25e879f7ae21785c7efd187738139593 Message-ID: <20110309223651.GC1762@pcnci.linuxbox.cz> References: <20110307101827.GA1762@pcnci.linuxbox.cz> <4D768A62.3050903@redhat.com> <20110309193003.GB1762@pcnci.linuxbox.cz> <4D77F149.8020906@redhat.com> MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: <4D77F149.8020906@redhat.com> User-Agent: Mutt/1.5.19 (2009-01-05) X-Antivirus: on lbxovapx by Kaspersky antivirus, 4796625 records (last update: 20110309) X-Spam-Score: N/A (trusted relay) X-Scanned-By: MIMEDefang v2.71/SpamAssassin v3.003001 on proxybox 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]); Wed, 09 Mar 2011 22:40:43 +0000 (UTC) diff --git a/arch/x86/kvm/x86.c b/arch/x86/kvm/x86.c index 4c27144..ba3f76f 100644 --- a/arch/x86/kvm/x86.c +++ b/arch/x86/kvm/x86.c @@ -2101,8 +2101,8 @@ void kvm_arch_vcpu_load(struct kvm_vcpu *vcpu, int cpu) if (check_tsc_unstable()) { kvm_x86_ops->adjust_tsc_offset(vcpu, -tsc_delta); vcpu->arch.tsc_catchup = 1; - kvm_make_request(KVM_REQ_CLOCK_UPDATE, vcpu); } + kvm_make_request(KVM_REQ_CLOCK_UPDATE, vcpu); if (vcpu->cpu != cpu) kvm_migrate_timers(vcpu); vcpu->cpu = cpu;