The compilation errors also showed up on my boxes. The attached patch
fixes the errors by renaming variables.
Signed-off-by: Wei Huang <[EMAIL PROTECTED]>
Piero Ottuzzi wrote:
Hi Avi, all,
trying to compile kvm-39 on Ubuntu 6.10 (Linux acaro 2.6.17-12-generic
#2 SMP
Wed Aug 29 18:53:01 UTC 2007 x86_64 GNU/Linux):
[EMAIL PROTECTED]:~/tmp/kvm-39$ make
make -C kernel
make[1]: Entering directory `/home/piero/tmp/kvm-39/kernel'
make -C /lib/modules/2.6.17-12-generic/build M=`pwd` "$@"
make[2]: Entering directory `/usr/src/linux-headers-2.6.17-12-generic'
LD /home/piero/tmp/kvm-39/kernel/built-in.o
CC [M] /home/piero/tmp/kvm-39/kernel/svm.o
CC [M] /home/piero/tmp/kvm-39/kernel/vmx.o
CC [M] /home/piero/tmp/kvm-39/kernel/vmx-debug.o
CC [M] /home/piero/tmp/kvm-39/kernel/kvm_main.o
/home/piero/tmp/kvm-39/kernel/kvm_main.c: In function ‘kvm_vcpu_ioctl’:
/home/piero/tmp/kvm-39/kernel/kvm_main.c:2850: error: expected identifier
or ‘(’ before ‘volatile’
/home/piero/tmp/kvm-39/kernel/kvm_main.c:2850: error: expected ‘)’
before ‘(’
token
/home/piero/tmp/kvm-39/kernel/kvm_main.c:2852: error: invalid lvalue in
unary ‘&’
/home/piero/tmp/kvm-39/kernel/kvm_main.c:2853: error: invalid lvalue in
unary ‘&’
/home/piero/tmp/kvm-39/kernel/kvm_main.c:2857: error: invalid lvalue in
unary ‘&’
/home/piero/tmp/kvm-39/kernel/kvm_main.c:2863: error: expected identifier
or ‘(’ before ‘volatile’
/home/piero/tmp/kvm-39/kernel/kvm_main.c:2863: error: expected ‘)’
before ‘(’
token
/home/piero/tmp/kvm-39/kernel/kvm_main.c:2866: error: invalid lvalue in
unary ‘&’
/home/piero/tmp/kvm-39/kernel/kvm_main.c:2868: error: invalid lvalue in
unary ‘&’
make[3]: *** [/home/piero/tmp/kvm-39/kernel/kvm_main.o] Error 1
make[2]: *** [_module_/home/piero/tmp/kvm-39/kernel] Error 2
make[2]: Leaving directory `/usr/src/linux-headers-2.6.17-12-generic'
make[1]: *** [all] Error 2
make[1]: Leaving directory `/home/piero/tmp/kvm-39/kernel'
make: *** [kernel] Error 2
Bye
Piero
Alle 16:14, mercoledì 12 settembre 2007, Avi Kivity ha scritto:
> That's kvm-39 of course.
>
> Avi Kivity wrote:
> > Fix a couple of lapic hiccups in kvm-38.
> >
> > Changes since kvm-38:
> > - provide div64_64() for older kernels
> > - improve emulation failure reporting
> > - more x86 emulator work (push imm8, pushf, call near) (Nitin A Kamble)
> > - don't use TPR shadow on i386 (Sheng Yang)
> >
> > Notes:
> > If you use the modules bundled with kvm-39, you can use any version
> > of Linux from 2.6.9 upwards.
> > If you use the modules bundled with Linux 2.6.20, you need to use
> > kvm-12.
> > If you use the modules bundled with Linux 2.6.21, you need to use
> > kvm-17.
> > Modules from Linux 2.6.22 and up will work with any kvm version from
> > kvm-22. Some features may only be available in newer releases.
> > For best performance, use Linux 2.6.23-rc2 or later as the host.
> >
> > http://kvm.qumranet.com
> >
> >
> >
> >
-------------------------------------------------------------------------
> > This SF.net email is sponsored by: Microsoft
> > Defy all challenges. Microsoft(R) Visual Studio 2005.
> > http://clk.atdmt.com/MRT/go/vse0120000070mrt/direct/01/
> > _______________________________________________
> > kvm-devel mailing list
> > kvm-devel@lists.sourceforge.net
> > https://lists.sourceforge.net/lists/listinfo/kvm-devel
-------------------------------------------------------------------------
This SF.net email is sponsored by: Microsoft
Defy all challenges. Microsoft(R) Visual Studio 2005.
http://clk.atdmt.com/MRT/go/vse0120000070mrt/direct/01/
_______________________________________________
kvm-devel mailing list
kvm-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/kvm-devel
diff --git a/drivers/kvm/kvm_main.c b/drivers/kvm/kvm_main.c
index 99e4917..f04ca6b 100644
--- a/drivers/kvm/kvm_main.c
+++ b/drivers/kvm/kvm_main.c
@@ -2967,25 +2967,25 @@ static long kvm_vcpu_ioctl(struct file *
break;
}
case KVM_GET_LAPIC: {
- struct kvm_lapic_state lapic;
+ struct kvm_lapic_state lapic_state;
- memset(&lapic, 0, sizeof lapic);
- r = kvm_vcpu_ioctl_get_lapic(vcpu, &lapic);
+ memset(&lapic_state, 0, sizeof lapic_state);
+ r = kvm_vcpu_ioctl_get_lapic(vcpu, &lapic_state);
if (r)
goto out;
r = -EFAULT;
- if (copy_to_user(argp, &lapic, sizeof lapic))
+ if (copy_to_user(argp, &lapic_state, sizeof lapic_state))
goto out;
r = 0;
break;
}
case KVM_SET_LAPIC: {
- struct kvm_lapic_state lapic;
+ struct kvm_lapic_state lapic_state;
r = -EFAULT;
- if (copy_from_user(&lapic, argp, sizeof lapic))
+ if (copy_from_user(&lapic_state, argp, sizeof lapic_state))
goto out;
- r = kvm_vcpu_ioctl_set_lapic(vcpu, &lapic);;
+ r = kvm_vcpu_ioctl_set_lapic(vcpu, &lapic_state);;
if (r)
goto out;
r = 0;
-------------------------------------------------------------------------
This SF.net email is sponsored by: Microsoft
Defy all challenges. Microsoft(R) Visual Studio 2005.
http://clk.atdmt.com/MRT/go/vse0120000070mrt/direct/01/
_______________________________________________
kvm-devel mailing list
kvm-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/kvm-devel
