[Xen-changelog] [xen-unstable] x86, cpuid: mask TSC invariant bit for PV and HVM domains if migration

[Xen patchbot-unstable <patchbot-unstable@xxxxxxxxxxxxxxxxxxx>]

# HG changeset patch
# User Keir Fraser <keir.fraser@xxxxxxxxxx>
# Date 1257753810 0
# Node ID f8a320c333e8f06d573aaea5aa5bb466462840ff
# Parent  c4630f8f69cc9579e7b011e56e3ceec8412c9671
x86, cpuid: mask TSC invariant bit for PV and HVM domains if migration
is not disabled and TSC is not emulated

Signed-off-by: Dan Magenheimer <dan.magenheimer@xxxxxxxxxx>
Signed-off-by: Keir Fraser <keir.fraser@xxxxxxxxxx>
---
 xen/arch/x86/domain.c |    9 +++++++++
 1 files changed, 9 insertions(+)

diff -r c4630f8f69cc -r f8a320c333e8 xen/arch/x86/domain.c
--- a/xen/arch/x86/domain.c     Mon Nov 09 07:52:27 2009 +0000
+++ b/xen/arch/x86/domain.c     Mon Nov 09 08:03:30 2009 +0000
@@ -2045,6 +2045,15 @@ void domain_cpuid(
             *ebx = cpuid->ebx;
             *ecx = cpuid->ecx;
             *edx = cpuid->edx;
+
+            /*
+             * Do not advertise host's invariant TSC unless the TSC is
+             * emulated, or the domain cannot migrate to other hosts.
+             */
+            if ( (input == 0x80000007) && /* Advanced Power Management */
+                 !d->disable_migrate && !d->arch.vtsc )
+                *edx &= ~(1u<<8); /* TSC Invariant */
+
             return;
         }
     }

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