From patchwork Tue Aug 30 03:06:58 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jason Wang X-Patchwork-Id: 663987 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org 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 3sNYkm0hrQz9s9G for ; Tue, 30 Aug 2016 13:23:28 +1000 (AEST) Received: from localhost ([::1]:46753 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1beZe1-00079Y-Ua for incoming@patchwork.ozlabs.org; Mon, 29 Aug 2016 23:23:25 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:39537) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1beZOw-0001aI-Ld for qemu-devel@nongnu.org; Mon, 29 Aug 2016 23:07:55 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1beZOu-0006CD-G2 for qemu-devel@nongnu.org; Mon, 29 Aug 2016 23:07:49 -0400 Received: from mx1.redhat.com ([209.132.183.28]:37924) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1beZOu-0006C7-AB for qemu-devel@nongnu.org; Mon, 29 Aug 2016 23:07:48 -0400 Received: from int-mx09.intmail.prod.int.phx2.redhat.com (int-mx09.intmail.prod.int.phx2.redhat.com [10.5.11.22]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 042433F724; Tue, 30 Aug 2016 03:07:48 +0000 (UTC) Received: from jason-ThinkPad-T450s.redhat.com (vpn1-6-61.pek2.redhat.com [10.72.6.61]) by int-mx09.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id u7U370dr027913; Mon, 29 Aug 2016 23:07:45 -0400 From: Jason Wang To: mst@redhat.com, qemu-devel@nongnu.org Date: Tue, 30 Aug 2016 11:06:58 +0800 Message-Id: <1472526419-5900-11-git-send-email-jasowang@redhat.com> In-Reply-To: <1472526419-5900-1-git-send-email-jasowang@redhat.com> References: <1472526419-5900-1-git-send-email-jasowang@redhat.com> X-Scanned-By: MIMEDefang 2.68 on 10.5.11.22 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.30]); Tue, 30 Aug 2016 03:07:48 +0000 (UTC) X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 209.132.183.28 Subject: [Qemu-devel] [PATCH for 2.8 10/11] Revert "intel_iommu: Throw hw_error on notify_started" 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: Jason Wang , peterx@redhat.com, vkaplans@redhat.com, Alex Williamson , wexu@redhat.com, cornelia.huck@de.ibm.com, pbonzini@redhat.com Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" From: Peter Xu This reverts commit 3cb3b1549f5401dc3a5e1d073e34063dc274136f. Vhost device IOTLB API will get notified and send invalidation request to vhost through this notifier. Cc: Alex Williamson Signed-off-by: Peter Xu Signed-off-by: Jason Wang --- hw/i386/intel_iommu.c | 12 ------------ 1 file changed, 12 deletions(-) diff --git a/hw/i386/intel_iommu.c b/hw/i386/intel_iommu.c index 298faab..15d1216 100644 --- a/hw/i386/intel_iommu.c +++ b/hw/i386/intel_iommu.c @@ -25,7 +25,6 @@ #include "exec/address-spaces.h" #include "intel_iommu_internal.h" #include "hw/pci/pci.h" -#include "hw/pci/pci_bus.h" #include "hw/i386/pc.h" #include "hw/boards.h" #include "hw/i386/x86-iommu.h" @@ -2041,16 +2040,6 @@ static IOMMUTLBEntry vtd_iommu_translate(MemoryRegion *iommu, hwaddr addr, return ret; } -static void vtd_iommu_notify_started(MemoryRegion *iommu) -{ - VTDAddressSpace *vtd_as = container_of(iommu, VTDAddressSpace, iommu); - - hw_error("Device at bus %s addr %02x.%d requires iommu notifier which " - "is currently not supported by intel-iommu emulation", - vtd_as->bus->qbus.name, PCI_SLOT(vtd_as->devfn), - PCI_FUNC(vtd_as->devfn)); -} - static const VMStateDescription vtd_vmstate = { .name = "iommu-intel", .unmigratable = 1, @@ -2418,7 +2407,6 @@ static void vtd_init(IntelIOMMUState *s) memset(s->womask, 0, DMAR_REG_SIZE); s->iommu_ops.translate = vtd_iommu_translate; - s->iommu_ops.notify_started = vtd_iommu_notify_started; s->root = 0; s->root_extended = false; s->dmar_enabled = false;