{"id":808634,"url":"http://patchwork.ozlabs.org/api/patches/808634/?format=json","web_url":"http://patchwork.ozlabs.org/project/qemu-devel/patch/20170901110706.429-1-otubo@redhat.com/","project":{"id":14,"url":"http://patchwork.ozlabs.org/api/projects/14/?format=json","name":"QEMU Development","link_name":"qemu-devel","list_id":"qemu-devel.nongnu.org","list_email":"qemu-devel@nongnu.org","web_url":"","scm_url":"","webscm_url":"","list_archive_url":"","list_archive_url_format":"","commit_url_format":""},"msgid":"<20170901110706.429-1-otubo@redhat.com>","list_archive_url":null,"date":"2017-09-01T11:07:06","name":"isa-fdc: assert replaced by proper error exit","commit_ref":null,"pull_url":null,"state":"new","archived":false,"hash":"9ab10ca1f97f6ce3146c0a30a19b361d092727c8","submitter":{"id":71779,"url":"http://patchwork.ozlabs.org/api/people/71779/?format=json","name":"Eduardo Otubo","email":"otubo@redhat.com"},"delegate":null,"mbox":"http://patchwork.ozlabs.org/project/qemu-devel/patch/20170901110706.429-1-otubo@redhat.com/mbox/","series":[{"id":1001,"url":"http://patchwork.ozlabs.org/api/series/1001/?format=json","web_url":"http://patchwork.ozlabs.org/project/qemu-devel/list/?series=1001","date":"2017-09-01T11:07:06","name":"isa-fdc: assert replaced by proper error exit","version":1,"mbox":"http://patchwork.ozlabs.org/series/1001/mbox/"}],"comments":"http://patchwork.ozlabs.org/api/patches/808634/comments/","check":"pending","checks":"http://patchwork.ozlabs.org/api/patches/808634/checks/","tags":{},"related":[],"headers":{"Return-Path":"","X-Original-To":"incoming@patchwork.ozlabs.org","Delivered-To":"patchwork-incoming@bilbo.ozlabs.org","Authentication-Results":["ozlabs.org;\n\tspf=pass (mailfrom) smtp.mailfrom=nongnu.org\n\t(client-ip=2001:4830:134:3::11; helo=lists.gnu.org;\n\tenvelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org;\n\treceiver=)","ext-mx05.extmail.prod.ext.phx2.redhat.com;\n\tdmarc=none (p=none dis=none) header.from=redhat.com","ext-mx05.extmail.prod.ext.phx2.redhat.com;\n\tspf=fail smtp.mailfrom=otubo@redhat.com"],"Received":["from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11])\n\t(using TLSv1 with cipher AES256-SHA (256/256 bits))\n\t(No client certificate requested)\n\tby ozlabs.org (Postfix) with ESMTPS id 3xkGgm2rYDz9s7p\n\tfor ;\n\tFri, 1 Sep 2017 21:08:20 +1000 (AEST)","from localhost ([::1]:35427 helo=lists.gnu.org)\n\tby lists.gnu.org with esmtp (Exim 4.71) (envelope-from\n\t)\n\tid 1dnjoA-00083s-F6\n\tfor incoming@patchwork.ozlabs.org; Fri, 01 Sep 2017 07:08:18 -0400","from eggs.gnu.org ([2001:4830:134:3::10]:54942)\n\tby lists.gnu.org with esmtp (Exim 4.71)\n\t(envelope-from ) id 1dnjnN-0007wp-K5\n\tfor qemu-devel@nongnu.org; Fri, 01 Sep 2017 07:07:34 -0400","from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)\n\t(envelope-from ) id 1dnjnI-0005BC-UI\n\tfor qemu-devel@nongnu.org; Fri, 01 Sep 2017 07:07:29 -0400","from mx1.redhat.com ([209.132.183.28]:57686)\n\tby eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32)\n\t(Exim 4.71) (envelope-from )\n\tid 1dnjn9-00058b-1V; Fri, 01 Sep 2017 07:07:15 -0400","from smtp.corp.redhat.com\n\t(int-mx06.intmail.prod.int.phx2.redhat.com [10.5.11.16])\n\t(using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits))\n\t(No client certificate requested)\n\tby mx1.redhat.com (Postfix) with ESMTPS id 299DF461FB;\n\tFri, 1 Sep 2017 11:07:14 +0000 (UTC)","from vader.redhat.com (ovpn-117-156.ams2.redhat.com\n\t[10.36.117.156])\n\tby smtp.corp.redhat.com (Postfix) with ESMTP id 0EE2871C48;\n\tFri, 1 Sep 2017 11:07:08 +0000 (UTC)"],"DMARC-Filter":"OpenDMARC Filter v1.3.2 mx1.redhat.com 299DF461FB","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\n\t(mx1.redhat.com [10.5.110.29]);\n\tFri, 01 Sep 2017 11:07:14 +0000 (UTC)","X-detected-operating-system":"by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic]\n\t[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":",\n\t","List-Archive":"","List-Post":"","List-Help":"","List-Subscribe":",\n\t","Cc":"qemu-trivial@nongnu.org, jsnow@redhat.com, qemu-block@nongnu.org","Errors-To":"qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org","Sender":"\"Qemu-devel\"\n\t"},"content":"When not available, isa-fdc falls into assert instead of proper error\nexit. This patch fixes this behavior.\n\nSigned-off-by: Eduardo Otubo \n---\n hw/block/fdc.c | 6 +++++-\n 1 file changed, 5 insertions(+), 1 deletion(-)","diff":"diff --git a/hw/block/fdc.c b/hw/block/fdc.c\nindex 401129073b..0b6def4e1d 100644\n--- a/hw/block/fdc.c\n+++ b/hw/block/fdc.c\n@@ -2699,11 +2699,15 @@ static void isabus_fdc_realize(DeviceState *dev, Error **errp)\n fdctrl->dma_chann = isa->dma;\n if (fdctrl->dma_chann != -1) {\n fdctrl->dma = isa_get_dma(isa_bus_from_device(isadev), isa->dma);\n- assert(fdctrl->dma);\n+ if (!fdctrl->dma) {\n+ error_setg(errp, \"isa-fdc not supported\");\n+ goto error;\n+ }\n }\n \n qdev_set_legacy_instance_id(dev, isa->iobase, 2);\n fdctrl_realize_common(dev, fdctrl, &err);\n+error:\n if (err != NULL) {\n error_propagate(errp, err);\n return;\n","prefixes":[]}