On 11/12/15 01:11, David Gibson wrote:
> 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
s/eror/error/
> to use error_report() instead.
>
> Signed-off-by: David Gibson <da...@gibson.dropbear.id.au>
> ---
> 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;
> }
With the typo fixed in the patch description:
Reviewed-by: Thomas Huth <th...@redhat.com>
