From nobody Fri May 3 04:11:18 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) client-ip=208.118.235.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; spf=pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org Return-Path: Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) by mx.zohomail.com with SMTPS id 1505420442219748.9857747286019; Thu, 14 Sep 2017 13:20:42 -0700 (PDT) Received: from localhost ([::1]:49873 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dsacr-0004je-Fg for importer@patchew.org; Thu, 14 Sep 2017 16:20:41 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:55513) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dsabW-0003lc-SD for qemu-devel@nongnu.org; Thu, 14 Sep 2017 16:19:19 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1dsabT-0005UL-KX for qemu-devel@nongnu.org; Thu, 14 Sep 2017 16:19:18 -0400 Received: from mx1.redhat.com ([209.132.183.28]:36632) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1dsabT-0005Tb-EX for qemu-devel@nongnu.org; Thu, 14 Sep 2017 16:19:15 -0400 Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.phx2.redhat.com [10.5.11.14]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 8EE294A6FB for ; Thu, 14 Sep 2017 20:19:14 +0000 (UTC) Received: from mmorsy.remote.csb (ovpn-204-57.brq.redhat.com [10.40.204.57]) by smtp.corp.redhat.com (Postfix) with ESMTP id EE66E5D9C8; Thu, 14 Sep 2017 20:19:05 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mx1.redhat.com 8EE294A6FB Authentication-Results: ext-mx09.extmail.prod.ext.phx2.redhat.com; dmarc=none (p=none dis=none) header.from=redhat.com Authentication-Results: ext-mx09.extmail.prod.ext.phx2.redhat.com; spf=fail smtp.mailfrom=mgamal@redhat.com From: Mohammed Gamal To: qemu-devel@nongnu.org Date: Thu, 14 Sep 2017 22:18:31 +0200 Message-Id: <1505420311-23744-1-git-send-email-mgamal@redhat.com> X-Scanned-By: MIMEDefang 2.79 on 10.5.11.14 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.38]); Thu, 14 Sep 2017 20:19:14 +0000 (UTC) X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 209.132.183.28 Subject: [Qemu-devel] [PATCH] amd_iommu: Return error on machines with no PCI X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: pbonzini@redhat.com, thuth@redhat.com, Mohammed Gamal , ehabkost@redhat.com, mst@redhat.com Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail: RSF_0 Z_629925259 SPT_0 Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Starting the following command line causes a segfault qemu-system-x86_64 -S -machine isapc,accel=3Dkvm -device amd-iommu This is due to the fact that the machine type 'isapc' doesn't have a PCI bus, while amd_iommu doesn't check if the machine has PCI support and subsequently does a null-pointer access. AMD IOMMU shouldn't even work if the target machine doesn't have PCI. Add a check for PCI on the given machine type and return an error if PCI is not supported. Signed-off-by: Mohammed Gamal --- hw/i386/amd_iommu.c | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/hw/i386/amd_iommu.c b/hw/i386/amd_iommu.c index 334938a..9a667b7 100644 --- a/hw/i386/amd_iommu.c +++ b/hw/i386/amd_iommu.c @@ -1153,6 +1153,13 @@ static void amdvi_realize(DeviceState *dev, Error **= err) } =20 bus =3D pcms->bus; + + if (!bus) { + error_setg(err, "Machine-type '%s' does not support PCI", + mc->name); + return; + } + s->iotlb =3D g_hash_table_new_full(amdvi_uint64_hash, amdvi_uint64_equal, g_free, g_free); =20 --=20 1.8.3.1