david.venhoff/QEMU-Nyx-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

pseries: Clean up error reporting in htab migration functions

Browse Source 
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 <david@gibson.dropbear.id.au>
Reviewed-by: Thomas Huth <thuth@redhat.com>
Reviewed-by: Alexey Kardashevskiy <aik@ozlabs.ru>
Reviewed-by: Markus Armbruster <armbru@redhat.com>
This commit is contained in:
David Gibson 2016-01-20 12:59:05 +11:00
parent d54e4d7659
commit 98a5d100c2
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
hw/ppc/spapr.c
View File

@ -1534,7 +1534,7 @@ static int htab_load(QEMUFile *f, void *opaque, int version_id)
int fd = -1; int fd = -1;
if (version_id < 1 || version_id > 1) { if (version_id < 1 || version_id > 1) {
fprintf(stderr, "htab_load() bad version\n"); error_report("htab_load() bad version");
return -EINVAL; return -EINVAL;
} }
@ -1555,7 +1555,7 @@ static int htab_load(QEMUFile *f, void *opaque, int version_id)
fd = kvmppc_get_htab_fd(true); fd = kvmppc_get_htab_fd(true);
if (fd < 0) { if (fd < 0) {
fprintf(stderr, "Unable to open fd to restore KVM hash table: %s\n", error_report("Unable to open fd to restore KVM hash table: %s",
strerror(errno)); strerror(errno));
} }
} }
@ -1576,9 +1576,9 @@ static int htab_load(QEMUFile *f, void *opaque, int version_id)
if ((index + n_valid + n_invalid) > if ((index + n_valid + n_invalid) >
(HTAB_SIZE(spapr) / HASH_PTE_SIZE_64)) { (HTAB_SIZE(spapr) / HASH_PTE_SIZE_64)) {
/* Bad index in stream */ /* Bad index in stream */
fprintf(stderr, "htab_load() bad index %d (%hd+%hd entries) " error_report(
"in htab stream (htab_shift=%d)\n", index, n_valid, n_invalid, "htab_load() bad index %d (%hd+%hd entries) in htab stream (htab_shift=%d)",
spapr->htab_shift); index, n_valid, n_invalid, spapr->htab_shift);
return -EINVAL; return -EINVAL;
} }