Re: [PATCH 7/10] KVM: MMU: introduce a common function to get no-dirty-logged slot

[Avi Kivity <avi@redhat.com>]

On 03/04/2011 01:00 PM, Xiao Guangrong wrote:
> pte_prefetch_gfn_to_memslot and mapping_level_dirty_bitmap have the same
> operation, so integrated
>
> Signed-off-by: Xiao Guangrong<xiaoguangrong@cn.fujitsu.com>
> ---
>   arch/x86/kvm/mmu.c |   26 ++++++++++++++++++--------
>   1 files changed, 18 insertions(+), 8 deletions(-)
>
> diff --git a/arch/x86/kvm/mmu.c b/arch/x86/kvm/mmu.c
> index cd35e71..8acb8e3 100644
> --- a/arch/x86/kvm/mmu.c
> +++ b/arch/x86/kvm/mmu.c
> @@ -554,13 +554,24 @@ static int host_mapping_level(struct kvm *kvm, gfn_t gfn)
>   	return ret;
>   }
>
> -static bool mapping_level_dirty_bitmap(struct kvm_vcpu *vcpu, gfn_t large_gfn)
> +static struct kvm_memory_slot *
> +gfn_to_memslot_dirty_bitmap(struct kvm_vcpu *vcpu, gfn_t gfn, bool no_dirty_log)
>   {
>   	struct kvm_memory_slot *slot;
> -	slot = gfn_to_memslot(vcpu->kvm, large_gfn);
> -	if (slot&&  slot->dirty_bitmap)
> -		return true;
> -	return false;
> +
> +	slot = gfn_to_memslot(vcpu->kvm, gfn);
> +	if (!slot)
> +		return NULL;
> +
> +	if (no_dirty_log&&  slot->dirty_bitmap)
> +		return NULL;
> +
> +	return slot;
> +}
> +
> +static bool mapping_level_dirty_bitmap(struct kvm_vcpu *vcpu, gfn_t large_gfn)
> +{
> +	return !!gfn_to_memslot_dirty_bitmap(vcpu, large_gfn, true);
>   }

!! !needed.

>
>   static int mapping_level(struct kvm_vcpu *vcpu, gfn_t large_gfn)
> @@ -2155,9 +2166,8 @@ pte_prefetch_gfn_to_memslot(struct kvm_vcpu *vcpu, gfn_t gfn, bool no_dirty_log)
>   {
>   	struct kvm_memory_slot *slot;
>
> -	slot = gfn_to_memslot(vcpu->kvm, gfn);
> -	if (!slot || slot->flags&  KVM_MEMSLOT_INVALID ||
> -	      (no_dirty_log&&  slot->dirty_bitmap))
> +	slot = gfn_to_memslot_dirty_bitmap(vcpu, gfn, no_dirty_log);
> +	if (slot&&  slot->flags&  KVM_MEMSLOT_INVALID)
>   		slot = NULL;
>
>   	return slot;

For a unification this adds a lot of code... I think the result is more 
complicated than the starting point.

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