[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL 56/96] virtio_ring.h: s/__inline__/inline/
From: |
Michael S. Tsirkin |
Subject: |
[Qemu-devel] [PULL 56/96] virtio_ring.h: s/__inline__/inline/ |
Date: |
Wed, 18 Feb 2015 22:49:34 +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 <address@hidden>
Signed-off-by: Michael S. Tsirkin <address@hidden>
---
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
- [Qemu-devel] [PULL 46/96] standard-headers: add s390 virtio headers, (continued)
- [Qemu-devel] [PULL 46/96] standard-headers: add s390 virtio headers, Michael S. Tsirkin, 2015/02/18
- [Qemu-devel] [PULL 47/96] s390: use standard headers, Michael S. Tsirkin, 2015/02/18
- [Qemu-devel] [PULL 48/96] virtio: cull virtio_bus_set_vdev_features, Michael S. Tsirkin, 2015/02/18
- [Qemu-devel] [PULL 49/96] virtio: feature bit manipulation helpers, Michael S. Tsirkin, 2015/02/18
- [Qemu-devel] [PULL 50/96] virtio: add feature checking helpers, Michael S. Tsirkin, 2015/02/18
- [Qemu-devel] [PULL 51/96] acpi-build: skip hotplugged bridges, Michael S. Tsirkin, 2015/02/18
- [Qemu-devel] [PULL 52/96] pc: acpi: use local var for accessing ACPI tables blob in acpi_build(), Michael S. Tsirkin, 2015/02/18
- [Qemu-devel] [PULL 53/96] update-linux-headers.sh: s/__inline__/inline/, Michael S. Tsirkin, 2015/02/18
- [Qemu-devel] [PULL 54/96] virtio-serial-bus.c: drop virtio_ids.h, Michael S. Tsirkin, 2015/02/18
- [Qemu-devel] [PULL 55/96] standard-headers: include stdint.h, Michael S. Tsirkin, 2015/02/18
- [Qemu-devel] [PULL 56/96] virtio_ring.h: s/__inline__/inline/,
Michael S. Tsirkin <=
- [Qemu-devel] [PULL 57/96] acpi: introduce AML composer aml_append(), Michael S. Tsirkin, 2015/02/18
- [Qemu-devel] [PULL 58/96] acpi: add aml_scope() term, Michael S. Tsirkin, 2015/02/18
- [Qemu-devel] [PULL 59/96] pc: acpi-build: use aml_scope() for \_SB scope, Michael S. Tsirkin, 2015/02/18
- [Qemu-devel] [PULL 60/96] acpi: add aml_device() term, Michael S. Tsirkin, 2015/02/18
- [Qemu-devel] [PULL 61/96] acpi: add aml_method() term, Michael S. Tsirkin, 2015/02/18
- [Qemu-devel] [PULL 62/96] acpi: add aml_if() term, Michael S. Tsirkin, 2015/02/18
- [Qemu-devel] [PULL 63/96] acpi: add aml_name() & aml_name_decl() term, Michael S. Tsirkin, 2015/02/18
- [Qemu-devel] [PULL 64/96] acpi: add aml_int() term, Michael S. Tsirkin, 2015/02/18
- [Qemu-devel] [PULL 65/96] acpi: add aml_return() term, Michael S. Tsirkin, 2015/02/18
- [Qemu-devel] [PULL 66/96] acpi: add aml_arg() term, Michael S. Tsirkin, 2015/02/18