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>
This commit is contained in:
Paolo Bonzini 2017-10-03 15:22:35 +02:00
parent da20f5cd0d
commit 895f9fdf3a
9 changed files with 7 additions and 9 deletions

View file

@ -15,8 +15,8 @@
* You should have received a copy of the GNU Lesser General Public * 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/>. * License along with this program; if not, see <http://www.gnu.org/licenses/>.
*/ */
#ifndef __X86_GEN_H__ #ifndef HVF_PANIC_H
#define __X86_GEN_H__ #define HVF_PANIC_H
#define VM_PANIC(x) {\ #define VM_PANIC(x) {\
printf("%s\n", x); \ printf("%s\n", x); \

View file

@ -19,8 +19,6 @@
#ifndef HVF_X86_H #ifndef HVF_X86_H
#define HVF_X86_H 1 #define HVF_X86_H 1
#include "x86_gen.h"
typedef struct x86_register { typedef struct x86_register {
union { union {
struct { struct {

View file

@ -19,10 +19,10 @@
#include "qemu/osdep.h" #include "qemu/osdep.h"
#include "qemu-common.h" #include "qemu-common.h"
#include "panic.h"
#include "x86_decode.h" #include "x86_decode.h"
#include "string.h" #include "string.h"
#include "vmx.h" #include "vmx.h"
#include "x86_gen.h"
#include "x86_mmu.h" #include "x86_mmu.h"
#include "x86_descr.h" #include "x86_descr.h"

View file

@ -36,7 +36,7 @@
///////////////////////////////////////////////////////////////////////// /////////////////////////////////////////////////////////////////////////
#include "qemu/osdep.h" #include "qemu/osdep.h"
#include "panic.h"
#include "qemu-common.h" #include "qemu-common.h"
#include "x86_decode.h" #include "x86_decode.h"
#include "x86.h" #include "x86.h"

View file

@ -24,6 +24,7 @@
#include "qemu/osdep.h" #include "qemu/osdep.h"
#include "qemu-common.h" #include "qemu-common.h"
#include "panic.h"
#include "cpu.h" #include "cpu.h"
#include "x86_flags.h" #include "x86_flags.h"
#include "x86.h" #include "x86.h"

View file

@ -23,7 +23,6 @@
#ifndef __X86_FLAGS_H__ #ifndef __X86_FLAGS_H__
#define __X86_FLAGS_H__ #define __X86_FLAGS_H__
#include "x86_gen.h"
#include "cpu.h" #include "cpu.h"
void lflags_to_rflags(CPUX86State *env); void lflags_to_rflags(CPUX86State *env);
void rflags_to_lflags(CPUX86State *env); void rflags_to_lflags(CPUX86State *env);

View file

@ -16,6 +16,7 @@
* License along with this program; if not, see <http://www.gnu.org/licenses/>. * License along with this program; if not, see <http://www.gnu.org/licenses/>.
*/ */
#include "qemu/osdep.h" #include "qemu/osdep.h"
#include "panic.h"
#include "qemu-common.h" #include "qemu-common.h"
#include "cpu.h" #include "cpu.h"

View file

@ -18,8 +18,6 @@
#ifndef __X86_MMU_H__ #ifndef __X86_MMU_H__
#define __X86_MMU_H__ #define __X86_MMU_H__
#include "x86_gen.h"
#define PT_PRESENT (1 << 0) #define PT_PRESENT (1 << 0)
#define PT_WRITE (1 << 1) #define PT_WRITE (1 << 1)
#define PT_USER (1 << 2) #define PT_USER (1 << 2)

View file

@ -7,6 +7,7 @@
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the // MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
// GNU General Public License for more details. // GNU General Public License for more details.
#include "qemu/osdep.h" #include "qemu/osdep.h"
#include "panic.h"
#include "qemu-common.h" #include "qemu-common.h"
#include "qemu/error-report.h" #include "qemu/error-report.h"