Skip to content

Commit

Permalink
pseries: Clean up error reporting in htab migration functions
Browse files Browse the repository at this point in the history
The functions for migrating the hash page table on pseries machine type
(htab_save_setup() and htab_load()) can report some errors with an
explicit fprintf() before returning an appropriate error code.  Change some
of these to use error_report() instead. htab_save_setup() is omitted for
now to avoid conflicts with some other in-progress work.

Signed-off-by: David Gibson <[email protected]>
Reviewed-by: Thomas Huth <[email protected]>
Reviewed-by: Alexey Kardashevskiy <[email protected]>
Reviewed-by: Markus Armbruster <[email protected]>
  • Loading branch information
dgibson committed Jan 30, 2016
1 parent d54e4d7 commit 98a5d10
Showing 1 changed file with 6 additions and 6 deletions.
12 changes: 6 additions & 6 deletions hw/ppc/spapr.c
Original file line number Diff line number Diff line change
Expand Up @@ -1534,7 +1534,7 @@ static int htab_load(QEMUFile *f, void *opaque, int version_id)
int fd = -1;

if (version_id < 1 || version_id > 1) {
fprintf(stderr, "htab_load() bad version\n");
error_report("htab_load() bad version");
return -EINVAL;
}

Expand All @@ -1555,8 +1555,8 @@ static int htab_load(QEMUFile *f, void *opaque, int version_id)

fd = kvmppc_get_htab_fd(true);
if (fd < 0) {
fprintf(stderr, "Unable to open fd to restore KVM hash table: %s\n",
strerror(errno));
error_report("Unable to open fd to restore KVM hash table: %s",
strerror(errno));
}
}

Expand All @@ -1576,9 +1576,9 @@ static int htab_load(QEMUFile *f, void *opaque, int version_id)
if ((index + n_valid + n_invalid) >
(HTAB_SIZE(spapr) / HASH_PTE_SIZE_64)) {
/* Bad index in stream */
fprintf(stderr, "htab_load() bad index %d (%hd+%hd entries) "
"in htab stream (htab_shift=%d)\n", index, n_valid, n_invalid,
spapr->htab_shift);
error_report(
"htab_load() bad index %d (%hd+%hd entries) in htab stream (htab_shift=%d)",
index, n_valid, n_invalid, spapr->htab_shift);
return -EINVAL;
}

Expand Down

0 comments on commit 98a5d10

Please sign in to comment.