mirrors/qemu
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

virtio_ring.h: s/__inline__/inline/

Browse Source 
Thomas Huth noticed that some linux headers
use __inline__, change to inline to be consistent
with the rest of QEMU.

Reported-by: Thomas Huth <thuth@linux.vnet.ibm.com>
Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
This commit is contained in:
Michael S. Tsirkin 2015-02-18 16:37:35 +01:00
parent 714e601379
commit e0d2be2ad6
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
include/standard-headers/linux/virtio_ring.h
View File

@ -137,7 +137,7 @@ struct vring {
#define vring_used_event(vr) ((vr)->avail->ring[(vr)->num]) #define vring_used_event(vr) ((vr)->avail->ring[(vr)->num])
#define vring_avail_event(vr) (*(__virtio16 *)&(vr)->used->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) unsigned long align)
{ {
vr->num = num; vr->num = num;
@ -147,7 +147,7 @@ static __inline__ void vring_init(struct vring *vr, unsigned int num, void *p,
+ align-1) & ~(align - 1)); + 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) return ((sizeof(struct vring_desc) * num + sizeof(__virtio16) * (3 + num)
+ align - 1) & ~(align - 1)) + 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 /* Assuming a given event_idx value from the other size, if
* we have just incremented index from old to new_idx, * we have just incremented index from old to new_idx,
* should we trigger an event? */ * 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 /* Note: Xen has similar logic for notification hold-off
* in include/xen/interface/io/ring.h with req_event and req_prod * in include/xen/interface/io/ring.h with req_event and req_prod