forked from luck/tmp_suning_uos_patched
KVM: Remove decache_vcpus_on_cpu() and related callbacks
Obsoleted by the vmx-specific per-cpu list. Signed-off-by: Avi Kivity <avi@qumranet.com>
This commit is contained in:
parent
543e424366
commit
7cc8883074
|
@ -1035,14 +1035,6 @@ static void kvm_free_vmm_area(void)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
/*
|
|
||||||
* Make sure that a cpu that is being hot-unplugged does not have any vcpus
|
|
||||||
* cached on it. Leave it as blank for IA64.
|
|
||||||
*/
|
|
||||||
void decache_vcpus_on_cpu(int cpu)
|
|
||||||
{
|
|
||||||
}
|
|
||||||
|
|
||||||
static void vti_vcpu_load(struct kvm_vcpu *vcpu, int cpu)
|
static void vti_vcpu_load(struct kvm_vcpu *vcpu, int cpu)
|
||||||
{
|
{
|
||||||
}
|
}
|
||||||
|
|
|
@ -240,10 +240,6 @@ void kvm_arch_vcpu_put(struct kvm_vcpu *vcpu)
|
||||||
{
|
{
|
||||||
}
|
}
|
||||||
|
|
||||||
void decache_vcpus_on_cpu(int cpu)
|
|
||||||
{
|
|
||||||
}
|
|
||||||
|
|
||||||
int kvm_arch_vcpu_ioctl_debug_guest(struct kvm_vcpu *vcpu,
|
int kvm_arch_vcpu_ioctl_debug_guest(struct kvm_vcpu *vcpu,
|
||||||
struct kvm_debug_guest *dbg)
|
struct kvm_debug_guest *dbg)
|
||||||
{
|
{
|
||||||
|
|
|
@ -79,10 +79,6 @@ void kvm_arch_hardware_disable(void *garbage)
|
||||||
{
|
{
|
||||||
}
|
}
|
||||||
|
|
||||||
void decache_vcpus_on_cpu(int cpu)
|
|
||||||
{
|
|
||||||
}
|
|
||||||
|
|
||||||
int kvm_arch_hardware_setup(void)
|
int kvm_arch_hardware_setup(void)
|
||||||
{
|
{
|
||||||
return 0;
|
return 0;
|
||||||
|
|
|
@ -709,10 +709,6 @@ static void svm_vcpu_put(struct kvm_vcpu *vcpu)
|
||||||
rdtscll(vcpu->arch.host_tsc);
|
rdtscll(vcpu->arch.host_tsc);
|
||||||
}
|
}
|
||||||
|
|
||||||
static void svm_vcpu_decache(struct kvm_vcpu *vcpu)
|
|
||||||
{
|
|
||||||
}
|
|
||||||
|
|
||||||
static void svm_cache_regs(struct kvm_vcpu *vcpu)
|
static void svm_cache_regs(struct kvm_vcpu *vcpu)
|
||||||
{
|
{
|
||||||
struct vcpu_svm *svm = to_svm(vcpu);
|
struct vcpu_svm *svm = to_svm(vcpu);
|
||||||
|
@ -1933,7 +1929,6 @@ static struct kvm_x86_ops svm_x86_ops = {
|
||||||
.prepare_guest_switch = svm_prepare_guest_switch,
|
.prepare_guest_switch = svm_prepare_guest_switch,
|
||||||
.vcpu_load = svm_vcpu_load,
|
.vcpu_load = svm_vcpu_load,
|
||||||
.vcpu_put = svm_vcpu_put,
|
.vcpu_put = svm_vcpu_put,
|
||||||
.vcpu_decache = svm_vcpu_decache,
|
|
||||||
|
|
||||||
.set_guest_debug = svm_guest_debug,
|
.set_guest_debug = svm_guest_debug,
|
||||||
.get_msr = svm_get_msr,
|
.get_msr = svm_get_msr,
|
||||||
|
|
|
@ -692,11 +692,6 @@ static void vmx_fpu_deactivate(struct kvm_vcpu *vcpu)
|
||||||
update_exception_bitmap(vcpu);
|
update_exception_bitmap(vcpu);
|
||||||
}
|
}
|
||||||
|
|
||||||
static void vmx_vcpu_decache(struct kvm_vcpu *vcpu)
|
|
||||||
{
|
|
||||||
vcpu_clear(to_vmx(vcpu));
|
|
||||||
}
|
|
||||||
|
|
||||||
static unsigned long vmx_get_rflags(struct kvm_vcpu *vcpu)
|
static unsigned long vmx_get_rflags(struct kvm_vcpu *vcpu)
|
||||||
{
|
{
|
||||||
return vmcs_readl(GUEST_RFLAGS);
|
return vmcs_readl(GUEST_RFLAGS);
|
||||||
|
@ -3114,7 +3109,6 @@ static struct kvm_x86_ops vmx_x86_ops = {
|
||||||
.prepare_guest_switch = vmx_save_host_state,
|
.prepare_guest_switch = vmx_save_host_state,
|
||||||
.vcpu_load = vmx_vcpu_load,
|
.vcpu_load = vmx_vcpu_load,
|
||||||
.vcpu_put = vmx_vcpu_put,
|
.vcpu_put = vmx_vcpu_put,
|
||||||
.vcpu_decache = vmx_vcpu_decache,
|
|
||||||
|
|
||||||
.set_guest_debug = set_guest_debug,
|
.set_guest_debug = set_guest_debug,
|
||||||
.guest_debug_pre = kvm_guest_debug_pre,
|
.guest_debug_pre = kvm_guest_debug_pre,
|
||||||
|
|
|
@ -817,14 +817,6 @@ static int msr_io(struct kvm_vcpu *vcpu, struct kvm_msrs __user *user_msrs,
|
||||||
return r;
|
return r;
|
||||||
}
|
}
|
||||||
|
|
||||||
/*
|
|
||||||
* Make sure that a cpu that is being hot-unplugged does not have any vcpus
|
|
||||||
* cached on it.
|
|
||||||
*/
|
|
||||||
void decache_vcpus_on_cpu(int cpu)
|
|
||||||
{
|
|
||||||
}
|
|
||||||
|
|
||||||
int kvm_dev_ioctl_check_extension(long ext)
|
int kvm_dev_ioctl_check_extension(long ext)
|
||||||
{
|
{
|
||||||
int r;
|
int r;
|
||||||
|
|
|
@ -380,7 +380,6 @@ struct kvm_x86_ops {
|
||||||
void (*prepare_guest_switch)(struct kvm_vcpu *vcpu);
|
void (*prepare_guest_switch)(struct kvm_vcpu *vcpu);
|
||||||
void (*vcpu_load)(struct kvm_vcpu *vcpu, int cpu);
|
void (*vcpu_load)(struct kvm_vcpu *vcpu, int cpu);
|
||||||
void (*vcpu_put)(struct kvm_vcpu *vcpu);
|
void (*vcpu_put)(struct kvm_vcpu *vcpu);
|
||||||
void (*vcpu_decache)(struct kvm_vcpu *vcpu);
|
|
||||||
|
|
||||||
int (*set_guest_debug)(struct kvm_vcpu *vcpu,
|
int (*set_guest_debug)(struct kvm_vcpu *vcpu,
|
||||||
struct kvm_debug_guest *dbg);
|
struct kvm_debug_guest *dbg);
|
||||||
|
|
|
@ -135,9 +135,6 @@ void kvm_vcpu_uninit(struct kvm_vcpu *vcpu);
|
||||||
void vcpu_load(struct kvm_vcpu *vcpu);
|
void vcpu_load(struct kvm_vcpu *vcpu);
|
||||||
void vcpu_put(struct kvm_vcpu *vcpu);
|
void vcpu_put(struct kvm_vcpu *vcpu);
|
||||||
|
|
||||||
void decache_vcpus_on_cpu(int cpu);
|
|
||||||
|
|
||||||
|
|
||||||
int kvm_init(void *opaque, unsigned int vcpu_size,
|
int kvm_init(void *opaque, unsigned int vcpu_size,
|
||||||
struct module *module);
|
struct module *module);
|
||||||
void kvm_exit(void);
|
void kvm_exit(void);
|
||||||
|
|
|
@ -1273,7 +1273,6 @@ static void hardware_disable(void *junk)
|
||||||
if (!cpu_isset(cpu, cpus_hardware_enabled))
|
if (!cpu_isset(cpu, cpus_hardware_enabled))
|
||||||
return;
|
return;
|
||||||
cpu_clear(cpu, cpus_hardware_enabled);
|
cpu_clear(cpu, cpus_hardware_enabled);
|
||||||
decache_vcpus_on_cpu(cpu);
|
|
||||||
kvm_arch_hardware_disable(NULL);
|
kvm_arch_hardware_disable(NULL);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue
Block a user