From patchwork Mon Sep 11 18:56:31 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Wei Xu X-Patchwork-Id: 812545 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=nongnu.org (client-ip=2001:4830:134:3::11; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=) Received: from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 3xrc9P6z5Vz9sxR for ; Tue, 12 Sep 2017 04:37:29 +1000 (AEST) Received: from localhost ([::1]:59927 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1drTaJ-0001Su-T6 for incoming@patchwork.ozlabs.org; Mon, 11 Sep 2017 14:37:27 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:42354) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1drTZi-0001RQ-7U for qemu-devel@nongnu.org; Mon, 11 Sep 2017 14:36:51 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1drTZh-0005kB-0w for qemu-devel@nongnu.org; Mon, 11 Sep 2017 14:36:50 -0400 Received: from mx1.redhat.com ([209.132.183.28]:53316) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1drTZg-0005jo-QU for qemu-devel@nongnu.org; Mon, 11 Sep 2017 14:36:48 -0400 Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id D7DC2C07F67E for ; Mon, 11 Sep 2017 18:36:47 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mx1.redhat.com D7DC2C07F67E Authentication-Results: ext-mx07.extmail.prod.ext.phx2.redhat.com; dmarc=none (p=none dis=none) header.from=redhat.com Authentication-Results: ext-mx07.extmail.prod.ext.phx2.redhat.com; spf=fail smtp.mailfrom=wexu@redhat.com Received: from Wei-Dev.nay.redhat.com (dhcp-15-231.nay.redhat.com [10.66.15.231]) by smtp.corp.redhat.com (Postfix) with ESMTP id AB90A600C4; Mon, 11 Sep 2017 18:36:44 +0000 (UTC) From: wexu@redhat.com To: qemu-devel@nongnu.org Date: Tue, 12 Sep 2017 02:56:31 +0800 Message-Id: <1505156192-18994-3-git-send-email-wexu@redhat.com> In-Reply-To: <1505156192-18994-1-git-send-email-wexu@redhat.com> References: <1505156192-18994-1-git-send-email-wexu@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 (mx1.redhat.com [10.5.110.31]); Mon, 11 Sep 2017 18:36:48 +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 2/3] vfio: invoke looking up address space. 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: marcel@redhat.com, jasowang@redhat.com, alex.williamson@redhat.com, Wei Xu Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" From: Wei Xu Invoke looking up correct address space before getting an IOMMU group. Signed-off-by: Wei Xu --- hw/vfio/pci.c | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/hw/vfio/pci.c b/hw/vfio/pci.c index 31e1edf..856cefd 100644 --- a/hw/vfio/pci.c +++ b/hw/vfio/pci.c @@ -2640,6 +2640,7 @@ static void vfio_realize(PCIDevice *pdev, Error **errp) struct stat st; int groupid; int i, ret; + AddressSpace *as; if (!vdev->vbasedev.sysfsdev) { if (!(~vdev->host.domain || ~vdev->host.bus || @@ -2686,7 +2687,12 @@ static void vfio_realize(PCIDevice *pdev, Error **errp) trace_vfio_realize(vdev->vbasedev.name, groupid); - group = vfio_get_group(groupid, pci_device_iommu_address_space(pdev), errp); + as = vfio_lookup_as(groupid, pdev, errp); + if (!as) { + goto error; + } + + group = vfio_get_group(groupid, as, errp); if (!group) { goto error; }