From nobody Tue Feb 10 02:49:37 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=1588145320; cv=none; d=zohomail.com; s=zohoarc; b=E5G0m6ZNHk8n+ejDvNY65PLf1clnT1v7XJ5lHJ79Y8DvCjUexo1amO+cRvJ/FsAVI8yIno9gHBRApKj05SQnhdqDCO+Y8Hrf1ZNmrPeZbc0/i05TvFf522cITAoRqUJR4Unk+Su/OQ+bKSXyBDy0KeI0ZUgwlzHVrOmDkIM9gr4= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1588145320; 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=dveDF7i19YrBFtpGujUfYTE4uhIXGRPm1+3EZMRFKqo=; b=B4/CMX++ob82lqsK0vXYYSOZbtbPSua9etmiaEu4WzRu01d+ILMg9zymr5DgNJ30j/YwqL3wHxuR6w17Iq25U+wN/4r6jAX2WUf9/R9w8Is0U0KnXeEqZWGgXw+y/N9QaS6T1laJIRknVRaQWY6vC5TWwQlLAbz/rIk7JmYrv2s= 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 158814532006479.51038103767746; Wed, 29 Apr 2020 00:28:40 -0700 (PDT) Received: from localhost ([::1]:48914 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jTh94-0003qV-MK for importer@patchew.org; Wed, 29 Apr 2020 03:28:38 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:46170) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jTh1w-0007tk-Fh for qemu-devel@nongnu.org; Wed, 29 Apr 2020 03:22:14 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.90_1) (envelope-from ) id 1jTh1g-0003wb-Kw for qemu-devel@nongnu.org; Wed, 29 Apr 2020 03:21:16 -0400 Received: from us-smtp-2.mimecast.com ([205.139.110.61]:38121 helo=us-smtp-delivery-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 1jTh1f-0003uO-QS for qemu-devel@nongnu.org; Wed, 29 Apr 2020 03:20:59 -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-186-SRw8G0QAObC_u2r8A5UiVw-1; Wed, 29 Apr 2020 03:20:54 -0400 Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.phx2.redhat.com [10.5.11.15]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 9DF6EBFC2 for ; Wed, 29 Apr 2020 07:20:53 +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 6C75F5D771; Wed, 29 Apr 2020 07:20:53 +0000 (UTC) Received: by blackfin.pond.sub.org (Postfix, from userid 1000) id 2878011358CD; Wed, 29 Apr 2020 09:20:49 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1588144856; 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=dveDF7i19YrBFtpGujUfYTE4uhIXGRPm1+3EZMRFKqo=; b=EFGQuzTIyWns3hl3ZcKuQI9DbYdkHxbB3l1d6A7YLsieI70kv3OxdJ8vY39rYalsZq5CT9 oMcmeZMMRQ/4NVibxkCZrXQUh0QvTZcjkUbCnnrfPD1tTv/dcbqICJ6o1TWdxY6P5vC7mF E1wo/HGwNGu6SkHONEE5rMziPtjMryQ= X-MC-Unique: SRw8G0QAObC_u2r8A5UiVw-1 From: Markus Armbruster To: qemu-devel@nongnu.org Subject: [PULL 16/32] fdc: Fix fallback=auto error handling Date: Wed, 29 Apr 2020 09:20:32 +0200 Message-Id: <20200429072048.29963-17-armbru@redhat.com> In-Reply-To: <20200429072048.29963-1-armbru@redhat.com> References: <20200429072048.29963-1-armbru@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.15 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=205.139.110.61; envelope-from=armbru@redhat.com; helo=us-smtp-delivery-1.mimecast.com X-detected-operating-system: by eggs.gnu.org: First seen = 2020/04/29 00:53:13 X-ACL-Warn: Detected OS = Linux 2.2.x-3.x [generic] X-Received-From: 205.139.110.61 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 Message-Id: <20200422130719.28225-7-armbru@redhat.com> --- 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