From patchwork Fri Sep 1 11:07:06 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Eduardo Otubo X-Patchwork-Id: 9933925 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 668E26016C for ; Fri, 1 Sep 2017 11:08:59 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 1A5D52863D for ; Fri, 1 Sep 2017 11:08:59 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 16E9B2862D; Fri, 1 Sep 2017 11:08:59 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.9 required=2.0 tests=BAYES_00,RCVD_IN_DNSWL_HI autolearn=ham version=3.3.1 Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id A402728684 for ; Fri, 1 Sep 2017 11:08:53 +0000 (UTC) Received: from localhost ([::1]:35427 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dnjoc-00083s-TB for patchwork-qemu-devel@patchwork.kernel.org; Fri, 01 Sep 2017 07:08:46 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:54942) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dnjnN-0007wp-K5 for qemu-devel@nongnu.org; Fri, 01 Sep 2017 07:07:34 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1dnjnI-0005BC-UI for qemu-devel@nongnu.org; Fri, 01 Sep 2017 07:07:29 -0400 Received: from mx1.redhat.com ([209.132.183.28]:57686) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1dnjn9-00058b-1V; Fri, 01 Sep 2017 07:07:15 -0400 Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.phx2.redhat.com [10.5.11.16]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 299DF461FB; Fri, 1 Sep 2017 11:07:14 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mx1.redhat.com 299DF461FB Authentication-Results: ext-mx05.extmail.prod.ext.phx2.redhat.com; dmarc=none (p=none dis=none) header.from=redhat.com Authentication-Results: ext-mx05.extmail.prod.ext.phx2.redhat.com; spf=fail smtp.mailfrom=otubo@redhat.com Received: from vader.redhat.com (ovpn-117-156.ams2.redhat.com [10.36.117.156]) by smtp.corp.redhat.com (Postfix) with ESMTP id 0EE2871C48; Fri, 1 Sep 2017 11:07:08 +0000 (UTC) From: Eduardo Otubo To: qemu-devel@nongnu.org Date: Fri, 1 Sep 2017 13:07:06 +0200 Message-Id: <20170901110706.429-1-otubo@redhat.com> X-Scanned-By: MIMEDefang 2.79 on 10.5.11.16 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.29]); Fri, 01 Sep 2017 11:07:14 +0000 (UTC) X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 209.132.183.28 Subject: [Qemu-devel] [PATCH] isa-fdc: assert replaced by proper error exit X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: qemu-trivial@nongnu.org, jsnow@redhat.com, qemu-block@nongnu.org Errors-To: qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Sender: "Qemu-devel" X-Virus-Scanned: ClamAV using ClamSMTP When not available, isa-fdc falls into assert instead of proper error exit. This patch fixes this behavior. Signed-off-by: Eduardo Otubo Reviewed-by: Thomas Huth --- hw/block/fdc.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/hw/block/fdc.c b/hw/block/fdc.c index 401129073b..0b6def4e1d 100644 --- a/hw/block/fdc.c +++ b/hw/block/fdc.c @@ -2699,11 +2699,15 @@ static void isabus_fdc_realize(DeviceState *dev, Error **errp) fdctrl->dma_chann = isa->dma; if (fdctrl->dma_chann != -1) { fdctrl->dma = isa_get_dma(isa_bus_from_device(isadev), isa->dma); - assert(fdctrl->dma); + if (!fdctrl->dma) { + error_setg(errp, "isa-fdc not supported"); + goto error; + } } qdev_set_legacy_instance_id(dev, isa->iobase, 2); fdctrl_realize_common(dev, fdctrl, &err); +error: if (err != NULL) { error_propagate(errp, err); return;