summaryrefslogtreecommitdiffstats
path: root/lib/libkvm/kvm_i386.c
diff options
context:
space:
mode:
authoruqs <uqs@FreeBSD.org>2011-01-23 11:08:28 +0000
committeruqs <uqs@FreeBSD.org>2011-01-23 11:08:28 +0000
commit7fdf187c116172ba5c8238926c41445a02f3a4ad (patch)
treeaffb155452e52759603cd28ea92e941e8e5ab8a0 /lib/libkvm/kvm_i386.c
parent72b8fc74b4eb02687ea1cfa8837baa1fe5f697ec (diff)
downloadFreeBSD-src-7fdf187c116172ba5c8238926c41445a02f3a4ad.zip
FreeBSD-src-7fdf187c116172ba5c8238926c41445a02f3a4ad.tar.gz
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
Diffstat (limited to 'lib/libkvm/kvm_i386.c')
-rw-r--r--lib/libkvm/kvm_i386.c26
1 files changed, 13 insertions, 13 deletions
diff --git a/lib/libkvm/kvm_i386.c b/lib/libkvm/kvm_i386.c
index ac86ba6..a92979f 100644
--- a/lib/libkvm/kvm_i386.c
+++ b/lib/libkvm/kvm_i386.c
@@ -153,7 +153,7 @@ _kvm_freevtop(kvm_t *kd)
int
_kvm_initvtop(kvm_t *kd)
{
- struct nlist nlist[2];
+ struct nlist nl[2];
u_long pa;
u_long kernbase;
char *PTD;
@@ -183,21 +183,21 @@ _kvm_initvtop(kvm_t *kd)
return (-1);
}
- nlist[0].n_name = "kernbase";
- nlist[1].n_name = 0;
+ nl[0].n_name = "kernbase";
+ nl[1].n_name = 0;
- if (kvm_nlist(kd, nlist) != 0)
+ if (kvm_nlist(kd, nl) != 0)
kernbase = KERNBASE; /* for old kernels */
else
- kernbase = nlist[0].n_value;
+ kernbase = nl[0].n_value;
- nlist[0].n_name = "IdlePDPT";
- nlist[1].n_name = 0;
+ nl[0].n_name = "IdlePDPT";
+ nl[1].n_name = 0;
- if (kvm_nlist(kd, nlist) == 0) {
+ if (kvm_nlist(kd, nl) == 0) {
uint64_t pa64;
- if (kvm_read(kd, (nlist[0].n_value - kernbase), &pa,
+ if (kvm_read(kd, (nl[0].n_value - kernbase), &pa,
sizeof(pa)) != sizeof(pa)) {
_kvm_err(kd, kd->program, "cannot read IdlePDPT");
return (-1);
@@ -220,14 +220,14 @@ _kvm_initvtop(kvm_t *kd)
kd->vmst->PTD = PTD;
kd->vmst->pae = 1;
} else {
- nlist[0].n_name = "IdlePTD";
- nlist[1].n_name = 0;
+ nl[0].n_name = "IdlePTD";
+ nl[1].n_name = 0;
- if (kvm_nlist(kd, nlist) != 0) {
+ if (kvm_nlist(kd, nl) != 0) {
_kvm_err(kd, kd->program, "bad namelist");
return (-1);
}
- if (kvm_read(kd, (nlist[0].n_value - kernbase), &pa,
+ if (kvm_read(kd, (nl[0].n_value - kernbase), &pa,
sizeof(pa)) != sizeof(pa)) {
_kvm_err(kd, kd->program, "cannot read IdlePTD");
return (-1);
OpenPOWER on IntegriCloud