1 files changed, 1 insertions, 8 deletions
diff --git a/hw/block/fdc.c b/hw/block/fdc.c
index c7b4fe9b3e..2e9c1e1e2f 100644
--- a/hw/block/fdc.c
+++ b/hw/block/fdc.c
@@ -397,16 +397,9 @@ static int pick_geometry(FDrive *drv)
                            nb_sectors,
                            FloppyDriveType_str(parse->drive));
         }
+        assert(type_match != -1 && "misconfigured fd_format");
         match = type_match;
     }
-
-    /* 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));
-    }
-
     parse = &(fd_formats[match]);
 
  out: