diff options
author | Ulrich Spörlein <uqs@FreeBSD.org> | 2011-01-23 11:08:28 +0000 |
---|---|---|
committer | Ulrich Spörlein <uqs@FreeBSD.org> | 2011-01-23 11:08:28 +0000 |
commit | c10970dd7d7cd88f4e14743bd56f6bf010c49274 (patch) | |
tree | affb155452e52759603cd28ea92e941e8e5ab8a0 /lib/libkvm/kvm_sparc64.c | |
parent | 9a6a64d3c42a9b9079995ea306b243949b81dfaf (diff) | |
download | src-c10970dd7d7cd88f4e14743bd56f6bf010c49274.tar.gz src-c10970dd7d7cd88f4e14743bd56f6bf010c49274.zip |
libkvm code janitoring
- make WARNS=6 clean for archs w/o strict alignment requirments
- add const, ANSIfy, remove unused vars, cast types for comparison
- thanks to differing definitions of VM_MIN_ADDRESS across our archs, we
need to trick the compiler to not complain about signedness. We could
either fix VM_MIN_ADDRESS to always be a simple integer or make the
check conditional on $ARCH.
Closes PRs: kern/42386, kern/83364
Reviewed by: bde
Notes
Notes:
svn path=/head/; revision=217744
Diffstat (limited to 'lib/libkvm/kvm_sparc64.c')
-rw-r--r-- | lib/libkvm/kvm_sparc64.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/lib/libkvm/kvm_sparc64.c b/lib/libkvm/kvm_sparc64.c index b8e9f693f5c0..a534d1da6bbf 100644 --- a/lib/libkvm/kvm_sparc64.c +++ b/lib/libkvm/kvm_sparc64.c @@ -97,7 +97,7 @@ _kvm_read_phys(kvm_t *kd, off_t pos, void *buf, size_t size) _kvm_syserr(kd, kd->program, "_kvm_read_phys: lseek"); return (0); } - if (read(kd->pmfd, buf, size) != size) { + if (read(kd->pmfd, buf, size) != (ssize_t)size) { _kvm_syserr(kd, kd->program, "_kvm_read_phys: read"); return (0); } @@ -146,7 +146,6 @@ _kvm_initvtop(kvm_t *kd) struct vmstate *vm; size_t regsz; vm_offset_t pa; - vm_size_t mask; vm = (struct vmstate *)_kvm_malloc(kd, sizeof(*vm)); if (vm == NULL) { @@ -189,12 +188,13 @@ fail_vm: int _kvm_kvatop(kvm_t *kd, u_long va, off_t *pa) { - struct vmstate *vm; #if !defined(SUN4V) struct tte tte; + off_t tte_off; + u_long vpn; #endif - off_t tte_off, pa_off; - u_long pg_off, vpn; + off_t pa_off; + u_long pg_off; int rest; pg_off = va & PAGE_MASK; @@ -220,6 +220,6 @@ _kvm_kvatop(kvm_t *kd, u_long va, off_t *pa) return (rest); invalid: - _kvm_err(kd, 0, "invalid address (%x)", va); + _kvm_err(kd, 0, "invalid address (%lx)", va); return (0); } |