[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH 01/13] i386: hvf: Move HVFState definition into hvf
From: |
Roman Bolshakov |
Subject: |
[PATCH 01/13] i386: hvf: Move HVFState definition into hvf |
Date: |
Thu, 28 May 2020 22:37:46 +0300 |
"sysemu/hvf.h" is intended for inclusion in generic code. However it
also contains several hvf definitions and declarations, including
HVFState that are used only inside "hvf.c". "hvf-i386.h" would be more
appropriate place to define HVFState as it's only included by "hvf.c"
and "x86_task.c".
Signed-off-by: Roman Bolshakov <r.bolshakov@yadro.com>
---
include/sysemu/hvf.h | 37 -------------------------------------
target/i386/hvf/hvf-i386.h | 35 +++++++++++++++++++++++++++++++++++
2 files changed, 35 insertions(+), 37 deletions(-)
diff --git a/include/sysemu/hvf.h b/include/sysemu/hvf.h
index d211e808e9..30a565ab73 100644
--- a/include/sysemu/hvf.h
+++ b/include/sysemu/hvf.h
@@ -15,8 +15,6 @@
#include "cpu.h"
#include "qemu/bitops.h"
-#include "exec/memory.h"
-#include "sysemu/accel.h"
extern bool hvf_allowed;
#ifdef CONFIG_HVF
@@ -32,41 +30,6 @@ uint32_t hvf_get_supported_cpuid(uint32_t func, uint32_t idx,
#define hvf_get_supported_cpuid(func, idx, reg) 0
#endif
-/* hvf_slot flags */
-#define HVF_SLOT_LOG (1 << 0)
-
-typedef struct hvf_slot {
- uint64_t start;
- uint64_t size;
- uint8_t *mem;
- int slot_id;
- uint32_t flags;
- MemoryRegion *region;
-} hvf_slot;
-
-typedef struct hvf_vcpu_caps {
- uint64_t vmx_cap_pinbased;
- uint64_t vmx_cap_procbased;
- uint64_t vmx_cap_procbased2;
- uint64_t vmx_cap_entry;
- uint64_t vmx_cap_exit;
- uint64_t vmx_cap_preemption_timer;
-} hvf_vcpu_caps;
-
-typedef struct HVFState {
- AccelState parent;
- hvf_slot slots[32];
- int num_slots;
-
- hvf_vcpu_caps *hvf_caps;
-} HVFState;
-extern HVFState *hvf_state;
-
-void hvf_set_phys_mem(MemoryRegionSection *, bool);
-void hvf_handle_io(CPUArchState *, uint16_t, void *,
- int, int, int);
-hvf_slot *hvf_find_overlap_slot(uint64_t, uint64_t);
-
/* Disable HVF if |disable| is 1, otherwise, enable it iff it is supported by
* the host CPU. Use hvf_enabled() after this to get the result. */
void hvf_disable(int disable);
diff --git a/target/i386/hvf/hvf-i386.h b/target/i386/hvf/hvf-i386.h
index 15ee4835cf..7cdf256649 100644
--- a/target/i386/hvf/hvf-i386.h
+++ b/target/i386/hvf/hvf-i386.h
@@ -16,6 +16,7 @@
#ifndef HVF_I386_H
#define HVF_I386_H
+#include "sysemu/accel.h"
#include "sysemu/hvf.h"
#include "cpu.h"
#include "x86.h"
@@ -37,6 +38,40 @@ struct hvf_state {
uint64_t mem_quota;
};
+/* hvf_slot flags */
+#define HVF_SLOT_LOG (1 << 0)
+
+typedef struct hvf_slot {
+ uint64_t start;
+ uint64_t size;
+ uint8_t *mem;
+ int slot_id;
+ uint32_t flags;
+ MemoryRegion *region;
+} hvf_slot;
+
+typedef struct hvf_vcpu_caps {
+ uint64_t vmx_cap_pinbased;
+ uint64_t vmx_cap_procbased;
+ uint64_t vmx_cap_procbased2;
+ uint64_t vmx_cap_entry;
+ uint64_t vmx_cap_exit;
+ uint64_t vmx_cap_preemption_timer;
+} hvf_vcpu_caps;
+
+typedef struct HVFState {
+ AccelState parent;
+ hvf_slot slots[32];
+ int num_slots;
+
+ hvf_vcpu_caps *hvf_caps;
+} HVFState;
+extern HVFState *hvf_state;
+
+void hvf_set_phys_mem(MemoryRegionSection *, bool);
+void hvf_handle_io(CPUArchState *, uint16_t, void *, int, int, int);
+hvf_slot *hvf_find_overlap_slot(uint64_t, uint64_t);
+
#ifdef NEED_CPU_H
/* Functions exported to host specific mode */
--
2.26.1
- [PATCH 00/13] i386: hvf: Remove HVFX86EmulatorState, Roman Bolshakov, 2020/05/28
- [PATCH 03/13] i386: hvf: Clean stray includes in sysemu, Roman Bolshakov, 2020/05/28
- [PATCH 02/13] i386: hvf: Drop useless declarations in sysemu, Roman Bolshakov, 2020/05/28
- [PATCH 01/13] i386: hvf: Move HVFState definition into hvf,
Roman Bolshakov <=
- [PATCH 04/13] i386: hvf: Drop unused variable, Roman Bolshakov, 2020/05/28
- [PATCH 06/13] i386: hvf: Use IP from CPUX86State, Roman Bolshakov, 2020/05/28
- [PATCH 08/13] i386: hvf: Drop rflags from HVFX86EmulatorState, Roman Bolshakov, 2020/05/28
- [PATCH 05/13] i386: hvf: Use ins_len to advance IP, Roman Bolshakov, 2020/05/28
- [PATCH 07/13] i386: hvf: Drop fetch_rip from HVFX86EmulatorState, Roman Bolshakov, 2020/05/28
- [PATCH 10/13] i386: hvf: Drop regs in HVFX86EmulatorState, Roman Bolshakov, 2020/05/28
- [PATCH 11/13] i386: hvf: Move lazy_flags into CPUX86State, Roman Bolshakov, 2020/05/28
- [PATCH 12/13] i386: hvf: Move mmio_buf into CPUX86State, Roman Bolshakov, 2020/05/28
- [PATCH 09/13] i386: hvf: Drop copy of RFLAGS defines, Roman Bolshakov, 2020/05/28
- [PATCH 13/13] i386: hvf: Drop HVFX86EmulatorState, Roman Bolshakov, 2020/05/28