]> Git Repo - qemu.git/commitdiff
virtio_ring.h: s/__inline__/inline/
authorMichael S. Tsirkin <[email protected]>
Wed, 18 Feb 2015 15:37:35 +0000 (16:37 +0100)
committerMichael S. Tsirkin <[email protected]>
Thu, 26 Feb 2015 12:04:09 +0000 (13:04 +0100)
Thomas Huth noticed that some linux headers
use __inline__, change to inline to be consistent
with the rest of QEMU.

Reported-by: Thomas Huth <[email protected]>
Signed-off-by: Michael S. Tsirkin <[email protected]>
include/standard-headers/linux/virtio_ring.h

index 2bd19a8d25c29bbd7ca8245b6386ecd127f962d9..cc647d61fcabc2851c20cdbac62ac0b75fdc2f00 100644 (file)
@@ -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
This page took 0.026916 seconds and 4 git commands to generate.