From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail-wm1-f65.google.com (mail-wm1-f65.google.com [209.85.128.65]) by dpdk.org (Postfix) with ESMTP id 43FAF1B114 for ; Wed, 21 Nov 2018 17:48:09 +0100 (CET) Received: by mail-wm1-f65.google.com with SMTP id p2-v6so6417996wmc.2 for ; Wed, 21 Nov 2018 08:48:09 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=PySX5U4MJiuK0JOqZuBD9tE13ex7UIeY+6AlU/qWhG0=; b=b15U+Ww1OQNvRyL8AUja6cxV7NAdkY6OLP5XsG92Cg/FJNtzIsRzbvQVYZtU6mnScS 5ZDL71UVKrvoekrXf26RZM7YOf8LRbhhPZMQiKHpI/6YyLzNsY/1elCGyulnucCJo8No eXlApJ+5dm8T6wr2zYXbivYQopv5TeSCeNkEN49zURlcu8UJVspwA1uy2+YZAPrtx5dX PnREEq+bLaUbDK9JuRzX7RCFzqHtvdPwMLYcGJTe7+C6Va4h7BVrwCFRkVXZKtsfi71R jHjZNfelsHfh8ILeNfWNbNB63m4KqR0qGw90YHmjWxysuyvEy0q1dy3qR7gGQ4RF2rIR 9y4g== X-Gm-Message-State: AA+aEWY1BsqqRWSMIY+jsODzOp7ewjC3P8XfXVEgIHA8F3y7b/zLaDmj l83fymYUeKviqyZTQCcTP3tIvWli X-Google-Smtp-Source: AJdET5dmL+q1yk2Ce30jHOLgqogzhLYpA2wnUwBWKBvx+UFCiqgenYvJtYgCnvNeDjOiLI3zDB+M8g== X-Received: by 2002:a1c:2d93:: with SMTP id t141mr5967918wmt.99.1542818888574; Wed, 21 Nov 2018 08:48:08 -0800 (PST) Received: from localhost ([2a01:4b00:f419:6f00:8361:8946:ba2b:d556]) by smtp.gmail.com with ESMTPSA id t17sm1801297wme.43.2018.11.21.08.48.07 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Wed, 21 Nov 2018 08:48:07 -0800 (PST) From: Luca Boccassi To: stable@dpdk.org Cc: anatoly.burakov@intel.com Date: Wed, 21 Nov 2018 16:48:02 +0000 Message-Id: <20181121164802.8186-2-bluca@debian.org> X-Mailer: git-send-email 2.19.1 In-Reply-To: <20181121164802.8186-1-bluca@debian.org> References: <20181121164802.8186-1-bluca@debian.org> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Subject: [dpdk-stable] [PATCH 16.11 2/2] vfio: fix build X-BeenThere: stable@dpdk.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: patches for DPDK stable branches List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 21 Nov 2018 16:48:09 -0000 From: Anatoly Burakov [ backported from upstream commit 9fa5993f103712d10be0f0b111a3a9afc92cd9e6 ] Some compilers require definition of vfio_iommu_spapr_tce_ddw_info before its use in vfio_iommu_spapr_tce_info, so move tce_info definition below tce_ddw_info. Fixes: 468f42cc2645 ("vfio: fix build on old kernel") Signed-off-by: Anatoly Burakov --- lib/librte_eal/linuxapp/eal/eal_vfio.h | 29 +++++++++++++------------- 1 file changed, 15 insertions(+), 14 deletions(-) diff --git a/lib/librte_eal/linuxapp/eal/eal_vfio.h b/lib/librte_eal/linuxapp/eal/eal_vfio.h index 0bf85bb59..72f1f7572 100644 --- a/lib/librte_eal/linuxapp/eal/eal_vfio.h +++ b/lib/librte_eal/linuxapp/eal/eal_vfio.h @@ -60,19 +60,6 @@ #define VFIO_IOMMU_SPAPR_TCE_CREATE _IO(VFIO_TYPE, VFIO_BASE + 19) #define VFIO_IOMMU_SPAPR_TCE_REMOVE _IO(VFIO_TYPE, VFIO_BASE + 20) -/* SPAPR_v2 is not present, but SPAPR might be */ -#ifndef VFIO_SPAPR_TCE_IOMMU -#define VFIO_IOMMU_SPAPR_TCE_GET_INFO _IO(VFIO_TYPE, VFIO_BASE + 12) - -struct vfio_iommu_spapr_tce_info { - uint32_t argsz; - uint32_t flags; - uint32_t dma32_window_start; - uint32_t dma32_window_size; - struct vfio_iommu_spapr_tce_ddw_info ddw; -}; -#endif - struct vfio_iommu_spapr_register_memory { uint32_t argsz; uint32_t flags; @@ -97,7 +84,21 @@ struct vfio_iommu_spapr_tce_ddw_info { uint32_t max_dynamic_windows_supported; uint32_t levels; }; -#else + +/* SPAPR_v2 is not present, but SPAPR might be */ +#ifndef VFIO_SPAPR_TCE_IOMMU +#define VFIO_IOMMU_SPAPR_TCE_GET_INFO _IO(VFIO_TYPE, VFIO_BASE + 12) + +struct vfio_iommu_spapr_tce_info { + uint32_t argsz; + uint32_t flags; + uint32_t dma32_window_start; + uint32_t dma32_window_size; + struct vfio_iommu_spapr_tce_ddw_info ddw; +}; +#endif /* VFIO_SPAPR_TCE_IOMMU */ + +#else /* VFIO_SPAPR_TCE_v2_IOMMU */ #define RTE_VFIO_SPAPR VFIO_SPAPR_TCE_v2_IOMMU #endif -- 2.19.1