From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:52624) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dsr30-0007sA-Kx for qemu-devel@nongnu.org; Fri, 15 Sep 2017 09:52:47 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1dsr2x-0006JX-KO for qemu-devel@nongnu.org; Fri, 15 Sep 2017 09:52:46 -0400 Received: from mx1.redhat.com ([209.132.183.28]:47298) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1dsr2x-0006IZ-Dq for qemu-devel@nongnu.org; Fri, 15 Sep 2017 09:52:43 -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 53A7F4A6FB for ; Fri, 15 Sep 2017 13:52:42 +0000 (UTC) Date: Fri, 15 Sep 2017 21:52:37 +0800 From: Peter Xu Message-ID: <20170915135237.GW3617@pxdev.xzpeter.org> References: <1505474026-13151-1-git-send-email-mgamal@redhat.com> <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> Subject: Re: [Qemu-devel] [PATCH 2/2] x86_iommu: check if machine has PCI bus List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Mohammed Gamal Cc: qemu-devel@nongnu.org, ehabkost@redhat.com, mst@redhat.com, thuth@redhat.com On Fri, Sep 15, 2017 at 01:13:46PM +0200, Mohammed Gamal wrote: > 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 Reviewed-by: Peter Xu > --- > 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 4d17e1f..afd8cd9 100644 > --- a/hw/i386/x86-iommu.c > +++ b/hw/i386/x86-iommu.c > @@ -88,7 +88,7 @@ static void x86_iommu_realize(DeviceState *dev, Error **errp) > PC_MACHINE(object_dynamic_cast(OBJECT(ms), TYPE_PC_MACHINE)); > 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 > -- Peter Xu