xcp-1.6-updates/xen-4.1.hg

changeset 23272:54b4ae0dfb60

Fix backport of 23225:3f00c5faa12a.

From: Konrad Rzeszutek Wilk <konrad.wilk@oracle.com>
Signed-off-by: Keir Fraser <keir@xen.org>
author Konrad Rzeszutek Wilk <konrad.wilk@oracle.com>
date Thu Mar 29 17:31:49 2012 +0100 (2012-03-29)
parents 13741fd6253b
children b574b8b6bb10
files xen/arch/x86/domain.c
line diff
     1.1 --- a/xen/arch/x86/domain.c	Thu Mar 29 10:20:58 2012 +0100
     1.2 +++ b/xen/arch/x86/domain.c	Thu Mar 29 17:31:49 2012 +0100
     1.3 @@ -558,9 +558,9 @@ int arch_domain_create(struct domain *d,
     1.4          d->arch.is_32bit_pv = d->arch.has_32bit_shinfo =
     1.5              (CONFIG_PAGING_LEVELS != 4);
     1.6  
     1.7 -        spin_lock_init(&d->arch.e820_lock);
     1.8      }
     1.9  
    1.10 +    spin_lock_init(&d->arch.e820_lock);
    1.11      memset(d->arch.cpuids, 0, sizeof(d->arch.cpuids));
    1.12      for ( i = 0; i < MAX_CPUID_INPUT; i++ )
    1.13      {
    1.14 @@ -605,8 +605,8 @@ void arch_domain_destroy(struct domain *
    1.15  
    1.16      if ( is_hvm_domain(d) )
    1.17          hvm_domain_destroy(d);
    1.18 -    else
    1.19 -        xfree(d->arch.e820);
    1.20 +
    1.21 +    xfree(d->arch.e820);
    1.22  
    1.23      vmce_destroy_msr(d);
    1.24      free_domain_pirqs(d);