From nobody Mon Feb 9 23:00:54 2026 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1587560948; cv=none; d=zohomail.com; s=zohoarc; b=EWU9ZY+fw+Fe1A5+zdnNikTvUHB6qriA+t31RMQedBDpru7dH1X0BFenmaEQbCFy2THI9jkIg60YZ67NSHsnzgApQvS2io5HGUiTgbSyuhc9Crg2Opp35P0JFUblIGG4R+KbnKFbzdjqFixm7eF1ddjmkft0RIndLYn0pR/MRa4= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1587560948; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=5Jq9e8o17VgILfi38+otFl0VpRP+BxozTAvRN+DwzvI=; b=YXyb8bGSV+wEXjAqW05+XeBXAHocBjkeKbDCLTfVel59hUnUE0ujD21Ta3z/y7FcwBE8KtbaHThXRbtD3w7obvyJCW70a4CnKQ2D6bNk8PNEbDa5hNeYSYpU0y2y4Om4oKvEAMBhF44UXfntMV17kTIaPZ1rVngQQQz93ffAIl8= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1587560948738951.6435578002319; Wed, 22 Apr 2020 06:09:08 -0700 (PDT) Received: from localhost ([::1]:50254 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jRF7j-0005qK-BW for importer@patchew.org; Wed, 22 Apr 2020 09:09:07 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:46864) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jRF69-0003mo-AJ for qemu-devel@nongnu.org; Wed, 22 Apr 2020 09:07:30 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.90_1) (envelope-from ) id 1jRF67-0003pb-Pu for qemu-devel@nongnu.org; Wed, 22 Apr 2020 09:07:29 -0400 Received: from us-smtp-delivery-1.mimecast.com ([207.211.31.120]:46284 helo=us-smtp-1.mimecast.com) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from ) id 1jRF67-0003ji-CD for qemu-devel@nongnu.org; Wed, 22 Apr 2020 09:07:27 -0400 Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-227-_QV421ytNfujhGn5wJMpqw-1; Wed, 22 Apr 2020 09:07:24 -0400 Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 39F258017F5 for ; Wed, 22 Apr 2020 13:07:23 +0000 (UTC) Received: from blackfin.pond.sub.org (ovpn-113-6.ams2.redhat.com [10.36.113.6]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 0B2D0600E5; Wed, 22 Apr 2020 13:07:23 +0000 (UTC) Received: by blackfin.pond.sub.org (Postfix, from userid 1000) id 11FD211358C2; Wed, 22 Apr 2020 15:07:20 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1587560845; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=5Jq9e8o17VgILfi38+otFl0VpRP+BxozTAvRN+DwzvI=; b=gNv/7Yk53/UXoqhmmyYIqfn6TcL5NjCZXTsE5cvxVP+wzbmwB6Lq70gVNCwN9u6/WlaiSc WlunkNKb4jvxMNghV2F1YCmssqyIUihhLPBYW8VbeOn8JxLjIib59V7hHJsAbMOTZLTaWD siyzdW1vrTj7X5rkSU/1aAz8u/qsEYs= X-MC-Unique: _QV421ytNfujhGn5wJMpqw-1 From: Markus Armbruster To: qemu-devel@nongnu.org Subject: [PATCH v2 06/14] fdc: Fix fallback=auto error handling Date: Wed, 22 Apr 2020 15:07:11 +0200 Message-Id: <20200422130719.28225-7-armbru@redhat.com> In-Reply-To: <20200422130719.28225-1-armbru@redhat.com> References: <20200422130719.28225-1-armbru@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.11 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=207.211.31.120; envelope-from=armbru@redhat.com; helo=us-smtp-1.mimecast.com X-detected-operating-system: by eggs.gnu.org: First seen = 2020/04/22 09:07:24 X-ACL-Warn: Detected OS = Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 207.211.31.120 X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , John Snow Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) Content-Type: text/plain; charset="utf-8" fdctrl_realize_common() rejects fallback=3Dauto. Used by devices "isa-fdc", "sysbus-fdc", "SUNW,fdtwo". The error handling is broken: $ qemu-system-x86_64 -nodefaults -device isa-fdc,fallback=3Dauto,driveA= =3Dfd0 -drive if=3Dnone,id=3Dfd0 ** ERROR:/work/armbru/qemu/hw/block/fdc.c:434:pick_drive_type: assertion f= ailed: (drv->drive !=3D FLOPPY_DRIVE_TYPE_AUTO) Aborted (core dumped) Cause: fdctrl_realize_common() neglects to bail out after setting the error. Fix that. Fixes: a73275dd6fc3bfda33165bebc28e0c33c20cb0a0 Cc: John Snow Signed-off-by: Markus Armbruster Reviewed-by: Philippe Mathieu-Daud=C3=A9 --- hw/block/fdc.c | 1 + 1 file changed, 1 insertion(+) diff --git a/hw/block/fdc.c b/hw/block/fdc.c index 33bc9e2f92..9628cc171e 100644 --- a/hw/block/fdc.c +++ b/hw/block/fdc.c @@ -2615,6 +2615,7 @@ static void fdctrl_realize_common(DeviceState *dev, F= DCtrl *fdctrl, =20 if (fdctrl->fallback =3D=3D FLOPPY_DRIVE_TYPE_AUTO) { error_setg(errp, "Cannot choose a fallback FDrive type of 'auto'"); + return; } =20 /* Fill 'command_to_handler' lookup table */ --=20 2.21.1