i386: hvf: cleanup x86_gen.h
This only includes VM_PANIC now. No need to include it from headers.
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
diff --git a/target/i386/hvf/x86_gen.h b/target/i386/hvf/panic.h
similarity index 95%
rename from target/i386/hvf/x86_gen.h
rename to target/i386/hvf/panic.h
index 96d6c5a..411ef43 100644
--- a/target/i386/hvf/x86_gen.h
+++ b/target/i386/hvf/panic.h
@@ -15,8 +15,8 @@
* You should have received a copy of the GNU Lesser General Public
* License along with this program; if not, see <http://www.gnu.org/licenses/>.
*/
-#ifndef __X86_GEN_H__
-#define __X86_GEN_H__
+#ifndef HVF_PANIC_H
+#define HVF_PANIC_H
#define VM_PANIC(x) {\
printf("%s\n", x); \
diff --git a/target/i386/hvf/x86.h b/target/i386/hvf/x86.h
index ae877f0..103ec09 100644
--- a/target/i386/hvf/x86.h
+++ b/target/i386/hvf/x86.h
@@ -19,8 +19,6 @@
#ifndef HVF_X86_H
#define HVF_X86_H 1
-#include "x86_gen.h"
-
typedef struct x86_register {
union {
struct {
diff --git a/target/i386/hvf/x86_decode.c b/target/i386/hvf/x86_decode.c
index 71d0c3d..bf93e82 100644
--- a/target/i386/hvf/x86_decode.c
+++ b/target/i386/hvf/x86_decode.c
@@ -19,10 +19,10 @@
#include "qemu/osdep.h"
#include "qemu-common.h"
+#include "panic.h"
#include "x86_decode.h"
#include "string.h"
#include "vmx.h"
-#include "x86_gen.h"
#include "x86_mmu.h"
#include "x86_descr.h"
diff --git a/target/i386/hvf/x86_emu.c b/target/i386/hvf/x86_emu.c
index 6abcea9..3ea18ed 100644
--- a/target/i386/hvf/x86_emu.c
+++ b/target/i386/hvf/x86_emu.c
@@ -36,7 +36,7 @@
/////////////////////////////////////////////////////////////////////////
#include "qemu/osdep.h"
-
+#include "panic.h"
#include "qemu-common.h"
#include "x86_decode.h"
#include "x86.h"
diff --git a/target/i386/hvf/x86_flags.c b/target/i386/hvf/x86_flags.c
index 28398ae..ee6d33f 100644
--- a/target/i386/hvf/x86_flags.c
+++ b/target/i386/hvf/x86_flags.c
@@ -24,6 +24,7 @@
#include "qemu/osdep.h"
#include "qemu-common.h"
+#include "panic.h"
#include "cpu.h"
#include "x86_flags.h"
#include "x86.h"
diff --git a/target/i386/hvf/x86_flags.h b/target/i386/hvf/x86_flags.h
index 13e5d5b..8942745 100644
--- a/target/i386/hvf/x86_flags.h
+++ b/target/i386/hvf/x86_flags.h
@@ -23,7 +23,6 @@
#ifndef __X86_FLAGS_H__
#define __X86_FLAGS_H__
-#include "x86_gen.h"
#include "cpu.h"
void lflags_to_rflags(CPUX86State *env);
void rflags_to_lflags(CPUX86State *env);
diff --git a/target/i386/hvf/x86_mmu.c b/target/i386/hvf/x86_mmu.c
index cd8d122..5c1f35a 100644
--- a/target/i386/hvf/x86_mmu.c
+++ b/target/i386/hvf/x86_mmu.c
@@ -16,6 +16,7 @@
* License along with this program; if not, see <http://www.gnu.org/licenses/>.
*/
#include "qemu/osdep.h"
+#include "panic.h"
#include "qemu-common.h"
#include "cpu.h"
diff --git a/target/i386/hvf/x86_mmu.h b/target/i386/hvf/x86_mmu.h
index ae02cb6..0bd1acc 100644
--- a/target/i386/hvf/x86_mmu.h
+++ b/target/i386/hvf/x86_mmu.h
@@ -18,8 +18,6 @@
#ifndef __X86_MMU_H__
#define __X86_MMU_H__
-#include "x86_gen.h"
-
#define PT_PRESENT (1 << 0)
#define PT_WRITE (1 << 1)
#define PT_USER (1 << 2)
diff --git a/target/i386/hvf/x86_task.c b/target/i386/hvf/x86_task.c
index bb3c345..d7f665f 100644
--- a/target/i386/hvf/x86_task.c
+++ b/target/i386/hvf/x86_task.c
@@ -7,6 +7,7 @@
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
// GNU General Public License for more details.
#include "qemu/osdep.h"
+#include "panic.h"
#include "qemu-common.h"
#include "qemu/error-report.h"
