[{"id":1769206,"web_url":"http://patchwork.ozlabs.org/comment/1769206/","msgid":"<20170915135237.GW3617@pxdev.xzpeter.org>","list_archive_url":null,"date":"2017-09-15T13:52:37","subject":"Re: [Qemu-devel] [PATCH 2/2] x86_iommu: check if machine has PCI bus","submitter":{"id":67717,"url":"http://patchwork.ozlabs.org/api/people/67717/","name":"Peter Xu","email":"peterx@redhat.com"},"content":"On Fri, Sep 15, 2017 at 01:13:46PM +0200, Mohammed Gamal wrote:\n> Starting qemu with\n> qemu-system-x86_64 -S -M isapc -device {amd|intel}-iommu\n> leads to a segfault. The code assume PCI bus is present and\n> tries to access the bus structure without checking.\n> \n> Since Intel VT-d and AMDVI should only work with PCI, add a\n> check for PCI bus and return error if not present.\n> \n> Signed-off-by: Mohammed Gamal \n\nReviewed-by: Peter Xu \n\n> ---\n> hw/i386/x86-iommu.c | 2 +-\n> 1 file changed, 1 insertion(+), 1 deletion(-)\n> \n> diff --git a/hw/i386/x86-iommu.c b/hw/i386/x86-iommu.c\n> index 4d17e1f..afd8cd9 100644\n> --- a/hw/i386/x86-iommu.c\n> +++ b/hw/i386/x86-iommu.c\n> @@ -88,7 +88,7 @@ static void x86_iommu_realize(DeviceState *dev, Error **errp)\n> PC_MACHINE(object_dynamic_cast(OBJECT(ms), TYPE_PC_MACHINE));\n> QLIST_INIT(&x86_iommu->iec_notifiers);\n> \n> - if (!pcms) {\n> + if (!pcms || !pcms->bus) {\n> error_setg(errp, \"Machine-type '%s' not supported by iommu\",\n> mc->name);\n> return;\n> -- \n> 1.8.3.1\n>","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-mx09.extmail.prod.ext.phx2.redhat.com;\n\tdmarc=none (p=none dis=none) header.from=redhat.com","ext-mx09.extmail.prod.ext.phx2.redhat.com;\n\tspf=fail smtp.mailfrom=peterx@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 3xtxhs0BpCz9sxR\n\tfor ;\n\tFri, 15 Sep 2017 23:54:21 +1000 (AEST)","from localhost ([::1]:53472 helo=lists.gnu.org)\n\tby lists.gnu.org with esmtp (Exim 4.71) (envelope-from\n\t)\n\tid 1dsr4V-00007d-6T\n\tfor incoming@patchwork.ozlabs.org; Fri, 15 Sep 2017 09:54:19 -0400","from eggs.gnu.org ([2001:4830:134:3::10]:52624)\n\tby lists.gnu.org with esmtp (Exim 4.71)\n\t(envelope-from ) id 1dsr30-0007sA-Kx\n\tfor qemu-devel@nongnu.org; Fri, 15 Sep 2017 09:52:47 -0400","from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)\n\t(envelope-from ) id 1dsr2x-0006JX-KO\n\tfor qemu-devel@nongnu.org; Fri, 15 Sep 2017 09:52:46 -0400","from mx1.redhat.com ([209.132.183.28]:47298)\n\tby eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32)\n\t(Exim 4.71) (envelope-from ) id 1dsr2x-0006IZ-Dq\n\tfor qemu-devel@nongnu.org; Fri, 15 Sep 2017 09:52:43 -0400","from smtp.corp.redhat.com\n\t(int-mx05.intmail.prod.int.phx2.redhat.com [10.5.11.15])\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 53A7F4A6FB\n\tfor ; Fri, 15 Sep 2017 13:52:42 +0000 (UTC)","from pxdev.xzpeter.org (ovpn-12-38.pek2.redhat.com [10.72.12.38])\n\tby smtp.corp.redhat.com (Postfix) with ESMTPS id 8C4486B6ED;\n\tFri, 15 Sep 2017 13:52:40 +0000 (UTC)"],"DMARC-Filter":"OpenDMARC Filter v1.3.2 mx1.redhat.com 53A7F4A6FB","Date":"Fri, 15 Sep 2017 21:52:37 +0800","From":"Peter Xu ","To":"Mohammed Gamal ","Message-ID":"<20170915135237.GW3617@pxdev.xzpeter.org>","References":"<1505474026-13151-1-git-send-email-mgamal@redhat.com>\n\t<1505474026-13151-3-git-send-email-mgamal@redhat.com>","MIME-Version":"1.0","Content-Type":"text/plain; charset=utf-8","Content-Disposition":"inline","In-Reply-To":"<1505474026-13151-3-git-send-email-mgamal@redhat.com>","User-Agent":"Mutt/1.5.24 (2015-08-30)","X-Scanned-By":"MIMEDefang 2.79 on 10.5.11.15","X-Greylist":"Sender IP whitelisted, not delayed by milter-greylist-4.5.16\n\t(mx1.redhat.com [10.5.110.38]);\n\tFri, 15 Sep 2017 13:52:42 +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":"Re: [Qemu-devel] [PATCH 2/2] x86_iommu: check if machine has PCI bus","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":"thuth@redhat.com, mst@redhat.com, qemu-devel@nongnu.org,\n\tehabkost@redhat.com","Errors-To":"qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org","Sender":"\"Qemu-devel\"\n\t"}}]