[Qemu-devel] [PATCH 0/4] pulling virtio headers - minor fixes

[Qemu-devel] [PATCH 0/4] pulling virtio headers - minor fixes

[Michael S. Tsirkin]

This fixes minor issues reported by Thomas.
Not really bugs so not respinning the series,
to reduce list spam.

Michael S. Tsirkin (4):
  update-linux-headers.sh: s/__inline__/inline/
  virtio-serial-bus.c: drop virtio_ids.h
  standard-headers: include stdint.h
  virtio_ring.h: s/__inline__/inline/

 include/standard-headers/linux/types.h       | 2 +-
 include/standard-headers/linux/virtio_ring.h | 6 +++---
 hw/char/virtio-serial-bus.c                  | 1 -
 scripts/update-linux-headers.sh              | 1 +
 4 files changed, 5 insertions(+), 5 deletions(-)

-- 
MST

[Qemu-devel] [PATCH 1/4] update-linux-headers.sh: s/__inline__/inline/

[Michael S. Tsirkin]

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>
---
 scripts/update-linux-headers.sh | 1 +
 1 file changed, 1 insertion(+)

diff --git a/scripts/update-linux-headers.sh b/scripts/update-linux-headers.sh
index 9680e27..f208ec9 100755
--- a/scripts/update-linux-headers.sh
+++ b/scripts/update-linux-headers.sh
@@ -53,6 +53,7 @@ cp_virtio() {
                 -e 's/<linux\/\([^>]*\)>/"standard-headers\/linux\/\1"/' \
                 -e 's/__bitwise__//' \
                 -e 's/__attribute__((packed))/QEMU_PACKED/' \
+                -e 's/__inline__/inline/' \
                 "$f" > "$to/$header";
         done
     fi
-- 
MST

[Qemu-devel] [PATCH 2/4] virtio-serial-bus.c: drop virtio_ids.h

[Michael S. Tsirkin]

virtio-serial.h pulls that in already.

Reported-by: Thomas Huth <thuth@linux.vnet.ibm.com>
Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
---
 hw/char/virtio-serial-bus.c | 1 -
 1 file changed, 1 deletion(-)

diff --git a/hw/char/virtio-serial-bus.c b/hw/char/virtio-serial-bus.c
index ba4cf2e..9a029d2 100644
--- a/hw/char/virtio-serial-bus.c
+++ b/hw/char/virtio-serial-bus.c
@@ -18,7 +18,6 @@
  * GNU GPL, version 2 or (at your option) any later version.
  */
 
-#include "standard-headers/linux/virtio_ids.h"
 #include "qemu/iov.h"
 #include "monitor/monitor.h"
 #include "qemu/queue.h"
-- 
MST

[Qemu-devel] [PATCH 3/4] standard-headers: include stdint.h

[Michael S. Tsirkin]

The importing script got it right already, I just forgot to re-run it.

Reported-by: Thomas Huth <thuth@linux.vnet.ibm.com>
Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
---
 include/standard-headers/linux/types.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/include/standard-headers/linux/types.h b/include/standard-headers/linux/types.h
index 7d42ac6..0526c2b 100644
--- a/include/standard-headers/linux/types.h
+++ b/include/standard-headers/linux/types.h
@@ -1,2 +1,2 @@
-#include <inttypes.h>
+#include <stdint.h>
 #include "qemu/compiler.h"
-- 
MST

[Qemu-devel] [PATCH 4/4] virtio_ring.h: s/__inline__/inline/

[Michael S. Tsirkin]

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>
---
 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