Use error_report() + abort() instead of error_setg(&error_abort), as suggested by the "qapi/error.h" documentation:
Please don't error_setg(&error_fatal, ...), use error_report() and exit(), because that's more obvious. Likewise, don't error_setg(&error_abort, ...), use assert(). Use abort() instead of the suggested assert() because the error message already got displayed. Suggested-by: Eric Blake <ebl...@redhat.com> Signed-off-by: Philippe Mathieu-Daudé <f4...@amsat.org> --- hw/block/fdc.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/hw/block/fdc.c b/hw/block/fdc.c index cd29e27d8f..048467c00b 100644 --- a/hw/block/fdc.c +++ b/hw/block/fdc.c @@ -401,9 +401,10 @@ 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_str(drv->drive)); + error_report("No candidate geometries present in table " + " for floppy drive type '%s'", + FloppyDriveType_str(drv->drive)); + abort(); } parse = &(fd_formats[match]); -- 2.17.0