From patchwork Fri Oct 31 14:05:49 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Auger Eric X-Patchwork-Id: 39913 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-ee0-f69.google.com (mail-ee0-f69.google.com [74.125.83.69]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id ED2D92405B for ; Fri, 31 Oct 2014 14:06:36 +0000 (UTC) Received: by mail-ee0-f69.google.com with SMTP id c41sf757689eek.8 for ; Fri, 31 Oct 2014 07:06:36 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:mime-version:delivered-to:from:to:cc:subject :date:message-id:in-reply-to:references:x-original-sender :x-original-authentication-results:precedence:mailing-list:list-id :list-post:list-help:list-archive:list-unsubscribe; bh=d3XjW70WSnnni1mWIZ36HHqDHNIGw3y409mm9GrRqAc=; b=aQ+kVoadGmZbY4OGMjJCrjjiY3GOO2Y6I2CgfihdUcN2fO/dlPfVJ7lznQ9zT5TKrn Pk8z1e/j243hmFzNUylKFKr988dM5Hv7ckHk8JnoeyDRUgKjsBdHHr/3mtdpTCMhUjmb iQ7pMp/LiQJi5LaQUfWX75L5cQrJmn2alBT48AhAcnSZXi+7FcvWa8ZVC4Vurj46rh6N DTumCT89/9/BVzclrIBlZ3FFqqDwBAW424J0xGthb5zSdDe0+qbdj0rej6BsSrt6hVq/ gP9XSfjaFFQjuR77a0XcfRrH5BYDY6c50SeGS2JOpxYivbvC1xvJ8/nDlU0HF8XrvYO9 9zKg== X-Gm-Message-State: ALoCoQm4i+rbWuwwOSboReacvfUEiq/CqmxUZ0HSrxsztllpL7z+F9IOzjWyrqESkZ90Qq40smrc X-Received: by 10.112.138.202 with SMTP id qs10mr4015741lbb.5.1414764396133; Fri, 31 Oct 2014 07:06:36 -0700 (PDT) MIME-Version: 1.0 X-BeenThere: patchwork-forward@linaro.org Received: by 10.152.5.166 with SMTP id t6ls518109lat.20.gmail; Fri, 31 Oct 2014 07:06:36 -0700 (PDT) X-Received: by 10.112.147.225 with SMTP id tn1mr26555848lbb.37.1414764395998; Fri, 31 Oct 2014 07:06:35 -0700 (PDT) Received: from mail-lb0-f177.google.com (mail-lb0-f177.google.com. [209.85.217.177]) by mx.google.com with ESMTPS id ao5si16866924lbc.58.2014.10.31.07.06.35 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Fri, 31 Oct 2014 07:06:35 -0700 (PDT) Received-SPF: pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.217.177 as permitted sender) client-ip=209.85.217.177; Received: by mail-lb0-f177.google.com with SMTP id 10so6022965lbg.22 for ; Fri, 31 Oct 2014 07:06:35 -0700 (PDT) X-Received: by 10.153.8.164 with SMTP id dl4mr26572090lad.29.1414764395916; Fri, 31 Oct 2014 07:06:35 -0700 (PDT) X-Forwarded-To: patchwork-forward@linaro.org X-Forwarded-For: patch@linaro.org patchwork-forward@linaro.org Delivered-To: patches@linaro.org Received: by 10.112.84.229 with SMTP id c5csp207566lbz; Fri, 31 Oct 2014 07:06:35 -0700 (PDT) X-Received: by 10.180.90.237 with SMTP id bz13mr4240477wib.50.1414764393591; Fri, 31 Oct 2014 07:06:33 -0700 (PDT) Received: from mail-wi0-f173.google.com (mail-wi0-f173.google.com. [209.85.212.173]) by mx.google.com with ESMTPS id ch2si26718420wib.20.2014.10.31.07.06.33 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Fri, 31 Oct 2014 07:06:33 -0700 (PDT) Received-SPF: pass (google.com: domain of eric.auger@linaro.org designates 209.85.212.173 as permitted sender) client-ip=209.85.212.173; Received: by mail-wi0-f173.google.com with SMTP id n3so1422956wiv.0 for ; Fri, 31 Oct 2014 07:06:33 -0700 (PDT) X-Received: by 10.194.109.226 with SMTP id hv2mr28075873wjb.45.1414764393394; Fri, 31 Oct 2014 07:06:33 -0700 (PDT) Received: from midway01-04-00.lavalab ([88.98.47.97]) by mx.google.com with ESMTPSA id v10sm12504563wiy.23.2014.10.31.07.06.32 for (version=TLSv1.1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Fri, 31 Oct 2014 07:06:32 -0700 (PDT) From: Eric Auger To: eric.auger@st.com, christoffer.dall@linaro.org, qemu-devel@nongnu.org, agraf@suse.de, pbonzini@redhat.com, kim.phillips@freescale.com, a.rigo@virtualopensystems.com, manish.jaggi@caviumnetworks.com, joel.schopp@amd.com Cc: eric.auger@linaro.org, kvmarm@lists.cs.columbia.edu, patches@linaro.org, alex.williamson@redhat.com, peter.maydell@linaro.org, will.deacon@arm.com, Bharat.Bhushan@freescale.com, stuart.yoder@freescale.com, a.motakis@virtualopensystems.com Subject: [PATCH v7 15/16] hw/vfio/common: vfio_kvm_device_fd moved in the common header Date: Fri, 31 Oct 2014 14:05:49 +0000 Message-Id: <1414764350-5140-16-git-send-email-eric.auger@linaro.org> X-Mailer: git-send-email 1.8.3.2 In-Reply-To: <1414764350-5140-1-git-send-email-eric.auger@linaro.org> References: <1414764350-5140-1-git-send-email-eric.auger@linaro.org> X-Removed-Original-Auth: Dkim didn't pass. X-Original-Sender: eric.auger@linaro.org X-Original-Authentication-Results: mx.google.com; spf=pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.217.177 as permitted sender) smtp.mail=patch+caf_=patchwork-forward=linaro.org@linaro.org Precedence: list Mailing-list: list patchwork-forward@linaro.org; contact patchwork-forward+owners@linaro.org List-ID: X-Google-Group-Id: 836684582541 List-Post: , List-Help: , List-Archive: List-Unsubscribe: , the device is now used in platform for forwarded IRQ setup Signed-off-by: Eric Auger --- hw/vfio/common.c | 3 ++- include/hw/vfio/vfio-common.h | 5 +++++ 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/hw/vfio/common.c b/hw/vfio/common.c index fbd9e7f..99ff89a 100644 --- a/hw/vfio/common.c +++ b/hw/vfio/common.c @@ -44,9 +44,10 @@ struct vfio_as_head vfio_address_spaces = * initialized, this file descriptor is only released on QEMU exit and * we'll re-use it should another vfio device be attached before then. */ -static int vfio_kvm_device_fd = -1; +int vfio_kvm_device_fd = -1; #endif + /* * Common VFIO interrupt disable */ diff --git a/include/hw/vfio/vfio-common.h b/include/hw/vfio/vfio-common.h index 83c7876..0ae0153 100644 --- a/include/hw/vfio/vfio-common.h +++ b/include/hw/vfio/vfio-common.h @@ -41,6 +41,11 @@ #define VFIO_ALLOW_KVM_MSI 1 #define VFIO_ALLOW_KVM_MSIX 1 +#ifdef CONFIG_KVM +extern int vfio_kvm_device_fd; +#endif + + enum { VFIO_DEVICE_TYPE_PCI = 0, VFIO_DEVICE_TYPE_PLATFORM = 1,