From patchwork Mon Sep 19 18:13:04 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Wei Liu X-Patchwork-Id: 9340307 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 CED246022E for ; Mon, 19 Sep 2016 18:19:54 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id C52BE293B8 for ; Mon, 19 Sep 2016 18:19:54 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id B9D0B29615; Mon, 19 Sep 2016 18:19:54 +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.2 required=2.0 tests=BAYES_00, RCVD_IN_DNSWL_MED 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 080F0293B8 for ; Mon, 19 Sep 2016 18:19:52 +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 1bm384-0000mJ-8x; Mon, 19 Sep 2016 18:17:20 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xenproject.org with esmtp (Exim 4.84_2) (envelope-from ) id 1bm382-0000ld-5w for xen-devel@lists.xenproject.org; Mon, 19 Sep 2016 18:17:18 +0000 Received: from [85.158.139.211] by server-14.bemta-5.messagelabs.com id B1/9B-11508-DAB20E75; Mon, 19 Sep 2016 18:17:17 +0000 X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFvrBLMWRWlGSWpSXmKPExsXitHRDpO4a7Qf hBs2fzCy+b5nM5MDocfjDFZYAxijWzLyk/IoE1oz5b3uZCu4KVezbuI21gXGVQBcjJ4eEgL9E 5/FfzCA2m4CyxM/OXjYQW0RAT6LpwHPGLkYuDmaB6YwS35buB3I4OIQFjCQmTpMGMVkEVCWaj 8qAlPMKOEsc2H2cEWKknMT54z/BRgoJKEh0TD/GBFEjKHFy5hMWEJtZQELi4IsXzBD13BK3T0 9lnsDIMwtJ2SwkZQsYmVYxahSnFpWlFukaGuklFWWmZ5TkJmbm6BoamOrlphYXJ6an5iQmFes l5+duYgSGCAMQ7GDsm+V8iFGSg0lJlFeO70G4EF9SfkplRmJxRnxRaU5q8SFGGQ4OJQneBVpA OcGi1PTUirTMHGCwwqQlOHiURHhLQdK8xQWJucWZ6RCpU4yKUuK8S0ESAiCJjNI8uDZYhFxil JUS5mUEOkSIpyC1KDezBFX+FaM4B6OSMO82kCk8mXklcNNfAS1mAlrM2HMfZHFJIkJKqoEx/6 ZMZirj4nrOOa5RhvsyNTmjHDhYObj/KbpeTBZIvKE22X4h78USZv35L6e0nXtZ0LJypkLvlup jS6b8i/w1/eo/u+lz3n93k8w9klHpPGeev9BxzxUMPnO+CTLlXxXJni23Kilk8vM5xfw/Wjer fw9hmKIWUDK35BWrQ2/ByvITwSEZByOUWIozEg21mIuKEwGB/XnCiwIAAA== X-Env-Sender: prvs=063d67274=wei.liu2@citrix.com X-Msg-Ref: server-7.tower-206.messagelabs.com!1474309035!60195080!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: 8.84; banners=-,-,- X-VirusChecked: Checked Received: (qmail 38346 invoked from network); 19 Sep 2016 18:17:16 -0000 Received: from smtp.citrix.com (HELO SMTP.CITRIX.COM) (66.165.176.89) by server-7.tower-206.messagelabs.com with RC4-SHA encrypted SMTP; 19 Sep 2016 18:17:16 -0000 X-IronPort-AV: E=Sophos;i="5.30,362,1470700800"; d="scan'208";a="379293205" From: Wei Liu To: Xen-devel Date: Mon, 19 Sep 2016 19:13:04 +0100 Message-ID: <1474308784-20636-1-git-send-email-wei.liu2@citrix.com> X-Mailer: git-send-email 2.1.4 MIME-Version: 1.0 X-DLP: MIA2 Cc: Ian Jackson , Wei Liu , Jan Beulich , Andrew Cooper Subject: [Xen-devel] [PATCH] Fix issues introduced in 3a7f872a 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: , Errors-To: xen-devel-bounces@lists.xen.org Sender: "Xen-devel" X-Virus-Scanned: ClamAV using ClamSMTP 3a7f872a ("tools: lift BUILD_BUG_ON to a tools header file") was taken out from an rather old half finished branch by dropping unrelated changes. Unfortunately two issues sneaked in. 1. Hvmloader should be standalone. Revert the changes to hvmloader. 2. The define guard in libs.h was erroneously deleted. Add that back. Signed-off-by: Wei Liu Acked-by: Jan Beulich Acked-by: Ian Jackson --- Cc: Ian Jackson Cc: Jan Beulich Cc: Andrew Cooper --- tools/firmware/hvmloader/rombios.c | 1 - tools/firmware/hvmloader/smbios.c | 1 - tools/firmware/hvmloader/util.h | 1 + tools/include/xen-tools/libs.h | 1 + 4 files changed, 2 insertions(+), 2 deletions(-) diff --git a/tools/firmware/hvmloader/rombios.c b/tools/firmware/hvmloader/rombios.c index 1e853ec..9acf03f 100644 --- a/tools/firmware/hvmloader/rombios.c +++ b/tools/firmware/hvmloader/rombios.c @@ -31,7 +31,6 @@ #include "option_rom.h" #include -#include #define ROM_INCLUDE_ROMBIOS #define ROM_INCLUDE_VGABIOS diff --git a/tools/firmware/hvmloader/smbios.c b/tools/firmware/hvmloader/smbios.c index 0e61bd1..210c7b0 100644 --- a/tools/firmware/hvmloader/smbios.c +++ b/tools/firmware/hvmloader/smbios.c @@ -26,7 +26,6 @@ #include "util.h" #include "hypercall.h" #include -#include /* SBMIOS handle base values */ #define SMBIOS_HANDLE_TYPE0 0x0000 diff --git a/tools/firmware/hvmloader/util.h b/tools/firmware/hvmloader/util.h index 94292d6..0fb266e 100644 --- a/tools/firmware/hvmloader/util.h +++ b/tools/firmware/hvmloader/util.h @@ -41,6 +41,7 @@ void __assert_failed(char *assertion, char *file, int line) void __bug(char *file, int line) __attribute__((noreturn)); #define BUG() __bug(__FILE__, __LINE__) #define BUG_ON(p) do { if (p) BUG(); } while (0) +#define BUILD_BUG_ON(p) ((void)sizeof(char[1 - 2 * !!(p)])) #define min_t(type,x,y) \ ({ type __x = (x); type __y = (y); __x < __y ? __x: __y; }) diff --git a/tools/include/xen-tools/libs.h b/tools/include/xen-tools/libs.h index 9d8b4ab..e874fb8 100644 --- a/tools/include/xen-tools/libs.h +++ b/tools/include/xen-tools/libs.h @@ -1,4 +1,5 @@ #ifndef __XEN_TOOLS_LIBS__ +#define __XEN_TOOLS_LIBS__ #ifndef BUILD_BUG_ON #if __GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 6)