From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:40966) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dtt4d-0003NZ-Ck for qemu-devel@nongnu.org; Mon, 18 Sep 2017 06:14:44 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1dtt4c-0002sM-Hp for qemu-devel@nongnu.org; Mon, 18 Sep 2017 06:14:43 -0400 Received: from mx1.redhat.com ([209.132.183.28]:44332) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1dtt4c-0002sG-Cl for qemu-devel@nongnu.org; Mon, 18 Sep 2017 06:14:42 -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 mx1.redhat.com (Postfix) with ESMTPS id 7BDE3C0587D4 for ; Mon, 18 Sep 2017 10:14:41 +0000 (UTC) From: Mohammed Gamal Date: Mon, 18 Sep 2017 12:14:09 +0200 Message-Id: <1505729649-11943-3-git-send-email-mgamal@redhat.com> In-Reply-To: <1505729649-11943-1-git-send-email-mgamal@redhat.com> References: <1505729649-11943-1-git-send-email-mgamal@redhat.com> Subject: [Qemu-devel] [PATCH v3 2/2] x86_iommu: check if machine has PCI bus List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: ehabkost@redhat.com, mst@redhat.com, thuth@redhat.com, peterx@redhat.com, pbonzini@redhat.com, Mohammed Gamal Starting qemu with qemu-system-x86_64 -S -M isapc -device {amd|intel}-iommu leads to a segfault. The code assume PCI bus is present and tries to access the bus structure without checking. Since Intel VT-d and AMDVI should only work with PCI, add a check for PCI bus and return error if not present. Signed-off-by: Mohammed Gamal --- hw/i386/x86-iommu.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/hw/i386/x86-iommu.c b/hw/i386/x86-iommu.c index d43b08a..00f70bb 100644 --- a/hw/i386/x86-iommu.c +++ b/hw/i386/x86-iommu.c @@ -87,7 +87,7 @@ static void x86_iommu_realize(DeviceState *dev, Error **errp) PCMachineState *pcms = PC_MACHINE(ms); QLIST_INIT(&x86_iommu->iec_notifiers); - if (!pcms) { + if (!pcms || !pcms->bus) { error_setg(errp, "Machine-type '%s' not supported by IOMMU", mc->name); return; -- 1.8.3.1