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: Eric Auger X-Patchwork-Id: 405369 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 663E7140077 for ; Sat, 1 Nov 2014 03:12:44 +1100 (AEDT) Received: from localhost ([::1]:38742 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XkEoc-0004Vx-7E for incoming@patchwork.ozlabs.org; Fri, 31 Oct 2014 12:12:42 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:35619) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XkDgx-000231-Ns for qemu-devel@nongnu.org; Fri, 31 Oct 2014 11:00:50 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1XkCqY-0003n1-4N for qemu-devel@nongnu.org; Fri, 31 Oct 2014 10:06:40 -0400 Received: from mail-wi0-f182.google.com ([209.85.212.182]:59467) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XkCqX-0003lU-VF for qemu-devel@nongnu.org; Fri, 31 Oct 2014 10:06:34 -0400 Received: by mail-wi0-f182.google.com with SMTP id d1so1394910wiv.9 for ; Fri, 31 Oct 2014 07:06:33 -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=d3XjW70WSnnni1mWIZ36HHqDHNIGw3y409mm9GrRqAc=; b=KzGHJEQ4T0N65C/Sdx9nqLSGWtAQGm5Rp0vzZQzTM00VsBFDQePtcdELPwqq1rle1e Ii/KFbTTe8bYyrbTmYakGgafp1xJG2OuTu1JAKfkXNKHvsQ/faYHhPpby9+T5pXlJQ6h mWeMwxhuDBf8x9F697s7Vvz+rr4eMheNQK0UMhNtITDw5MQ0S7c+9KNxxK/IWg6mwEav o4OVybRTFKw7k0/5UO+sfD6VKXVlzG8XUYBjxxuUjpcGEA9VB48CcEUUilh7DaEVjZLR 9mTn8AtxTofCFB2M8I03KQAQKT1O8ZK3hCxj3zEzhOPl9EKSf+8jEyaJ0TjBBRaw9VAI cK3w== X-Gm-Message-State: ALoCoQlvZkQDgyDrVpha3fwMUzxRTPebXEIpqCglPiyH/KqGp436bHlqpcjerP4K8m5+tZOsMGPf 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 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-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 209.85.212.182 Cc: peter.maydell@linaro.org, patches@linaro.org, eric.auger@linaro.org, will.deacon@arm.com, stuart.yoder@freescale.com, Bharat.Bhushan@freescale.com, alex.williamson@redhat.com, a.motakis@virtualopensystems.com, kvmarm@lists.cs.columbia.edu Subject: [Qemu-devel] [PATCH v7 15/16] hw/vfio/common: vfio_kvm_device_fd moved in the common header X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org 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,