From mboxrd@z Thu Jan 1 00:00:00 1970 From: Xiao Guangrong Subject: [PATCH 1/5] KVM: MMU: fix compile warning in audit code Date: Sat, 28 Aug 2010 19:19:42 +0800 Message-ID: <4C78F0CE.9050900@cn.fujitsu.com> References: <4C78F07E.1040709@cn.fujitsu.com> Mime-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: QUOTED-PRINTABLE Cc: Marcelo Tosatti , LKML , KVM To: Avi Kivity Return-path: In-Reply-To: <4C78F07E.1040709@cn.fujitsu.com> Sender: linux-kernel-owner@vger.kernel.org List-Id: kvm.vger.kernel.org fix: arch/x86/kvm/mmu.c: In function =E2=80=98kvm_mmu_unprotect_page=E2=80=99= : arch/x86/kvm/mmu.c:1741: warning: format =E2=80=98%lx=E2=80=99 expects = type =E2=80=98long unsigned int=E2=80=99, but argument 3 has type =E2=80= =98gfn_t=E2=80=99 arch/x86/kvm/mmu.c:1745: warning: format =E2=80=98%lx=E2=80=99 expects = type =E2=80=98long unsigned int=E2=80=99, but argument 3 has type =E2=80= =98gfn_t=E2=80=99 arch/x86/kvm/mmu.c: In function =E2=80=98mmu_unshadow=E2=80=99: arch/x86/kvm/mmu.c:1761: warning: format =E2=80=98%lx=E2=80=99 expects = type =E2=80=98long unsigned int=E2=80=99, but argument 3 has type =E2=80= =98gfn_t=E2=80=99 arch/x86/kvm/mmu.c: In function =E2=80=98set_spte=E2=80=99: arch/x86/kvm/mmu.c:2005: warning: format =E2=80=98%lx=E2=80=99 expects = type =E2=80=98long unsigned int=E2=80=99, but argument 3 has type =E2=80= =98gfn_t=E2=80=99 arch/x86/kvm/mmu.c: In function =E2=80=98mmu_set_spte=E2=80=99: arch/x86/kvm/mmu.c:2033: warning: format =E2=80=98%lx=E2=80=99 expects = type =E2=80=98long unsigned int=E2=80=99, but argument 7 has type =E2=80= =98gfn_t=E2=80=99 Signed-off-by: Xiao Guangrong --- arch/x86/kvm/mmu.c | 20 ++++++++++---------- 1 files changed, 10 insertions(+), 10 deletions(-) diff --git a/arch/x86/kvm/mmu.c b/arch/x86/kvm/mmu.c index b0037a7..59bf1d9 100644 --- a/arch/x86/kvm/mmu.c +++ b/arch/x86/kvm/mmu.c @@ -1738,11 +1738,11 @@ static int kvm_mmu_unprotect_page(struct kvm *k= vm, gfn_t gfn) LIST_HEAD(invalid_list); int r; =20 - pgprintk("%s: looking for gfn %lx\n", __func__, gfn); + pgprintk("%s: looking for gfn %llx\n", __func__, gfn); r =3D 0; =20 for_each_gfn_indirect_valid_sp(kvm, sp, gfn, node) { - pgprintk("%s: gfn %lx role %x\n", __func__, gfn, + pgprintk("%s: gfn %llx role %x\n", __func__, gfn, sp->role.word); r =3D 1; kvm_mmu_prepare_zap_page(kvm, sp, &invalid_list); @@ -1758,7 +1758,7 @@ static void mmu_unshadow(struct kvm *kvm, gfn_t g= fn) LIST_HEAD(invalid_list); =20 for_each_gfn_indirect_valid_sp(kvm, sp, gfn, node) { - pgprintk("%s: zap %lx %x\n", + pgprintk("%s: zap %llx %x\n", __func__, gfn, sp->role.word); kvm_mmu_prepare_zap_page(kvm, sp, &invalid_list); } @@ -2002,7 +2002,7 @@ static int set_spte(struct kvm_vcpu *vcpu, u64 *s= ptep, goto set_pte; =20 if (mmu_need_write_protect(vcpu, gfn, can_unsync)) { - pgprintk("%s: found shadow page for %lx, marking ro\n", + pgprintk("%s: found shadow page for %llx, marking ro\n", __func__, gfn); ret =3D 1; pte_access &=3D ~ACC_WRITE_MASK; @@ -2031,7 +2031,7 @@ static void mmu_set_spte(struct kvm_vcpu *vcpu, u= 64 *sptep, int rmap_count; =20 pgprintk("%s: spte %llx access %x write_fault %d" - " user_fault %d gfn %lx\n", + " user_fault %d gfn %llx\n", __func__, *sptep, pt_access, write_fault, user_fault, gfn); =20 @@ -2050,7 +2050,7 @@ static void mmu_set_spte(struct kvm_vcpu *vcpu, u= 64 *sptep, __set_spte(sptep, shadow_trap_nonpresent_pte); kvm_flush_remote_tlbs(vcpu->kvm); } else if (pfn !=3D spte_to_pfn(*sptep)) { - pgprintk("hfn old %lx new %lx\n", + pgprintk("hfn old %llx new %llx\n", spte_to_pfn(*sptep), pfn); drop_spte(vcpu->kvm, sptep, shadow_trap_nonpresent_pte); kvm_flush_remote_tlbs(vcpu->kvm); @@ -2067,7 +2067,7 @@ static void mmu_set_spte(struct kvm_vcpu *vcpu, u= 64 *sptep, } =20 pgprintk("%s: setting spte %llx\n", __func__, *sptep); - pgprintk("instantiating %s PTE (%s) at %ld (%llx) addr %p\n", + pgprintk("instantiating %s PTE (%s) at %llx (%llx) addr %p\n", is_large_pte(*sptep)? "2MB" : "4kB", *sptep & PT_PRESENT_MASK ?"RW":"R", gfn, *sptep, sptep); @@ -3651,9 +3651,9 @@ void inspect_spte_has_rmap(struct kvm *kvm, u64 *= sptep) if (!gfn_to_memslot(kvm, gfn)) { if (!printk_ratelimit()) return; - printk(KERN_ERR "%s: no memslot for gfn %ld\n", + printk(KERN_ERR "%s: no memslot for gfn %llx\n", audit_msg, gfn); - printk(KERN_ERR "%s: index %ld of sp (gfn=3D%lx)\n", + printk(KERN_ERR "%s: index %ld of sp (gfn=3D%llx)\n", audit_msg, (long int)(sptep - rev_sp->spt), rev_sp->gfn); dump_stack(); @@ -3728,7 +3728,7 @@ static void audit_write_protection(struct kvm_vcp= u *vcpu) while (spte) { if (is_writable_pte(*spte)) printk(KERN_ERR "%s: (%s) shadow page has " - "writable mappings: gfn %lx role %x\n", + "writable mappings: gfn %llx role %x\n", __func__, audit_msg, sp->gfn, sp->role.word); spte =3D rmap_next(vcpu->kvm, rmapp, spte); --=20 1.7.0.4