[Xen-changelog] [xen master] Revert "x86/viridian: Time Reference Count MSR"

[patchbot@xxxxxxx]

commit 1cd4fab14ce25859efa4a2af13475e6650a5506c
Author:     Jan Beulich <jbeulich@xxxxxxxx>
AuthorDate: Fri Jan 24 10:19:53 2014 +0100
Commit:     Jan Beulich <jbeulich@xxxxxxxx>
CommitDate: Fri Jan 24 10:19:53 2014 +0100

    Revert "x86/viridian: Time Reference Count MSR"
    
    This mostly reverts commit e36cd2cdc9674a7a4855d21fb7b3e6e17c4bb33b.
    hvm_get_guest_time() is not a suitable time source for this MSR, as
    is resets across migration.
    
    Conflicts:
        xen/arch/x86/hvm/viridian.c
        xen/include/asm-x86/perfc_defn.h
---
 xen/arch/x86/hvm/viridian.c      |    8 +-------
 xen/include/asm-x86/perfc_defn.h |    1 -
 2 files changed, 1 insertions(+), 8 deletions(-)

diff --git a/xen/arch/x86/hvm/viridian.c b/xen/arch/x86/hvm/viridian.c
index 2b86d66..0fcbfd8 100644
--- a/xen/arch/x86/hvm/viridian.c
+++ b/xen/arch/x86/hvm/viridian.c
@@ -88,8 +88,7 @@ int cpuid_viridian_leaves(unsigned int leaf, unsigned int 
*eax,
         break;
     case 3:
         /* Which hypervisor MSRs are available to the guest */
-        *eax = (CPUID3A_MSR_REF_COUNT   |
-                CPUID3A_MSR_APIC_ACCESS |
+        *eax = (CPUID3A_MSR_APIC_ACCESS |
                 CPUID3A_MSR_HYPERCALL   |
                 CPUID3A_MSR_VP_INDEX    |
                 CPUID3A_MSR_FREQ);
@@ -312,11 +311,6 @@ int rdmsr_viridian_regs(uint32_t idx, uint64_t *val)
         *val = v->vcpu_id;
         break;
 
-    case VIRIDIAN_MSR_TIME_REF_COUNT:
-        perfc_incr(mshv_rdmsr_time_ref_count);
-        *val = hvm_get_guest_time(v) / 100;
-        break;
-
     case VIRIDIAN_MSR_TSC_FREQUENCY:
         perfc_incr(mshv_rdmsr_tsc_frequency);
         *val = (uint64_t)d->arch.tsc_khz * 1000ull;
diff --git a/xen/include/asm-x86/perfc_defn.h b/xen/include/asm-x86/perfc_defn.h
index 6c590aa..7d802cc 100644
--- a/xen/include/asm-x86/perfc_defn.h
+++ b/xen/include/asm-x86/perfc_defn.h
@@ -118,7 +118,6 @@ PERFCOUNTER(mshv_call_long_wait,        "MS Hv Notify long 
wait")
 PERFCOUNTER(mshv_rdmsr_osid,            "MS Hv rdmsr Guest OS ID")
 PERFCOUNTER(mshv_rdmsr_hc_page,         "MS Hv rdmsr hypercall page")
 PERFCOUNTER(mshv_rdmsr_vp_index,        "MS Hv rdmsr vp index")
-PERFCOUNTER(mshv_rdmsr_time_ref_count,  "MS Hv rdmsr time reference count")
 PERFCOUNTER(mshv_rdmsr_tsc_frequency,   "MS Hv rdmsr TSC frequency")
 PERFCOUNTER(mshv_rdmsr_apic_frequency,  "MS Hv rdmsr APIC frequency")
 PERFCOUNTER(mshv_rdmsr_icr,             "MS Hv rdmsr icr")
--
generated by git-patchbot for /home/xen/git/xen.git#master

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