From mboxrd@z Thu Jan 1 00:00:00 1970 From: Christoffer Dall Subject: [GIT PULL 06/51] arm64: KVM: export demux regids as KVM_REG_ARM64 Date: Mon, 4 Aug 2014 10:46:23 +0200 Message-ID: <1407142028-31105-7-git-send-email-christoffer.dall@linaro.org> References: <1407142028-31105-1-git-send-email-christoffer.dall@linaro.org> Mime-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: QUOTED-PRINTABLE Cc: linux-arm-kernel@lists.infradead.org, kvmarm@lists.cs.columbia.edu, kvm@vger.kernel.org, =?UTF-8?q?Alex=20Benn=C3=A9e?= , Marc Zyngier To: Paolo Bonzini , Gleb Natapov Return-path: Received: from mail-la0-f53.google.com ([209.85.215.53]:35476 "EHLO mail-la0-f53.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751693AbaHDIrV (ORCPT ); Mon, 4 Aug 2014 04:47:21 -0400 Received: by mail-la0-f53.google.com with SMTP id gl10so5036939lab.26 for ; Mon, 04 Aug 2014 01:47:19 -0700 (PDT) In-Reply-To: <1407142028-31105-1-git-send-email-christoffer.dall@linaro.org> Sender: kvm-owner@vger.kernel.org List-ID: =46rom: Alex Benn=C3=A9e I suspect this is a -ECUTPASTE fault from the initial implementation. I= f we don't declare the register ID to be KVM_REG_ARM64 the KVM_GET_ONE_RE= G implementation kvm_arm_get_reg() returns -EINVAL and hilarity ensues. The kvm/api.txt document describes all arm64 registers as starting with 0x60xx... (i.e KVM_REG_ARM64). Signed-off-by: Alex Benn=C3=A9e Acked-by: Christoffer Dall Acked-by: Marc Zyngier Signed-off-by: Marc Zyngier --- arch/arm64/kvm/sys_regs.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/arch/arm64/kvm/sys_regs.c b/arch/arm64/kvm/sys_regs.c index c59a1bd..34f25a5 100644 --- a/arch/arm64/kvm/sys_regs.c +++ b/arch/arm64/kvm/sys_regs.c @@ -962,7 +962,7 @@ static unsigned int num_demux_regs(void) =20 static int write_demux_regids(u64 __user *uindices) { - u64 val =3D KVM_REG_ARM | KVM_REG_SIZE_U32 | KVM_REG_ARM_DEMUX; + u64 val =3D KVM_REG_ARM64 | KVM_REG_SIZE_U32 | KVM_REG_ARM_DEMUX; unsigned int i; =20 val |=3D KVM_REG_ARM_DEMUX_ID_CCSIDR; --=20 2.0.0