From patchwork Mon Sep 30 15:28:42 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Antonios Motakis X-Patchwork-Id: 2966251 Return-Path: X-Original-To: patchwork-linux-samsung-soc@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork2.web.kernel.org (Postfix) with ESMTP id 0991BBFF0C for ; Mon, 30 Sep 2013 15:29:52 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 6ABF2202A7 for ; Mon, 30 Sep 2013 15:29:47 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 454D32027D for ; Mon, 30 Sep 2013 15:29:46 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1756196Ab3I3P33 (ORCPT ); Mon, 30 Sep 2013 11:29:29 -0400 Received: from mail-we0-f171.google.com ([74.125.82.171]:61874 "EHLO mail-we0-f171.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1756181Ab3I3P30 (ORCPT ); Mon, 30 Sep 2013 11:29:26 -0400 Received: by mail-we0-f171.google.com with SMTP id t61so5748356wes.16 for ; Mon, 30 Sep 2013 08:29:25 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=KciQrA5KTINoFM3c8rLQtbXHn24OASu5kJI0RP7oj2Y=; b=SkVQSpAoyat9Xd+D3J2FeHoa1uUXaWOcbcFpX8+PDsO9kosTxlpbSZU/b8r42YDSWf ITvZ9DK/ORidByzGRgrsD8cKAEAA6fXbV7td5j28YRn2Y+FrHFE/mMZMBM0pmRKOVxnq 1bq9OCv2hzk6nqe5ibuNHFmAfHdwhk1FnFftf2sI5MViPhlHTuAUzuM3kTGnTunLS7HC rsajC3BZ78yaDTuqLDFgTHVya5Jol3GTc74PTu0DpoWzJteRb23Qx11oDzWN7wEG869U /tYCDyEV2Uxsv/Uv47/yn0M9bW5XMed9jfPvz4J0e8np6zkOw+/wiRuAN26HAdQp+UCE tecw== X-Gm-Message-State: ALoCoQm0v/CVnmpOmv7kVQ2MLrpyIlbF6X6NZSNrYr3MOjSY/A8Njv0y78JohhOryrBaLspxOPsl X-Received: by 10.180.12.45 with SMTP id v13mr14201202wib.57.1380554965688; Mon, 30 Sep 2013 08:29:25 -0700 (PDT) Received: from localhost.localdomain (home.tvelocity.eu. [82.67.68.96]) by mx.google.com with ESMTPSA id ey4sm2015579wic.11.1969.12.31.16.00.00 (version=TLSv1.1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Mon, 30 Sep 2013 08:29:24 -0700 (PDT) From: Antonios Motakis To: kvmarm@lists.cs.columbia.edu, alex.williamson@redhat.com Cc: iommu@lists.linux-foundation.org, linux-samsung-soc@vger.kernel.org, kvm@vger.kernel.org, agraf@suse.de, B08248@freescale.com, tech@virtualopensystems.com, Antonios Motakis Subject: [PATCH 6/7] VFIO: Update documentation for VFIO_IOMMU_TYPE1 driver Date: Mon, 30 Sep 2013 17:28:42 +0200 Message-Id: <1380554923-17818-7-git-send-email-a.motakis@virtualopensystems.com> X-Mailer: git-send-email 1.8.1.2 In-Reply-To: <1380554923-17818-1-git-send-email-a.motakis@virtualopensystems.com> References: <1380554923-17818-1-git-send-email-a.motakis@virtualopensystems.com> Sender: linux-samsung-soc-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-samsung-soc@vger.kernel.org X-Spam-Status: No, score=-7.5 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_HI, RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=ham version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP The VFIO documentation is slightly out of date. This minor correction replaces references to VFIO_IOMMU_X86 with the correct reference to VFIO_IOMMU_TYPE1 Signed-off-by: Antonios Motakis --- Documentation/vfio.txt | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/Documentation/vfio.txt b/Documentation/vfio.txt index 8eda363..b4eafa6 100644 --- a/Documentation/vfio.txt +++ b/Documentation/vfio.txt @@ -167,8 +167,8 @@ group and can access them as follows: int container, group, device, i; struct vfio_group_status group_status = { .argsz = sizeof(group_status) }; - struct vfio_iommu_x86_info iommu_info = { .argsz = sizeof(iommu_info) }; - struct vfio_iommu_x86_dma_map dma_map = { .argsz = sizeof(dma_map) }; + struct vfio_iommu_type1_info iommu_info = { .argsz = sizeof(iommu_info) }; + struct vfio_iommu_type1_dma_map dma_map = { .argsz = sizeof(dma_map) }; struct vfio_device_info device_info = { .argsz = sizeof(device_info) }; /* Create a new container */ @@ -177,7 +177,7 @@ group and can access them as follows: if (ioctl(container, VFIO_GET_API_VERSION) != VFIO_API_VERSION) /* Unknown API version */ - if (!ioctl(container, VFIO_CHECK_EXTENSION, VFIO_X86_IOMMU)) + if (!ioctl(container, VFIO_CHECK_EXTENSION, VFIO_TYPE1_IOMMU)) /* Doesn't support the IOMMU driver we want. */ /* Open the group */ @@ -193,7 +193,7 @@ group and can access them as follows: ioctl(group, VFIO_GROUP_SET_CONTAINER, &container); /* Enable the IOMMU model we want */ - ioctl(container, VFIO_SET_IOMMU, VFIO_X86_IOMMU) + ioctl(container, VFIO_SET_IOMMU, VFIO_TYPE1_IOMMU) /* Get addition IOMMU info */ ioctl(container, VFIO_IOMMU_GET_INFO, &iommu_info);