From: Gleb Natapov <[email protected]>
Signed-off-by: Gleb Natapov <[email protected]>
Signed-off-by: Marcelo Tosatti <[email protected]>
diff --git a/kvm/user/test/lib/libcflat.h b/kvm/user/test/lib/libcflat.h
index 1f96cb8..1da4013 100644
--- a/kvm/user/test/lib/libcflat.h
+++ b/kvm/user/test/lib/libcflat.h
@@ -22,6 +22,12 @@
#include <stdarg.h>
+typedef unsigned char u8;
+typedef unsigned short u16;
+typedef unsigned u32;
+typedef unsigned long ulong;
+typedef unsigned long long u64;
+
extern void exit(int code);
extern void panic(char *fmt, ...);
diff --git a/kvm/user/test/lib/x86/apic.c b/kvm/user/test/lib/x86/apic.c
index 1fc3888..7bb98ed 100644
--- a/kvm/user/test/lib/x86/apic.c
+++ b/kvm/user/test/lib/x86/apic.c
@@ -4,12 +4,6 @@
static void *g_apic = (void *)0xfee00000;
static void *g_ioapic = (void *)0xfec00000;
-typedef unsigned char u8;
-typedef unsigned short u16;
-typedef unsigned u32;
-typedef unsigned long ulong;
-typedef unsigned long long u64;
-
struct apic_ops {
u32 (*reg_read)(unsigned reg);
void (*reg_write)(unsigned reg, u32 val);
diff --git a/kvm/user/test/x86/apic.c b/kvm/user/test/x86/apic.c
index 1edfba5..4e89c77 100644
--- a/kvm/user/test/x86/apic.c
+++ b/kvm/user/test/x86/apic.c
@@ -2,12 +2,6 @@
#include "apic.h"
#include "vm.h"
-typedef unsigned char u8;
-typedef unsigned short u16;
-typedef unsigned u32;
-typedef unsigned long ulong;
-typedef unsigned long long u64;
-
typedef struct {
unsigned short offset0;
unsigned short selector;
diff --git a/kvm/user/test/x86/tsc.c b/kvm/user/test/x86/tsc.c
index 204b1fd..394a9c6 100644
--- a/kvm/user/test/x86/tsc.c
+++ b/kvm/user/test/x86/tsc.c
@@ -1,7 +1,5 @@
#include "libcflat.h"
-typedef unsigned long long u64;
-
u64 rdtsc(void)
{
unsigned a, d;
--
To unsubscribe from this list: send the line "unsubscribe kvm-commits" in
the body of a message to [email protected]
More majordomo info at http://vger.kernel.org/majordomo-info.html
