[Xen-changelog] [xen-4.1-testing] Fix backport of 23225:3f00c5faa12a.

[Xen patchbot-4.1-testing <patchbot@xxxxxxx>]

# HG changeset patch
# User Konrad Rzeszutek Wilk <konrad.wilk@xxxxxxxxxx>
# Date 1333038709 -3600
# Node ID 54b4ae0dfb60c635001f56916de2de552b1c1072
# Parent  13741fd6253bd74abd8fe6253838327745f23806
Fix backport of 23225:3f00c5faa12a.

From: Konrad Rzeszutek Wilk <konrad.wilk@xxxxxxxxxx>
Signed-off-by: Keir Fraser <keir@xxxxxxx>
---


diff -r 13741fd6253b -r 54b4ae0dfb60 xen/arch/x86/domain.c
--- a/xen/arch/x86/domain.c     Thu Mar 29 10:20:58 2012 +0100
+++ b/xen/arch/x86/domain.c     Thu Mar 29 17:31:49 2012 +0100
@@ -558,9 +558,9 @@ int arch_domain_create(struct domain *d,
         d->arch.is_32bit_pv = d->arch.has_32bit_shinfo =
             (CONFIG_PAGING_LEVELS != 4);
 
-        spin_lock_init(&d->arch.e820_lock);
     }
 
+    spin_lock_init(&d->arch.e820_lock);
     memset(d->arch.cpuids, 0, sizeof(d->arch.cpuids));
     for ( i = 0; i < MAX_CPUID_INPUT; i++ )
     {
@@ -605,8 +605,8 @@ void arch_domain_destroy(struct domain *
 
     if ( is_hvm_domain(d) )
         hvm_domain_destroy(d);
-    else
-        xfree(d->arch.e820);
+
+    xfree(d->arch.e820);
 
     vmce_destroy_msr(d);
     free_domain_pirqs(d);

_______________________________________________
Xen-changelog mailing list
Xen-changelog@xxxxxxxxxxxxx
http://lists.xensource.com/xen-changelog