From 895f9fdf3ac5481ca5ad5763bf667cbf82aa52c4 Mon Sep 17 00:00:00 2001 From: Paolo Bonzini Date: Tue, 3 Oct 2017 15:22:35 +0200 Subject: i386: hvf: cleanup x86_gen.h This only includes VM_PANIC now. No need to include it from headers. Signed-off-by: Paolo Bonzini --- target/i386/hvf/panic.h | 45 ++++++++++++++++++++++++++++++++++++++++++++ target/i386/hvf/x86.h | 2 -- target/i386/hvf/x86_decode.c | 2 +- target/i386/hvf/x86_emu.c | 2 +- target/i386/hvf/x86_flags.c | 1 + target/i386/hvf/x86_flags.h | 1 - target/i386/hvf/x86_gen.h | 45 -------------------------------------------- target/i386/hvf/x86_mmu.c | 1 + target/i386/hvf/x86_mmu.h | 2 -- target/i386/hvf/x86_task.c | 1 + 10 files changed, 50 insertions(+), 52 deletions(-) create mode 100644 target/i386/hvf/panic.h delete mode 100644 target/i386/hvf/x86_gen.h (limited to 'target/i386') diff --git a/target/i386/hvf/panic.h b/target/i386/hvf/panic.h new file mode 100644 index 0000000000..411ef43a5b --- /dev/null +++ b/target/i386/hvf/panic.h @@ -0,0 +1,45 @@ +/* + * Copyright (C) 2016 Veertu Inc, + * Copyright (C) 2017 Google Inc, + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2 of the License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this program; if not, see . + */ +#ifndef HVF_PANIC_H +#define HVF_PANIC_H + +#define VM_PANIC(x) {\ + printf("%s\n", x); \ + abort(); \ +} + +#define VM_PANIC_ON(x) {\ + if (x) { \ + printf("%s\n", #x); \ + abort(); \ + } \ +} + +#define VM_PANIC_EX(...) {\ + printf(__VA_ARGS__); \ + abort(); \ +} + +#define VM_PANIC_ON_EX(x, ...) {\ + if (x) { \ + printf(__VA_ARGS__); \ + abort(); \ + } \ +} + +#endif diff --git a/target/i386/hvf/x86.h b/target/i386/hvf/x86.h index ae877f0022..103ec0976c 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 71d0c3d115..bf93e8207d 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 6abcea9d92..3ea18edc68 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 28398ae680..ee6d33f861 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 13e5d5bd1a..8942745988 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_gen.h b/target/i386/hvf/x86_gen.h deleted file mode 100644 index 96d6c5a811..0000000000 --- a/target/i386/hvf/x86_gen.h +++ /dev/null @@ -1,45 +0,0 @@ -/* - * Copyright (C) 2016 Veertu Inc, - * Copyright (C) 2017 Google Inc, - * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2 of the License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this program; if not, see . - */ -#ifndef __X86_GEN_H__ -#define __X86_GEN_H__ - -#define VM_PANIC(x) {\ - printf("%s\n", x); \ - abort(); \ -} - -#define VM_PANIC_ON(x) {\ - if (x) { \ - printf("%s\n", #x); \ - abort(); \ - } \ -} - -#define VM_PANIC_EX(...) {\ - printf(__VA_ARGS__); \ - abort(); \ -} - -#define VM_PANIC_ON_EX(x, ...) {\ - if (x) { \ - printf(__VA_ARGS__); \ - abort(); \ - } \ -} - -#endif diff --git a/target/i386/hvf/x86_mmu.c b/target/i386/hvf/x86_mmu.c index cd8d122b45..5c1f35acd0 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 . */ #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 ae02cb6916..0bd1acc94f 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 bb3c3457eb..d7f665f8fa 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" -- cgit v1.2.3