mirrors/qemu
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

i386: hvf: Remove hvf_disabled

Browse Source 
accel_init_machine sets *(acc->allowed) to true if acc->init_machine(ms)
succeeds. There's no need to have both hvf_allowed and hvf_disabled.

Signed-off-by: Roman Bolshakov <r.bolshakov@yadro.com>
Message-Id: <20181018143051.48508-1-r.bolshakov@yadro.com>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
This commit is contained in:
Roman Bolshakov 2018-10-18 17:30:51 +03:00 committed by Paolo Bonzini
parent b4e1af8961
commit 92cc3aaa1f
2 changed files with 3 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
include/sysemu/hvf.h
View File

@ -17,7 +17,7 @@
#include "exec/memory.h" #include "exec/memory.h"
#include "sysemu/accel.h" #include "sysemu/accel.h"
extern int hvf_disabled; extern bool hvf_allowed;
#ifdef CONFIG_HVF #ifdef CONFIG_HVF
#include <Hypervisor/hv.h> #include <Hypervisor/hv.h>
#include <Hypervisor/hv_vmx.h> #include <Hypervisor/hv_vmx.h>
@ -26,7 +26,7 @@ extern int hvf_disabled;
#include "hw/hw.h" #include "hw/hw.h"
uint32_t hvf_get_supported_cpuid(uint32_t func, uint32_t idx, uint32_t hvf_get_supported_cpuid(uint32_t func, uint32_t idx,
int reg); int reg);
#define hvf_enabled() !hvf_disabled #define hvf_enabled() (hvf_allowed)
#else #else
#define hvf_enabled() 0 #define hvf_enabled() 0
#define hvf_get_supported_cpuid(func, idx, reg) 0 #define hvf_get_supported_cpuid(func, idx, reg) 0

9
target/i386/hvf/hvf.c
View File

@ -73,7 +73,6 @@
#include "target/i386/cpu.h" #include "target/i386/cpu.h"
HVFState *hvf_state; HVFState *hvf_state;
int hvf_disabled = 1;
static void assert_hvf_ok(hv_return_t ret) static void assert_hvf_ok(hv_return_t ret)
{ {
@ -604,11 +603,6 @@ int hvf_init_vcpu(CPUState *cpu)
return 0; return 0;
} }
void hvf_disable(int shouldDisable)
{
hvf_disabled = shouldDisable;
}
static void hvf_store_events(CPUState *cpu, uint32_t ins_len, uint64_t idtvec_info) static void hvf_store_events(CPUState *cpu, uint32_t ins_len, uint64_t idtvec_info)
{ {
X86CPU *x86_cpu = X86_CPU(cpu); X86CPU *x86_cpu = X86_CPU(cpu);
@ -934,7 +928,7 @@ int hvf_vcpu_exec(CPUState *cpu)
return ret; return ret;
} }
static bool hvf_allowed; bool hvf_allowed;
static int hvf_accel_init(MachineState *ms) static int hvf_accel_init(MachineState *ms)
{ {
@ -942,7 +936,6 @@ static int hvf_accel_init(MachineState *ms)
hv_return_t ret; hv_return_t ret;
HVFState *s; HVFState *s;
hvf_disable(0);
ret = hv_vm_create(HV_VM_DEFAULT); ret = hv_vm_create(HV_VM_DEFAULT);
assert_hvf_ok(ret); assert_hvf_ok(ret);