From mboxrd@z Thu Jan  1 00:00:00 1970
From: Avi Kivity <avi@qumranet.com>
Subject: Re: [kvm-devel] can't boot 2.6.26-rcX
Date: Wed, 21 May 2008 15:40:24 +0300
Message-ID: <48341838.6000304@qumranet.com>
References: <g0bp02$qok$1@ger.gmane.org> <200805151847.44472.bs@q-leap.de> <4833F13B.1000603@qumranet.com> <200805211213.28127.bs@q-leap.de>
Mime-Version: 1.0
Content-Type: multipart/mixed;
 boundary="------------050708010706000203020803"
Cc: kvm@vger.kernel.org
To: Bernd Schubert <bs@q-leap.de>
Return-path: <kvm-owner@vger.kernel.org>
Received: from bzq-179-150-194.static.bezeqint.net ([212.179.150.194]:22588
	"EHLO il.qumranet.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org
	with ESMTP id S1764438AbYEUMk0 (ORCPT <rfc822;kvm@vger.kernel.org>);
	Wed, 21 May 2008 08:40:26 -0400
In-Reply-To: <200805211213.28127.bs@q-leap.de>
Sender: kvm-owner@vger.kernel.org
List-ID: <kvm.vger.kernel.org>

This is a multi-part message in MIME format.
--------------050708010706000203020803
Content-Type: text/plain; charset=ISO-8859-1; format=flowed
Content-Transfer-Encoding: 7bit

Bernd Schubert wrote:
> On Wednesday 21 May 2008 11:54:03 Avi Kivity wrote:
>   
>> Bernd Schubert wrote:
>>     
>>> It is CONFIG_KVM_GUEST, with CONFIG_KVM_CLOCK=y is boots fine!
>>>       
>> Works fine here.  Can you post your non-booting config?
>>     
>
> CONFIG_KVM_GUEST=y doesn't work on my workstation, while the same kernel works 
> fine in a kvm-session on a laptop of a colleague. So it seems to be dependent 
> on the host hardware.
>   

Yes.  Attached patch fixes hypercalls on AMD.

-- 
error compiling committee.c: too many arguments to function


--------------050708010706000203020803
Content-Type: text/plain;
 name="fix-amd-hypercall.patch"
Content-Transfer-Encoding: 7bit
Content-Disposition: inline;
 filename="fix-amd-hypercall.patch"

diff --git a/kernel/x86_emulate.c b/kernel/x86_emulate.c
index 8a96320..932f216 100644
--- a/kernel/x86_emulate.c
+++ b/kernel/x86_emulate.c
@@ -1727,7 +1727,8 @@ twobyte_insn:
 			if (rc)
 				goto done;
 
-			kvm_emulate_hypercall(ctxt->vcpu);
+			/* Let the processor re-execute the fixed hypercall */
+			c->eip = ctxt->vcpu->arch.rip;
 			/* Disable writeback. */
 			c->dst.type = OP_NONE;
 			break;

--------------050708010706000203020803--