accel: Share CPUState accel context (HAX/NVMM/WHPX/HVF)
v2 cover accel: Share CPUState accel context (HAX/NVMM/WHPX/HVF)
This series is part of the single binary effort.
All accelerator will share their per-vCPU context in an opaque 'accel' pointer within the CPUState.
First handle HAX/NVMM/WHPX/HVF. KVM and TCG will follow as two different (bigger) follow-up series.
Since v1:
- Addressed rth's review comments
- Added rth's R-b tag
- Converted HVF intel (untested)
- Rebased
Philippe Mathieu-Daudé (16):
MAINTAINERS: Update Roman Bolshakov email address
accel: Document generic accelerator headers
accel: Remove unused hThread variable on TCG/WHPX
accel: Fix a leak on Windows HAX
accel: Destroy HAX vCPU threads once done
accel: Rename 'hax_vcpu' as 'accel' in CPUState
accel: Rename HAX 'struct hax_vcpu_state' -> AccelCPUState
accel: Move HAX hThread to accelerator context
accel: Remove NVMM unreachable error path
accel: Rename NVMM 'struct qemu_vcpu' -> AccelCPUState
accel: Inline NVMM get_qemu_vcpu()
accel: Remove WHPX unreachable error path
accel: Rename WHPX 'struct whpx_vcpu' -> AccelCPUState
accel: Inline WHPX get_whpx_vcpu()
accel: Rename 'cpu_state' -> 'cpu'
accel: Rename HVF 'struct hvf_vcpu_state' -> AccelCPUState
MAINTAINERS | 4 +- include/hw/core/cpu.h | 10 +- include/sysemu/hax.h | 2 + include/sysemu/hvf_int.h | 2 +- include/sysemu/kvm.h | 2 + include/sysemu/nvmm.h | 2 + include/sysemu/tcg.h | 2 + include/sysemu/whpx.h | 2 + include/sysemu/xen.h | 2 + target/i386/hax/hax-i386.h | 14 +- target/i386/hvf/vmx.h | 22 +- target/i386/hvf/x86hvf.h | 12 +- accel/hvf/hvf-accel-ops.c | 18 +- accel/tcg/tcg-accel-ops-mttcg.c | 4 - accel/tcg/tcg-accel-ops-rr.c | 3 - target/arm/hvf/hvf.c | 108 ++++----- target/i386/hax/hax-accel-ops.c | 5 +- target/i386/hax/hax-all.c | 26 ++- target/i386/hax/hax-posix.c | 4 +- target/i386/hax/hax-windows.c | 6 +- target/i386/hvf/hvf.c | 104 ++++----- target/i386/hvf/x86.c | 28 +-- target/i386/hvf/x86_descr.c | 26 +-- target/i386/hvf/x86_emu.c | 62 ++--- target/i386/hvf/x86_mmu.c | 4 +- target/i386/hvf/x86_task.c | 10 +- target/i386/hvf/x86hvf.c | 364 +++++++++++++++--------------- target/i386/nvmm/nvmm-all.c | 42 ++-- target/i386/whpx/whpx-accel-ops.c | 3 - target/i386/whpx/whpx-all.c | 45 ++-- .mailmap | 3 +- 31 files changed, 462 insertions(+), 479 deletions(-)
Signature · 1 line
2.38.1
PATCH v2 1/16 MAINTAINERS: Update Roman Bolshakov email address
[email protected] is bouncing: Update Roman's email address using one found somewhere on the Internet; this way he can Ack-by.
(Reorder Taylor's line to keep the section sorted alphabetically).
--- MAINTAINERS | 4 ++-- .mailmap | 3 ++- 2 files changed, 4 insertions(+), 3 deletions(-)
MAINTAINERS +2 -2
@@ -497,14 +497,14 @@ F: target/arm/hvf/ X86 HVF CPUs M: Cameron Esfahani <[email protected]> -M: Roman Bolshakov <[email protected]> +M: Roman Bolshakov <[email protected]> W: https://wiki.qemu.org/Features/HVF S: Maintained F: target/i386/hvf/ HVF M: Cameron Esfahani <[email protected]> -M: Roman Bolshakov <[email protected]> +M: Roman Bolshakov <[email protected]> W: https://wiki.qemu.org/Features/HVF S: Maintained F: accel/hvf/
.mailmap +2 -1
@@ -76,9 +76,10 @@ Paul Burton <[email protected]> <[email protected]> Philippe Mathieu-Daudé <[email protected]> <[email protected]> Philippe Mathieu-Daudé <[email protected]> <[email protected]> Philippe Mathieu-Daudé <[email protected]> <[email protected]> +Roman Bolshakov <[email protected]> <[email protected]> Stefan Brankovic <[email protected]> <[email protected]> -Yongbok Kim <[email protected]> <[email protected]> Taylor Simpson <[email protected]> <[email protected]> +Yongbok Kim <[email protected]> <[email protected]> # Also list preferred name forms where people have changed their # git author config, or had utf8/latin1 encoding issues.
Signature · 1 line
2.38.1
PATCH v2 2/16 accel: Document generic accelerator headers
In reply to Philippe Mathieu-DaudéThese headers are meant to be include by any file to check the availability of accelerators, thus are not accelerator specific.
--- include/sysemu/hax.h | 2 ++ include/sysemu/kvm.h | 2 ++ include/sysemu/nvmm.h | 2 ++ include/sysemu/tcg.h | 2 ++ include/sysemu/whpx.h | 2 ++ include/sysemu/xen.h | 2 ++ 6 files changed, 12 insertions(+)
include/sysemu/hax.h +2 -0
@@ -19,6 +19,8 @@* */ +/* header to be included in non-HAX-specific code */ +#ifndef QEMU_HAX_H #define QEMU_HAX_H
include/sysemu/kvm.h +2 -0
@@ -11,6 +11,8 @@* */ +/* header to be included in non-KVM-specific code */ +#ifndef QEMU_KVM_H #define QEMU_KVM_H
include/sysemu/nvmm.h +2 -0
@@ -7,6 +7,8 @@* See the COPYING file in the top-level directory. */ +/* header to be included in non-NVMM-specific code */ +#ifndef QEMU_NVMM_H #define QEMU_NVMM_H
include/sysemu/tcg.h +2 -0
@@ -5,6 +5,8 @@* See the COPYING file in the top-level directory. */ +/* header to be included in non-TCG-specific code */ +#ifndef SYSEMU_TCG_H #define SYSEMU_TCG_H
include/sysemu/whpx.h +2 -0
@@ -10,6 +10,8 @@* */ +/* header to be included in non-WHPX-specific code */ +#ifndef QEMU_WHPX_H #define QEMU_WHPX_H
include/sysemu/xen.h +2 -0
@@ -5,6 +5,8 @@* See the COPYING file in the top-level directory. */ +/* header to be included in non-Xen-specific code */ +#ifndef SYSEMU_XEN_H #define SYSEMU_XEN_H
Signature · 1 line
2.38.1
PATCH v2 3/16 accel: Remove unused hThread variable on TCG/WHPX
In reply to Philippe Mathieu-DaudéOn Windows hosts, cpu->hThread is assigned but never accessed:
remove it.
--- accel/tcg/tcg-accel-ops-mttcg.c | 4 ---- accel/tcg/tcg-accel-ops-rr.c | 3 --- target/i386/whpx/whpx-accel-ops.c | 3 --- 3 files changed, 10 deletions(-)
accel/tcg/tcg-accel-ops-mttcg.c +0 -4
@@ -152,8 +152,4 @@ void mttcg_start_vcpu_thread(CPUState *cpu)qemu_thread_create (cpu->thread, thread_name, mttcg_cpu_thread_fn, cpu,QEMU_THREAD_JOINABLE ); - -#ifdef _WIN32 - cpu->hThread =qemu_thread_get_handle (cpu->thread); -#endif }
accel/tcg/tcg-accel-ops-rr.c +0 -3
@@ -329,9 +329,6 @@ void rr_start_vcpu_thread(CPUState *cpu) single_tcg_halt_cond = cpu->halt_cond; single_tcg_cpu_thread = cpu->thread; -#ifdef _WIN32 - cpu->hThread =qemu_thread_get_handle (cpu->thread); -#endif }else {/* we share the thread */ cpu->thread = single_tcg_cpu_thread;
target/i386/whpx/whpx-accel-ops.c +0 -3
@@ -71,9 +71,6 @@ static void whpx_start_vcpu_thread(CPUState *cpu) cpu->cpu_index);qemu_thread_create (cpu->thread, thread_name, whpx_cpu_thread_fn, cpu,QEMU_THREAD_JOINABLE ); -#ifdef _WIN32 - cpu->hThread =qemu_thread_get_handle (cpu->thread); -#endif }static void whpx_kick_vcpu_thread (CPUState *cpu)
Signature · 1 line
2.38.1
PATCH v2 4/16 accel: Fix a leak on Windows HAX
In reply to Philippe Mathieu-DaudéhThread is only used on the error path in hax_kick_vcpu_thread().
--- target/i386/hax/hax-all.c | 3 +++ 1 file changed, 3 insertions(+)
target/i386/hax/hax-all.c +3 -0
@@ -205,6 +205,9 @@ int hax_vcpu_destroy(CPUState *cpu)*/ hax_close_fd (vcpu->fd); hax_global.vm->vcpus[vcpu->vcpu_id] =NULL ; +#ifdef _WIN32 +CloseHandle (cpu->hThread); +#endif g_free (vcpu);return 0 ; }
Signature · 1 line
2.38.1
PATCH v2 5/16 accel: Destroy HAX vCPU threads once done
In reply to Philippe Mathieu-DaudéWhen the vCPU thread finished its processing, destroy it and signal its destruction to generic vCPU management layer.
Add a sanity check for the vCPU accelerator context.
--- target/i386/hax/hax-accel-ops.c | 3 +++ target/i386/hax/hax-all.c | 1 + 2 files changed, 4 insertions(+)
target/i386/hax/hax-accel-ops.c +3 -0
@@ -53,6 +53,8 @@ static void *hax_cpu_thread_fn(void *arg)qemu_wait_io_event (cpu); }while (!cpu->unplug ||cpu_can_run (cpu)); +hax_vcpu_destroy (cpu); +cpu_thread_signal_destroyed (cpu);rcu_unregister_thread ();return NULL ; }
@@ -69,6 +71,7 @@ static void hax_start_vcpu_thread(CPUState *cpu) cpu->cpu_index);qemu_thread_create (cpu->thread, thread_name, hax_cpu_thread_fn, cpu,QEMU_THREAD_JOINABLE ); +assert (cpu->hax_vcpu);#ifdef _WIN32 cpu->hThread =qemu_thread_get_handle (cpu->thread);#endif
target/i386/hax/hax-all.c +1 -0
@@ -209,6 +209,7 @@ int hax_vcpu_destroy(CPUState *cpu)CloseHandle (cpu->hThread);#endif g_free (vcpu); + cpu->hax_vcpu =NULL ;return 0 ; }
Signature · 1 line
2.38.1
Re: [PATCH v2 05/16] accel: Destroy HAX vCPU threads once done
Quoted 11 lines · Philippe Mathieu-Daudé
When the vCPU thread finished its processing, destroy it and signal its destruction to generic vCPU management layer.
Add a sanity check for the vCPU accelerator context.
Signed-off-by Philippe Mathieu-Daudé<[email protected]>--- target/i386/hax/hax-accel-ops.c | 3 +++ target/i386/hax/hax-all.c | 1 + 2 files changed, 4 insertions(+)
r~
PATCH v2 6/16 accel: Rename 'hax_vcpu' as 'accel' in CPUState
In reply to Philippe Mathieu-DaudéAll accelerators will share a single opaque context in CPUState. Start by renaming 'hax_vcpu' as 'accel'.
--- include/hw/core/cpu.h | 2 +- target/i386/hax/hax-accel-ops.c | 2 +- target/i386/hax/hax-all.c | 18 +++++++++--------- target/i386/nvmm/nvmm-all.c | 6 +++--- target/i386/whpx/whpx-all.c | 6 +++--- 5 files changed, 17 insertions(+), 17 deletions(-)
include/hw/core/cpu.h +1 -1
@@ -441,7 +441,7 @@ struct CPUState {/* Used for user-only emulation of prctl(PR_SET_UNALIGN). */ bool prctl_unalign_sigbus; -struct hax_vcpu_state *hax_vcpu; +struct hax_vcpu_state *accel;struct hvf_vcpu_state *hvf;
target/i386/hax/hax-accel-ops.c +1 -1
@@ -71,7 +71,7 @@ static void hax_start_vcpu_thread(CPUState *cpu) cpu->cpu_index);qemu_thread_create (cpu->thread, thread_name, hax_cpu_thread_fn, cpu,QEMU_THREAD_JOINABLE ); -assert (cpu->hax_vcpu); +assert (cpu->accel);#ifdef _WIN32 cpu->hThread =qemu_thread_get_handle (cpu->thread);#endif
target/i386/hax/hax-all.c +9 -9
@@ -62,7 +62,7 @@ int valid_hax_tunnel_size(uint16_t size)hax_fd hax_vcpu_get_fd (CPUArchState *env) { -struct hax_vcpu_state *vcpu =env_cpu (env)->hax_vcpu; +struct hax_vcpu_state *vcpu =env_cpu (env)->accel;if (!vcpu) {return HAX_INVALID_FD ; }
@@ -188,7 +188,7 @@ int hax_vcpu_create(int id)int hax_vcpu_destroy (CPUState *cpu) { -struct hax_vcpu_state *vcpu = cpu->hax_vcpu; +struct hax_vcpu_state *vcpu = cpu->accel;if (!hax_global.vm) {fprintf (stderr,"vcpu %x destroy failed, vm is null\n" , vcpu->vcpu_id);
@@ -209,7 +209,7 @@ int hax_vcpu_destroy(CPUState *cpu)CloseHandle (cpu->hThread);#endif g_free (vcpu); - cpu->hax_vcpu =NULL ; + cpu->accel =NULL ;return 0 ; }
@@ -223,7 +223,7 @@ int hax_init_vcpu(CPUState *cpu)exit (-1 ); } - cpu->hax_vcpu = hax_global.vm->vcpus[cpu->cpu_index]; + cpu->accel = hax_global.vm->vcpus[cpu->cpu_index]; cpu->vcpu_dirty = true;qemu_register_reset (hax_reset_vcpu_state, cpu->env_ptr);
@@ -415,7 +415,7 @@ static int hax_handle_io(CPUArchState *env, uint32_t df, uint16_t port,static int hax_vcpu_interrupt (CPUArchState *env) {CPUState *cpu =env_cpu (env); -struct hax_vcpu_state *vcpu = cpu->hax_vcpu; +struct hax_vcpu_state *vcpu = cpu->accel;struct hax_tunnel *ht = vcpu->tunnel;/*
@@ -447,7 +447,7 @@ static int hax_vcpu_interrupt(CPUArchState *env)void hax_raise_event (CPUState *cpu) { -struct hax_vcpu_state *vcpu = cpu->hax_vcpu; +struct hax_vcpu_state *vcpu = cpu->accel;if (!vcpu) {return ;
@@ -468,7 +468,7 @@ static int hax_vcpu_hax_exec(CPUArchState *env)int ret =0 ;CPUState *cpu =env_cpu (env);X86CPU *x86_cpu =X86_CPU (cpu); -struct hax_vcpu_state *vcpu = cpu->hax_vcpu; +struct hax_vcpu_state *vcpu = cpu->accel;struct hax_tunnel *ht = vcpu->tunnel;if (!hax_enabled ()) {
@@ -1114,8 +1114,8 @@ void hax_reset_vcpu_state(void *opaque) {CPUState *cpu;for (cpu = first_cpu; cpu !=NULL ; cpu =CPU_NEXT (cpu)) { - cpu->hax_vcpu->tunnel->user_event_pending =0 ; - cpu->hax_vcpu->tunnel->ready_for_interrupt_injection =0 ; + cpu->accel->tunnel->user_event_pending =0 ; + cpu->accel->tunnel->ready_for_interrupt_injection =0 ; } }
target/i386/nvmm/nvmm-all.c +3 -3
@@ -52,7 +52,7 @@ static struct qemu_machine qemu_mach;static struct qemu_vcpu *get_qemu_vcpu (CPUState *cpu) { -return (struct qemu_vcpu *)cpu->hax_vcpu; +return (struct qemu_vcpu *)cpu->accel; } static struct nvmm_machine *
@@ -995,7 +995,7 @@ nvmm_init_vcpu(CPUState *cpu) } cpu->vcpu_dirty = true; - cpu->hax_vcpu = (struct hax_vcpu_state *)qcpu; + cpu->accel = (struct hax_vcpu_state *)qcpu;return 0 ; }
@@ -1030,7 +1030,7 @@ nvmm_destroy_vcpu(CPUState *cpu)struct qemu_vcpu *qcpu =get_qemu_vcpu (cpu);nvmm_vcpu_destroy (mach, &qcpu->vcpu); -g_free (cpu->hax_vcpu); +g_free (cpu->accel); }/* -------------------------------------------------------------------------- */
target/i386/whpx/whpx-all.c +3 -3
@@ -262,7 +262,7 @@ static bool whpx_has_xsave(void)static struct whpx_vcpu *get_whpx_vcpu (CPUState *cpu) { -return (struct whpx_vcpu *)cpu->hax_vcpu; +return (struct whpx_vcpu *)cpu->accel; } static WHV_X64_SEGMENT_REGISTER whpx_seg_q2h(const SegmentCache *qs, int v86,
@@ -2258,7 +2258,7 @@ int whpx_init_vcpu(CPUState *cpu) vcpu->interruptable = true; cpu->vcpu_dirty = true; - cpu->hax_vcpu = (struct hax_vcpu_state *)vcpu; + cpu->accel = (struct hax_vcpu_state *)vcpu; max_vcpu_index =max (max_vcpu_index, cpu->cpu_index);qemu_add_vm_change_state_handler (whpx_cpu_update_state, cpu->env_ptr);
@@ -2300,7 +2300,7 @@ void whpx_destroy_vcpu(CPUState *cpu) whp_dispatch.WHvDeleteVirtualProcessor (whpx->partition, cpu->cpu_index); whp_dispatch.WHvEmulatorDestroyEmulator (vcpu->emulator); -g_free (cpu->hax_vcpu); +g_free (cpu->accel);return ; }
Signature · 1 line
2.38.1
PATCH v2 7/16 accel: Rename HAX 'struct hax_vcpu_state' -> AccelCPUState
In reply to Philippe Mathieu-DaudéWe want all accelerators to share the same opaque pointer in CPUState. Start with the HAX context, renaming its forward declarated structure 'hax_vcpu_state' as 'AccelCPUState'. Directly use the typedef.
--- include/hw/core/cpu.h | 5 ++--- target/i386/hax/hax-i386.h | 11 ++++++----- target/i386/hax/hax-all.c | 16 ++++++++-------- target/i386/hax/hax-posix.c | 4 ++-- target/i386/hax/hax-windows.c | 4 ++-- target/i386/nvmm/nvmm-all.c | 2 +- target/i386/whpx/whpx-all.c | 2 +- 7 files changed, 22 insertions(+), 22 deletions(-)
include/hw/core/cpu.h +2 -3
@@ -240,7 +240,6 @@ typedef struct SavedIOTLB {struct KVMState ;struct kvm_run ; -struct hax_vcpu_state ;struct hvf_vcpu_state ;/* work queue */
@@ -308,6 +307,7 @@ struct qemu_work_item;* @next_cpu: Next CPU sharing TB cache. * @opaque: User data. * @mem_io_pc: Host Program Counter at which the memory was accessed. +* @accel: Pointer to accelerator specific state. * @kvm_fd: vCPU file descriptor for KVM. * @work_mutex: Lock to prevent multiple access to @work_list. * @work_list: List of pending asynchronous work.
@@ -422,6 +422,7 @@ struct CPUState {uint32_t can_do_io;int32_t exception_index; +struct AccelvCPUState *accel;/* shared by kvm, hax and hvf */ bool vcpu_dirty;
@@ -441,8 +442,6 @@ struct CPUState {/* Used for user-only emulation of prctl(PR_SET_UNALIGN). */ bool prctl_unalign_sigbus; -struct hax_vcpu_state *accel; -struct hvf_vcpu_state *hvf;/* track IOMMUs whose translations we've cached in the TCG TLB */
target/i386/hax/hax-i386.h +6 -5
@@ -25,12 +25,13 @@ typedef HANDLE hax_fd;#endif extern struct hax_state hax_global; -struct hax_vcpu_state { + +typedef struct AccelCPUState {hax_fd fd;int vcpu_id;struct hax_tunnel *tunnel;unsigned char *iobuf; -}; +}hax_vcpu_state ;struct hax_state {hax_fd fd;/* the global hax device interface */
@@ -46,7 +47,7 @@ struct hax_vm {hax_fd fd;int id;int numvcpus; -struct hax_vcpu_state **vcpus; +hax_vcpu_state **vcpus; };/* Functions exported to host specific mode */
@@ -57,7 +58,7 @@ int valid_hax_tunnel_size(uint16_t size);int hax_mod_version (struct hax_state *hax,struct hax_module_version *version);int hax_inject_interrupt (CPUArchState *env,int vector);struct hax_vm *hax_vm_create (struct hax_state *hax,int max_cpus); -int hax_vcpu_run (struct hax_vcpu_state *vcpu); +int hax_vcpu_run (hax_vcpu_state *vcpu);int hax_vcpu_create (int id);void hax_kick_vcpu_thread (CPUState *cpu);
@@ -76,7 +77,7 @@ int hax_host_create_vm(struct hax_state *hax, int *vm_id);hax_fd hax_host_open_vm (struct hax_state *hax,int vm_id);int hax_host_create_vcpu (hax_fd vm_fd,int vcpuid);hax_fd hax_host_open_vcpu (int vmid,int vcpuid); -int hax_host_setup_vcpu_channel (struct hax_vcpu_state *vcpu); +int hax_host_setup_vcpu_channel (hax_vcpu_state *vcpu);hax_fd hax_mod_open (void );void hax_memory_init (void );
target/i386/hax/hax-all.c +8 -8
@@ -62,7 +62,7 @@ int valid_hax_tunnel_size(uint16_t size)hax_fd hax_vcpu_get_fd (CPUArchState *env) { -struct hax_vcpu_state *vcpu =env_cpu (env)->accel; +hax_vcpu_state *vcpu =env_cpu (env)->accel;if (!vcpu) {return HAX_INVALID_FD ; }
@@ -136,7 +136,7 @@ static int hax_version_support(struct hax_state *hax)int hax_vcpu_create (int id) { -struct hax_vcpu_state *vcpu =NULL ; +hax_vcpu_state *vcpu =NULL ;int ret;if (!hax_global.vm) {
@@ -149,7 +149,7 @@ int hax_vcpu_create(int id)return 0 ; } - vcpu = g_new0(struct hax_vcpu_state, 1); + vcpu =g_new0 (hax_vcpu_state,1 ); ret =hax_host_create_vcpu (hax_global.vm->fd, id);if (ret) {
@@ -188,7 +188,7 @@ int hax_vcpu_create(int id)int hax_vcpu_destroy (CPUState *cpu) { -struct hax_vcpu_state *vcpu = cpu->accel; +hax_vcpu_state *vcpu = cpu->accel;if (!hax_global.vm) {fprintf (stderr,"vcpu %x destroy failed, vm is null\n" , vcpu->vcpu_id);
@@ -263,7 +263,7 @@ struct hax_vm *hax_vm_create(struct hax_state *hax, int max_cpus) } vm->numvcpus = max_cpus; - vm->vcpus = g_new0(struct hax_vcpu_state *, vm->numvcpus); + vm->vcpus = g_new0(hax_vcpu_state *, vm->numvcpus);for (i =0 ; i < vm->numvcpus; i++) { vm->vcpus[i] =NULL ; }
@@ -415,7 +415,7 @@ static int hax_handle_io(CPUArchState *env, uint32_t df, uint16_t port,static int hax_vcpu_interrupt (CPUArchState *env) {CPUState *cpu =env_cpu (env); -struct hax_vcpu_state *vcpu = cpu->accel; +hax_vcpu_state *vcpu = cpu->accel;struct hax_tunnel *ht = vcpu->tunnel;/*
@@ -447,7 +447,7 @@ static int hax_vcpu_interrupt(CPUArchState *env)void hax_raise_event (CPUState *cpu) { -struct hax_vcpu_state *vcpu = cpu->accel; +hax_vcpu_state *vcpu = cpu->accel;if (!vcpu) {return ;
@@ -468,7 +468,7 @@ static int hax_vcpu_hax_exec(CPUArchState *env)int ret =0 ;CPUState *cpu =env_cpu (env);X86CPU *x86_cpu =X86_CPU (cpu); -struct hax_vcpu_state *vcpu = cpu->accel; +hax_vcpu_state *vcpu = cpu->accel;struct hax_tunnel *ht = vcpu->tunnel;if (!hax_enabled ()) {
target/i386/hax/hax-posix.c +2 -2
@@ -205,7 +205,7 @@ hax_fd hax_host_open_vcpu(int vmid, int vcpuid)return fd; } -int hax_host_setup_vcpu_channel (struct hax_vcpu_state *vcpu) +int hax_host_setup_vcpu_channel (hax_vcpu_state *vcpu) {int ret;struct hax_tunnel_info info;
@@ -227,7 +227,7 @@ int hax_host_setup_vcpu_channel(struct hax_vcpu_state *vcpu)return 0 ; } -int hax_vcpu_run (struct hax_vcpu_state *vcpu) +int hax_vcpu_run (hax_vcpu_state *vcpu) {return ioctl (vcpu->fd,HAX_VCPU_IOCTL_RUN ,NULL ); }
target/i386/hax/hax-windows.c +2 -2
@@ -301,7 +301,7 @@ hax_fd hax_host_open_vcpu(int vmid, int vcpuid)return hDeviceVCPU; } -int hax_host_setup_vcpu_channel (struct hax_vcpu_state *vcpu) +int hax_host_setup_vcpu_channel (hax_vcpu_state *vcpu) {hax_fd hDeviceVCPU = vcpu->fd;int ret;
@@ -327,7 +327,7 @@ int hax_host_setup_vcpu_channel(struct hax_vcpu_state *vcpu)return 0 ; } -int hax_vcpu_run (struct hax_vcpu_state *vcpu) +int hax_vcpu_run (hax_vcpu_state *vcpu) {int ret;HANDLE hDeviceVCPU = vcpu->fd;
target/i386/nvmm/nvmm-all.c +1 -1
@@ -995,7 +995,7 @@ nvmm_init_vcpu(CPUState *cpu) } cpu->vcpu_dirty = true; - cpu->accel = (struct hax_vcpu_state *)qcpu; + cpu->accel = (struct AccelCPUState *)qcpu;return 0 ; }
target/i386/whpx/whpx-all.c +1 -1
@@ -2258,7 +2258,7 @@ int whpx_init_vcpu(CPUState *cpu) vcpu->interruptable = true; cpu->vcpu_dirty = true; - cpu->accel = (struct hax_vcpu_state *)vcpu; + cpu->accel = (struct AccelCPUState *)vcpu; max_vcpu_index =max (max_vcpu_index, cpu->cpu_index);qemu_add_vm_change_state_handler (whpx_cpu_update_state, cpu->env_ptr);
Signature · 1 line
2.38.1
Re: [PATCH v2 07/16] accel: Rename HAX 'struct hax_vcpu_state' -> AccelCPUState
Quoted 1 line · Philippe Mathieu-Daudé
|+ struct AccelvCPUState *accel;|
...
target/i386/hax/hax-i386.h typedef HANDLE hax_fd; · line 34
Quoted 7 lines
target/i386/hax/hax-i386.h +2
-1+typedef struct AccelCPUState {hax_fd fd;int vcpu_id;struct hax_tunnel *tunnel;unsigned char *iobuf; -}; +}hax_vcpu_state ;
Discussed face to face, but for the record:
Put the typedef in qemu/typedefs.h, so that we can use it immediately in core/cpu.h and not need to re-declare it in each accelerator.
Drop hax_vcpu_state typedef and just use AccelCPUState (since you have to change all of those lines anyway. Which will eventually allow
target/i386/whpx/whpx-all.c int whpx_init_vcpu(CPUState *cpu) · line 2261
Quoted 7 lines
+++
b/target/i386/whpx/whpx-all.ctarget/i386/whpx/whpx-all.c +1
-1@@ -2258,7 +2258,7 @@ int whpx_init_vcpu(CPUState *cpu) vcpu->interruptable = true; cpu->vcpu_dirty = true; - cpu->accel = (struct hax_vcpu_state *)vcpu; + cpu->accel = (struct AccelCPUState *)vcpu;
this cast to go away.
r~
Re: [PATCH v2 07/16] accel: Rename HAX 'struct hax_vcpu_state' -> AccelCPUState
Quoted 21 lines · Richard Henderson
Quoted 1 line · Philippe Mathieu-Daudé
|+ struct AccelvCPUState *accel;|
...
target/i386/hax/hax-i386.h typedef HANDLE hax_fd; · line 34
Quoted 7 lines
+typedef struct AccelCPUState {
hax_fdfd;
intvcpu_id;
structhax_tunnel*tunnel;
unsigned char *iobuf;target/i386/hax/hax-i386.h +1
-1-}; +} hax_vcpu_state;Discussed face to face, but for the record:
Put the typedef in
qemu/typedefs.h, so that we can use it immediately incore/cpu.hand not need to re-declare it in each accelerator.Drop
hax_vcpu_statetypedef and just use AccelCPUState (since you have to change all of those lines anyway. Which will eventually allowQuoted 3 lines
+++
b/target/i386/whpx/whpx-all.c(quoted diff) +0
-0@@ -2258,7 +2258,7 @@ int whpx_init_vcpu(CPUState *cpu)
Quoted 6 lines
target/i386/whpx/whpx-all.c int whpx_init_vcpu(CPUState *cpu) · line 2261
Quoted 4 lines
target/i386/whpx/whpx-all.c +1
-1vcpu->interruptable = true; cpu->vcpu_dirty = true; - cpu->accel = (struct hax_vcpu_state *)vcpu; + cpu->accel = (struct AccelCPUState *)vcpu;this cast to go away.
Indeed, thanks :)
PATCH v2 8/16 accel: Move HAX hThread to accelerator context
In reply to Philippe Mathieu-DaudéhThread variable is only used by the HAX accelerator, so move it to the accelerator specific context.
--- include/hw/core/cpu.h | 1 - target/i386/hax/hax-i386.h | 3 +++ target/i386/hax/hax-accel-ops.c | 2 +- target/i386/hax/hax-all.c | 2 +- target/i386/hax/hax-windows.c | 2 +- 5 files changed, 6 insertions(+), 4 deletions(-)
include/hw/core/cpu.h +0 -1
@@ -337,7 +337,6 @@ struct CPUState {struct QemuThread *thread;#ifdef _WIN32 -HANDLE hThread;QemuSemaphore sem;#endif int thread_id;
target/i386/hax/hax-i386.h +3 -0
@@ -27,6 +27,9 @@ typedef HANDLE hax_fd;extern struct hax_state hax_global; typedef struct AccelCPUState { +#ifdef _WIN32 + HANDLE hThread; +#endif hax_fd fd; int vcpu_id; struct hax_tunnel *tunnel;
target/i386/hax/hax-accel-ops.c +1 -1
@@ -73,7 +73,7 @@ static void hax_start_vcpu_thread(CPUState *cpu) cpu, QEMU_THREAD_JOINABLE);assert (cpu->accel);#ifdef _WIN32 - cpu->hThread =qemu_thread_get_handle (cpu->thread); + cpu->accel->hThread =qemu_thread_get_handle (cpu->thread);#endif }
target/i386/hax/hax-all.c +1 -1
@@ -206,7 +206,7 @@ int hax_vcpu_destroy(CPUState *cpu)hax_close_fd (vcpu->fd); hax_global.vm->vcpus[vcpu->vcpu_id] =NULL ;#ifdef _WIN32 -CloseHandle (cpu->hThread); +CloseHandle (vcpu->hThread);#endif g_free (vcpu); cpu->accel =NULL ;
target/i386/hax/hax-windows.c +1 -1
@@ -476,7 +476,7 @@ void hax_kick_vcpu_thread(CPUState *cpu)*/ cpu->exit_request =1 ;if (!qemu_cpu_is_self (cpu)) { -if (!QueueUserAPC (dummy_apc_func, cpu->hThread,0 )) { +if (!QueueUserAPC (dummy_apc_func, cpu->accel->hThread,0 )) {fprintf (stderr,"%s: QueueUserAPC failed with error %lu\n" , __func__,GetLastError ());exit (1 );
Signature · 1 line
2.38.1
PATCH v2 9/16 accel: Remove NVMM unreachable error path
In reply to Philippe Mathieu-Daudég_malloc0() can not fail. Remove the unreachable error path.
--- target/i386/nvmm/nvmm-all.c | 4 ---- 1 file changed, 4 deletions(-)
target/i386/nvmm/nvmm-all.c +0 -4
@@ -943,10 +943,6 @@ nvmm_init_vcpu(CPUState *cpu) } qcpu =g_malloc0 (sizeof (*qcpu)); -if (qcpu ==NULL ) { -error_report ("NVMM: Failed to allocate VCPU context." ); -return -ENOMEM ; - } ret =nvmm_vcpu_create (mach, cpu->cpu_index, &qcpu->vcpu);if (ret ==-1 ) {
Signature · 1 line
2.38.1
Re: [PATCH v2 09/16] accel: Remove NVMM unreachable error path
Quoted 8 lines · Philippe Mathieu-Daudé
g_malloc0()can not fail. Remove the unreachable error path.Signed-off-by Philippe Mathieu-Daudé <[email protected]>--- target/i386/nvmm/nvmm-all.c | 4 ---- 1 file changed, 4 deletions(-)
r~
PATCH v2 10/16 accel: Rename NVMM 'struct qemu_vcpu' -> AccelCPUState
In reply to Philippe Mathieu-DaudéWe want all accelerators to share the same opaque pointer in CPUState. Rename NVMM 'qemu_vcpu' as 'AccelCPUState'; directly use the typedef, remove unnecessary casts.
--- target/i386/nvmm/nvmm-all.c | 34 +++++++++++++++++----------------- 1 file changed, 17 insertions(+), 17 deletions(-)
target/i386/nvmm/nvmm-all.c +17 -17
@@ -26,7 +26,7 @@#include <nvmm.h> -struct qemu_vcpu { +struct AccelCPUState {struct nvmm_vcpu vcpu;uint8_t tpr;bool stop;
@@ -49,10 +49,10 @@ struct qemu_machine {static bool nvmm_allowed;static struct qemu_machine qemu_mach; -static struct qemu_vcpu * +static AccelCPUState *get_qemu_vcpu (CPUState *cpu) { -return (struct qemu_vcpu *)cpu->accel; +return cpu->accel; } static struct nvmm_machine *
@@ -86,7 +86,7 @@ nvmm_set_registers(CPUState *cpu) {CPUX86State *env = cpu->env_ptr;struct nvmm_machine *mach =get_nvmm_mach (); -struct qemu_vcpu *qcpu =get_qemu_vcpu (cpu); +AccelCPUState *qcpu =get_qemu_vcpu (cpu);struct nvmm_vcpu *vcpu = &qcpu->vcpu;struct nvmm_x64_state *state = vcpu->state;uint64_t bitmap;
@@ -223,7 +223,7 @@ nvmm_get_registers(CPUState *cpu) {CPUX86State *env = cpu->env_ptr;struct nvmm_machine *mach =get_nvmm_mach (); -struct qemu_vcpu *qcpu =get_qemu_vcpu (cpu); +AccelCPUState *qcpu =get_qemu_vcpu (cpu);struct nvmm_vcpu *vcpu = &qcpu->vcpu;X86CPU *x86_cpu =X86_CPU (cpu);struct nvmm_x64_state *state = vcpu->state;
@@ -347,7 +347,7 @@ static bool nvmm_can_take_int(CPUState *cpu) {CPUX86State *env = cpu->env_ptr; -struct qemu_vcpu *qcpu =get_qemu_vcpu (cpu); +AccelCPUState *qcpu =get_qemu_vcpu (cpu);struct nvmm_vcpu *vcpu = &qcpu->vcpu;struct nvmm_machine *mach =get_nvmm_mach ();
@@ -372,7 +372,7 @@ nvmm_can_take_int(CPUState *cpu)static bool nvmm_can_take_nmi (CPUState *cpu) { -struct qemu_vcpu *qcpu =get_qemu_vcpu (cpu); +AccelCPUState *qcpu =get_qemu_vcpu (cpu);/* * Contrary to INTs, NMIs always schedule an exit when they are
@@ -395,7 +395,7 @@ nvmm_vcpu_pre_run(CPUState *cpu) {CPUX86State *env = cpu->env_ptr;struct nvmm_machine *mach =get_nvmm_mach (); -struct qemu_vcpu *qcpu =get_qemu_vcpu (cpu); +AccelCPUState *qcpu =get_qemu_vcpu (cpu);struct nvmm_vcpu *vcpu = &qcpu->vcpu;X86CPU *x86_cpu =X86_CPU (cpu);struct nvmm_x64_state *state = vcpu->state;
@@ -478,7 +478,7 @@ nvmm_vcpu_pre_run(CPUState *cpu)static void nvmm_vcpu_post_run (CPUState *cpu,struct nvmm_vcpu_exit *exit) { -struct qemu_vcpu *qcpu =get_qemu_vcpu (cpu); +AccelCPUState *qcpu =get_qemu_vcpu (cpu);CPUX86State *env = cpu->env_ptr;X86CPU *x86_cpu =X86_CPU (cpu);uint64_t tpr;
@@ -565,7 +565,7 @@ static int nvmm_handle_rdmsr(struct nvmm_machine *mach, CPUState *cpu, struct nvmm_vcpu_exit *exit) { - struct qemu_vcpu *qcpu = get_qemu_vcpu(cpu); + AccelCPUState *qcpu = get_qemu_vcpu(cpu);struct nvmm_vcpu *vcpu = &qcpu->vcpu;X86CPU *x86_cpu =X86_CPU (cpu);struct nvmm_x64_state *state = vcpu->state;
@@ -610,7 +610,7 @@ static int nvmm_handle_wrmsr(struct nvmm_machine *mach, CPUState *cpu, struct nvmm_vcpu_exit *exit) { - struct qemu_vcpu *qcpu = get_qemu_vcpu(cpu); + AccelCPUState *qcpu = get_qemu_vcpu(cpu);struct nvmm_vcpu *vcpu = &qcpu->vcpu;X86CPU *x86_cpu =X86_CPU (cpu);struct nvmm_x64_state *state = vcpu->state;
@@ -686,7 +686,7 @@ nvmm_vcpu_loop(CPUState *cpu) {CPUX86State *env = cpu->env_ptr;struct nvmm_machine *mach =get_nvmm_mach (); -struct qemu_vcpu *qcpu =get_qemu_vcpu (cpu); +AccelCPUState *qcpu =get_qemu_vcpu (cpu);struct nvmm_vcpu *vcpu = &qcpu->vcpu;X86CPU *x86_cpu =X86_CPU (cpu);struct nvmm_vcpu_exit *exit = vcpu->exit;
@@ -892,7 +892,7 @@ static void nvmm_ipi_signal(int sigcpu) {if (current_cpu) { -struct qemu_vcpu *qcpu =get_qemu_vcpu (current_cpu); +AccelCPUState *qcpu =get_qemu_vcpu (current_cpu);#if NVMM_USER_VERSION >=2 struct nvmm_vcpu *vcpu = &qcpu->vcpu;nvmm_vcpu_stop (vcpu);
@@ -926,7 +926,7 @@ nvmm_init_vcpu(CPUState *cpu)struct nvmm_vcpu_conf_cpuid cpuid;struct nvmm_vcpu_conf_tpr tpr;Error *local_error =NULL ; -struct qemu_vcpu *qcpu; +AccelCPUState *qcpu;int ret, err;nvmm_init_cpu_signals ();
@@ -942,7 +942,7 @@ nvmm_init_vcpu(CPUState *cpu) } } - qcpu =g_malloc0 (sizeof (*qcpu)); + qcpu =g_new0 (AccelCPUState,1 ); ret =nvmm_vcpu_create (mach, cpu->cpu_index, &qcpu->vcpu);if (ret ==-1 ) {
@@ -991,7 +991,7 @@ nvmm_init_vcpu(CPUState *cpu) } cpu->vcpu_dirty = true; - cpu->accel = (struct AccelCPUState *)qcpu; + cpu->accel = qcpu;return 0 ; }
@@ -1023,7 +1023,7 @@ void nvmm_destroy_vcpu(CPUState *cpu) {struct nvmm_machine *mach =get_nvmm_mach (); -struct qemu_vcpu *qcpu =get_qemu_vcpu (cpu); +AccelCPUState *qcpu =get_qemu_vcpu (cpu);nvmm_vcpu_destroy (mach, &qcpu->vcpu);g_free (cpu->accel);
Signature · 1 line
2.38.1
PATCH v2 11/16 accel: Inline NVMM get_qemu_vcpu()
In reply to Philippe Mathieu-DaudéNo need for this helper to access the CPUState::accel field.
--- target/i386/nvmm/nvmm-all.c | 28 +++++++++++----------------- 1 file changed, 11 insertions(+), 17 deletions(-)
target/i386/nvmm/nvmm-all.c +11 -17
@@ -49,12 +49,6 @@ struct qemu_machine {static bool nvmm_allowed;static struct qemu_machine qemu_mach; -static AccelCPUState * -get_qemu_vcpu (CPUState *cpu) -{ -return cpu->accel; -} -static struct nvmm_machine *get_nvmm_mach (void ) {
@@ -86,7 +80,7 @@ nvmm_set_registers(CPUState *cpu) {CPUX86State *env = cpu->env_ptr;struct nvmm_machine *mach =get_nvmm_mach (); -AccelCPUState *qcpu =get_qemu_vcpu (cpu); +AccelCPUState *qcpu = cpu->accel;struct nvmm_vcpu *vcpu = &qcpu->vcpu;struct nvmm_x64_state *state = vcpu->state;uint64_t bitmap;
@@ -223,7 +217,7 @@ nvmm_get_registers(CPUState *cpu) {CPUX86State *env = cpu->env_ptr;struct nvmm_machine *mach =get_nvmm_mach (); -AccelCPUState *qcpu =get_qemu_vcpu (cpu); +AccelCPUState *qcpu = cpu->accel;struct nvmm_vcpu *vcpu = &qcpu->vcpu;X86CPU *x86_cpu =X86_CPU (cpu);struct nvmm_x64_state *state = vcpu->state;
@@ -347,7 +341,7 @@ static bool nvmm_can_take_int(CPUState *cpu) {CPUX86State *env = cpu->env_ptr; -AccelCPUState *qcpu =get_qemu_vcpu (cpu); +AccelCPUState *qcpu = cpu->accel;struct nvmm_vcpu *vcpu = &qcpu->vcpu;struct nvmm_machine *mach =get_nvmm_mach ();
@@ -372,7 +366,7 @@ nvmm_can_take_int(CPUState *cpu)static bool nvmm_can_take_nmi (CPUState *cpu) { -AccelCPUState *qcpu =get_qemu_vcpu (cpu); +AccelCPUState *qcpu = cpu->accel;/* * Contrary to INTs, NMIs always schedule an exit when they are
@@ -395,7 +389,7 @@ nvmm_vcpu_pre_run(CPUState *cpu) {CPUX86State *env = cpu->env_ptr;struct nvmm_machine *mach =get_nvmm_mach (); -AccelCPUState *qcpu =get_qemu_vcpu (cpu); +AccelCPUState *qcpu = cpu->accel;struct nvmm_vcpu *vcpu = &qcpu->vcpu;X86CPU *x86_cpu =X86_CPU (cpu);struct nvmm_x64_state *state = vcpu->state;
@@ -478,7 +472,7 @@ nvmm_vcpu_pre_run(CPUState *cpu)static void nvmm_vcpu_post_run (CPUState *cpu,struct nvmm_vcpu_exit *exit) { -AccelCPUState *qcpu =get_qemu_vcpu (cpu); +AccelCPUState *qcpu = cpu->accel;CPUX86State *env = cpu->env_ptr;X86CPU *x86_cpu =X86_CPU (cpu);uint64_t tpr;
@@ -565,7 +559,7 @@ static int nvmm_handle_rdmsr(struct nvmm_machine *mach, CPUState *cpu, struct nvmm_vcpu_exit *exit) { - AccelCPUState *qcpu = get_qemu_vcpu(cpu); + AccelCPUState *qcpu = cpu->accel;struct nvmm_vcpu *vcpu = &qcpu->vcpu;X86CPU *x86_cpu =X86_CPU (cpu);struct nvmm_x64_state *state = vcpu->state;
@@ -610,7 +604,7 @@ static int nvmm_handle_wrmsr(struct nvmm_machine *mach, CPUState *cpu, struct nvmm_vcpu_exit *exit) { - AccelCPUState *qcpu = get_qemu_vcpu(cpu); + AccelCPUState *qcpu = cpu->accel;struct nvmm_vcpu *vcpu = &qcpu->vcpu;X86CPU *x86_cpu =X86_CPU (cpu);struct nvmm_x64_state *state = vcpu->state;
@@ -686,7 +680,7 @@ nvmm_vcpu_loop(CPUState *cpu) {CPUX86State *env = cpu->env_ptr;struct nvmm_machine *mach =get_nvmm_mach (); -AccelCPUState *qcpu =get_qemu_vcpu (cpu); +AccelCPUState *qcpu = cpu->accel;struct nvmm_vcpu *vcpu = &qcpu->vcpu;X86CPU *x86_cpu =X86_CPU (cpu);struct nvmm_vcpu_exit *exit = vcpu->exit;
@@ -892,7 +886,7 @@ static void nvmm_ipi_signal(int sigcpu) {if (current_cpu) { -AccelCPUState *qcpu =get_qemu_vcpu (current_cpu); +AccelCPUState *qcpu = current_cpu->accel;#if NVMM_USER_VERSION >=2 struct nvmm_vcpu *vcpu = &qcpu->vcpu;nvmm_vcpu_stop (vcpu);
@@ -1023,7 +1017,7 @@ void nvmm_destroy_vcpu(CPUState *cpu) {struct nvmm_machine *mach =get_nvmm_mach (); -AccelCPUState *qcpu =get_qemu_vcpu (cpu); +AccelCPUState *qcpu = cpu->accel;nvmm_vcpu_destroy (mach, &qcpu->vcpu);g_free (cpu->accel);
Signature · 1 line
2.38.1
PATCH v2 12/16 accel: Remove WHPX unreachable error path
In reply to Philippe Mathieu-Daudég_new0() can not fail. Remove the unreachable error path.
--- target/i386/whpx/whpx-all.c | 6 ------ 1 file changed, 6 deletions(-)
target/i386/whpx/whpx-all.c +0 -6
@@ -2179,12 +2179,6 @@ int whpx_init_vcpu(CPUState *cpu) vcpu = g_new0(struct whpx_vcpu, 1); -if (!vcpu) { -error_report ("WHPX: Failed to allocte VCPU context." ); - ret = -ENOMEM ; - goto error; - } - hr = whp_dispatch.WHvEmulatorCreateEmulator ( &whpx_emu_callbacks, &vcpu->emulator);
Signature · 1 line
2.38.1
Re: [PATCH v2 12/16] accel: Remove WHPX unreachable error path
Quoted 9 lines · Philippe Mathieu-Daudé
g_new0()can not fail. Remove the unreachable error path.Reported-by Richard Henderson <[email protected]>Signed-off-by Philippe Mathieu-Daudé <[email protected]>--- target/i386/whpx/whpx-all.c | 6 ------ 1 file changed, 6 deletions(-)
r~
PATCH v2 13/16 accel: Rename WHPX 'struct whpx_vcpu' -> AccelCPUState
In reply to Philippe Mathieu-DaudéWe want all accelerators to share the same opaque pointer in CPUState. Rename WHPX 'whpx_vcpu' as 'AccelCPUState'; use the typedef.
--- target/i386/whpx/whpx-all.c | 32 ++++++++++++++++---------------- 1 file changed, 16 insertions(+), 16 deletions(-)
target/i386/whpx/whpx-all.c +16 -16
@@ -229,7 +229,7 @@ typedef enum WhpxStepMode {WHPX_STEP_EXCLUSIVE , } WhpxStepMode; -struct whpx_vcpu { +struct AccelCPUState {WHV_EMULATOR_HANDLE emulator;bool window_registered;bool interruptable;
@@ -260,9 +260,9 @@ static bool whpx_has_xsave(void)* VP support */ -static struct whpx_vcpu *get_whpx_vcpu (CPUState *cpu) +static AccelCPUState *get_whpx_vcpu (CPUState *cpu) { -return (struct whpx_vcpu *)cpu->accel; +return (AccelCPUState *)cpu->accel; } static WHV_X64_SEGMENT_REGISTER whpx_seg_q2h(const SegmentCache *qs, int v86,
@@ -390,7 +390,7 @@ static uint64_t whpx_cr8_to_apic_tpr(uint64_t cr8)static void whpx_set_registers (CPUState *cpu,int level) {struct whpx_state *whpx = &whpx_global; -struct whpx_vcpu *vcpu =get_whpx_vcpu (cpu); +AccelCPUState *vcpu =get_whpx_vcpu (cpu);CPUX86State *env = cpu->env_ptr;X86CPU *x86_cpu =X86_CPU (cpu);struct whpx_register_set vcxt;
@@ -609,7 +609,7 @@ static void whpx_get_xcrs(CPUState *cpu)static void whpx_get_registers (CPUState *cpu) {struct whpx_state *whpx = &whpx_global; -struct whpx_vcpu *vcpu =get_whpx_vcpu (cpu); +AccelCPUState *vcpu =get_whpx_vcpu (cpu);CPUX86State *env = cpu->env_ptr;X86CPU *x86_cpu =X86_CPU (cpu);struct whpx_register_set vcxt;
@@ -892,7 +892,7 @@ static const WHV_EMULATOR_CALLBACKS whpx_emu_callbacks = {static int whpx_handle_mmio (CPUState *cpu,WHV_MEMORY_ACCESS_CONTEXT *ctx) {HRESULT hr; -struct whpx_vcpu *vcpu =get_whpx_vcpu (cpu); +AccelCPUState *vcpu =get_whpx_vcpu (cpu);WHV_EMULATOR_STATUS emu_status; hr = whp_dispatch.WHvEmulatorTryMmioEmulation(
@@ -917,7 +917,7 @@ static int whpx_handle_portio(CPUState *cpu, WHV_X64_IO_PORT_ACCESS_CONTEXT *ctx) {HRESULT hr; -struct whpx_vcpu *vcpu =get_whpx_vcpu (cpu); +AccelCPUState *vcpu =get_whpx_vcpu (cpu);WHV_EMULATOR_STATUS emu_status; hr = whp_dispatch.WHvEmulatorTryIoEmulation(
@@ -1417,7 +1417,7 @@ static vaddr whpx_vcpu_get_pc(CPUState *cpu, bool exit_context_valid)* of QEMU, nor this port by calling WHvSetVirtualProcessorRegisters(). * This is the most common case. */ -struct whpx_vcpu *vcpu =get_whpx_vcpu (cpu); +AccelCPUState *vcpu =get_whpx_vcpu (cpu);return vcpu->exit_ctx.VpContext.Rip; }else {/*
@@ -1468,7 +1468,7 @@ static void whpx_vcpu_pre_run(CPUState *cpu) {HRESULT hr;struct whpx_state *whpx = &whpx_global; -struct whpx_vcpu *vcpu =get_whpx_vcpu (cpu); +AccelCPUState *vcpu =get_whpx_vcpu (cpu);CPUX86State *env = cpu->env_ptr;X86CPU *x86_cpu =X86_CPU (cpu);int irq;
@@ -1590,7 +1590,7 @@ static void whpx_vcpu_pre_run(CPUState *cpu)static void whpx_vcpu_post_run (CPUState *cpu) { -struct whpx_vcpu *vcpu =get_whpx_vcpu (cpu); +AccelCPUState *vcpu =get_whpx_vcpu (cpu);CPUX86State *env = cpu->env_ptr;X86CPU *x86_cpu =X86_CPU (cpu);
@@ -1617,7 +1617,7 @@ static void whpx_vcpu_process_async_events(CPUState *cpu) {CPUX86State *env = cpu->env_ptr;X86CPU *x86_cpu =X86_CPU (cpu); -struct whpx_vcpu *vcpu =get_whpx_vcpu (cpu); +AccelCPUState *vcpu =get_whpx_vcpu (cpu);if ((cpu->interrupt_request &CPU_INTERRUPT_INIT ) && !(env->hflags &HF_SMM_MASK )) {
@@ -1656,7 +1656,7 @@ static int whpx_vcpu_run(CPUState *cpu) {HRESULT hr;struct whpx_state *whpx = &whpx_global; -struct whpx_vcpu *vcpu =get_whpx_vcpu (cpu); +AccelCPUState *vcpu =get_whpx_vcpu (cpu);struct whpx_breakpoint *stepped_over_bp =NULL ;WhpxStepMode exclusive_step_mode =WHPX_STEP_NONE ;int ret;
@@ -2154,7 +2154,7 @@ int whpx_init_vcpu(CPUState *cpu) {HRESULT hr;struct whpx_state *whpx = &whpx_global; -struct whpx_vcpu *vcpu =NULL ; +AccelCPUState *vcpu =NULL ;Error *local_error =NULL ;CPUX86State *env = cpu->env_ptr;X86CPU *x86_cpu =X86_CPU (cpu);
@@ -2177,7 +2177,7 @@ int whpx_init_vcpu(CPUState *cpu) } } - vcpu = g_new0(struct whpx_vcpu, 1); + vcpu =g_new0 (AccelCPUState,1 ); hr = whp_dispatch.WHvEmulatorCreateEmulator( &whpx_emu_callbacks,
@@ -2252,7 +2252,7 @@ int whpx_init_vcpu(CPUState *cpu) vcpu->interruptable = true; cpu->vcpu_dirty = true; - cpu->accel = (struct AccelCPUState *)vcpu; + cpu->accel = (AccelCPUState *)vcpu; max_vcpu_index =max (max_vcpu_index, cpu->cpu_index);qemu_add_vm_change_state_handler (whpx_cpu_update_state, cpu->env_ptr);
@@ -2290,7 +2290,7 @@ int whpx_vcpu_exec(CPUState *cpu)void whpx_destroy_vcpu (CPUState *cpu) {struct whpx_state *whpx = &whpx_global; -struct whpx_vcpu *vcpu =get_whpx_vcpu (cpu); +AccelCPUState *vcpu =get_whpx_vcpu (cpu); whp_dispatch.WHvDeleteVirtualProcessor (whpx->partition, cpu->cpu_index); whp_dispatch.WHvEmulatorDestroyEmulator (vcpu->emulator);
Signature · 1 line
2.38.1
PATCH v2 14/16 accel: Inline WHPX get_whpx_vcpu()
In reply to Philippe Mathieu-DaudéNo need for this helper to access the CPUState::accel field.
--- target/i386/whpx/whpx-all.c | 29 ++++++++++------------------- 1 file changed, 10 insertions(+), 19 deletions(-)
target/i386/whpx/whpx-all.c +10 -19
@@ -256,15 +256,6 @@ static bool whpx_has_xsave(void)return whpx_xsave_cap.XsaveSupport; } -/* -* VP support -*/ - -static AccelCPUState *get_whpx_vcpu (CPUState *cpu) -{ -return (AccelCPUState *)cpu->accel; -} -static WHV_X64_SEGMENT_REGISTER whpx_seg_q2h (const SegmentCache *qs,int v86,int r86) {
@@ -390,7 +381,7 @@ static uint64_t whpx_cr8_to_apic_tpr(uint64_t cr8)static void whpx_set_registers (CPUState *cpu,int level) {struct whpx_state *whpx = &whpx_global; -AccelCPUState *vcpu =get_whpx_vcpu (cpu); +AccelCPUState *vcpu = cpu->accel;CPUX86State *env = cpu->env_ptr;X86CPU *x86_cpu =X86_CPU (cpu);struct whpx_register_set vcxt;
@@ -609,7 +600,7 @@ static void whpx_get_xcrs(CPUState *cpu)static void whpx_get_registers (CPUState *cpu) {struct whpx_state *whpx = &whpx_global; -AccelCPUState *vcpu =get_whpx_vcpu (cpu); +AccelCPUState *vcpu = cpu->accel;CPUX86State *env = cpu->env_ptr;X86CPU *x86_cpu =X86_CPU (cpu);struct whpx_register_set vcxt;
@@ -892,7 +883,7 @@ static const WHV_EMULATOR_CALLBACKS whpx_emu_callbacks = {static int whpx_handle_mmio (CPUState *cpu,WHV_MEMORY_ACCESS_CONTEXT *ctx) {HRESULT hr; -AccelCPUState *vcpu =get_whpx_vcpu (cpu); +AccelCPUState *vcpu = cpu->accel;WHV_EMULATOR_STATUS emu_status; hr = whp_dispatch.WHvEmulatorTryMmioEmulation(
@@ -917,7 +908,7 @@ static int whpx_handle_portio(CPUState *cpu, WHV_X64_IO_PORT_ACCESS_CONTEXT *ctx) {HRESULT hr; -AccelCPUState *vcpu =get_whpx_vcpu (cpu); +AccelCPUState *vcpu = cpu->accel;WHV_EMULATOR_STATUS emu_status; hr = whp_dispatch.WHvEmulatorTryIoEmulation(
@@ -1417,7 +1408,7 @@ static vaddr whpx_vcpu_get_pc(CPUState *cpu, bool exit_context_valid)* of QEMU, nor this port by calling WHvSetVirtualProcessorRegisters(). * This is the most common case. */ -AccelCPUState *vcpu =get_whpx_vcpu (cpu); +AccelCPUState *vcpu = cpu->accel;return vcpu->exit_ctx.VpContext.Rip; }else {/*
@@ -1468,7 +1459,7 @@ static void whpx_vcpu_pre_run(CPUState *cpu) {HRESULT hr;struct whpx_state *whpx = &whpx_global; -AccelCPUState *vcpu =get_whpx_vcpu (cpu); +AccelCPUState *vcpu = cpu->accel;CPUX86State *env = cpu->env_ptr;X86CPU *x86_cpu =X86_CPU (cpu);int irq;
@@ -1590,7 +1581,7 @@ static void whpx_vcpu_pre_run(CPUState *cpu)static void whpx_vcpu_post_run (CPUState *cpu) { -AccelCPUState *vcpu =get_whpx_vcpu (cpu); +AccelCPUState *vcpu = cpu->accel;CPUX86State *env = cpu->env_ptr;X86CPU *x86_cpu =X86_CPU (cpu);
@@ -1617,7 +1608,7 @@ static void whpx_vcpu_process_async_events(CPUState *cpu) {CPUX86State *env = cpu->env_ptr;X86CPU *x86_cpu =X86_CPU (cpu); -AccelCPUState *vcpu =get_whpx_vcpu (cpu); +AccelCPUState *vcpu = cpu->accel;if ((cpu->interrupt_request &CPU_INTERRUPT_INIT ) && !(env->hflags &HF_SMM_MASK )) {
@@ -1656,7 +1647,7 @@ static int whpx_vcpu_run(CPUState *cpu) {HRESULT hr;struct whpx_state *whpx = &whpx_global; -AccelCPUState *vcpu =get_whpx_vcpu (cpu); +AccelCPUState *vcpu = cpu->accel;struct whpx_breakpoint *stepped_over_bp =NULL ;WhpxStepMode exclusive_step_mode =WHPX_STEP_NONE ;int ret;
@@ -2290,7 +2281,7 @@ int whpx_vcpu_exec(CPUState *cpu)void whpx_destroy_vcpu (CPUState *cpu) {struct whpx_state *whpx = &whpx_global; -AccelCPUState *vcpu =get_whpx_vcpu (cpu); +AccelCPUState *vcpu = cpu->accel; whp_dispatch.WHvDeleteVirtualProcessor (whpx->partition, cpu->cpu_index); whp_dispatch.WHvEmulatorDestroyEmulator (vcpu->emulator);
Signature · 1 line
2.38.1
PATCH v2 15/16 accel: Rename 'cpu_state' -> 'cpu'
In reply to Philippe Mathieu-DaudéMost of the codebase uses 'CPUState *cpu' or 'CPUState *cs'. While 'cpu_state' is kind of explicit, it makes the code harder to review. Simply rename as 'cpu' like the rest.
--- target/i386/hvf/x86hvf.h | 12 +- target/i386/hvf/x86hvf.c | 356 +++++++++++++++++++-------------------- 2 files changed, 184 insertions(+), 184 deletions(-)
target/i386/hvf/x86hvf.h +6 -6
@@ -20,15 +20,15 @@#include "cpu.h" #include "x86_descr.h" -int hvf_process_events (CPUState *); -bool hvf_inject_interrupts (CPUState *); +int hvf_process_events (CPUState *cpu); +bool hvf_inject_interrupts (CPUState *cpu);void hvf_set_segment (struct CPUState *cpu,struct vmx_segment *vmx_seg,SegmentCache *qseg,bool is_tr);void hvf_get_segment (SegmentCache *qseg,struct vmx_segment *vmx_seg); -void hvf_put_xsave (CPUState *cpu_state); -void hvf_put_msrs (CPUState *cpu_state); -void hvf_get_xsave (CPUState *cpu_state); -void hvf_get_msrs (CPUState *cpu_state); +void hvf_put_xsave (CPUState *cpu); +void hvf_put_msrs (CPUState *cpu); +void hvf_get_xsave (CPUState *cpu); +void hvf_get_msrs (CPUState *cpu);void vmx_clear_int_window_exiting (CPUState *cpu);void vmx_update_tpr (CPUState *cpu);#endif
target/i386/hvf/x86hvf.c +178 -178
531 lines not on this page · raw message
Signature · 1 line
2.38.1
Re: [PATCH v2 15/16] accel: Rename 'cpu_state' -> 'cpu'
Quoted 5 lines · Philippe Mathieu-Daudé
Most of the codebase uses 'CPUState *cpu' or 'CPUState *cs'. While '
cpu_state' is kind of explicit, it makes the code harder to review. Simply rename as 'cpu' like the rest.Signed-off-by Philippe Mathieu-Daudé <[email protected]>
I would have chosen 'cs', since 'cpu' is often used for ArchCPU. But ok.
r~
PATCH v2 16/16 accel: Rename HVF 'struct hvf_vcpu_state' -> AccelCPUState
In reply to Philippe Mathieu-DaudéWe want all accelerators to share the same opaque pointer in CPUState.
Rename the 'hvf_vcpu_state' structure as 'AccelCPUState'.
Use the generic 'accel' field of CPUState instead of 'hvf'.
Replace g_malloc0() by g_new0() for readability.
---
Not even built on x86!
--- include/hw/core/cpu.h | 4 - include/sysemu/hvf_int.h | 2 +- target/i386/hvf/vmx.h | 22 ++-- accel/hvf/hvf-accel-ops.c | 18 ++-- target/arm/hvf/hvf.c | 108 +++++++++---------- target/i386/hvf/hvf.c | 104 +++++++++--------- target/i386/hvf/x86.c | 28 ++--- target/i386/hvf/x86_descr.c | 26 ++--- target/i386/hvf/x86_emu.c | 62 +++++------ target/i386/hvf/x86_mmu.c | 4 +- target/i386/hvf/x86_task.c | 10 +- target/i386/hvf/x86hvf.c | 208 ++++++++++++++++++------------------ 12 files changed, 296 insertions(+), 300 deletions(-)
include/hw/core/cpu.h +0 -4
@@ -240,8 +240,6 @@ typedef struct SavedIOTLB {struct KVMState ;struct kvm_run ; -struct hvf_vcpu_state ; -/* work queue */ /* The union type allows passing of 64 bit target pointers on 32 bit
@@ -441,8 +439,6 @@ struct CPUState {/* Used for user-only emulation of prctl(PR_SET_UNALIGN). */ bool prctl_unalign_sigbus; -struct hvf_vcpu_state *hvf; -/* track IOMMUs whose translations we've cached in the TCG TLB */ GArray *iommu_notifiers; };
include/sysemu/hvf_int.h +1 -1
@@ -49,7 +49,7 @@ struct HVFState { };extern HVFState *hvf_state; -struct hvf_vcpu_state { +struct AccelvCPUState {uint64_t fd;void *exit;bool vtimer_masked;
target/i386/hvf/vmx.h +11 -11
@@ -180,15 +180,15 @@ static inline void macvm_set_rip(CPUState *cpu, uint64_t rip)uint64_t val;/* BUG, should take considering overlap.. */ -wreg (cpu->hvf->fd,HV_X86_RIP , rip); +wreg (cpu->accel->fd,HV_X86_RIP , rip); env->eip = rip;/* after moving forward in rip, we need to clean INTERRUPTABILITY */ - val =rvmcs (cpu->hvf->fd,VMCS_GUEST_INTERRUPTIBILITY ); + val =rvmcs (cpu->accel->fd,VMCS_GUEST_INTERRUPTIBILITY );if (val & (VMCS_INTERRUPTIBILITY_STI_BLOCKING |VMCS_INTERRUPTIBILITY_MOVSS_BLOCKING )) { env->hflags &= ~HF_INHIBIT_IRQ_MASK ; -wvmcs (cpu->hvf->fd,VMCS_GUEST_INTERRUPTIBILITY , +wvmcs (cpu->accel->fd,VMCS_GUEST_INTERRUPTIBILITY , val & ~(VMCS_INTERRUPTIBILITY_STI_BLOCKING |VMCS_INTERRUPTIBILITY_MOVSS_BLOCKING )); }
@@ -200,9 +200,9 @@ static inline void vmx_clear_nmi_blocking(CPUState *cpu)CPUX86State *env = &x86_cpu->env; env->hflags2 &= ~HF2_NMI_MASK ; -uint32_t gi = (uint32_t )rvmcs (cpu->hvf->fd,VMCS_GUEST_INTERRUPTIBILITY ); +uint32_t gi = (uint32_t )rvmcs (cpu->accel->fd,VMCS_GUEST_INTERRUPTIBILITY ); gi &= ~VMCS_INTERRUPTIBILITY_NMI_BLOCKING ; -wvmcs (cpu->hvf->fd,VMCS_GUEST_INTERRUPTIBILITY , gi); +wvmcs (cpu->accel->fd,VMCS_GUEST_INTERRUPTIBILITY , gi); }static inline void vmx_set_nmi_blocking (CPUState *cpu)
@@ -211,16 +211,16 @@ static inline void vmx_set_nmi_blocking(CPUState *cpu)CPUX86State *env = &x86_cpu->env; env->hflags2 |=HF2_NMI_MASK ; -uint32_t gi = (uint32_t )rvmcs (cpu->hvf->fd,VMCS_GUEST_INTERRUPTIBILITY ); +uint32_t gi = (uint32_t )rvmcs (cpu->accel->fd,VMCS_GUEST_INTERRUPTIBILITY ); gi |=VMCS_INTERRUPTIBILITY_NMI_BLOCKING ; -wvmcs (cpu->hvf->fd,VMCS_GUEST_INTERRUPTIBILITY , gi); +wvmcs (cpu->accel->fd,VMCS_GUEST_INTERRUPTIBILITY , gi); }static inline void vmx_set_nmi_window_exiting (CPUState *cpu) {uint64_t val; - val =rvmcs (cpu->hvf->fd,VMCS_PRI_PROC_BASED_CTLS ); -wvmcs (cpu->hvf->fd,VMCS_PRI_PROC_BASED_CTLS , val | + val =rvmcs (cpu->accel->fd,VMCS_PRI_PROC_BASED_CTLS ); +wvmcs (cpu->accel->fd,VMCS_PRI_PROC_BASED_CTLS , val |VMCS_PRI_PROC_BASED_CTLS_NMI_WINDOW_EXITING ); }
@@ -229,8 +229,8 @@ static inline void vmx_clear_nmi_window_exiting(CPUState *cpu) {uint64_t val; - val =rvmcs (cpu->hvf->fd,VMCS_PRI_PROC_BASED_CTLS ); -wvmcs (cpu->hvf->fd,VMCS_PRI_PROC_BASED_CTLS , val & + val =rvmcs (cpu->accel->fd,VMCS_PRI_PROC_BASED_CTLS ); +wvmcs (cpu->accel->fd,VMCS_PRI_PROC_BASED_CTLS , val & ~VMCS_PRI_PROC_BASED_CTLS_NMI_WINDOW_EXITING ); }
accel/hvf/hvf-accel-ops.c +9 -9
@@ -372,19 +372,19 @@ type_init(hvf_type_init);static void hvf_vcpu_destroy (CPUState *cpu) { -hv_return_t ret =hv_vcpu_destroy (cpu->hvf->fd); +hv_return_t ret =hv_vcpu_destroy (cpu->accel->fd);assert_hvf_ok (ret);hvf_arch_vcpu_destroy (cpu); -g_free (cpu->hvf); - cpu->hvf =NULL ; +g_free (cpu->accel); + cpu->accel =NULL ; }static int hvf_init_vcpu (CPUState *cpu) {int r; - cpu->hvf =g_malloc0 (sizeof (*cpu->hvf)); + cpu->accel = g_new0(struct AccelvCPUState, 1);/* init cpu signals */ struct sigaction sigact;
@@ -393,18 +393,18 @@ static int hvf_init_vcpu(CPUState *cpu) sigact.sa_handler = dummy_signal;sigaction (SIG_IPI , &sigact,NULL ); -pthread_sigmask (SIG_BLOCK ,NULL , &cpu->hvf->unblock_ipi_mask); -sigdelset (&cpu->hvf->unblock_ipi_mask,SIG_IPI ); +pthread_sigmask (SIG_BLOCK ,NULL , &cpu->accel->unblock_ipi_mask); +sigdelset (&cpu->accel->unblock_ipi_mask,SIG_IPI );#ifdef __aarch64__ - r =hv_vcpu_create (&cpu->hvf->fd, (hv_vcpu_exit_t **)&cpu->hvf->exit,NULL ); + r =hv_vcpu_create (&cpu->accel->fd, (hv_vcpu_exit_t **)&cpu->accel->exit,NULL );#else - r =hv_vcpu_create ((hv_vcpuid_t *)&cpu->hvf->fd,HV_VCPU_DEFAULT ); + r =hv_vcpu_create ((hv_vcpuid_t *)&cpu->accel->fd,HV_VCPU_DEFAULT );#endif cpu->vcpu_dirty =1 ;assert_hvf_ok (r); - cpu->hvf->guest_debug_enabled = false; + cpu->accel->guest_debug_enabled = false;return hvf_arch_init_vcpu (cpu); }
target/arm/hvf/hvf.c +54 -54
343 lines not on this page · raw message
target/i386/hvf/hvf.c +52 -52
227 lines not on this page · raw message
target/i386/hvf/x86.c +14 -14
@@ -61,11 +61,11 @@ bool x86_read_segment_descriptor(struct CPUState *cpu, }if (GDT_SEL == sel.ti) { - base =rvmcs (cpu->hvf->fd,VMCS_GUEST_GDTR_BASE ); - limit =rvmcs (cpu->hvf->fd,VMCS_GUEST_GDTR_LIMIT ); + base =rvmcs (cpu->accel->fd,VMCS_GUEST_GDTR_BASE ); + limit =rvmcs (cpu->accel->fd,VMCS_GUEST_GDTR_LIMIT ); }else { - base =rvmcs (cpu->hvf->fd,VMCS_GUEST_LDTR_BASE ); - limit =rvmcs (cpu->hvf->fd,VMCS_GUEST_LDTR_LIMIT ); + base =rvmcs (cpu->accel->fd,VMCS_GUEST_LDTR_BASE ); + limit =rvmcs (cpu->accel->fd,VMCS_GUEST_LDTR_LIMIT ); }if (sel.index *8 >= limit) {
@@ -84,11 +84,11 @@ bool x86_write_segment_descriptor(struct CPUState *cpu,uint32_t limit;if (GDT_SEL == sel.ti) { - base =rvmcs (cpu->hvf->fd,VMCS_GUEST_GDTR_BASE ); - limit =rvmcs (cpu->hvf->fd,VMCS_GUEST_GDTR_LIMIT ); + base =rvmcs (cpu->accel->fd,VMCS_GUEST_GDTR_BASE ); + limit =rvmcs (cpu->accel->fd,VMCS_GUEST_GDTR_LIMIT ); }else { - base =rvmcs (cpu->hvf->fd,VMCS_GUEST_LDTR_BASE ); - limit =rvmcs (cpu->hvf->fd,VMCS_GUEST_LDTR_LIMIT ); + base =rvmcs (cpu->accel->fd,VMCS_GUEST_LDTR_BASE ); + limit =rvmcs (cpu->accel->fd,VMCS_GUEST_LDTR_LIMIT ); }if (sel.index *8 >= limit) {
@@ -102,8 +102,8 @@ bool x86_write_segment_descriptor(struct CPUState *cpu,bool x86_read_call_gate (struct CPUState *cpu,struct x86_call_gate *idt_desc,int gate) { -target_ulong base =rvmcs (cpu->hvf->fd,VMCS_GUEST_IDTR_BASE ); -uint32_t limit =rvmcs (cpu->hvf->fd,VMCS_GUEST_IDTR_LIMIT ); +target_ulong base =rvmcs (cpu->accel->fd,VMCS_GUEST_IDTR_BASE ); +uint32_t limit =rvmcs (cpu->accel->fd,VMCS_GUEST_IDTR_LIMIT );memset (idt_desc,0 ,sizeof (*idt_desc));if (gate *8 >= limit) {
@@ -117,7 +117,7 @@ bool x86_read_call_gate(struct CPUState *cpu, struct x86_call_gate *idt_desc,bool x86_is_protected (struct CPUState *cpu) { -uint64_t cr0 =rvmcs (cpu->hvf->fd,VMCS_GUEST_CR0 ); +uint64_t cr0 =rvmcs (cpu->accel->fd,VMCS_GUEST_CR0 );return cr0 &CR0_PE_MASK ; }
@@ -135,7 +135,7 @@ bool x86_is_v8086(struct CPUState *cpu)bool x86_is_long_mode (struct CPUState *cpu) { -return rvmcs (cpu->hvf->fd,VMCS_GUEST_IA32_EFER ) &MSR_EFER_LMA ; +return rvmcs (cpu->accel->fd,VMCS_GUEST_IA32_EFER ) &MSR_EFER_LMA ; }bool x86_is_long64_mode (struct CPUState *cpu)
@@ -148,13 +148,13 @@ bool x86_is_long64_mode(struct CPUState *cpu)bool x86_is_paging_mode (struct CPUState *cpu) { -uint64_t cr0 =rvmcs (cpu->hvf->fd,VMCS_GUEST_CR0 ); +uint64_t cr0 =rvmcs (cpu->accel->fd,VMCS_GUEST_CR0 );return cr0 &CR0_PG_MASK ; }bool x86_is_pae_enabled (struct CPUState *cpu) { -uint64_t cr4 =rvmcs (cpu->hvf->fd,VMCS_GUEST_CR4 ); +uint64_t cr4 =rvmcs (cpu->accel->fd,VMCS_GUEST_CR4 );return cr4 &CR4_PAE_MASK ; }
target/i386/hvf/x86_descr.c +13 -13
@@ -47,47 +47,47 @@ static const struct vmx_segment_field {uint32_t vmx_read_segment_limit (CPUState *cpu,X86Seg seg) { -return (uint32_t )rvmcs (cpu->hvf->fd, vmx_segment_fields[seg].limit); +return (uint32_t )rvmcs (cpu->accel->fd, vmx_segment_fields[seg].limit); }uint32_t vmx_read_segment_ar (CPUState *cpu,X86Seg seg) { -return (uint32_t )rvmcs (cpu->hvf->fd, vmx_segment_fields[seg].ar_bytes); +return (uint32_t )rvmcs (cpu->accel->fd, vmx_segment_fields[seg].ar_bytes); }uint64_t vmx_read_segment_base (CPUState *cpu,X86Seg seg) { -return rvmcs (cpu->hvf->fd, vmx_segment_fields[seg].base); +return rvmcs (cpu->accel->fd, vmx_segment_fields[seg].base); }x68_segment_selector vmx_read_segment_selector (CPUState *cpu,X86Seg seg) {x68_segment_selector sel; - sel.sel =rvmcs (cpu->hvf->fd, vmx_segment_fields[seg].selector); + sel.sel =rvmcs (cpu->accel->fd, vmx_segment_fields[seg].selector);return sel; }void vmx_write_segment_selector (struct CPUState *cpu,x68_segment_selector selector,X86Seg seg) { -wvmcs (cpu->hvf->fd, vmx_segment_fields[seg].selector, selector.sel); +wvmcs (cpu->accel->fd, vmx_segment_fields[seg].selector, selector.sel); }void vmx_read_segment_descriptor (struct CPUState *cpu,struct vmx_segment *desc,X86Seg seg) { - desc->sel =rvmcs (cpu->hvf->fd, vmx_segment_fields[seg].selector); - desc->base =rvmcs (cpu->hvf->fd, vmx_segment_fields[seg].base); - desc->limit =rvmcs (cpu->hvf->fd, vmx_segment_fields[seg].limit); - desc->ar =rvmcs (cpu->hvf->fd, vmx_segment_fields[seg].ar_bytes); + desc->sel =rvmcs (cpu->accel->fd, vmx_segment_fields[seg].selector); + desc->base =rvmcs (cpu->accel->fd, vmx_segment_fields[seg].base); + desc->limit =rvmcs (cpu->accel->fd, vmx_segment_fields[seg].limit); + desc->ar =rvmcs (cpu->accel->fd, vmx_segment_fields[seg].ar_bytes); }void vmx_write_segment_descriptor (CPUState *cpu,struct vmx_segment *desc,X86Seg seg) {const struct vmx_segment_field *sf = &vmx_segment_fields[seg]; -wvmcs (cpu->hvf->fd, sf->base, desc->base); -wvmcs (cpu->hvf->fd, sf->limit, desc->limit); -wvmcs (cpu->hvf->fd, sf->selector, desc->sel); -wvmcs (cpu->hvf->fd, sf->ar_bytes, desc->ar); +wvmcs (cpu->accel->fd, sf->base, desc->base); +wvmcs (cpu->accel->fd, sf->limit, desc->limit); +wvmcs (cpu->accel->fd, sf->selector, desc->sel); +wvmcs (cpu->accel->fd, sf->ar_bytes, desc->ar); }void x86_segment_descriptor_to_vmx (struct CPUState *cpu,x68_segment_selector selector,struct x86_segment_descriptor *desc,struct vmx_segment *vmx_desc)
target/i386/hvf/x86_emu.c +31 -31
117 lines not on this page · raw message
target/i386/hvf/x86_mmu.c +2 -2
@@ -126,7 +126,7 @@ static bool test_pt_entry(struct CPUState *cpu, struct gpt_translation *pt, pt->err_code |=MMU_PAGE_PT ; } -uint32_t cr0 =rvmcs (cpu->hvf->fd,VMCS_GUEST_CR0 ); +uint32_t cr0 =rvmcs (cpu->accel->fd,VMCS_GUEST_CR0 );/* check protection */ if (cr0 &CR0_WP_MASK ) {if (pt->write_access && !pte_write_access (pte)) {
@@ -171,7 +171,7 @@ static bool walk_gpt(struct CPUState *cpu, target_ulong addr, int err_code, {int top_level, level;bool is_large = false; -target_ulong cr3 =rvmcs (cpu->hvf->fd,VMCS_GUEST_CR3 ); +target_ulong cr3 =rvmcs (cpu->accel->fd,VMCS_GUEST_CR3 );uint64_t page_mask = pae ?PAE_PTE_PAGE_MASK :LEGACY_PTE_PAGE_MASK ;memset (pt,0 ,sizeof (*pt));
target/i386/hvf/x86_task.c +5 -5
@@ -61,7 +61,7 @@ static void load_state_from_tss32(CPUState *cpu, struct x86_tss_segment32 *tss)X86CPU *x86_cpu =X86_CPU (cpu);CPUX86State *env = &x86_cpu->env; -wvmcs (cpu->hvf->fd,VMCS_GUEST_CR3 , tss->cr3); +wvmcs (cpu->accel->fd,VMCS_GUEST_CR3 , tss->cr3); env->eip = tss->eip; env->eflags = tss->eflags |2 ;
@@ -110,11 +110,11 @@ static int task_switch_32(CPUState *cpu, x68_segment_selector tss_sel, x68_segmevoid vmx_handle_task_switch (CPUState *cpu,x68_segment_selector tss_sel,int reason,bool gate_valid,uint8_t gate,uint64_t gate_type) { -uint64_t rip =rreg (cpu->hvf->fd,HV_X86_RIP ); +uint64_t rip =rreg (cpu->accel->fd,HV_X86_RIP );if (!gate_valid || (gate_type !=VMCS_INTR_T_HWEXCEPTION && gate_type !=VMCS_INTR_T_HWINTR && gate_type !=VMCS_INTR_T_NMI )) { -int ins_len =rvmcs (cpu->hvf->fd,VMCS_EXIT_INSTRUCTION_LENGTH ); +int ins_len =rvmcs (cpu->accel->fd,VMCS_EXIT_INSTRUCTION_LENGTH );macvm_set_rip (cpu, rip + ins_len);return ; }
@@ -173,12 +173,12 @@ void vmx_handle_task_switch(CPUState *cpu, x68_segment_selector tss_sel, int rea//ret = task_switch_16(cpu, tss_sel, old_tss_sel, old_tss_base, &next_tss_desc); VM_PANIC ("task_switch_16" ); -macvm_set_cr0 (cpu->hvf->fd,rvmcs (cpu->hvf->fd,VMCS_GUEST_CR0 ) | +macvm_set_cr0 (cpu->accel->fd,rvmcs (cpu->accel->fd,VMCS_GUEST_CR0 ) |CR0_TS_MASK );x86_segment_descriptor_to_vmx (cpu, tss_sel, &next_tss_desc, &vmx_seg);vmx_write_segment_descriptor (cpu, &vmx_seg,R_TR );store_regs (cpu); -hv_vcpu_invalidate_tlb (cpu->hvf->fd); +hv_vcpu_invalidate_tlb (cpu->accel->fd); }
target/i386/hvf/x86hvf.c +104 -104
346 lines not on this page · raw message
Signature · 1 line
2.38.1