@@ -485,17 +485,24 @@ int vcpu_initialise(struct vcpu *v)
return rc;
}
-void vcpu_destroy(struct vcpu *v)
+static void pv_vcpu_destroy(struct vcpu *v)
{
- xfree(v->arch.vm_event);
- v->arch.vm_event = NULL;
-
if ( is_pv_32bit_vcpu(v) )
{
free_compat_arg_xlat(v);
release_compat_l4(v);
}
+ pv_destroy_gdt_ldt_l1tab(v->domain, v);
+ xfree(v->arch.pv_vcpu.trap_ctxt);
+ v->arch.pv_vcpu.trap_ctxt = NULL;
+}
+
+void vcpu_destroy(struct vcpu *v)
+{
+ xfree(v->arch.vm_event);
+ v->arch.vm_event = NULL;
+
vcpu_destroy_fpu(v);
if ( !is_idle_domain(v->domain) )
@@ -504,10 +511,7 @@ void vcpu_destroy(struct vcpu *v)
if ( is_hvm_vcpu(v) )
hvm_vcpu_destroy(v);
else
- {
- pv_destroy_gdt_ldt_l1tab(v->domain, v);
- xfree(v->arch.pv_vcpu.trap_ctxt);
- }
+ pv_vcpu_destroy(v);
}
static bool emulation_flags_ok(const struct domain *d, uint32_t emflags)
The function is made idempotent on purpose. No functional change. Signed-off-by: Wei Liu <wei.liu2@citrix.com> --- Cc: Jan Beulich <jbeulich@suse.com> Cc: Andrew Cooper <andrew.cooper3@citrix.com> --- xen/arch/x86/domain.c | 20 ++++++++++++-------- 1 file changed, 12 insertions(+), 8 deletions(-)