Re: [Qemu-devel] [PATCH v6 2/5] util: Use new error_report_fatal/abort instead of error_setg(&error_fatal/abort)

[John Snow]

On 02/02/2016 11:14 AM, Lluís Vilanova wrote:
> 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ís Vilanova <address@hidden>
> ---
>  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)
>  
>      /* No match of any kind found -- fd_format is misconfigured, abort. */
>      if (match == -1) {
> -        error_setg(&error_abort, "No candidate geometries present in table "
> -                   " 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]);
>      }
>  

Acked-by: John Snow <address@hidden>

>      parse = &(fd_formats[match]);
> diff --git a/hw/ppc/spapr.c b/hw/ppc/spapr.c
> index 5bd8fd3..3c0f339 100644
> --- a/hw/ppc/spapr.c
> +++ b/hw/ppc/spapr.c
> @@ -1039,7 +1039,7 @@ static void spapr_alloc_htab(sPAPRMachineState *spapr)
>           * 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 size, 
> try with smaller maxmem");
> +        error_report_abort("Failed to allocate HTAB of requested size, try 
> with smaller maxmem");
>      } else if (shift > 0) {
>          /*
>           * Kernel handles htab, we don't need to allocate one
> @@ -1048,7 +1048,7 @@ static void spapr_alloc_htab(sPAPRMachineState *spapr)
>           * but we don't allow booting of such guests.
>           */
>          if (shift != spapr->htab_shift) {
> -            error_setg(&error_abort, "Failed to allocate HTAB of requested 
> size, try with smaller maxmem");
> +            error_report_abort("Failed to allocate HTAB of requested size, 
> try with smaller maxmem");
>          }
>  
>          spapr->htab_shift = shift;
> @@ -1079,10 +1079,10 @@ static void spapr_reset_htab(sPAPRMachineState *spapr)
>  
>      shift = 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 != spapr->htab_shift) {
> -            error_setg(&error_abort, "Requested HTAB allocation failed 
> during reset");
> +            error_report_abort("Requested HTAB allocation failed during 
> reset");
>          }
>  
>          /* Tell readers to update their file descriptor */
> diff --git a/hw/ppc/spapr_drc.c b/hw/ppc/spapr_drc.c
> index 90016e6..2228124 100644
> --- a/hw/ppc/spapr_drc.c
> +++ b/hw/ppc/spapr_drc.c
> @@ -323,7 +323,7 @@ static void prop_get_fdt(Object *obj, Visitor *v, void 
> *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 = fdt_offset_next;
>      } while (fdt_depth != 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;
>  
>  static void error_handle_fatal(Error **errp, Error *err)
>  {
> +    /* None of them has a hint, so error_report_err() is not necessary here 
> */
>      if (errp == &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 == &error_fatal) {
> -        error_report_err(err);
> -        exit(1);
> +        error_report_fatal("%s", err->msg);
>      }
>  }
>  
> 
>