kvm: Move util.h to include/kvm directory

Signed-off-by: Pekka Enberg <penberg@cs.helsinki.fi>

diff --git a/tools/kvm/util.h b/tools/kvm/include/kvm/util.h
similarity index 94%
rename from tools/kvm/util.h
rename to tools/kvm/include/kvm/util.h
index fa91b95cb0560500100849de02177cbf6af96ff3..5d818c8f59a5fb52ebb65a9362b8a517a8464c84 100644 (file)
--- a/tools/kvm/util.h
+++ b/tools/kvm/include/kvm/util.h
@@ -1,5 +1,5 @@
-#ifndef UTIL_H_
-#define UTIL_H_
+#ifndef KVM__UTIL_H
+#define KVM__UTIL_H
 
 #define ARRAY_SIZE(x) (sizeof(x) / sizeof((x)[0]))
 
@@ -44,4 +44,4 @@ do {                                                          \
                __stringify(cnd) "\n");                         \
 } while (0)
 
-#endif /* UTIL_H_ */
+#endif /* KVM__UTIL_H */

diff --git a/tools/kvm/interrupt.c b/tools/kvm/interrupt.c
index 5290e601666755a60d1ec8cea53054ab00cbd28e..0ce82c8a128c65d24bedb01fb87599bdc08d1016 100644 (file)
--- a/tools/kvm/interrupt.c
+++ b/tools/kvm/interrupt.c
@@ -1,6 +1,6 @@
 #include "kvm/interrupt.h"
 
-#include "util.h"
+#include "kvm/util.h"
 
 #include <string.h>
 

diff --git a/tools/kvm/kvm.c b/tools/kvm/kvm.c
index 2c96394535ac8dc6b1bcc1090349d91299a977cc..6347735e3424b805e46c0e7f0e076d075b0b0900 100644 (file)
--- a/tools/kvm/kvm.c
+++ b/tools/kvm/kvm.c
@@ -1,6 +1,7 @@
 #include "kvm/kvm.h"
 
 #include "kvm/interrupt.h"
+#include "kvm/util.h"
 
 #include <linux/kvm.h>
 
@@ -18,8 +19,6 @@
 #include <stdio.h>
 #include <fcntl.h>
 
-#include "util.h"
-
 /*
  * Compatibility code. Remove this when we move to tools/kvm.
  */

diff --git a/tools/kvm/main.c b/tools/kvm/main.c
index ab2d8876453c47982ba5ab263d8ea12ecaf06dc4..950e7010edf9fe1e9fbb4675b077b1b434ed37d0 100644 (file)
--- a/tools/kvm/main.c
+++ b/tools/kvm/main.c
@@ -1,10 +1,11 @@
 #include "kvm/kvm.h"
 
-#include "util.h"
+#include "kvm/util.h"
 
 #include <inttypes.h>
 #include <stdint.h>
 #include <stdlib.h>
+#include <string.h>
 #include <stdio.h>
 
 static void usage(char *argv[])

diff --git a/tools/kvm/util.c b/tools/kvm/util.c
index ee41488246a63ceb6ed4bd53f088e1f90511e784..096e94265fdf4ae45392c89268b1ea5aa285f790 100644 (file)
--- a/tools/kvm/util.c
+++ b/tools/kvm/util.c
@@ -2,7 +2,7 @@
  * Taken from perf which in turn take it from GIT
  */
 
-#include "util.h"
+#include "kvm/util.h"
 
 static void report(const char *prefix, const char *err, va_list params)
 {