{"id":814233,"url":"http://patchwork.ozlabs.org/api/patches/814233/?format=json","web_url":"http://patchwork.ozlabs.org/project/qemu-devel/patch/1505474026-13151-3-git-send-email-mgamal@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":"<1505474026-13151-3-git-send-email-mgamal@redhat.com>","list_archive_url":null,"date":"2017-09-15T11:13:46","name":"[2/2] x86_iommu: check if machine has PCI bus","commit_ref":null,"pull_url":null,"state":"new","archived":false,"hash":"945b3f80dc2ca395aaeebf43b7ba3ea0e8a72bf5","submitter":{"id":72367,"url":"http://patchwork.ozlabs.org/api/people/72367/?format=json","name":"Mohammed Gamal","email":"mgamal@redhat.com"},"delegate":null,"mbox":"http://patchwork.ozlabs.org/project/qemu-devel/patch/1505474026-13151-3-git-send-email-mgamal@redhat.com/mbox/","series":[{"id":3285,"url":"http://patchwork.ozlabs.org/api/series/3285/?format=json","web_url":"http://patchwork.ozlabs.org/project/qemu-devel/list/?series=3285","date":"2017-09-15T11:13:45","name":"x86_iommu: Fix segfault when starting on non-PCI machines","version":1,"mbox":"http://patchwork.ozlabs.org/series/3285/mbox/"}],"comments":"http://patchwork.ozlabs.org/api/patches/814233/comments/","check":"pending","checks":"http://patchwork.ozlabs.org/api/patches/814233/checks/","tags":{},"related":[],"headers":{"Return-Path":"<qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org>","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=<UNKNOWN>)","ext-mx06.extmail.prod.ext.phx2.redhat.com;\n\tdmarc=none (p=none dis=none) header.from=redhat.com","ext-mx06.extmail.prod.ext.phx2.redhat.com;\n\tspf=fail smtp.mailfrom=mgamal@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 3xttCb1qLlz9sBZ\n\tfor <incoming@patchwork.ozlabs.org>;\n\tFri, 15 Sep 2017 21:17:15 +1000 (AEST)","from localhost ([::1]:52560 helo=lists.gnu.org)\n\tby lists.gnu.org with esmtp (Exim 4.71) (envelope-from\n\t<qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org>)\n\tid 1dsocT-0001xM-CV\n\tfor incoming@patchwork.ozlabs.org; Fri, 15 Sep 2017 07:17:13 -0400","from eggs.gnu.org ([2001:4830:134:3::10]:55522)\n\tby lists.gnu.org with esmtp (Exim 4.71)\n\t(envelope-from <mgamal@redhat.com>) id 1dsoa0-0000Fl-My\n\tfor qemu-devel@nongnu.org; Fri, 15 Sep 2017 07:14:45 -0400","from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)\n\t(envelope-from <mgamal@redhat.com>) id 1dsoZr-0003ES-55\n\tfor qemu-devel@nongnu.org; Fri, 15 Sep 2017 07:14:35 -0400","from mx1.redhat.com ([209.132.183.28]:59094)\n\tby eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32)\n\t(Exim 4.71) (envelope-from <mgamal@redhat.com>) id 1dsoZq-0003Ds-VA\n\tfor qemu-devel@nongnu.org; Fri, 15 Sep 2017 07:14:31 -0400","from smtp.corp.redhat.com\n\t(int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11])\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 1C1373680F\n\tfor <qemu-devel@nongnu.org>; Fri, 15 Sep 2017 11:14:30 +0000 (UTC)","from mmorsy.remote.csb (unknown [10.40.205.89])\n\tby smtp.corp.redhat.com (Postfix) with ESMTP id 3F45360462;\n\tFri, 15 Sep 2017 11:14:26 +0000 (UTC)"],"DMARC-Filter":"OpenDMARC Filter v1.3.2 mx1.redhat.com 1C1373680F","From":"Mohammed Gamal <mgamal@redhat.com>","To":"qemu-devel@nongnu.org","Date":"Fri, 15 Sep 2017 13:13:46 +0200","Message-Id":"<1505474026-13151-3-git-send-email-mgamal@redhat.com>","In-Reply-To":"<1505474026-13151-1-git-send-email-mgamal@redhat.com>","References":"<1505474026-13151-1-git-send-email-mgamal@redhat.com>","X-Scanned-By":"MIMEDefang 2.79 on 10.5.11.11","X-Greylist":"Sender IP whitelisted, not delayed by milter-greylist-4.5.16\n\t(mx1.redhat.com [10.5.110.30]);\n\tFri, 15 Sep 2017 11:14:30 +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 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":"<qemu-devel.nongnu.org>","List-Unsubscribe":"<https://lists.nongnu.org/mailman/options/qemu-devel>,\n\t<mailto:qemu-devel-request@nongnu.org?subject=unsubscribe>","List-Archive":"<http://lists.nongnu.org/archive/html/qemu-devel/>","List-Post":"<mailto:qemu-devel@nongnu.org>","List-Help":"<mailto:qemu-devel-request@nongnu.org?subject=help>","List-Subscribe":"<https://lists.nongnu.org/mailman/listinfo/qemu-devel>,\n\t<mailto:qemu-devel-request@nongnu.org?subject=subscribe>","Cc":"thuth@redhat.com, Mohammed Gamal <mgamal@redhat.com>, ehabkost@redhat.com,\n\tpeterx@redhat.com, mst@redhat.com","Errors-To":"qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org","Sender":"\"Qemu-devel\"\n\t<qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org>"},"content":"Starting qemu with\nqemu-system-x86_64 -S -M isapc -device {amd|intel}-iommu\nleads to a segfault. The code assume PCI bus is present and\ntries to access the bus structure without checking.\n\nSince Intel VT-d and AMDVI should only work with PCI, add a\ncheck for PCI bus and return error if not present.\n\nSigned-off-by: Mohammed Gamal <mgamal@redhat.com>\n---\n hw/i386/x86-iommu.c | 2 +-\n 1 file changed, 1 insertion(+), 1 deletion(-)","diff":"diff --git a/hw/i386/x86-iommu.c b/hw/i386/x86-iommu.c\nindex 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","prefixes":["2/2"]}