i386: hvf: Drop HVFX86EmulatorState

Signed-off-by: Roman Bolshakov <r.bolshakov@yadro.com>
Message-Id: <20200528193758.51454-14-r.bolshakov@yadro.com>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>

diff --git a/include/qemu/typedefs.h b/include/qemu/typedefs.h
index de68d51d52b93c103ffb2213a3dd05c1f30cf795..ce4a78b687a825928904879127a791fb3e5ac884 100644 (file)
--- a/include/qemu/typedefs.h
+++ b/include/qemu/typedefs.h
@@ -51,7 +51,6 @@ typedef struct FWCfgIoState FWCfgIoState;
 typedef struct FWCfgMemState FWCfgMemState;
 typedef struct FWCfgState FWCfgState;
 typedef struct HostMemoryBackend HostMemoryBackend;
-typedef struct HVFX86EmulatorState HVFX86EmulatorState;
 typedef struct I2CBus I2CBus;
 typedef struct I2SCodec I2SCodec;
 typedef struct IOMMUMemoryRegion IOMMUMemoryRegion;

diff --git a/target/i386/cpu.h b/target/i386/cpu.h
index 25a2f4c0c389118e9a5c58cad1e1002cca003a3b..7d77efd9e4964e280cc8a8b781aa8be5ed41a25e 100644 (file)
--- a/target/i386/cpu.h
+++ b/target/i386/cpu.h
@@ -1604,7 +1604,6 @@ typedef struct CPUX86State {
 #if defined(CONFIG_HVF)
     HVFX86LazyFlags hvf_lflags;
     void *hvf_mmio_buf;
-    HVFX86EmulatorState *hvf_emul;
 #endif
 
     uint64_t mcg_cap;

diff --git a/target/i386/hvf/hvf.c b/target/i386/hvf/hvf.c
index 57696c46c7f436e324ea6d0e2d50de07a3afe3e4..be016b951a5ca96bdd0f1776ed2bb8203f9f6f67 100644 (file)
--- a/target/i386/hvf/hvf.c
+++ b/target/i386/hvf/hvf.c
@@ -568,7 +568,6 @@ int hvf_init_vcpu(CPUState *cpu)
 
     hvf_state->hvf_caps = g_new0(struct hvf_vcpu_caps, 1);
     env->hvf_mmio_buf = g_new(char, 4096);
-    env->hvf_emul = g_new0(HVFX86EmulatorState, 1);
 
     r = hv_vcpu_create((hv_vcpuid_t *)&cpu->hvf_fd, HV_VCPU_DEFAULT);
     cpu->vcpu_dirty = 1;

diff --git a/target/i386/hvf/x86.h b/target/i386/hvf/x86.h
index 483fcea7623c5caee4debb0ad989d919955a2cfe..bacade7b658d402bfade1b431dd0e7e765592621 100644 (file)
--- a/target/i386/hvf/x86.h
+++ b/target/i386/hvf/x86.h
@@ -228,10 +228,6 @@ typedef struct x68_segment_selector {
     };
 } __attribute__ ((__packed__)) x68_segment_selector;
 
-/* Definition of hvf_x86_state is here */
-struct HVFX86EmulatorState {
-};
-
 /* useful register access  macros */
 #define x86_reg(cpu, reg) ((x86_register *) &cpu->regs[reg])