Code Review
/
kvmfornfv.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Merge "Adding breaktrace & disabling timer migration"
[kvmfornfv.git]
/
qemu
/
include
/
standard-headers
/
linux
/
virtio_ring.h
diff --git
a/qemu/include/standard-headers/linux/virtio_ring.h
b/qemu/include/standard-headers/linux/virtio_ring.h
index
6fe276f
..
023c6db
100644
(file)
--- a/
qemu/include/standard-headers/linux/virtio_ring.h
+++ b/
qemu/include/standard-headers/linux/virtio_ring.h
@@
-31,6
+31,7
@@
* SUCH DAMAGE.
*
* Copyright Rusty Russell IBM Corporation 2007. */
* SUCH DAMAGE.
*
* Copyright Rusty Russell IBM Corporation 2007. */
+#include <stdint.h>
#include "standard-headers/linux/types.h"
#include "standard-headers/linux/virtio_types.h"
#include "standard-headers/linux/types.h"
#include "standard-headers/linux/virtio_types.h"
@@
-143,7
+144,7
@@
static inline void vring_init(struct vring *vr, unsigned int num, void *p,
vr->num = num;
vr->desc = p;
vr->avail = p + num*sizeof(struct vring_desc);
vr->num = num;
vr->desc = p;
vr->avail = p + num*sizeof(struct vring_desc);
- vr->used = (void *)(((u
nsigned long
)&vr->avail->ring[num] + sizeof(__virtio16)
+ vr->used = (void *)(((u
intptr_t
)&vr->avail->ring[num] + sizeof(__virtio16)
+ align-1) & ~(align - 1));
}
+ align-1) & ~(align - 1));
}