Re: [Xen-devel] [PATCH] Fix issues introduced in 3a7f872a

[Wei Liu]

On Tue, Sep 20, 2016 at 01:18:35PM +0100, Ian Jackson wrote:
> Wei Liu writes ("[PATCH] Fix issues introduced in 3a7f872a"):
> > 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.
> 
> Sorry, I didn't realise you were waiting for my ack.
> 
> Acked-by: Ian Jackson 
> 

Pushed. Thanks everyone.

___
Xen-devel mailing list
Xen-devel@lists.xen.org
https://lists.xen.org/xen-devel

Re: [Xen-devel] [PATCH] Fix issues introduced in 3a7f872a

[Ian Jackson]

Wei Liu writes ("[PATCH] Fix issues introduced in 3a7f872a"):
> 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.

Sorry, I didn't realise you were waiting for my ack.

Acked-by: Ian Jackson 

Ian.

___
Xen-devel mailing list
Xen-devel@lists.xen.org
https://lists.xen.org/xen-devel

Re: [Xen-devel] [PATCH] Fix issues introduced in 3a7f872a

[Jan Beulich]

>>> On 19.09.16 at 20:13,  wrote:
> 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 

Ah, here it comes already.

Acked-by: Jan Beulich 

Jan


___
Xen-devel mailing list
Xen-devel@lists.xen.org
https://lists.xen.org/xen-devel

[Xen-devel] [PATCH] Fix issues introduced in 3a7f872a

[Wei Liu]

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 
---
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   0x
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)
-- 
2.1.4


___
Xen-devel mailing list
Xen-devel@lists.xen.org
https://lists.xen.org/xen-devel