From mboxrd@z Thu Jan 1 00:00:00 1970 From: "Michael S. Tsirkin" Subject: [PATCH] tools/virtio: move module license stub to module.h Date: Sun, 7 Jul 2013 17:29:44 +0300 Message-ID: <20130707142944.GA3022@redhat.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: Content-Disposition: inline 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: kvm@vger.kernel.org Cc: linux-kernel@vger.kernel.org, virtualization@lists.linux-foundation.org List-Id: virtualization@lists.linuxfoundation.org VGhpcyBmaXhlcyBidWlsZCBmb3IgdGhlIHZyaW5naCB0ZXN0OgpbbGludXhdJCBtYWtlIC1DIHRv b2xzL3ZpcnRpby8KbWFrZTogRW50ZXJpbmcgZGlyZWN0b3J5IGAvaG9tZS9tc3Qvc2NtL2xpbnV4 L3Rvb2xzL3ZpcnRpbycKY2MgLWcgLU8yIC1XYWxsIC1JLiAtSSAuLi8uLi91c3IvaW5jbHVkZS8g LVduby1wb2ludGVyLXNpZ24KLWZuby1zdHJpY3Qtb3ZlcmZsb3cgLWZuby1zdHJpY3QtYWxpYXNp bmcgLWZuby1jb21tb24gLU1NRAotVV9GT1JUSUZZX1NPVVJDRSAgIC1jIC1vIHZyaW5naC5vIC4u Ly4uL2RyaXZlcnMvdmhvc3QvdnJpbmdoLmMKLi4vLi4vZHJpdmVycy92aG9zdC92cmluZ2guYzox MDEwOjE2OiBlcnJvcjogZXhwZWN0ZWQgZGVjbGFyYXRpb24Kc3BlY2lmaWVycyBvciDigJguLi7i gJkgYmVmb3JlIHN0cmluZyBjb25zdGFudAoKU2lnbmVkLW9mZi1ieTogTWljaGFlbCBTLiBUc2ly a2luIDxtc3RAcmVkaGF0LmNvbT4KLS0tCiB0b29scy92aXJ0aW8vbGludXgvbW9kdWxlLmggfCA1 ICsrKysrCiB0b29scy92aXJ0aW8vbGludXgvdmlydGlvLmggfCAzIC0tLQogMiBmaWxlcyBjaGFu Z2VkLCA1IGluc2VydGlvbnMoKyksIDMgZGVsZXRpb25zKC0pCgpkaWZmIC0tZ2l0IGEvdG9vbHMv dmlydGlvL2xpbnV4L21vZHVsZS5oIGIvdG9vbHMvdmlydGlvL2xpbnV4L21vZHVsZS5oCmluZGV4 IDMwMzlhN2UuLjI4Y2U5NWEgMTAwNjQ0Ci0tLSBhL3Rvb2xzL3ZpcnRpby9saW51eC9tb2R1bGUu aAorKysgYi90b29scy92aXJ0aW8vbGludXgvbW9kdWxlLmgKQEAgLTEgKzEsNiBAQAogI2luY2x1 ZGUgPGxpbnV4L2V4cG9ydC5oPgorCisjZGVmaW5lIE1PRFVMRV9MSUNFTlNFKF9fTU9EVUxFX0xJ Q0VOU0VfdmFsdWUpIFwKKwlzdGF0aWMgX19hdHRyaWJ1dGVfXygodW51c2VkKSkgY29uc3QgY2hh ciAqX19NT0RVTEVfTElDRU5TRV9uYW1lID0gXAorCQlfX01PRFVMRV9MSUNFTlNFX3ZhbHVlCisK ZGlmZiAtLWdpdCBhL3Rvb2xzL3ZpcnRpby9saW51eC92aXJ0aW8uaCBiL3Rvb2xzL3ZpcnRpby9s aW51eC92aXJ0aW8uaAppbmRleCBjZDgwMTgzLi44NDQ3ODMwIDEwMDY0NAotLS0gYS90b29scy92 aXJ0aW8vbGludXgvdmlydGlvLmgKKysrIGIvdG9vbHMvdmlydGlvL2xpbnV4L3ZpcnRpby5oCkBA IC00NSw5ICs0NSw2IEBAIHN0cnVjdCB2aXJ0cXVldWUgewogCXZvaWQgKnByaXY7CiB9OwogCi0j ZGVmaW5lIE1PRFVMRV9MSUNFTlNFKF9fTU9EVUxFX0xJQ0VOU0VfdmFsdWUpIFwKLQljb25zdCBj aGFyICpfX01PRFVMRV9MSUNFTlNFX25hbWUgPSBfX01PRFVMRV9MSUNFTlNFX3ZhbHVlCi0KIC8q IEludGVyZmFjZXMgZXhwb3J0ZWQgYnkgdmlydGlvX3JpbmcuICovCiBpbnQgdmlydHF1ZXVlX2Fk ZF9zZ3Moc3RydWN0IHZpcnRxdWV1ZSAqdnEsCiAJCSAgICAgIHN0cnVjdCBzY2F0dGVybGlzdCAq c2dzW10sCi0tIApNU1QKX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fX18KVmlydHVhbGl6YXRpb24gbWFpbGluZyBsaXN0ClZpcnR1YWxpemF0aW9uQGxpc3RzLmxp bnV4LWZvdW5kYXRpb24ub3JnCmh0dHBzOi8vbGlzdHMubGludXhmb3VuZGF0aW9uLm9yZy9tYWls bWFuL2xpc3RpbmZvL3ZpcnR1YWxpemF0aW9u From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752618Ab3GGO2n (ORCPT ); Sun, 7 Jul 2013 10:28:43 -0400 Received: from mx1.redhat.com ([209.132.183.28]:23161 "EHLO mx1.redhat.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752349Ab3GGO2j (ORCPT ); Sun, 7 Jul 2013 10:28:39 -0400 Date: Sun, 7 Jul 2013 17:29:44 +0300 From: "Michael S. Tsirkin" To: kvm@vger.kernel.org Cc: Rusty Russell , Wanlong Gao , Asias He , linux-kernel@vger.kernel.org, virtualization@lists.linux-foundation.org Subject: [PATCH] tools/virtio: move module license stub to module.h Message-ID: <20130707142944.GA3022@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Disposition: inline Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 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(-) 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