From fae94ff125f6db6513b8ffd3d057392fc671ee69 Mon Sep 17 00:00:00 2001 From: Avi Kivity Date: Fri, 29 Dec 2006 16:49:45 -0800 Subject: [PATCH] --- yaml --- r: 45136 b: refs/heads/master c: 671d6564796e0c90398aab30f89b5e48fc5a3fbe h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/kvm/svm.c | 3 +++ trunk/drivers/kvm/vmx.c | 3 +++ 3 files changed, 7 insertions(+), 1 deletion(-) diff --git a/[refs] b/[refs] index dcc791c3c3f4..311d8513db97 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 09db28b8a3765a7ec35eba80420c71a7973f5a88 +refs/heads/master: 671d6564796e0c90398aab30f89b5e48fc5a3fbe diff --git a/trunk/drivers/kvm/svm.c b/trunk/drivers/kvm/svm.c index 68124c0bf630..6cd97c69ab3b 100644 --- a/trunk/drivers/kvm/svm.c +++ b/trunk/drivers/kvm/svm.c @@ -1068,6 +1068,9 @@ static int emulate_on_interception(struct kvm_vcpu *vcpu, struct kvm_run *kvm_ru static int svm_get_msr(struct kvm_vcpu *vcpu, unsigned ecx, u64 *data) { switch (ecx) { + case 0xc0010010: /* SYSCFG */ + case 0xc0010015: /* HWCR */ + case MSR_IA32_PLATFORM_ID: case MSR_IA32_P5_MC_ADDR: case MSR_IA32_P5_MC_TYPE: case MSR_IA32_MC0_CTL: diff --git a/trunk/drivers/kvm/vmx.c b/trunk/drivers/kvm/vmx.c index 603a4135de42..e5358a8b01f1 100644 --- a/trunk/drivers/kvm/vmx.c +++ b/trunk/drivers/kvm/vmx.c @@ -359,6 +359,9 @@ static int vmx_get_msr(struct kvm_vcpu *vcpu, u32 msr_index, u64 *pdata) case MSR_IA32_SYSENTER_ESP: data = vmcs_read32(GUEST_SYSENTER_ESP); break; + case 0xc0010010: /* SYSCFG */ + case 0xc0010015: /* HWCR */ + case MSR_IA32_PLATFORM_ID: case MSR_IA32_P5_MC_ADDR: case MSR_IA32_P5_MC_TYPE: case MSR_IA32_MC0_CTL: