On Wed, Nov 17, 2010 at 12:13:17PM +0800, Xiao Guangrong wrote: > Remove it since we can jude it by sp->unsync > > Signed-off-by: Xiao Guangrong <[email protected]> > --- > arch/x86/include/asm/kvm_host.h | 2 +- > arch/x86/kvm/mmu.c | 8 ++++---- > arch/x86/kvm/paging_tmpl.h | 5 ++--- > 3 files changed, 7 insertions(+), 8 deletions(-) > > diff --git a/arch/x86/include/asm/kvm_host.h b/arch/x86/include/asm/kvm_host.h > index b04c0fa..ce8c1e4 100644 > --- a/arch/x86/include/asm/kvm_host.h > +++ b/arch/x86/include/asm/kvm_host.h > @@ -250,7 +250,7 @@ struct kvm_mmu { > void (*prefetch_page)(struct kvm_vcpu *vcpu, > struct kvm_mmu_page *page); > int (*sync_page)(struct kvm_vcpu *vcpu, > - struct kvm_mmu_page *sp, bool clear_unsync); > + struct kvm_mmu_page *sp); > void (*invlpg)(struct kvm_vcpu *vcpu, gva_t gva); > hpa_t root_hpa; > int root_level; > diff --git a/arch/x86/kvm/mmu.c b/arch/x86/kvm/mmu.c > index c4531a3..0668f4b 100644 > --- a/arch/x86/kvm/mmu.c > +++ b/arch/x86/kvm/mmu.c > @@ -1162,7 +1162,7 @@ static void nonpaging_prefetch_page(struct kvm_vcpu > *vcpu, > } > > static int nonpaging_sync_page(struct kvm_vcpu *vcpu, > - struct kvm_mmu_page *sp, bool clear_unsync) > + struct kvm_mmu_page *sp) > { > return 1; > } > @@ -1292,7 +1292,7 @@ static int __kvm_sync_page(struct kvm_vcpu *vcpu, > struct kvm_mmu_page *sp, > if (clear_unsync) > kvm_unlink_unsync_page(vcpu->kvm, sp); > > - if (vcpu->arch.mmu.sync_page(vcpu, sp, clear_unsync)) { > + if (vcpu->arch.mmu.sync_page(vcpu, sp)) { > kvm_mmu_prepare_zap_page(vcpu->kvm, sp, invalid_list); > return 1; > } > @@ -1333,12 +1333,12 @@ static void kvm_sync_pages(struct kvm_vcpu *vcpu, > gfn_t gfn) > continue; > > WARN_ON(s->role.level != PT_PAGE_TABLE_LEVEL); > + kvm_unlink_unsync_page(vcpu->kvm, s); > if ((s->role.cr4_pae != !!is_pae(vcpu)) || > - (vcpu->arch.mmu.sync_page(vcpu, s, true))) { > + (vcpu->arch.mmu.sync_page(vcpu, s))) { > kvm_mmu_prepare_zap_page(vcpu->kvm, s, &invalid_list); > continue; > } > - kvm_unlink_unsync_page(vcpu->kvm, s); > flush = true; > } > > diff --git a/arch/x86/kvm/paging_tmpl.h b/arch/x86/kvm/paging_tmpl.h > index 57619ed..60f00db 100644 > --- a/arch/x86/kvm/paging_tmpl.h > +++ b/arch/x86/kvm/paging_tmpl.h > @@ -740,8 +740,7 @@ static void FNAME(prefetch_page)(struct kvm_vcpu *vcpu, > * - The spte has a reference to the struct page, so the pfn for a given gfn > * can't change unless all sptes pointing to it are nuked first. > */ > -static int FNAME(sync_page)(struct kvm_vcpu *vcpu, struct kvm_mmu_page *sp, > - bool clear_unsync) > +static int FNAME(sync_page)(struct kvm_vcpu *vcpu, struct kvm_mmu_page *sp) > { > int i, offset, nr_present; > bool host_writable; > @@ -781,7 +780,7 @@ static int FNAME(sync_page)(struct kvm_vcpu *vcpu, struct > kvm_mmu_page *sp, > u64 nonpresent; > > if (rsvd_bits_set || is_present_gpte(gpte) || > - !clear_unsync) > + sp->unsync) > nonpresent = shadow_trap_nonpresent_pte; > else > nonpresent = shadow_notrap_nonpresent_pte;
Its better to keep this explicit as a parameter. -- To unsubscribe from this list: send the line "unsubscribe kvm" in the body of a message to [email protected] More majordomo info at http://vger.kernel.org/majordomo-info.html
