From mboxrd@z Thu Jan 1 00:00:00 1970 From: Alexander Graf Date: Thu, 17 Jul 2014 08:17:51 +0000 Subject: Re: [PATCH 6/6] kvm: ppc: Add SPRN_SPR get helper function Message-Id: <53C786AF.408@suse.de> List-Id: References: <1405407692-32075-7-git-send-email-Bharat.Bhushan@freescale.com> In-Reply-To: <1405407692-32075-7-git-send-email-Bharat.Bhushan@freescale.com> MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit To: kvm-ppc@vger.kernel.org On 16.07.14 06:21, Bharat.Bhushan@freescale.com wrote: > >> -----Original Message----- >> From: Caraman Mihai Claudiu-B02008 >> Sent: Tuesday, July 15, 2014 10:20 PM >> To: Alexander Graf >> Cc: Bhushan Bharat-R65777; kvm-ppc@vger.kernel.org >> Subject: Re: [PATCH 6/6] kvm: ppc: Add SPRN_SPR get helper function >> >>> kvmppc_set_epr() is already defined in asm/kvm_ppc.h, So >>> rename and move get_epr helper function to same file. >>> >>> Signed-off-by: Bharat Bhushan >>> --- >>> arch/powerpc/include/asm/kvm_ppc.h | 9 +++++++++ >>> arch/powerpc/kvm/booke.c | 11 +---------- >>> 2 files changed, 10 insertions(+), 10 deletions(-) >> This patch which is already applied on kvm-ppc-queue breaks book3s. >> I get these errors with g5_defconfig: >> >> In file included from arch/powerpc/kernel/asm-offsets.c:57:0: >> ./arch/powerpc/include/asm/kvm_ppc.h: In function 'kvmppc_get_epr': >> ./arch/powerpc/include/asm/kvm_ppc.h:400:19: error: 'struct kvm_vcpu_arch' has >> no member named 'epr' >> ./arch/powerpc/include/asm/kvm_ppc.h: In function 'kvmppc_get_sprg0': >> ./arch/powerpc/include/asm/kvm_ppc.h:522:1: error: 'SPRN_GSPRG0' undeclared >> (first use in this function) >> ./arch/powerpc/include/asm/kvm_ppc.h:522:1: note: each undeclared identifier is >> reported only once for each function it appears in >> ... > I am sorry, I forgot to compile for book3s. > > Should we squash below change to fix these errors. While trying to squash them in I realized that things become very ugly here. If we have to explicitly #ifdef the generators, why don't we just call a new macro for the SPRN_G access and #ifdef on CONFIG_KVM_BOOKE_HV? #ifdef CONFIG_KVM_BOOKE_HV SPRNG_WRAPPER(sprg0, SPRN_GSPRG0) ... #else SHARED_WRAPPER(sprg0, SPRN_GSPRG0) #endif that way the code flow is at least reasonably obvious :). I'll remove the patches from my queue for now. Alex