Re: [PATCH 2/9] KVM: define kvm_fault_pfn statically

From: Marcelo Tosatti
Date: Thu Aug 02 2012 - 09:18:37 EST


On Sun, Jul 29, 2012 at 04:12:58PM +0800, Xiao Guangrong wrote:
> After that, the exported and un-inline function, get_fault_pfn,
> can be removed
>
> Signed-off-by: Xiao Guangrong <xiaoguangrong@xxxxxxxxxxxxxxxxxx>
> ---
> arch/x86/kvm/mmu.c | 2 +-
> include/linux/kvm_host.h | 3 ++-
> virt/kvm/kvm_main.c | 12 +++---------
> 3 files changed, 6 insertions(+), 11 deletions(-)
>
> diff --git a/arch/x86/kvm/mmu.c b/arch/x86/kvm/mmu.c
> index a9a2052..19bac91 100644
> --- a/arch/x86/kvm/mmu.c
> +++ b/arch/x86/kvm/mmu.c
> @@ -2514,7 +2514,7 @@ static pfn_t pte_prefetch_gfn_to_pfn(struct kvm_vcpu *vcpu, gfn_t gfn,
>
> slot = gfn_to_memslot_dirty_bitmap(vcpu, gfn, no_dirty_log);
> if (!slot)
> - return get_fault_pfn();
> + return kvm_fault_pfn;
>
> hva = gfn_to_hva_memslot(slot, gfn);
>
> diff --git a/include/linux/kvm_host.h b/include/linux/kvm_host.h
> index dbc65f9..7cd6871 100644
> --- a/include/linux/kvm_host.h
> +++ b/include/linux/kvm_host.h
> @@ -48,6 +48,8 @@
> #define KVM_MAX_MMIO_FRAGMENTS \
> (KVM_MMIO_SIZE / KVM_USER_MMIO_SIZE + KVM_EXTRA_MMIO_FRAGMENTS)
>
> +#define kvm_fault_pfn (-EFAULT)
> +

This is confusing, it appears to be a variable not a definition.
Use "#define KVM_FAULT_PFN_ERR" please.

--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/