From mboxrd@z Thu Jan 1 00:00:00 1970 From: Rusty Russell Subject: Re: [PATCH] make KVM conform to sucky rdmsr interface Date: Thu, 22 Mar 2007 18:49:30 +1100 Message-ID: <1174549770.2713.121.camel@localhost.localdomain> References: <1174531917.2713.91.camel@localhost.localdomain> <46022E40.8080300@qumranet.com> Mime-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Cc: Andrew Morton , Andi Kleen , Jeremy Fitzhardinge , lkml - Kernel Mailing List , kvm-devel To: Avi Kivity Return-path: In-Reply-To: <46022E40.8080300-atKUWr5tajBWk0Htik3J/w@public.gmane.org> List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: kvm-devel-bounces-5NWGOfrQmneRv+LV9MX5uipxlwaOVQ5f@public.gmane.org Errors-To: kvm-devel-bounces-5NWGOfrQmneRv+LV9MX5uipxlwaOVQ5f@public.gmane.org List-Id: kvm.vger.kernel.org On Thu, 2007-03-22 at 09:20 +0200, Avi Kivity wrote: > My rdmsr_safe (x86_64, i386 is similar/same) is Erk. Andrew, please drop that patch, and take this one. It was actually Jeremy's paravirt cleanup patch which changed the calling convention of rdmsr_safe() to match rdmsr(). I went "oh it's that fucking rdmsr interface" and "fixed" kvm. Sorry for the bad patch, Rusty. == rdmsr_safe() takes pointers. rdmsr() modifies its arguments. What a mess. Fix rdmsr_safe() with !CONFIG_PARAVIRT. Signed-off-by: Rusty Russell diff -r a7f78e8eacc8 include/asm-i386/msr.h --- a/include/asm-i386/msr.h Thu Mar 22 12:38:35 2007 +1100 +++ b/include/asm-i386/msr.h Thu Mar 22 18:40:35 2007 +1100 @@ -96,12 +96,12 @@ static inline void wrmsrl (unsigned long (native_write_msr(msr, ((unsigned long long)val2 << 32) | val1)) /* rdmsr with exception handling */ -#define rdmsr_safe(msr,val1,val2) \ +#define rdmsr_safe(msr,p1,p2) \ ({ \ int __err; \ - unsigned long long __val = native_read_msr(msr, &__err); \ - val1 = __val; \ - val2 = __val >> 32; \ + unsigned long long __val = native_read_msr(msr, &__err);\ + (*p1) = __val; \ + (*p2) = __val >> 32; \ __err; \ }) ------------------------------------------------------------------------- Take Surveys. Earn Cash. Influence the Future of IT Join SourceForge.net's Techsay panel and you'll get the chance to share your opinions on IT & business topics through brief surveys-and earn cash http://www.techsay.com/default.php?page=join.php&p=sourceforge&CID=DEVDEV