From mboxrd@z Thu Jan 1 00:00:00 1970 From: Avi Kivity Subject: Re: [PATCH] qemu-kvm: x86: Fix mismerge in cpu_post_load Date: Sun, 06 Dec 2009 11:54:45 +0200 Message-ID: <4B1B7F65.2040904@redhat.com> References: <4B18018D.1060305@siemens.com> Mime-Version: 1.0 Content-Type: text/plain; charset=ISO-8859-15; format=flowed Content-Transfer-Encoding: 7bit Cc: Marcelo Tosatti , kvm , Gleb Natapov To: Jan Kiszka Return-path: Received: from mx1.redhat.com ([209.132.183.28]:59245 "EHLO mx1.redhat.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932494AbZLFJyl (ORCPT ); Sun, 6 Dec 2009 04:54:41 -0500 In-Reply-To: <4B18018D.1060305@siemens.com> Sender: kvm-owner@vger.kernel.org List-ID: On 12/03/2009 08:21 PM, Jan Kiszka wrote: > Merge 8e2c5ec2f6 forgot to restore some qemu-kvm-specific hooks in > cpu_post_load. mp_state was readded later on, but tsc was missing, > breaking the guest timing after resume. Also, reset of halt was dropped > which is obviously required for in-kernel irqchip. > Applied, thanks. > BTW, this patch just made me realize that the TSC MSR belongs to the > list states that should not be written back unconditionally. Upstream > does this currently, qemu-kvm not (at the price one more kvm-specific > hook into generic code). Yet another reminder why we don't rewrite, only refactor. > Unlike the other states we discussed, this one > is not "fixable" in the kernel. So I tend to think there is a real need > for my write-back scope abstraction - which would also be able to handle > the other states cleanly, both in upstream and here. > Yes. Gleb suggested treating mpstate/nmi as part of the APIC state (which makes sense), which would work, as APIC state is not automatically written back. But the tsc msr would need special treatment. -- error compiling committee.c: too many arguments to function