From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:49397) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aOuVo-0005ys-01 for qemu-devel@nongnu.org; Thu, 28 Jan 2016 16:53:57 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1aOuVm-0004pi-Hw for qemu-devel@nongnu.org; Thu, 28 Jan 2016 16:53:55 -0500 From: =?utf-8?b?TGx1w61z?= Vilanova Date: Thu, 28 Jan 2016 22:53:43 +0100 Message-Id: <145401802305.13643.16884320385969020316.stgit@localhost> In-Reply-To: <145401801194.13643.11789300006832270147.stgit@localhost> References: <145401801194.13643.11789300006832270147.stgit@localhost> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Subject: [Qemu-devel] [PATCH v5 2/5] util: Use new error_report_fatal/abort instead of error_setg(&error_fatal/abort) List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: Kevin Wolf , Alexander Graf , Thomas Huth , "open list:Floppy" , Stefan Hajnoczi , "Dr . David Alan Gilbert" , Markus Armbruster , "open list:sPAPR" , John Snow , David Gibson Replaces all direct uses of 'error_setg(&error_fatal/abort)' with 'error_report_fatal/abort'. Also reimplements the former on top of the latter. Signed-off-by: Llu=C3=ADs Vilanova --- hw/block/fdc.c | 6 +++--- hw/ppc/spapr.c | 8 ++++---- hw/ppc/spapr_drc.c | 2 +- util/error.c | 9 +++------ 4 files changed, 11 insertions(+), 14 deletions(-) diff --git a/hw/block/fdc.c b/hw/block/fdc.c index e3b0e1e..8f0c947 100644 --- a/hw/block/fdc.c +++ b/hw/block/fdc.c @@ -347,9 +347,9 @@ static int pick_geometry(FDrive *drv) =20 /* No match of any kind found -- fd_format is misconfigured, abort. = */ if (match =3D=3D -1) { - error_setg(&error_abort, "No candidate geometries present in tab= le " - " for floppy drive type '%s'", - FloppyDriveType_lookup[drv->drive]); + error_report_abort("No candidate geometries present in table " + " for floppy drive type '%s'", + FloppyDriveType_lookup[drv->drive]); } =20 parse =3D &(fd_formats[match]); diff --git a/hw/ppc/spapr.c b/hw/ppc/spapr.c index 50e5a26..a5afea1 100644 --- a/hw/ppc/spapr.c +++ b/hw/ppc/spapr.c @@ -1031,7 +1031,7 @@ static void spapr_alloc_htab(sPAPRMachineState *spa= pr) * For HV KVM, host kernel will return -ENOMEM when requested * HTAB size can't be allocated. */ - error_setg(&error_abort, "Failed to allocate HTAB of requested s= ize, try with smaller maxmem"); + error_report_abort("Failed to allocate HTAB of requested size, t= ry with smaller maxmem"); } else if (shift > 0) { /* * Kernel handles htab, we don't need to allocate one @@ -1040,7 +1040,7 @@ static void spapr_alloc_htab(sPAPRMachineState *spa= pr) * but we don't allow booting of such guests. */ if (shift !=3D spapr->htab_shift) { - error_setg(&error_abort, "Failed to allocate HTAB of request= ed size, try with smaller maxmem"); + error_report_abort("Failed to allocate HTAB of requested siz= e, try with smaller maxmem"); } =20 spapr->htab_shift =3D shift; @@ -1071,10 +1071,10 @@ static void spapr_reset_htab(sPAPRMachineState *s= papr) =20 shift =3D kvmppc_reset_htab(spapr->htab_shift); if (shift < 0) { - error_setg(&error_abort, "Failed to reset HTAB"); + error_report_abort("Failed to reset HTAB"); } else if (shift > 0) { if (shift !=3D spapr->htab_shift) { - error_setg(&error_abort, "Requested HTAB allocation failed d= uring reset"); + error_report_abort("Requested HTAB allocation failed during = reset"); } =20 /* Tell readers to update their file descriptor */ diff --git a/hw/ppc/spapr_drc.c b/hw/ppc/spapr_drc.c index dccb908..0d8f5b4 100644 --- a/hw/ppc/spapr_drc.c +++ b/hw/ppc/spapr_drc.c @@ -322,7 +322,7 @@ static void prop_get_fdt(Object *obj, Visitor *v, voi= d *opaque, break; } default: - error_setg(&error_abort, "device FDT in unexpected state: %d= ", tag); + error_report_abort("device FDT in unexpected state: %d", tag= ); } fdt_offset =3D fdt_offset_next; } while (fdt_depth !=3D 0); diff --git a/util/error.c b/util/error.c index 57303fd..b8a9120 100644 --- a/util/error.c +++ b/util/error.c @@ -30,15 +30,12 @@ Error *error_fatal; =20 static void error_handle_fatal(Error **errp, Error *err) { + /* None of them has a hint, so error_report_err() is not necessary h= ere */ if (errp =3D=3D &error_abort) { - fprintf(stderr, "Unexpected error in %s() at %s:%d:\n", - err->func, err->src, err->line); - error_report_err(err); - abort(); + error_report_abort_internal("%s", err->msg); } if (errp =3D=3D &error_fatal) { - error_report_err(err); - exit(1); + error_report_fatal("%s", err->msg); } } =20