From mboxrd@z Thu Jan 1 00:00:00 1970 From: =?UTF-8?q?Toralf=20F=C3=B6rster?= Subject: [PATCH] arch/x86/kvm/x86.c: remove a superfluous test for !X86_64 Date: Sun, 27 Apr 2014 17:32:10 +0200 Message-ID: <1398612730-6684-1-git-send-email-toralf.foerster@gmx.de> Mime-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: QUOTED-PRINTABLE Cc: kvm@vger.kernel.org, =?UTF-8?q?Toralf=20F=C3=B6rster?= To: pbonzini@redhat.com Return-path: Received: from mout.gmx.net ([212.227.17.21]:60199 "EHLO mout.gmx.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752721AbaD0PcY (ORCPT ); Sun, 27 Apr 2014 11:32:24 -0400 Sender: kvm-owner@vger.kernel.org List-ID: compile and runtime tested Signed-off-by: Toralf F=C3=B6rster --- arch/x86/kvm/x86.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/arch/x86/kvm/x86.c b/arch/x86/kvm/x86.c index 8b8fc0b..a6ca7e0 100644 --- a/arch/x86/kvm/x86.c +++ b/arch/x86/kvm/x86.c @@ -5680,15 +5680,17 @@ int kvm_hv_hypercall(struct kvm_vcpu *vcpu) kvm_x86_ops->get_cs_db_l_bits(vcpu, &cs_db, &cs_l); longmode =3D is_long_mode(vcpu) && cs_l =3D=3D 1; =20 +#ifdef CONFIG_X86_64 if (!longmode) { +#endif param =3D ((u64)kvm_register_read(vcpu, VCPU_REGS_RDX) << 32) | (kvm_register_read(vcpu, VCPU_REGS_RAX) & 0xffffffff); ingpa =3D ((u64)kvm_register_read(vcpu, VCPU_REGS_RBX) << 32) | (kvm_register_read(vcpu, VCPU_REGS_RCX) & 0xffffffff); outgpa =3D ((u64)kvm_register_read(vcpu, VCPU_REGS_RDI) << 32) | (kvm_register_read(vcpu, VCPU_REGS_RSI) & 0xffffffff); - } #ifdef CONFIG_X86_64 + } else { param =3D kvm_register_read(vcpu, VCPU_REGS_RCX); ingpa =3D kvm_register_read(vcpu, VCPU_REGS_RDX); --=20 1.9.2