From patchwork Tue Mar 14 07:37:04 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Olaf Hering X-Patchwork-Id: 9622613 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id B1F3360424 for ; Tue, 14 Mar 2017 07:39:57 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id A14D9284BC for ; Tue, 14 Mar 2017 07:39:57 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 95A9F284CF; Tue, 14 Mar 2017 07:39:57 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-4.1 required=2.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_MED,T_DKIM_INVALID autolearn=ham version=3.3.1 Received: from lists.xenproject.org (lists.xenproject.org [192.237.175.120]) (using TLSv1.2 with cipher AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 80516284BC for ; Tue, 14 Mar 2017 07:39:55 +0000 (UTC) Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.84_2) (envelope-from ) id 1cnh17-0006o2-0L; Tue, 14 Mar 2017 07:37:13 +0000 Received: from mail6.bemta6.messagelabs.com ([193.109.254.103]) by lists.xenproject.org with esmtp (Exim 4.84_2) (envelope-from ) id 1cnh15-0006nw-8v for xen-devel@lists.xen.org; Tue, 14 Mar 2017 07:37:11 +0000 Received: from [193.109.254.147] by server-4.bemta-6.messagelabs.com id D7/00-25093-6AD97C85; Tue, 14 Mar 2017 07:37:10 +0000 X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFnrILMWRWlGSWpSXmKPExsUSuHLSLd2lc49 HGNy9a2Ox5ONiFgdGj6O7fzMFMEaxZuYl5VcksGbc3rCYtaCfp2LmjN9sDYw7uLoYuThYBB4z SRw9fYi9i5GTQ0IgU+L2yefMXYwcQLaIxJP/aSA1QgLHmSTmLbvDBFIjJJAmseTBZFYQm01AS WLvweOMILaIgLTEtc+XwWxmgSyJ3YsPgNnCAhYSn6/9YAKZySKgKrHqjyRImFfAWOLf8feMEG vlJRZtmsEygZFnASPDKkaN4tSistQiXUMLvaSizPSMktzEzBxdQwMzvdzU4uLE9NScxKRiveT 83E2MQK8zAMEOxpsbAw4xSnIwKYnySs05HiHEl5SfUpmRWJwRX1Sak1p8iFGGg0NJgtcdJCdY lJqeWpGWmQMMP5i0BAePkgjvM5A0b3FBYm5xZjpE6hSjopQ473+QhABIIqM0D64NFvKXGGWlh HkZgQ4R4ilILcrNLEGVf8UozsGoJMxrDTKFJzOvBG76K6DFTECLE38eAVlckoiQkmpgdJnwa1 JQ3GeeeVPCPzhJJr39FytRb3tJY3635YUm7gvN5z/sOB9+ooj9YkenlV/XRpbHp04mJk/5cCF 6gxW/e6REzyeWC3fmsjjvX7ffZOpG3UURdYxL0m92xCelhO490TvNUD7gt+HDWx1/5yw6d59z lcCMP1uywo9c0/b9PKVV5fC6dYtaviqxFGckGmoxFxUnAgC57OcMdAIAAA== X-Env-Sender: olaf@aepfle.de X-Msg-Ref: server-10.tower-27.messagelabs.com!1489477029!68378090!1 X-Originating-IP: [81.169.146.218] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 9.2.3; banners=-,-,- X-VirusChecked: Checked Received: (qmail 41338 invoked from network); 14 Mar 2017 07:37:09 -0000 Received: from mo4-p00-ob.smtp.rzone.de (HELO mo4-p00-ob.smtp.rzone.de) (81.169.146.218) by server-10.tower-27.messagelabs.com with DHE-RSA-AES256-GCM-SHA384 encrypted SMTP; 14 Mar 2017 07:37:09 -0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; t=1489477029; l=1562; s=domk; d=aepfle.de; h=Date:Subject:Cc:To:From; bh=jyMXOe+GdTSqxKb3WUGgAaWVPdI3RRXjyK7TT7L9tzc=; b=w1To7tbHOrDRjn4M8y4KU+rk58BnVOUdsnV133bRvxPQrWUoBsJXOAbT/mxNUuUnZK zV0t3XjGk95k+fZVqDMFH2VhI0f+sD+kz39ZXwfxTGNbuJQqmVo4WnPtjn0xUya65ehR g4P3NQ67+erStpkG08D5vTqzKTcBm6h/BE46s= X-RZG-AUTH: :P2EQZWCpfu+qG7CngxMFH1J+yackYocTD1iAi8x+OWi/zfN1cLnAYQz4mzReNqcqYjtv4Azy8MXwnz064sGsI34WDl4= X-RZG-CLASS-ID: mo00 Received: from probook ([2001:a61:3430:6aff:1e5:e21:774c:5659]) by smtp.strato.de (RZmta 40.1 AUTH) with ESMTPSA id i010d3t2E7b89Fk (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (curve secp521r1 with 521 ECDH bits, eq. 15360 bits RSA)) (Client did not present a certificate); Tue, 14 Mar 2017 08:37:08 +0100 (CET) Received: by probook (Postfix, from userid 1000) id 040BC50BA5; Tue, 14 Mar 2017 08:37:06 +0100 (CET) From: Olaf Hering To: xen-devel@lists.xen.org Date: Tue, 14 Mar 2017 07:37:04 +0000 Message-Id: <20170314073704.28345-1-olaf@aepfle.de> X-Mailer: git-send-email 2.12.0 Cc: Wei Liu , Olaf Hering , Ian Jackson Subject: [Xen-devel] [PATCH] tools: include sys/sysmacros.h on Linux X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: xen-devel-bounces@lists.xen.org Sender: "Xen-devel" X-Virus-Scanned: ClamAV using ClamSMTP Due to a bug in the glibc headers the macros makedev(), major() and minor() where avaialble by including sys/types.h. This bug was addressed in glibc-2.25 by introducing a warning when these macros are used. Since Xen is build with -Werror this new warning cause a compile error. Use sys/sysmacros.h to define these three macros. blktap2 is already Linux specific. The kernel header which was used to get makedev() does not provided it anymore, and it was wrong to use a kernel header anyway. Signed-off-by: Olaf Hering Acked-by: Wei Liu --- tools/blktap2/control/tap-ctl-allocate.c | 2 +- tools/libxl/libxl_osdeps.h | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/tools/blktap2/control/tap-ctl-allocate.c b/tools/blktap2/control/tap-ctl-allocate.c index 8a6471e987..908c87f305 100644 --- a/tools/blktap2/control/tap-ctl-allocate.c +++ b/tools/blktap2/control/tap-ctl-allocate.c @@ -36,7 +36,7 @@ #include #include #include -#include +#include #include "tap-ctl.h" #include "blktap2.h" diff --git a/tools/libxl/libxl_osdeps.h b/tools/libxl/libxl_osdeps.h index a40d62066b..de1d24ecae 100644 --- a/tools/libxl/libxl_osdeps.h +++ b/tools/libxl/libxl_osdeps.h @@ -39,6 +39,7 @@ #define SYSFS_PCI_DEV "/sys/bus/pci/devices" #define SYSFS_PCIBACK_DRIVER "/sys/bus/pci/drivers/pciback" #define NETBACK_NIC_NAME "vif%u.%d" +#include #include #include #elif defined(__sun__)