Re: [Qemu-devel] [PATCHv4 8/8] pseries: Clean up error reporting in htab migration functions

[Alexey Kardashevskiy]

On 01/19/2016 02:39 PM, 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 error code.  Change these
to use error_report() instead.

Signed-off-by: David Gibson <da...@gibson.dropbear.id.au>
Reviewed-by: Thomas Huth <th...@redhat.com>

Reviewed-by: Alexey Kardashevskiy <a...@ozlabs.ru>        

---
  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
@@ -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;
          }

--
Alexey