From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:41608) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aLNwx-0001tl-FS for qemu-devel@nongnu.org; Mon, 18 Jan 2016 23:31:24 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1aLNwu-0002qD-9p for qemu-devel@nongnu.org; Mon, 18 Jan 2016 23:31:23 -0500 Received: from mail-pf0-x230.google.com ([2607:f8b0:400e:c00::230]:34623) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aLNwu-0002pw-46 for qemu-devel@nongnu.org; Mon, 18 Jan 2016 23:31:20 -0500 Received: by mail-pf0-x230.google.com with SMTP id q63so173370471pfb.1 for ; Mon, 18 Jan 2016 20:31:20 -0800 (PST) References: <1453174759-22837-1-git-send-email-david@gibson.dropbear.id.au> <1453174759-22837-9-git-send-email-david@gibson.dropbear.id.au> From: Alexey Kardashevskiy Message-ID: <569DBC12.1050406@ozlabs.ru> Date: Tue, 19 Jan 2016 15:31:14 +1100 MIME-Version: 1.0 In-Reply-To: <1453174759-22837-9-git-send-email-david@gibson.dropbear.id.au> Content-Type: text/plain; charset=koi8-r; format=flowed Content-Transfer-Encoding: 7bit Subject: Re: [Qemu-devel] [PATCHv4 8/8] pseries: Clean up error reporting in htab migration functions List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: David Gibson , armbru@redhat.com, mdroth@linux.vnet.ibm.com Cc: lvivier@redhat.com, thuth@redhat.com, qemu-ppc@nongnu.org, qemu-devel@nongnu.org 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 > Reviewed-by: Thomas Huth Reviewed-by: Alexey Kardashevskiy > --- > 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