Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

MFC r257216:

Several small fixes for the amd64 minidump code.

Approved by:	re (gjb)
  • Loading branch information...
commit a2c021b32c7c075288fbc3192a675eabb0395bc6 1 parent 5dcfadb
@kostikbel kostikbel authored
Showing with 7 additions and 4 deletions.
  1. +7 −4 sys/amd64/amd64/minidump_machdep.c
View
11 sys/amd64/amd64/minidump_machdep.c
@@ -127,8 +127,9 @@ report_progress(size_t progress, size_t dumpsize)
int sofar, i;
sofar = 100 - ((progress * 100) / dumpsize);
- for (i = 0; i < 10; i++) {
- if (sofar < progress_track[i].min_per || sofar > progress_track[i].max_per)
+ for (i = 0; i < nitems(progress_track); i++) {
+ if (sofar < progress_track[i].min_per ||
+ sofar > progress_track[i].max_per)
continue;
if (progress_track[i].visited)
return;
@@ -157,8 +158,8 @@ blk_write(struct dumperinfo *di, char *ptr, vm_paddr_t pa, size_t sz)
printf("cant have both va and pa!\n");
return (EINVAL);
}
- if (pa != 0 && (((uintptr_t)ptr) % PAGE_SIZE) != 0) {
- printf("address not page aligned\n");
+ if ((((uintptr_t)pa) % PAGE_SIZE) != 0) {
+ printf("address not page aligned %p\n", ptr);
return (EINVAL);
}
if (ptr != NULL) {
@@ -230,6 +231,8 @@ minidumpsys(struct dumperinfo *di)
retry:
retry_count++;
counter = 0;
+ for (i = 0; i < nitems(progress_track); i++)
+ progress_track[i].visited = 0;
/* Walk page table pages, set bits in vm_page_dump */
pmapsize = 0;
for (va = VM_MIN_KERNEL_ADDRESS; va < MAX(KERNBASE + nkpt * NBPDR,
Please sign in to comment.
Something went wrong with that request. Please try again.