[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 11/11] pseries: Clean up error reporting in htab mig
From: |
David Gibson |
Subject: |
[Qemu-devel] [PATCH 11/11] pseries: Clean up error reporting in htab migration functions |
Date: |
Fri, 11 Dec 2015 11:11:25 +1100 |
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 eror code. Change these
to use error_report() instead.
Signed-off-by: David Gibson <address@hidden>
---
hw/ppc/spapr.c | 17 +++++++++--------
1 file changed, 9 insertions(+), 8 deletions(-)
diff --git a/hw/ppc/spapr.c b/hw/ppc/spapr.c
index deaf5c0..c93ce09 100644
--- a/hw/ppc/spapr.c
+++ b/hw/ppc/spapr.c
@@ -1318,8 +1318,9 @@ static int htab_save_setup(QEMUFile *f, void *opaque)
spapr->htab_fd = kvmppc_get_htab_fd(false);
spapr->htab_fd_stale = false;
if (spapr->htab_fd < 0) {
- fprintf(stderr, "Unable to open fd for reading hash table from
KVM: %s\n",
- strerror(errno));
+ error_report(
+ "Unable to open fd for reading hash table from KVM: %s",
+ strerror(errno));
return -1;
}
}
@@ -1535,7 +1536,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;
}
@@ -1556,8 +1557,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));
}
}
@@ -1577,9 +1578,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)\n",
+ index, n_valid, n_invalid, spapr->htab_shift);
return -EINVAL;
}
--
2.5.0
- [Qemu-devel] [PATCH 04/11] pseries: Clean up error handling in spapr_validate_node_memory(), (continued)
- [Qemu-devel] [PATCH 04/11] pseries: Clean up error handling in spapr_validate_node_memory(), David Gibson, 2015/12/10
- [Qemu-devel] [PATCH 05/11] pseries: Cleanup error handling in spapr_vga_init(), David Gibson, 2015/12/10
- [Qemu-devel] [PATCH 02/11] pseries: Cleanup error handling of spapr_cpu_init(), David Gibson, 2015/12/10
- [Qemu-devel] [PATCH 11/11] pseries: Clean up error reporting in htab migration functions,
David Gibson <=
- [Qemu-devel] [PATCH 08/11] pseries: Clean up error handling in spapr_rtas_register(), David Gibson, 2015/12/10
- [Qemu-devel] [PATCH 09/11] pseries: Clean up error handling in xics_system_init(), David Gibson, 2015/12/10
- [Qemu-devel] [PATCH 10/11] pseries: Clean up error handling in ppc_spapr_init(), David Gibson, 2015/12/10
- [Qemu-devel] [PATCH 03/11] pseries: Clean up hash page table allocation error handling, David Gibson, 2015/12/10