[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Re: [Qemu-devel] [PATCHv4 8/8] pseries: Clean up error reporting in htab
From: |
Markus Armbruster |
Subject: |
Re: [Qemu-devel] [PATCHv4 8/8] pseries: Clean up error reporting in htab migration functions |
Date: |
Tue, 19 Jan 2016 08:44:51 +0100 |
User-agent: |
Gnus/5.13 (Gnus v5.13) Emacs/24.5 (gnu/linux) |
David Gibson <address@hidden> writes:
> 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 these
> to use error_report() instead.
>
> Signed-off-by: David Gibson <address@hidden>
> Reviewed-by: Thomas Huth <address@hidden>
> ---
> hw/ppc/spapr.c | 12 ++++++------
> 1 file changed, 6 insertions(+), 6 deletions(-)
>
> diff --git a/hw/ppc/spapr.c b/hw/ppc/spapr.c
> index 3cfacb9..1eb7d03 100644
> --- a/hw/ppc/spapr.c
> +++ b/hw/ppc/spapr.c
Lost this hunk:
@@ -1309,8 +1309,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;
}
}
Intentional?
> @@ -1526,7 +1526,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;
> }
>
> @@ -1547,8 +1547,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));
> }
> }
>
> @@ -1568,9 +1568,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;
> }
- [Qemu-devel] [PATCHv4 2/8] pseries: Cleanup error handling of spapr_cpu_init(), (continued)
- [Qemu-devel] [PATCHv4 2/8] pseries: Cleanup error handling of spapr_cpu_init(), David Gibson, 2016/01/18
- [Qemu-devel] [PATCHv4 7/8] pseries: Clean up error reporting in ppc_spapr_init(), David Gibson, 2016/01/18
- [Qemu-devel] [PATCHv4 3/8] pseries: Clean up error handling in spapr_validate_node_memory(), David Gibson, 2016/01/18
- [Qemu-devel] [PATCHv4 1/8] ppc: Cleanup error handling in ppc_set_compat(), David Gibson, 2016/01/18
- [Qemu-devel] [PATCHv4 8/8] pseries: Clean up error reporting in htab migration functions, David Gibson, 2016/01/18
[Qemu-devel] [PATCHv4 6/8] pseries: Clean up error handling in xics_system_init(), David Gibson, 2016/01/18
Re: [Qemu-devel] [PATCHv4 0/8] Cleanups to error reporting on ppc and spapr, Markus Armbruster, 2016/01/19