RepoMirrors
/
crash
mirror of https://github.com/crash-utility/crash
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

vmware: Improve output when we fail to read vmware 'vmsn' file 

Today if crash fails to read some structure in a vmware 'vmsn' file,
it will throw an "No such file or directory" message.  Such a generic
message does not give any clue as to the problem, but instead sounds
like the file may not exist when it does, for example:
  $ crash ./vmcore.vmsn  ./vmlinux

  crash 8.0.3
  ...

  crash: vmw: Failed to read './vmcore.vmsn': [Error 2] No such file or directory

  crash: ./vmcore.vmsn: initialization failed

  $ ls -l ./vmcore.vmsn
  -rwxrwxrwx. 7 myuser mygroup 12128999 Jul  4 07:21 ./vmcore.vmsn

Improve the above error message so we at least know which portion
of the file crash had difficulty reading.  After this patch, the
above error looks like:
  crash: vmw: Failed to read 'cptgroupdesc' from file './vmcore.vmsn': [Error 2] No such file or directory

Signed-off-by: Dave Wysochanski <dwysocha@redhat.com>
This commit is contained in:
Dave Wysochanski 2023-07-06 10:53:18 -04:00 committed by Kazuhito Hagio
parent 6d0be1316a
commit b76e116c50
2 changed files with 16 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
vmware_guestdump.c
View File

@ -117,8 +117,8 @@ is_vmware_guestdump(char *filename)
}
if (fread(&hdr, sizeof(struct guestdumpheader), 1, fp) != 1) {
error(INFO, LOGPRX"Failed to read '%s': [Error %d] %s\n",
filename, errno, strerror(errno));
error(INFO, LOGPRX"Failed to read '%s' from file '%s': [Error %d] %s\n",
"guestdumpheader", filename, errno, strerror(errno));
fclose(fp);
return FALSE;
}
@ -204,8 +204,8 @@ vmware_guestdump_init(char *filename, FILE *ofp)
for (i = 0; i < vmss.num_vcpus; i++) {
if (fread(&vs, sizeof(struct vcpu_state), 1, fp) != 1) {
error(INFO, LOGPRX"Failed to read '%s': [Error %d] %s\n",
filename, errno, strerror(errno));
error(INFO, LOGPRX"Failed to read '%s' from file '%s': [Error %d] %s\n",
"vcpu_state", filename, errno, strerror(errno));
result = FALSE;
goto exit;
}

24
vmware_vmss.c
View File

@ -39,8 +39,8 @@ is_vmware_vmss(char *filename)
}
if (fread(&hdr, sizeof(cptdumpheader), 1, fp) != 1) {
error(INFO, LOGPRX"Failed to read '%s': [Error %d] %s\n",
filename, errno, strerror(errno));
error(INFO, LOGPRX"Failed to read '%s' from file '%s': [Error %d] %s\n",
"cptdumpheader", filename, errno, strerror(errno));
fclose(fp);
return FALSE;
}
@ -86,8 +86,8 @@ vmware_vmss_init(char *filename, FILE *ofp)
}
if (fread(&hdr, sizeof(cptdumpheader), 1, fp) != 1) {
error(INFO, LOGPRX"Failed to read '%s': %s [Error %d] %s\n",
filename, errno, strerror(errno));
error(INFO, LOGPRX"Failed to read '%s' from file '%s': [Error %d] %s\n",
"cptdumpheader", filename, errno, strerror(errno));
result = FALSE;
goto exit;
}
@ -112,8 +112,8 @@ vmware_vmss_init(char *filename, FILE *ofp)
}
if (fread(grps, sizeof(cptgroupdesc), grpsize, fp) != grpsize) {
error(INFO, LOGPRX"Failed to read '%s': [Error %d] %s\n",
filename, errno, strerror(errno));
error(INFO, LOGPRX"Failed to read '%s' from file '%s': [Error %d] %s\n",
"cptgroupdesc", filename, errno, strerror(errno));
result = FALSE;
goto exit;
}
@ -225,8 +225,8 @@ vmware_vmss_init(char *filename, FILE *ofp)
idx[0] < vmss.num_vcpus) {
int cpu = idx[0];
if (fread(vmss.regs64[cpu], VMW_GPREGS_SIZE, 1, fp) != 1) {
error(INFO, LOGPRX"Failed to read '%s': [Error %d] %s\n",
filename, errno, strerror(errno));
error(INFO, LOGPRX"Failed to read '%s' from file '%s': [Error %d] %s\n",
name, filename, errno, strerror(errno));
break;
}
DEBUG_PARSE_PRINT((ofp, "\n"));
@ -237,8 +237,8 @@ vmware_vmss_init(char *filename, FILE *ofp)
int cpu = idx[0];
DEBUG_PARSE_PRINT((ofp, "\t=> "));
if (fread(&vmss.regs64[cpu]->cr[0], VMW_CR64_SIZE, 1, fp) != 1) {
error(INFO, LOGPRX"Failed to read '%s': [Error %d] %s\n",
filename, errno, strerror(errno));
error(INFO, LOGPRX"Failed to read '%s' from file '%s': [Error %d] %s\n",
name, filename, errno, strerror(errno));
break;
}
for (j = 0; j < VMW_CR64_SIZE / 8; j++)
@ -257,8 +257,8 @@ vmware_vmss_init(char *filename, FILE *ofp)
break;
}
if (fread(&idtr, sizeof(idtr), 1, fp) != 1) {
error(INFO, LOGPRX"Failed to read '%s': [Error %d] %s\n",
filename, errno, strerror(errno));
error(INFO, LOGPRX"Failed to read '%s' from file '%s': [Error %d] %s\n",
name, filename, errno, strerror(errno));
break;
}
DEBUG_PARSE_PRINT((ofp, "\n"));