From patchwork Fri Jun 3 06:51:05 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jan Kiszka X-Patchwork-Id: 845742 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by demeter1.kernel.org (8.14.4/8.14.3) with ESMTP id p536nbUM010210 for ; Fri, 3 Jun 2011 06:55:15 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751829Ab1FCGwA (ORCPT ); Fri, 3 Jun 2011 02:52:00 -0400 Received: from fmmailgate02.web.de ([217.72.192.227]:47725 "EHLO fmmailgate02.web.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750890Ab1FCGv7 (ORCPT ); Fri, 3 Jun 2011 02:51:59 -0400 Received: from smtp06.web.de ( [172.20.5.172]) by fmmailgate02.web.de (Postfix) with ESMTP id 0356A1A15CDB1; Fri, 3 Jun 2011 08:51:06 +0200 (CEST) Received: from [92.75.140.119] (helo=mchn199C.mchp.siemens.de) by smtp06.web.de with asmtp (TLSv1:AES256-SHA:256) (WEB.DE 4.110 #2) id 1QSODp-00069T-00; Fri, 03 Jun 2011 08:51:05 +0200 Message-ID: <4DE88459.3010205@web.de> Date: Fri, 03 Jun 2011 08:51:05 +0200 From: Jan Kiszka User-Agent: Mozilla/5.0 (X11; U; Linux i686 (x86_64); de; rv:1.8.1.12) Gecko/20080226 SUSE/2.0.0.12-1.1 Thunderbird/2.0.0.12 Mnenhy/0.7.5.666 MIME-Version: 1.0 To: Marcelo Tosatti CC: Avi Kivity , kvm Subject: [PATCH v2] KVM: Clarify KVM_ASSIGN_PCI_DEVICE documentation References: <4DE79B29.6030609@web.de> <20110603020414.GB7272@amt.cnet> In-Reply-To: <20110603020414.GB7272@amt.cnet> X-Enigmail-Version: 1.1.2 X-Sender: jan.kiszka@web.de X-Provags-ID: V01U2FsdGVkX1/mgyTzjGJKi1eT+yh+EOaWJFDsxOXBtlOZuEw9 W9BF1/SGRvcyp1tpTSFJ51GzWmlHt4QI7Rc9FbEzBiJazs6rux 8BHoQtUec= Sender: kvm-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: kvm@vger.kernel.org X-Greylist: IP, sender and recipient auto-whitelisted, not delayed by milter-greylist-4.2.6 (demeter1.kernel.org [140.211.167.41]); Fri, 03 Jun 2011 06:55:20 +0000 (UTC) From: Jan Kiszka Neither host_irq nor the guest_msi struct are used anymore today. Tag the former, drop the latter to avoid confusion. Signed-off-by: Jan Kiszka --- Documentation/virtual/kvm/api.txt | 7 +------ include/linux/kvm.h | 8 +------- 2 files changed, 2 insertions(+), 13 deletions(-) diff --git a/Documentation/virtual/kvm/api.txt b/Documentation/virtual/kvm/api.txt index 2bd06b0..0ebe922 100644 --- a/Documentation/virtual/kvm/api.txt +++ b/Documentation/virtual/kvm/api.txt @@ -1143,15 +1143,10 @@ Assigns an IRQ to a passed-through device. struct kvm_assigned_irq { __u32 assigned_dev_id; - __u32 host_irq; + __u32 host_irq; /* ignored (legacy field) */ __u32 guest_irq; __u32 flags; union { - struct { - __u32 addr_lo; - __u32 addr_hi; - __u32 data; - } guest_msi; __u32 reserved[12]; }; }; diff --git a/include/linux/kvm.h b/include/linux/kvm.h index 55ef181..9c9ca7c 100644 --- a/include/linux/kvm.h +++ b/include/linux/kvm.h @@ -773,20 +773,14 @@ struct kvm_assigned_pci_dev { struct kvm_assigned_irq { __u32 assigned_dev_id; - __u32 host_irq; + __u32 host_irq; /* ignored (legacy field) */ __u32 guest_irq; __u32 flags; union { - struct { - __u32 addr_lo; - __u32 addr_hi; - __u32 data; - } guest_msi; __u32 reserved[12]; }; }; - struct kvm_assigned_msix_nr { __u32 assigned_dev_id; __u16 entry_nr;