From: Haozhong Zhang <haozhong.zhang@intel.com>
Date: Tue, 8 Dec 2015 08:46:30 +0000 (+0100)
Subject: x86/time: fix domain type check in tsc_set_info()
X-Git-Tag: archive/raspbian/4.8.0-1+rpi1~1^2~2126
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=3c80d6f3c61eb0f8072f70b0a9a8c8c7adf17572;p=xen.git

x86/time: fix domain type check in tsc_set_info()

Replace is_hvm_domain() in tsc_set_info() by has_hvm_container_domain()
to keep consistent with other domain type checks in tsc_set_info().

Signed-off-by: Haozhong Zhang <haozhong.zhang@intel.com>
Reviewed-by: Boris Ostrovsky <boris.ostrovsky@oracle.com>
---

diff --git a/xen/arch/x86/time.c b/xen/arch/x86/time.c
index 30d52c45cb..b5223cf7f5 100644
--- a/xen/arch/x86/time.c
+++ b/xen/arch/x86/time.c
@@ -1878,7 +1878,7 @@ void tsc_set_info(struct domain *d,
         break;
     }
     d->arch.incarnation = incarnation + 1;
-    if ( is_hvm_domain(d) )
+    if ( has_hvm_container_domain(d) )
     {
         hvm_set_rdtsc_exiting(d, d->arch.vtsc);
         if ( d->vcpu && d->vcpu[0] && incarnation == 0 )