kvm tools, bios: Don't include glibc headers

We should not include glibc headers from BIOS code which can't rely on glibc at
runtime.

This patch fixes the following build breakage on 64-bit:

    CC       bios/e820.o
  In file included from /usr/include/features.h:387:0,
                   from /usr/include/unistd.h:26,
                   from include/kvm/util.h:12,
                   from bios/e820.c:5:
  /usr/include/gnu/stubs.h:7:27: fatal error: gnu/stubs-32.h: No such file or directory compilation terminated.
  make: *** [bios/bios.bin.elf] Error 1

when built without the 'glibc-devel.i686' package on Fedora, for example.

Cc: Asias He <asias.hejun@gmail.com>
Cc: Ingo Molnar <mingo@elte.hu>
Cc: Sasha Levin <levinsasha928@gmail.com>
Acked-by: Cyrill Gorcunov <gorcunov@gmail.com>
Signed-off-by: Pekka Enberg <penberg@kernel.org>

diff --git a/tools/kvm/README b/tools/kvm/README
index 7cbf5306db02568c31559b33f9e34f198d27629c..c262995600d69ad2375f3cb1181f30193454f974 100644 (file)
--- a/tools/kvm/README
+++ b/tools/kvm/README
@@ -102,7 +102,7 @@ For rpm based systems:
 32-bit:
 yum install glibc-devel
 64-bit:
-yum install glibc-devel glibc-devel.i686 glibc-static
+yum install glibc-devel glibc-static
 
 On 64-bit Arch Linux make sure the multilib repository is enabled in your
 /etc/pacman.conf and run

diff --git a/tools/kvm/bios/e820.c b/tools/kvm/bios/e820.c
index 1eafb5b357e544267c76bbecbe92ddc766a04c4f..a9bca29bff7378169ba452c4eb3984edab9f17a7 100644 (file)
--- a/tools/kvm/bios/e820.c
+++ b/tools/kvm/bios/e820.c
@@ -2,7 +2,6 @@
 
 #include "kvm/segment.h"
 #include "kvm/bios.h"
-#include "kvm/util.h"
 
 #include <asm/processor-flags.h>
 #include <asm/e820.h>

diff --git a/tools/kvm/bios/int10.c b/tools/kvm/bios/int10.c
index 6387ca8b15ebdc79dbbe6d184a67dd2d7b7293c4..32f7c923d459bf6ee83c8ff6be0373084d369572 100644 (file)
--- a/tools/kvm/bios/int10.c
+++ b/tools/kvm/bios/int10.c
@@ -1,12 +1,9 @@
 #include "kvm/segment.h"
 #include "kvm/bios.h"
-#include "kvm/util.h"
 #include "kvm/vesa.h"
 
 #include "bios/memcpy.h"
 
-#include <stdint.h>
-
 #define VESA_MAGIC ('V' + ('E' << 8) + ('S' << 16) + ('A' << 24))
 
 /* VESA General Information table */