diff options
| author | Ankur Arora <ankur.a.arora@oracle.com> | 2017-06-02 17:05:58 -0700 |
|---|---|---|
| committer | Juergen Gross <jgross@suse.com> | 2017-06-13 16:05:14 +0200 |
| commit | ad73fd595c2ab168fdd01a266cbe6e4df95f8db0 (patch) | |
| tree | 59d5195bd08008ea036af15648e17683aabd049f /arch/x86/xen/enlighten_hvm.c | |
| parent | c48f64ab472389df6f48171899c9d337adfadc5b (diff) | |
| download | linux-ad73fd595c2ab168fdd01a266cbe6e4df95f8db0.tar.bz2 | |
xen/vcpu: Simplify xen_vcpu related code
Largely mechanical changes to aid unification of xen_vcpu_restore()
logic for PV, PVH and PVHVM.
xen_vcpu_setup(): the only change in logic is that clamp_max_cpus()
is now handled inside the "if (!xen_have_vcpu_info_placement)" block.
xen_vcpu_restore(): code movement from enlighten_pv.c to enlighten.c.
xen_vcpu_info_reset(): pulls together all the code where xen_vcpu
is set to default.
Reviewed-by: Boris Ostrovsky <boris.ostrovsky@oracle.com>
Signed-off-by: Ankur Arora <ankur.a.arora@oracle.com>
Signed-off-by: Juergen Gross <jgross@suse.com>
Diffstat (limited to 'arch/x86/xen/enlighten_hvm.c')
| -rw-r--r-- | arch/x86/xen/enlighten_hvm.c | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/arch/x86/xen/enlighten_hvm.c b/arch/x86/xen/enlighten_hvm.c index a6d014f47e52..eb53da6547ee 100644 --- a/arch/x86/xen/enlighten_hvm.c +++ b/arch/x86/xen/enlighten_hvm.c @@ -45,11 +45,7 @@ void __ref xen_hvm_init_shared_info(void) * online but xen_hvm_init_shared_info is run at resume time too and * in that case multiple vcpus might be online. */ for_each_online_cpu(cpu) { - /* Leave it to be NULL. */ - if (xen_vcpu_nr(cpu) >= MAX_VIRT_CPUS) - continue; - per_cpu(xen_vcpu, cpu) = - &HYPERVISOR_shared_info->vcpu_info[xen_vcpu_nr(cpu)]; + xen_vcpu_info_reset(cpu); } } |