diff options
| author | Peter Wemm <peter@FreeBSD.org> | 2001-08-24 08:53:30 +0000 |
|---|---|---|
| committer | Peter Wemm <peter@FreeBSD.org> | 2001-08-24 08:53:30 +0000 |
| commit | f85f3040062dffca6dfcb0c3c2ac64d99cc19db3 (patch) | |
| tree | e650d445aa765ce562c70af08ad2a6b61144525d | |
| parent | c1c2006ca79ecee8b54c38172a9016ee5e0667ae (diff) | |
Notes
| -rw-r--r-- | lib/libkvm/kvm_amd64.c | 14 | ||||
| -rw-r--r-- | lib/libkvm/kvm_i386.c | 14 |
2 files changed, 24 insertions, 4 deletions
diff --git a/lib/libkvm/kvm_amd64.c b/lib/libkvm/kvm_amd64.c index b4365aedb6c5..5801e0c0d7dc 100644 --- a/lib/libkvm/kvm_amd64.c +++ b/lib/libkvm/kvm_amd64.c @@ -93,6 +93,7 @@ _kvm_initvtop(kvm_t *kd) struct vmstate *vm; struct nlist nlist[2]; u_long pa; + u_long kernbase; pd_entry_t *PTD; vm = (struct vmstate *)_kvm_malloc(kd, sizeof(*vm)); @@ -103,14 +104,23 @@ _kvm_initvtop(kvm_t *kd) kd->vmst = vm; vm->PTD = 0; - nlist[0].n_name = "_IdlePTD"; + nlist[0].n_name = "kernbase"; + nlist[1].n_name = 0; + + if (kvm_nlist(kd, nlist) != 0) + kernbase = KERNBASE; /* for old kernels */ + else + kernbase = nlist[0].n_value; + + nlist[0].n_name = "IdlePTD"; nlist[1].n_name = 0; if (kvm_nlist(kd, nlist) != 0) { _kvm_err(kd, kd->program, "bad namelist"); return (-1); } - if (kvm_read(kd, (nlist[0].n_value - KERNBASE), &pa, sizeof(pa)) != sizeof(pa)) { + if (kvm_read(kd, (nlist[0].n_value - kernbase), &pa, sizeof(pa)) != + sizeof(pa)) { _kvm_err(kd, kd->program, "cannot read IdlePTD"); return (-1); } diff --git a/lib/libkvm/kvm_i386.c b/lib/libkvm/kvm_i386.c index b4365aedb6c5..5801e0c0d7dc 100644 --- a/lib/libkvm/kvm_i386.c +++ b/lib/libkvm/kvm_i386.c @@ -93,6 +93,7 @@ _kvm_initvtop(kvm_t *kd) struct vmstate *vm; struct nlist nlist[2]; u_long pa; + u_long kernbase; pd_entry_t *PTD; vm = (struct vmstate *)_kvm_malloc(kd, sizeof(*vm)); @@ -103,14 +104,23 @@ _kvm_initvtop(kvm_t *kd) kd->vmst = vm; vm->PTD = 0; - nlist[0].n_name = "_IdlePTD"; + nlist[0].n_name = "kernbase"; + nlist[1].n_name = 0; + + if (kvm_nlist(kd, nlist) != 0) + kernbase = KERNBASE; /* for old kernels */ + else + kernbase = nlist[0].n_value; + + nlist[0].n_name = "IdlePTD"; nlist[1].n_name = 0; if (kvm_nlist(kd, nlist) != 0) { _kvm_err(kd, kd->program, "bad namelist"); return (-1); } - if (kvm_read(kd, (nlist[0].n_value - KERNBASE), &pa, sizeof(pa)) != sizeof(pa)) { + if (kvm_read(kd, (nlist[0].n_value - kernbase), &pa, sizeof(pa)) != + sizeof(pa)) { _kvm_err(kd, kd->program, "cannot read IdlePTD"); return (-1); } |