From mboxrd@z Thu Jan 1 00:00:00 1970 From: Hollis Blanchard Date: Tue, 29 Jan 2008 23:41:08 +0000 Subject: Re: [kvm-ppc-devel] [kvm-devel] [PATCH] Message-Id: <1201650068.22639.51.camel@basalt> List-Id: References: <6a2f4869cf5da00fa0cc.1201563754@basalt> <479FB535.5080302@redhat.com> In-Reply-To: <479FB535.5080302-H+wXaHxf7aLQT0dZR+AlfA@public.gmane.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 8bit To: Chris Lalancette Cc: kvm-devel-5NWGOfrQmneRv+LV9MX5uipxlwaOVQ5f@public.gmane.org, kvm-ppc-devel-5NWGOfrQmneRv+LV9MX5uipxlwaOVQ5f@public.gmane.org On Tue, 2008-01-29 at 18:22 -0500, Chris Lalancette wrote: > Hollis Blanchard wrote: > > diff --git a/include/linux/kvm_host.h b/include/linux/kvm_host.h > > --- a/include/linux/kvm_host.h > > +++ b/include/linux/kvm_host.h > > @@ -67,7 +67,9 @@ void kvm_io_bus_register_dev(struct kvm_ > > > > struct kvm_vcpu { > > struct kvm *kvm; > > +#ifdef CONFIG_PREEMPT_NOTIFIERS > > struct preempt_notifier preempt_notifier; > > +#endif > > int vcpu_id; > > struct mutex mutex; > > int cpu; > > Hm, this causes my build to fail on x86_64: > > make -C /lib/modules/2.6.23.8-63.fc8/build M=`pwd` "$@" > make[2]: Entering directory `/usr/src/kernels/2.6.23.8-63.fc8-x86_64' > LD /tmp/kvm-userspace/kernel/built-in.o > CC [M] /tmp/kvm-userspace/kernel/svm.o > CC [M] /tmp/kvm-userspace/kernel/vmx.o > CC [M] /tmp/kvm-userspace/kernel/vmx-debug.o > CC [M] /tmp/kvm-userspace/kernel/kvm_main.o > /tmp/kvm-userspace/kernel/kvm_main.c: In function ‘vcpu_load’: > /tmp/kvm-userspace/kernel/kvm_main.c:82: error: ‘struct kvm_vcpu’ has no member > named ‘preempt_notifier’ > /tmp/kvm-userspace/kernel/kvm_main.c: In function ‘vcpu_put’: > /tmp/kvm-userspace/kernel/kvm_main.c:91: error: ‘struct kvm_vcpu’ has no member > named ‘preempt_notifier’ > /tmp/kvm-userspace/kernel/kvm_main.c: In function ‘kvm_vm_ioctl_create_vcpu’: > /tmp/kvm-userspace/kernel/kvm_main.c:749: error: ‘struct kvm_vcpu’ has no member > named ‘preempt_notifier’ > /tmp/kvm-userspace/kernel/kvm_main.c: In function ‘preempt_notifier_to_vcpu’: > /tmp/kvm-userspace/kernel/kvm_main.c:1284: error: ‘struct kvm_vcpu’ has no > member named ‘preempt_notifier’ > /tmp/kvm-userspace/kernel/kvm_main.c:1284: warning: type defaults to ‘int’ in > declaration of ‘__mptr’ > /tmp/kvm-userspace/kernel/kvm_main.c:1284: warning: initialization from > incompatible pointer type > /tmp/kvm-userspace/kernel/kvm_main.c:1284: error: ‘struct kvm_vcpu’ has no > member named ‘preempt_notifier’ > make[3]: *** [/tmp/kvm-userspace/kernel/kvm_main.o] Error 1 > make[2]: *** [_module_/tmp/kvm-userspace/kernel] Error 2 > make[2]: Leaving directory `/usr/src/kernels/2.6.23.8-63.fc8-x86_64' > make[1]: *** [all] Error 2 > make[1]: Leaving directory `/tmp/kvm-userspace/kernel' > make: *** [kernel] Error 2 This seems to be an artifact of the hackage in external-module-compat.h, since you're building with a pre-PREEMPT_NOTIFIERS kernel. Maybe adding #define CONFIG_PREEMPT_NOTIFIERS after #ifndef CONFIG_PREEMPT_NOTIFIERS in external-module-compat.h would "fix" it, since kvm_host.h would pick up the define when it's included later. The other hackful alternative would be this in kvm_host.h: #ifdef CONFIG_PREEMPT_NOTIFIERS struct preempt_notifier preempt_notifier; #else long preempt_notifier; #endif -- Hollis Blanchard IBM Linux Technology Center ------------------------------------------------------------------------- This SF.net email is sponsored by: Microsoft Defy all challenges. Microsoft(R) Visual Studio 2008. http://clk.atdmt.com/MRT/go/vse0120000070mrt/direct/01/ _______________________________________________ kvm-ppc-devel mailing list kvm-ppc-devel@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/kvm-ppc-devel From mboxrd@z Thu Jan 1 00:00:00 1970 From: Hollis Blanchard Subject: Re: [kvm-ppc-devel] [PATCH] Use CONFIG_PREEMPT_NOTIFIERS around struct preempt_notifier Date: Tue, 29 Jan 2008 17:41:08 -0600 Message-ID: <1201650068.22639.51.camel@basalt> References: <6a2f4869cf5da00fa0cc.1201563754@basalt> <479FB535.5080302@redhat.com> Reply-To: Hollis Blanchard Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Cc: kvm-devel-5NWGOfrQmneRv+LV9MX5uipxlwaOVQ5f@public.gmane.org, kvm-ppc-devel-5NWGOfrQmneRv+LV9MX5uipxlwaOVQ5f@public.gmane.org To: Chris Lalancette Return-path: In-Reply-To: <479FB535.5080302-H+wXaHxf7aLQT0dZR+AlfA@public.gmane.org> List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: kvm-devel-bounces-5NWGOfrQmneRv+LV9MX5uipxlwaOVQ5f@public.gmane.org Errors-To: kvm-devel-bounces-5NWGOfrQmneRv+LV9MX5uipxlwaOVQ5f@public.gmane.org List-Id: kvm.vger.kernel.org T24gVHVlLCAyMDA4LTAxLTI5IGF0IDE4OjIyIC0wNTAwLCBDaHJpcyBMYWxhbmNldHRlIHdyb3Rl Ogo+IEhvbGxpcyBCbGFuY2hhcmQgd3JvdGU6Cj4gPiBkaWZmIC0tZ2l0IGEvaW5jbHVkZS9saW51 eC9rdm1faG9zdC5oIGIvaW5jbHVkZS9saW51eC9rdm1faG9zdC5oCj4gPiAtLS0gYS9pbmNsdWRl L2xpbnV4L2t2bV9ob3N0LmgKPiA+ICsrKyBiL2luY2x1ZGUvbGludXgva3ZtX2hvc3QuaAo+ID4g QEAgLTY3LDcgKzY3LDkgQEAgdm9pZCBrdm1faW9fYnVzX3JlZ2lzdGVyX2RldihzdHJ1Y3Qga3Zt Xwo+ID4gIAo+ID4gIHN0cnVjdCBrdm1fdmNwdSB7Cj4gPiAgCXN0cnVjdCBrdm0gKmt2bTsKPiA+ ICsjaWZkZWYgQ09ORklHX1BSRUVNUFRfTk9USUZJRVJTCj4gPiAgCXN0cnVjdCBwcmVlbXB0X25v dGlmaWVyIHByZWVtcHRfbm90aWZpZXI7Cj4gPiArI2VuZGlmCj4gPiAgCWludCB2Y3B1X2lkOwo+ ID4gIAlzdHJ1Y3QgbXV0ZXggbXV0ZXg7Cj4gPiAgCWludCAgIGNwdTsKPiAKPiBIbSwgdGhpcyBj YXVzZXMgbXkgYnVpbGQgdG8gZmFpbCBvbiB4ODZfNjQ6Cj4gCj4gbWFrZSAtQyAvbGliL21vZHVs ZXMvMi42LjIzLjgtNjMuZmM4L2J1aWxkIE09YHB3ZGAgIiRAIgo+IG1ha2VbMl06IEVudGVyaW5n IGRpcmVjdG9yeSBgL3Vzci9zcmMva2VybmVscy8yLjYuMjMuOC02My5mYzgteDg2XzY0Jwo+ICAg TEQgICAgICAvdG1wL2t2bS11c2Vyc3BhY2Uva2VybmVsL2J1aWx0LWluLm8KPiAgIENDIFtNXSAg L3RtcC9rdm0tdXNlcnNwYWNlL2tlcm5lbC9zdm0ubwo+ICAgQ0MgW01dICAvdG1wL2t2bS11c2Vy c3BhY2Uva2VybmVsL3ZteC5vCj4gICBDQyBbTV0gIC90bXAva3ZtLXVzZXJzcGFjZS9rZXJuZWwv dm14LWRlYnVnLm8KPiAgIENDIFtNXSAgL3RtcC9rdm0tdXNlcnNwYWNlL2tlcm5lbC9rdm1fbWFp bi5vCj4gL3RtcC9rdm0tdXNlcnNwYWNlL2tlcm5lbC9rdm1fbWFpbi5jOiBJbiBmdW5jdGlvbiDi gJh2Y3B1X2xvYWTigJk6Cj4gL3RtcC9rdm0tdXNlcnNwYWNlL2tlcm5lbC9rdm1fbWFpbi5jOjgy OiBlcnJvcjog4oCYc3RydWN0IGt2bV92Y3B14oCZIGhhcyBubyBtZW1iZXIKPiBuYW1lZCDigJhw cmVlbXB0X25vdGlmaWVy4oCZCj4gL3RtcC9rdm0tdXNlcnNwYWNlL2tlcm5lbC9rdm1fbWFpbi5j OiBJbiBmdW5jdGlvbiDigJh2Y3B1X3B1dOKAmToKPiAvdG1wL2t2bS11c2Vyc3BhY2Uva2VybmVs L2t2bV9tYWluLmM6OTE6IGVycm9yOiDigJhzdHJ1Y3Qga3ZtX3ZjcHXigJkgaGFzIG5vIG1lbWJl cgo+IG5hbWVkIOKAmHByZWVtcHRfbm90aWZpZXLigJkKPiAvdG1wL2t2bS11c2Vyc3BhY2Uva2Vy bmVsL2t2bV9tYWluLmM6IEluIGZ1bmN0aW9uIOKAmGt2bV92bV9pb2N0bF9jcmVhdGVfdmNwdeKA mToKPiAvdG1wL2t2bS11c2Vyc3BhY2Uva2VybmVsL2t2bV9tYWluLmM6NzQ5OiBlcnJvcjog4oCY c3RydWN0IGt2bV92Y3B14oCZIGhhcyBubyBtZW1iZXIKPiBuYW1lZCDigJhwcmVlbXB0X25vdGlm aWVy4oCZCj4gL3RtcC9rdm0tdXNlcnNwYWNlL2tlcm5lbC9rdm1fbWFpbi5jOiBJbiBmdW5jdGlv biDigJhwcmVlbXB0X25vdGlmaWVyX3RvX3ZjcHXigJk6Cj4gL3RtcC9rdm0tdXNlcnNwYWNlL2tl cm5lbC9rdm1fbWFpbi5jOjEyODQ6IGVycm9yOiDigJhzdHJ1Y3Qga3ZtX3ZjcHXigJkgaGFzIG5v Cj4gbWVtYmVyIG5hbWVkIOKAmHByZWVtcHRfbm90aWZpZXLigJkKPiAvdG1wL2t2bS11c2Vyc3Bh Y2Uva2VybmVsL2t2bV9tYWluLmM6MTI4NDogd2FybmluZzogdHlwZSBkZWZhdWx0cyB0byDigJhp bnTigJkgaW4KPiBkZWNsYXJhdGlvbiBvZiDigJhfX21wdHLigJkKPiAvdG1wL2t2bS11c2Vyc3Bh Y2Uva2VybmVsL2t2bV9tYWluLmM6MTI4NDogd2FybmluZzogaW5pdGlhbGl6YXRpb24gZnJvbQo+ IGluY29tcGF0aWJsZSBwb2ludGVyIHR5cGUKPiAvdG1wL2t2bS11c2Vyc3BhY2Uva2VybmVsL2t2 bV9tYWluLmM6MTI4NDogZXJyb3I6IOKAmHN0cnVjdCBrdm1fdmNwdeKAmSBoYXMgbm8KPiBtZW1i ZXIgbmFtZWQg4oCYcHJlZW1wdF9ub3RpZmllcuKAmQo+IG1ha2VbM106ICoqKiBbL3RtcC9rdm0t dXNlcnNwYWNlL2tlcm5lbC9rdm1fbWFpbi5vXSBFcnJvciAxCj4gbWFrZVsyXTogKioqIFtfbW9k dWxlXy90bXAva3ZtLXVzZXJzcGFjZS9rZXJuZWxdIEVycm9yIDIKPiBtYWtlWzJdOiBMZWF2aW5n IGRpcmVjdG9yeSBgL3Vzci9zcmMva2VybmVscy8yLjYuMjMuOC02My5mYzgteDg2XzY0Jwo+IG1h a2VbMV06ICoqKiBbYWxsXSBFcnJvciAyCj4gbWFrZVsxXTogTGVhdmluZyBkaXJlY3RvcnkgYC90 bXAva3ZtLXVzZXJzcGFjZS9rZXJuZWwnCj4gbWFrZTogKioqIFtrZXJuZWxdIEVycm9yIDIKClRo aXMgc2VlbXMgdG8gYmUgYW4gYXJ0aWZhY3Qgb2YgdGhlIGhhY2thZ2UgaW4gZXh0ZXJuYWwtbW9k dWxlLWNvbXBhdC5oLApzaW5jZSB5b3UncmUgYnVpbGRpbmcgd2l0aCBhIHByZS1QUkVFTVBUX05P VElGSUVSUyBrZXJuZWwuCgpNYXliZSBhZGRpbmcgCiAgICAgICAgI2RlZmluZSBDT05GSUdfUFJF RU1QVF9OT1RJRklFUlMKYWZ0ZXIKICAgICAgICAjaWZuZGVmIENPTkZJR19QUkVFTVBUX05PVElG SUVSUwppbiBleHRlcm5hbC1tb2R1bGUtY29tcGF0Lmggd291bGQgImZpeCIgaXQsIHNpbmNlIGt2 bV9ob3N0Lmggd291bGQgcGljawp1cCB0aGUgZGVmaW5lIHdoZW4gaXQncyBpbmNsdWRlZCBsYXRl ci4KClRoZSBvdGhlciBoYWNrZnVsIGFsdGVybmF0aXZlIHdvdWxkIGJlIHRoaXMgaW4ga3ZtX2hv c3QuaDoKICAgICAgICAjaWZkZWYgQ09ORklHX1BSRUVNUFRfTk9USUZJRVJTCiAgICAgICAgc3Ry dWN0IHByZWVtcHRfbm90aWZpZXIgcHJlZW1wdF9ub3RpZmllcjsKICAgICAgICAjZWxzZQogICAg ICAgIGxvbmcgcHJlZW1wdF9ub3RpZmllcjsKICAgICAgICAjZW5kaWYKCi0tIApIb2xsaXMgQmxh bmNoYXJkCklCTSBMaW51eCBUZWNobm9sb2d5IENlbnRlcgoKCi0tLS0tLS0tLS0tLS0tLS0tLS0t LS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0KVGhp cyBTRi5uZXQgZW1haWwgaXMgc3BvbnNvcmVkIGJ5OiBNaWNyb3NvZnQKRGVmeSBhbGwgY2hhbGxl bmdlcy4gTWljcm9zb2Z0KFIpIFZpc3VhbCBTdHVkaW8gMjAwOC4KaHR0cDovL2Nsay5hdGRtdC5j b20vTVJUL2dvL3ZzZTAxMjAwMDAwNzBtcnQvZGlyZWN0LzAxLwpfX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fXwprdm0tZGV2ZWwgbWFpbGluZyBsaXN0Cmt2bS1k ZXZlbEBsaXN0cy5zb3VyY2Vmb3JnZS5uZXQKaHR0cHM6Ly9saXN0cy5zb3VyY2Vmb3JnZS5uZXQv bGlzdHMvbGlzdGluZm8va3ZtLWRldmVsCg==