From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:53278) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1apY1m-000736-F8 for qemu-devel@nongnu.org; Mon, 11 Apr 2016 05:21:03 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1apY1l-0007PS-Hi for qemu-devel@nongnu.org; Mon, 11 Apr 2016 05:21:02 -0400 Received: from mx1.redhat.com ([209.132.183.28]:50091) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1apY1l-0007PO-Ca for qemu-devel@nongnu.org; Mon, 11 Apr 2016 05:21:01 -0400 From: Peter Xu Date: Mon, 11 Apr 2016 17:19:20 +0800 Message-Id: <1460366363-4589-11-git-send-email-peterx@redhat.com> In-Reply-To: <1460366363-4589-1-git-send-email-peterx@redhat.com> References: <1460366363-4589-1-git-send-email-peterx@redhat.com> Subject: [Qemu-devel] [PATCH v2 10/13] ioapic-common: add iommu for IOAPICCommonState List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: imammedo@redhat.com, rth@twiddle.net, ehabkost@redhat.com, jasowang@redhat.com, marcel@redhat.com, mst@redhat.com, pbonzini@redhat.com, jan.kiszka@web.de, rkrcmar@redhat.com, peterx@redhat.com When IR is enabled for IOMMU, each IOAPIC will belong to a specific intel IOMMU. This pointer will store the owner of current IOAPIC, which is always the default IOMMU device. Signed-off-by: Peter Xu --- hw/intc/ioapic_common.c | 2 ++ include/hw/i386/ioapic_internal.h | 3 +++ 2 files changed, 5 insertions(+) diff --git a/hw/intc/ioapic_common.c b/hw/intc/ioapic_common.c index 1b7ec5e..f5b6417 100644 --- a/hw/intc/ioapic_common.c +++ b/hw/intc/ioapic_common.c @@ -137,6 +137,8 @@ static void ioapic_common_realize(DeviceState *dev, Error **errp) sysbus_init_mmio(SYS_BUS_DEVICE(s), &s->io_memory); ioapic_no++; + + s->iommu = vtd_iommu_get(); } static const VMStateDescription vmstate_ioapic_common = { diff --git a/include/hw/i386/ioapic_internal.h b/include/hw/i386/ioapic_internal.h index 797ed47..41fc282 100644 --- a/include/hw/i386/ioapic_internal.h +++ b/include/hw/i386/ioapic_internal.h @@ -25,6 +25,7 @@ #include "hw/hw.h" #include "exec/memory.h" #include "hw/sysbus.h" +#include "hw/i386/intel_iommu.h" #define MAX_IOAPICS 1 @@ -101,6 +102,8 @@ struct IOAPICCommonState { uint8_t ioregsel; uint32_t irr; uint64_t ioredtbl[IOAPIC_NUM_PINS]; + /* IOMMU pointer that this IOAPIC belongs. */ + IntelIOMMUState *iommu; }; void ioapic_reset_common(DeviceState *dev); -- 2.4.3