Reduces the diff to upstream.
Signed-off-by: Jan Kiszka <[email protected]>
---
cpu-exec.c | 2 --
exec.c | 1 -
gdbstub.c | 1 -
hw/acpi.c | 3 ---
hw/ppc440.c | 1 -
hw/ppc440_bamboo.c | 1 -
hw/ppce500_mpc8544ds.c | 1 -
hw/virtio-balloon.c | 1 -
target-i386/helper.c | 1 -
9 files changed, 0 insertions(+), 12 deletions(-)
diff --git a/cpu-exec.c b/cpu-exec.c
index 583d7d6..6ec519d 100644
--- a/cpu-exec.c
+++ b/cpu-exec.c
@@ -41,8 +41,6 @@
#endif
#endif
-#include "qemu-kvm.h"
-
#if defined(__sparc__) && !defined(CONFIG_SOLARIS)
// Work around ugly bugs in glibc that mangle global register contents
#undef env
diff --git a/exec.c b/exec.c
index 1dc970f..9a493d0 100644
--- a/exec.c
+++ b/exec.c
@@ -32,7 +32,6 @@
#if !defined(TARGET_IA64)
#include "tcg.h"
#endif
-#include "qemu-kvm.h"
#include "hw/hw.h"
#include "hw/qdev.h"
diff --git a/gdbstub.c b/gdbstub.c
index df93691..0838948 100644
--- a/gdbstub.c
+++ b/gdbstub.c
@@ -34,7 +34,6 @@
#include "sysemu.h"
#include "gdbstub.h"
#endif
-#include "qemu-kvm.h"
#define MAX_PACKET_LENGTH 4096
diff --git a/hw/acpi.c b/hw/acpi.c
index 3d78d5f..ad40fb4 100644
--- a/hw/acpi.c
+++ b/hw/acpi.c
@@ -19,9 +19,6 @@
#include "hw.h"
#include "pc.h"
#include "acpi.h"
-#include "kvm.h"
-#include "qemu-kvm.h"
-#include "string.h"
struct acpi_table_header
{
diff --git a/hw/ppc440.c b/hw/ppc440.c
index 7d651e9..1ed001a 100644
--- a/hw/ppc440.c
+++ b/hw/ppc440.c
@@ -20,7 +20,6 @@
#include "ppc405.h"
#include "sysemu.h"
#include "kvm.h"
-#include "qemu-kvm.h"
#define PPC440EP_PCI_CONFIG 0xeec00000
#define PPC440EP_PCI_INTACK 0xeed00000
diff --git a/hw/ppc440_bamboo.c b/hw/ppc440_bamboo.c
index 6627cd8..20b8629 100644
--- a/hw/ppc440_bamboo.c
+++ b/hw/ppc440_bamboo.c
@@ -23,7 +23,6 @@
#include "device_tree.h"
#include "loader.h"
#include "elf.h"
-#include "qemu-kvm.h"
#define BINARY_DEVICE_TREE_FILE "bamboo.dtb"
diff --git a/hw/ppce500_mpc8544ds.c b/hw/ppce500_mpc8544ds.c
index 13153dd..17b0165 100644
--- a/hw/ppce500_mpc8544ds.c
+++ b/hw/ppce500_mpc8544ds.c
@@ -32,7 +32,6 @@
#include "loader.h"
#include "elf.h"
#include "sysbus.h"
-#include "qemu-kvm.h"
#define BINARY_DEVICE_TREE_FILE "mpc8544ds.dtb"
#define UIMAGE_LOAD_BASE 0
diff --git a/hw/virtio-balloon.c b/hw/virtio-balloon.c
index 447b337..70a8710 100644
--- a/hw/virtio-balloon.c
+++ b/hw/virtio-balloon.c
@@ -20,7 +20,6 @@
#include "balloon.h"
#include "virtio-balloon.h"
#include "kvm.h"
-#include "qemu-kvm.h"
#include "qlist.h"
#include "qint.h"
#include "qstring.h"
diff --git a/target-i386/helper.c b/target-i386/helper.c
index 4ab5241..2315c84 100644
--- a/target-i386/helper.c
+++ b/target-i386/helper.c
@@ -32,7 +32,6 @@
#include "monitor.h"
#endif
-#include "qemu-kvm.h"
#ifndef OBSOLETE_KVM_IMPL
#define run_on_cpu on_vcpu
#endif /* !OBSOLETE_KVM_IMPL */
--
1.7.1
--
To unsubscribe from this list: send the line "unsubscribe kvm" in
the body of a message to [email protected]
More majordomo info at http://vger.kernel.org/majordomo-info.html
