Date: Wed, 29 Jun 2005 22:00:35 GMT From: Peter Wemm <peter@FreeBSD.org> To: Perforce Change Reviews <perforce@freebsd.org> Subject: PERFORCE change 79198 for review Message-ID: <200506292200.j5TM0ZvG047869@repoman.freebsd.org>
next in thread | raw e-mail | index | archive | help
http://perforce.freebsd.org/chv.cgi?CH=79198 Change 79198 by peter@peter_daintree on 2005/06/29 22:00:01 kvm_kvatop() returns something used for lseek - ie: off_t. Use it since its the correct type. Affected files ... .. //depot/projects/hammer/lib/libkvm/kvm_amd64.c#16 edit .. //depot/projects/hammer/lib/libkvm/kvm_arm.c#3 edit .. //depot/projects/hammer/lib/libkvm/kvm_i386.c#8 edit .. //depot/projects/hammer/lib/libkvm/kvm_ia64.c#6 edit .. //depot/projects/hammer/lib/libkvm/kvm_powerpc.c#3 edit .. //depot/projects/hammer/lib/libkvm/kvm_sparc64.c#6 edit Differences ... ==== //depot/projects/hammer/lib/libkvm/kvm_amd64.c#16 (text+ko) ==== @@ -110,7 +110,7 @@ * (Taken from kvm_ia64.c) */ static size_t -_kvm_pa2off(kvm_t *kd, uint64_t pa, u_long *ofs) +_kvm_pa2off(kvm_t *kd, uint64_t pa, off_t *ofs) { Elf_Ehdr *e = kd->vmst->mmapbase; Elf_Phdr *p = (Elf_Phdr*)((char*)e + e->e_phoff); @@ -194,7 +194,7 @@ } static int -_kvm_vatop(kvm_t *kd, u_long va, uint64_t *pa) +_kvm_vatop(kvm_t *kd, u_long va, off_t *pa) { struct vmstate *vm; u_long offset; @@ -210,7 +210,8 @@ u_long pdeindex; u_long pteindex; int i; - u_long a, ofs; + u_long a; + off_t ofs; size_t s; vm = kd->vmst; @@ -328,7 +329,7 @@ } int -_kvm_kvatop(kvm_t *kd, u_long va, uint64_t *pa) +_kvm_kvatop(kvm_t *kd, u_long va, off_t *pa) { if (ISALIVE(kd)) { _kvm_err(kd, 0, "kvm_kvatop called in live kernel!"); ==== //depot/projects/hammer/lib/libkvm/kvm_arm.c#3 (text+ko) ==== @@ -68,7 +68,7 @@ _kvm_kvatop(kd, va, pa) kvm_t *kd; u_long va; - uint64_t *pa; + off_t *pa; { _kvm_err(kd, 0, "vatop not yet implemented!"); return 0; ==== //depot/projects/hammer/lib/libkvm/kvm_i386.c#8 (text+ko) ==== @@ -115,7 +115,7 @@ * (Taken from kvm_ia64.c) */ static size_t -_kvm_pa2off(kvm_t *kd, uint64_t pa, uint64_t *ofs) +_kvm_pa2off(kvm_t *kd, uint64_t pa, off_t *ofs) { Elf_Ehdr *e = kd->vmst->mmapbase; Elf_Phdr *p = (Elf_Phdr*)((char*)e + e->e_phoff); @@ -233,7 +233,7 @@ } static int -_kvm_vatop(kvm_t *kd, u_long va, uint64_t *pa) +_kvm_vatop(kvm_t *kd, u_long va, off_t *pa) { struct vmstate *vm; u_long offset; @@ -245,7 +245,7 @@ u_long pteindex; size_t s; u_long a; - uint64_t ofs; + off_t ofs; uint32_t *PTD; vm = kd->vmst; @@ -325,7 +325,7 @@ } static int -_kvm_vatop_pae(kvm_t *kd, u_long va, uint64_t *pa) +_kvm_vatop_pae(kvm_t *kd, u_long va, off_t *pa) { struct vmstate *vm; uint64_t offset; @@ -336,7 +336,8 @@ u_long pdeindex; u_long pteindex; size_t s; - uint64_t a, ofs; + uint64_t a; + off_t ofs; uint64_t *PTD; vm = kd->vmst; ==== //depot/projects/hammer/lib/libkvm/kvm_ia64.c#6 (text+ko) ==== @@ -85,7 +85,7 @@ * Translate a physical memory address to a file-offset in the crash-dump. */ static size_t -_kvm_pa2off(kvm_t *kd, uint64_t pa, uint64_t *ofs, size_t pgsz) +_kvm_pa2off(kvm_t *kd, uint64_t pa, off_t *ofs, size_t pgsz) { Elf64_Ehdr *e = kd->vmst->mmapbase; Elf64_Phdr *p = (Elf64_Phdr*)((char*)e + e->e_phoff); @@ -171,7 +171,7 @@ } int -_kvm_kvatop(kvm_t *kd, u_long va, uint64_t *pa) +_kvm_kvatop(kvm_t *kd, u_long va, off_t *pa) { struct ia64_lpte pte; uint64_t pgaddr, ptaddr; ==== //depot/projects/hammer/lib/libkvm/kvm_powerpc.c#3 (text+ko) ==== @@ -68,7 +68,7 @@ _kvm_kvatop(kd, va, pa) kvm_t *kd; u_long va; - u_long *pa; + off_t *pa; { _kvm_err(kd, 0, "vatop not yet implemented!"); return 0; @@ -77,7 +77,7 @@ off_t _kvm_pa2off(kd, pa) kvm_t *kd; - uint64_t pa; + u_long pa; { _kvm_err(kd, 0, "pa2off not yet implemented!"); return 0; ==== //depot/projects/hammer/lib/libkvm/kvm_sparc64.c#6 (text+ko) ==== @@ -191,7 +191,7 @@ } int -_kvm_kvatop(kvm_t *kd, u_long va, uint64_t *pa) +_kvm_kvatop(kvm_t *kd, u_long va, off_t *pa) { struct vmstate *vm; struct tte tte;
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200506292200.j5TM0ZvG047869>