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

diff --git a/xen/arch/x86/hvm/viridian.c b/xen/arch/x86/hvm/viridian.c
index 2b86d66d150e8a944b55a56f66f10c1cba8fc1c3..0fcbfd81c6a726fa153bf0378badeb5d81a16208 100644 (file)
--- 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 6c590aa025b45651bcf6d8ed96ffa31c550c6f81..7d802ccd0edb2bc812485653d4b3884f77248ef0 100644 (file)
--- 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")