[BACK]Return to kvm_x86_64.c CVS log [TXT][DIR] Up to [cvs.NetBSD.org] / src / lib / libkvm

Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.

Diff for /src/lib/libkvm/kvm_x86_64.c between version 1.4 and 1.5

version 1.4, 2003/08/07 16:44:40 version 1.5, 2005/08/04 19:26:02
Line 117  _kvm_kvatop(kd, va, pa)
Line 117  _kvm_kvatop(kd, va, pa)
         /*          /*
          * Level 4.           * Level 4.
          */           */
         pde_pa = cpu_kh->ptdpaddr + (pl4_i(va) * sizeof(pd_entry_t));          pde_pa = cpu_kh->ptdpaddr + (pl4_pi(va) * sizeof(pd_entry_t));
         if (pread(kd->pmfd, (void *)&pde, sizeof(pde),          if (pread(kd->pmfd, (void *)&pde, sizeof(pde),
             _kvm_pa2off(kd, pde_pa)) != sizeof(pde)) {              _kvm_pa2off(kd, pde_pa)) != sizeof(pde)) {
                 _kvm_syserr(kd, 0, "could not read PT level 4 entry");                  _kvm_syserr(kd, 0, "could not read PT level 4 entry");
Line 131  _kvm_kvatop(kd, va, pa)
Line 131  _kvm_kvatop(kd, va, pa)
         /*          /*
          * Level 3.           * Level 3.
          */           */
         pde_pa = (pde_pa + PG_FRAME) + (pl3_i(va) * sizeof(pd_entry_t));          pde_pa = (pde & PG_FRAME) + (pl3_pi(va) * sizeof(pd_entry_t));
         if (pread(kd->pmfd, (void *)&pde, sizeof(pde),          if (pread(kd->pmfd, (void *)&pde, sizeof(pde),
             _kvm_pa2off(kd, pde_pa)) != sizeof(pde)) {              _kvm_pa2off(kd, pde_pa)) != sizeof(pde)) {
                 _kvm_syserr(kd, 0, "could not read PT level 3 entry");                  _kvm_syserr(kd, 0, "could not read PT level 3 entry");
Line 145  _kvm_kvatop(kd, va, pa)
Line 145  _kvm_kvatop(kd, va, pa)
         /*          /*
          * Level 2.           * Level 2.
          */           */
         pde_pa = (pde_pa & PG_FRAME) + (pl2_i(va) * sizeof(pd_entry_t));          pde_pa = (pde & PG_FRAME) + (pl2_pi(va) * sizeof(pd_entry_t));
         if (pread(kd->pmfd, (void *)&pde, sizeof(pde),          if (pread(kd->pmfd, (void *)&pde, sizeof(pde),
             _kvm_pa2off(kd, pde_pa)) != sizeof(pde)) {              _kvm_pa2off(kd, pde_pa)) != sizeof(pde)) {
                 _kvm_syserr(kd, 0, "could not read PT level 2 entry");                  _kvm_syserr(kd, 0, "could not read PT level 2 entry");
Line 160  _kvm_kvatop(kd, va, pa)
Line 160  _kvm_kvatop(kd, va, pa)
         /*          /*
          * Level 1.           * Level 1.
          */           */
         pte_pa = (pde_pa & PG_FRAME) + (pl1_i(va) * sizeof(pt_entry_t));          pte_pa = (pde & PG_FRAME) + (pl1_pi(va) * sizeof(pt_entry_t));
         if (pread(kd->pmfd, (void *) &pte, sizeof(pte),          if (pread(kd->pmfd, (void *) &pte, sizeof(pte),
             _kvm_pa2off(kd, pte_pa)) != sizeof(pte)) {              _kvm_pa2off(kd, pte_pa)) != sizeof(pte)) {
                 _kvm_syserr(kd, 0, "could not read PTE");                  _kvm_syserr(kd, 0, "could not read PTE");

Legend:
Removed from v.1.4  
changed lines
  Added in v.1.5

CVSweb <webmaster@jp.NetBSD.org>