From mboxrd@z Thu Jan 1 00:00:00 1970 From: Rusty Russell Subject: Re: [PATCH] tools/virtio: move module license stub to module.h Date: Mon, 08 Jul 2013 11:32:10 +0930 Message-ID: <87li5herml.fsf@rustcorp.com.au> References: <20130707142944.GA3022@redhat.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: In-Reply-To: <20130707142944.GA3022@redhat.com> List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: virtualization-bounces@lists.linux-foundation.org Errors-To: virtualization-bounces@lists.linux-foundation.org To: "Michael S. Tsirkin" , kvm@vger.kernel.org Cc: linux-kernel@vger.kernel.org, virtualization@lists.linux-foundation.org List-Id: virtualization@lists.linuxfoundation.org Ik1pY2hhZWwgUy4gVHNpcmtpbiIgPG1zdEByZWRoYXQuY29tPiB3cml0ZXM6Cj4gVGhpcyBmaXhl cyBidWlsZCBmb3IgdGhlIHZyaW5naCB0ZXN0Ogo+IFtsaW51eF0kIG1ha2UgLUMgdG9vbHMvdmly dGlvLwo+IG1ha2U6IEVudGVyaW5nIGRpcmVjdG9yeSBgL2hvbWUvbXN0L3NjbS9saW51eC90b29s cy92aXJ0aW8nCj4gY2MgLWcgLU8yIC1XYWxsIC1JLiAtSSAuLi8uLi91c3IvaW5jbHVkZS8gLVdu by1wb2ludGVyLXNpZ24KPiAtZm5vLXN0cmljdC1vdmVyZmxvdyAtZm5vLXN0cmljdC1hbGlhc2lu ZyAtZm5vLWNvbW1vbiAtTU1ECj4gLVVfRk9SVElGWV9TT1VSQ0UgICAtYyAtbyB2cmluZ2gubyAu Li8uLi9kcml2ZXJzL3Zob3N0L3ZyaW5naC5jCj4gLi4vLi4vZHJpdmVycy92aG9zdC92cmluZ2gu YzoxMDEwOjE2OiBlcnJvcjogZXhwZWN0ZWQgZGVjbGFyYXRpb24KPiBzcGVjaWZpZXJzIG9yIOKA mC4uLuKAmSBiZWZvcmUgc3RyaW5nIGNvbnN0YW50Cj4KPiBTaWduZWQtb2ZmLWJ5OiBNaWNoYWVs IFMuIFRzaXJraW4gPG1zdEByZWRoYXQuY29tPgo+IC0tLQo+ICB0b29scy92aXJ0aW8vbGludXgv bW9kdWxlLmggfCA1ICsrKysrCj4gIHRvb2xzL3ZpcnRpby9saW51eC92aXJ0aW8uaCB8IDMgLS0t Cj4gIDIgZmlsZXMgY2hhbmdlZCwgNSBpbnNlcnRpb25zKCspLCAzIGRlbGV0aW9ucygtKQoKQXBw bGllZCwgdGhhbmtzLgoKQ2hlZXJzLApSdXN0eS4KCj4gZGlmZiAtLWdpdCBhL3Rvb2xzL3ZpcnRp by9saW51eC9tb2R1bGUuaCBiL3Rvb2xzL3ZpcnRpby9saW51eC9tb2R1bGUuaAo+IGluZGV4IDMw MzlhN2UuLjI4Y2U5NWEgMTAwNjQ0Cj4gLS0tIGEvdG9vbHMvdmlydGlvL2xpbnV4L21vZHVsZS5o Cj4gKysrIGIvdG9vbHMvdmlydGlvL2xpbnV4L21vZHVsZS5oCj4gQEAgLTEgKzEsNiBAQAo+ICAj aW5jbHVkZSA8bGludXgvZXhwb3J0Lmg+Cj4gKwo+ICsjZGVmaW5lIE1PRFVMRV9MSUNFTlNFKF9f TU9EVUxFX0xJQ0VOU0VfdmFsdWUpIFwKPiArCXN0YXRpYyBfX2F0dHJpYnV0ZV9fKCh1bnVzZWQp KSBjb25zdCBjaGFyICpfX01PRFVMRV9MSUNFTlNFX25hbWUgPSBcCj4gKwkJX19NT0RVTEVfTElD RU5TRV92YWx1ZQo+ICsKPiBkaWZmIC0tZ2l0IGEvdG9vbHMvdmlydGlvL2xpbnV4L3ZpcnRpby5o IGIvdG9vbHMvdmlydGlvL2xpbnV4L3ZpcnRpby5oCj4gaW5kZXggY2Q4MDE4My4uODQ0NzgzMCAx MDA2NDQKPiAtLS0gYS90b29scy92aXJ0aW8vbGludXgvdmlydGlvLmgKPiArKysgYi90b29scy92 aXJ0aW8vbGludXgvdmlydGlvLmgKPiBAQCAtNDUsOSArNDUsNiBAQCBzdHJ1Y3QgdmlydHF1ZXVl IHsKPiAgCXZvaWQgKnByaXY7Cj4gIH07Cj4gIAo+IC0jZGVmaW5lIE1PRFVMRV9MSUNFTlNFKF9f TU9EVUxFX0xJQ0VOU0VfdmFsdWUpIFwKPiAtCWNvbnN0IGNoYXIgKl9fTU9EVUxFX0xJQ0VOU0Vf bmFtZSA9IF9fTU9EVUxFX0xJQ0VOU0VfdmFsdWUKPiAtCj4gIC8qIEludGVyZmFjZXMgZXhwb3J0 ZWQgYnkgdmlydGlvX3JpbmcuICovCj4gIGludCB2aXJ0cXVldWVfYWRkX3NncyhzdHJ1Y3Qgdmly dHF1ZXVlICp2cSwKPiAgCQkgICAgICBzdHJ1Y3Qgc2NhdHRlcmxpc3QgKnNnc1tdLAo+IC0tIAo+ IE1TVApfX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fXwpWaXJ0 dWFsaXphdGlvbiBtYWlsaW5nIGxpc3QKVmlydHVhbGl6YXRpb25AbGlzdHMubGludXgtZm91bmRh dGlvbi5vcmcKaHR0cHM6Ly9saXN0cy5saW51eGZvdW5kYXRpb24ub3JnL21haWxtYW4vbGlzdGlu Zm8vdmlydHVhbGl6YXRpb24= From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753479Ab3GHCXK (ORCPT ); Sun, 7 Jul 2013 22:23:10 -0400 Received: from ozlabs.org ([203.10.76.45]:40589 "EHLO ozlabs.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753384Ab3GHCWP convert rfc822-to-8bit (ORCPT ); Sun, 7 Jul 2013 22:22:15 -0400 From: Rusty Russell To: "Michael S. Tsirkin" , kvm@vger.kernel.org Cc: Wanlong Gao , Asias He , linux-kernel@vger.kernel.org, virtualization@lists.linux-foundation.org Subject: Re: [PATCH] tools/virtio: move module license stub to module.h In-Reply-To: <20130707142944.GA3022@redhat.com> References: <20130707142944.GA3022@redhat.com> User-Agent: Notmuch/0.15.2+81~gd2c8818 (http://notmuchmail.org) Emacs/23.4.1 (i686-pc-linux-gnu) Date: Mon, 08 Jul 2013 11:32:10 +0930 Message-ID: <87li5herml.fsf@rustcorp.com.au> MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8BIT Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org "Michael S. Tsirkin" writes: > This fixes build for the vringh test: > [linux]$ make -C tools/virtio/ > make: Entering directory `/home/mst/scm/linux/tools/virtio' > cc -g -O2 -Wall -I. -I ../../usr/include/ -Wno-pointer-sign > -fno-strict-overflow -fno-strict-aliasing -fno-common -MMD > -U_FORTIFY_SOURCE -c -o vringh.o ../../drivers/vhost/vringh.c > ../../drivers/vhost/vringh.c:1010:16: error: expected declaration > specifiers or ‘...’ before string constant > > Signed-off-by: Michael S. Tsirkin > --- > tools/virtio/linux/module.h | 5 +++++ > tools/virtio/linux/virtio.h | 3 --- > 2 files changed, 5 insertions(+), 3 deletions(-) Applied, thanks. Cheers, Rusty. > diff --git a/tools/virtio/linux/module.h b/tools/virtio/linux/module.h > index 3039a7e..28ce95a 100644 > --- a/tools/virtio/linux/module.h > +++ b/tools/virtio/linux/module.h > @@ -1 +1,6 @@ > #include > + > +#define MODULE_LICENSE(__MODULE_LICENSE_value) \ > + static __attribute__((unused)) const char *__MODULE_LICENSE_name = \ > + __MODULE_LICENSE_value > + > diff --git a/tools/virtio/linux/virtio.h b/tools/virtio/linux/virtio.h > index cd80183..8447830 100644 > --- a/tools/virtio/linux/virtio.h > +++ b/tools/virtio/linux/virtio.h > @@ -45,9 +45,6 @@ struct virtqueue { > void *priv; > }; > > -#define MODULE_LICENSE(__MODULE_LICENSE_value) \ > - const char *__MODULE_LICENSE_name = __MODULE_LICENSE_value > - > /* Interfaces exported by virtio_ring. */ > int virtqueue_add_sgs(struct virtqueue *vq, > struct scatterlist *sgs[], > -- > MST