From patchwork Thu Feb 4 10:15:35 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ian Campbell X-Patchwork-Id: 8217111 Return-Path: X-Original-To: patchwork-xen-devel@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork1.web.kernel.org (Postfix) with ESMTP id 8CB2F9F3CD for ; Thu, 4 Feb 2016 10:18:15 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id B79E22038A for ; Thu, 4 Feb 2016 10:18:14 +0000 (UTC) Received: from lists.xen.org (lists.xenproject.org [50.57.142.19]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id E016F2010C for ; Thu, 4 Feb 2016 10:18:13 +0000 (UTC) Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1aRGwv-0000Xr-Oy; Thu, 04 Feb 2016 10:15:41 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1aRGwu-0000Xf-Ce for xen-devel@lists.xen.org; Thu, 04 Feb 2016 10:15:40 +0000 Received: from [193.109.254.147] by server-5.bemta-14.messagelabs.com id 71/4E-23366-BC423B65; Thu, 04 Feb 2016 10:15:39 +0000 X-Env-Sender: prvs=8352e0589=Ian.Campbell@citrix.com X-Msg-Ref: server-8.tower-27.messagelabs.com!1454580937!17662893!1 X-Originating-IP: [66.165.176.89] X-SpamReason: No, hits=0.0 required=7.0 tests=sa_preprocessor: VHJ1c3RlZCBJUDogNjYuMTY1LjE3Ni44OSA9PiAyMDMwMDc=\n, received_headers: No Received headers X-StarScan-Received: X-StarScan-Version: 7.35.1; banners=-,-,- X-VirusChecked: Checked Received: (qmail 37139 invoked from network); 4 Feb 2016 10:15:38 -0000 Received: from smtp.citrix.com (HELO SMTP.CITRIX.COM) (66.165.176.89) by server-8.tower-27.messagelabs.com with RC4-SHA encrypted SMTP; 4 Feb 2016 10:15:38 -0000 X-IronPort-AV: E=Sophos;i="5.22,395,1449532800"; d="scan'208";a="329627193" From: Ian Campbell To: , , Date: Thu, 4 Feb 2016 10:15:35 +0000 Message-ID: <1454580935-19200-1-git-send-email-ian.campbell@citrix.com> X-Mailer: git-send-email 2.1.4 MIME-Version: 1.0 X-DLP: MIA1 Cc: Andrew Cooper , Ian Campbell Subject: [Xen-devel] [PATCH] tools: libxc: do not redefine evtchn_port_or_error_t in xc_evtchn_compat.c X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org X-Spam-Status: No, score=-4.2 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_MED, UNPARSEABLE_RELAY autolearn=unavailable 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 This file stradles the xenevtchn and libxc evtchn_compat worlds, and hence ends up with two evtchn_port_or_error_t typedefs which older gcc's (and the C standard) do not like. Avoid this by gating the compat definition on a gate provided by the compat implementation. Note that this would still be broken by an application which does: #define XC_WANT_COMPAT_EVTCHN_API #include #include Which effectively means that an application must be ported over to xenevtchn in one go rather than incrementally (e.g. if it uses evtchn's for multiple purposes). Since the port is actually fairly mechanical I hope this is acceptable. Reported-by: Olaf Hering Signed-off-by: Ian Campbell Cc: Andrew Cooper Tested-by: Olaf Hering --- I'm not super happy about this approach, due to the caveat in the second half of the commit message. Other approaches: rename the libxenevtchn type, e.g. xenevtchn_port_or_error_t? Some sort of skank based on the header guard #defines, but that's awful (and fragile). --- tools/libxc/include/xenctrl_compat.h | 2 ++ tools/libxc/xc_evtchn_compat.c | 1 + 2 files changed, 3 insertions(+) diff --git a/tools/libxc/include/xenctrl_compat.h b/tools/libxc/include/xenctrl_compat.h index 93ccadb..afc3d88 100644 --- a/tools/libxc/include/xenctrl_compat.h +++ b/tools/libxc/include/xenctrl_compat.h @@ -51,7 +51,9 @@ void *xc_map_foreign_bulk(xc_interface *xch, uint32_t dom, int prot, #ifdef XC_WANT_COMPAT_EVTCHN_API typedef struct xenevtchn_handle xc_evtchn; +#ifndef XC_BUILDING_COMPAT_EVTCHN_API typedef xc_evtchn_port_or_error_t evtchn_port_or_error_t; +#endif xc_evtchn *xc_evtchn_open(xentoollog_logger *logger, unsigned open_flags); diff --git a/tools/libxc/xc_evtchn_compat.c b/tools/libxc/xc_evtchn_compat.c index 5d3e4ba..99da476 100644 --- a/tools/libxc/xc_evtchn_compat.c +++ b/tools/libxc/xc_evtchn_compat.c @@ -6,6 +6,7 @@ #include #define XC_WANT_COMPAT_EVTCHN_API +#define XC_BUILDING_COMPAT_EVTCHN_API #include "xenctrl.h" xc_evtchn *xc_evtchn_open(xentoollog_logger *logger,