From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:39444) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YOCV5-0000YD-Nd for qemu-devel@nongnu.org; Wed, 18 Feb 2015 16:49:44 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1YOCV2-0004cM-Hx for qemu-devel@nongnu.org; Wed, 18 Feb 2015 16:49:43 -0500 Received: from mail.kernel.org ([198.145.29.136]:52011) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YOCV2-0004bR-7m for qemu-devel@nongnu.org; Wed, 18 Feb 2015 16:49:40 -0500 Date: Wed, 18 Feb 2015 22:49:34 +0100 From: "Michael S. Tsirkin" Message-ID: <1424295164-4774-57-git-send-email-mst@redhat.com> References: <1424295164-4774-1-git-send-email-mst@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <1424295164-4774-1-git-send-email-mst@redhat.com> Subject: [Qemu-devel] [PULL 56/96] virtio_ring.h: s/__inline__/inline/ List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: Peter Maydell , Thomas Huth , dgilbert@redhat.com, Juan Quintela Thomas Huth noticed that some linux headers use __inline__, change to inline to be consistent with the rest of QEMU. Reported-by: Thomas Huth Signed-off-by: Michael S. Tsirkin --- include/standard-headers/linux/virtio_ring.h | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/include/standard-headers/linux/virtio_ring.h b/include/standard-headers/linux/virtio_ring.h index 2bd19a8..cc647d6 100644 --- a/include/standard-headers/linux/virtio_ring.h +++ b/include/standard-headers/linux/virtio_ring.h @@ -137,7 +137,7 @@ struct vring { #define vring_used_event(vr) ((vr)->avail->ring[(vr)->num]) #define vring_avail_event(vr) (*(__virtio16 *)&(vr)->used->ring[(vr)->num]) -static __inline__ void vring_init(struct vring *vr, unsigned int num, void *p, +static inline void vring_init(struct vring *vr, unsigned int num, void *p, unsigned long align) { vr->num = num; @@ -147,7 +147,7 @@ static __inline__ void vring_init(struct vring *vr, unsigned int num, void *p, + align-1) & ~(align - 1)); } -static __inline__ unsigned vring_size(unsigned int num, unsigned long align) +static inline unsigned vring_size(unsigned int num, unsigned long align) { return ((sizeof(struct vring_desc) * num + sizeof(__virtio16) * (3 + num) + align - 1) & ~(align - 1)) @@ -158,7 +158,7 @@ static __inline__ unsigned vring_size(unsigned int num, unsigned long align) /* Assuming a given event_idx value from the other size, if * we have just incremented index from old to new_idx, * should we trigger an event? */ -static __inline__ int vring_need_event(uint16_t event_idx, uint16_t new_idx, uint16_t old) +static inline int vring_need_event(uint16_t event_idx, uint16_t new_idx, uint16_t old) { /* Note: Xen has similar logic for notification hold-off * in include/xen/interface/io/ring.h with req_event and req_prod -- MST