2009-06-18 01:11:35

by Stephen Rothwell

[permalink] [raw]

Subject: linux-next: kvm tree build failure

---

Hi Avi,

Today's linux-next build (x86_64 allmodconfig) failed like this:

arch/x86/kvm/svm.c: In function 'svm_set_msr':
arch/x86/kvm/svm.c:2152: error: 'MSR_K8_HWCR' undeclared (first use in this function)

Caused by commit 6878bf85dfc107cea4660f1167693c15754c1660 ("KVM:
Implement MSRs used by Hyper-V"). MSR_K8_HWCR was removed by commit
bf8b9a63c18a1a7777571650de0c9f4fd4368ca0 ("x86: msr-index.h remove
duplicate MSR C001_0015 declaration") which is now in Linus' tree (it
entered Linus' tree on Jun 10 via commit
7dc3ca39cb1e22eedbf1207ff9ac7bf682fc0f6d "Merge branch
'x86-cleanups-for-linus' of
git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip").

I have used the version of the kvm tree from 20090617.
--
Cheers,
Stephen Rothwell [email protected]
http://www.canb.auug.org.au/~sfr/

---

Attachments:

(No filename) (830.00 B)
(No filename) (197.00 B)
Download all attachments

2009-06-18 04:25:27

by Jaswinder Singh Rajput

[permalink] [raw]

Subject: Re: linux-next: kvm tree build failure

---

Hello Stephen,

On Thu, 2009-06-18 at 11:11 +1000, Stephen Rothwell wrote:
> Hi Avi,
>
> Today's linux-next build (x86_64 allmodconfig) failed like this:
>
> arch/x86/kvm/svm.c: In function 'svm_set_msr':
> arch/x86/kvm/svm.c:2152: error: 'MSR_K8_HWCR' undeclared (first use in this function)
>
> Caused by commit 6878bf85dfc107cea4660f1167693c15754c1660 ("KVM:
> Implement MSRs used by Hyper-V"). MSR_K8_HWCR was removed by commit
> bf8b9a63c18a1a7777571650de0c9f4fd4368ca0 ("x86: msr-index.h remove
> duplicate MSR C001_0015 declaration") which is now in Linus' tree (it
> entered Linus' tree on Jun 10 via commit
> 7dc3ca39cb1e22eedbf1207ff9ac7bf682fc0f6d "Merge branch
> 'x86-cleanups-for-linus' of
> git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip").
>
> I have used the version of the kvm tree from 20090617.

Can you try this patch :

[PATCH] KVM: use MSR_K7_HWCR for MSRC001_0015 Hardware Configuration Register (HWCR)

MSR_K8_MSR is removed as it is duplicating MSRC001_0015 Hardware
Configuration Register (HWCR), which is already defined as MSR_K7_HWCR

Fix x86_64 allmodconfig :

arch/x86/kvm/svm.c: In function 'svm_set_msr':
arch/x86/kvm/svm.c:2152: error: 'MSR_K8_HWCR' undeclared (first use in this function)

Reported-by: Stephen Rothwell <[email protected]>
Signed-off-by: Jaswinder Singh Rajput <[email protected]>
---
arch/x86/kvm/svm.c | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/arch/x86/kvm/svm.c b/arch/x86/kvm/svm.c
index c283201..481010c 100644
--- a/arch/x86/kvm/svm.c
+++ b/arch/x86/kvm/svm.c
@@ -2149,7 +2149,7 @@ static int svm_set_msr(struct kvm_vcpu *vcpu, unsigned ecx, u64 data)
break;
case MSR_VM_CR:
case MSR_VM_IGNNE:
- case MSR_K8_HWCR:
+ case MSR_K7_HWCR:
pr_unimpl(vcpu, "unimplemented wrmsr: 0x%x data 0x%llx\n", ecx, data);
break;
default:
--
1.6.0.6

2009-06-18 09:49:52

by Avi Kivity

[permalink] [raw]

Subject: Re: linux-next: kvm tree build failure

---

On 06/18/2009 07:25 AM, Jaswinder Singh Rajput wrote:
> [PATCH] KVM: use MSR_K7_HWCR for MSRC001_0015 Hardware Configuration Register (HWCR)
>
> MSR_K8_MSR is removed as it is duplicating MSRC001_0015 Hardware
> Configuration Register (HWCR), which is already defined as MSR_K7_HWCR
>
> Fix x86_64 allmodconfig :
>
> arch/x86/kvm/svm.c: In function 'svm_set_msr':
> arch/x86/kvm/svm.c:2152: error: 'MSR_K8_HWCR' undeclared (first use in this function)
>
>

Applied, thanks.

--
error compiling committee.c: too many arguments to function