osdep: make readv_writev() work with partial read/write

[mirror_qemu.git] / util / atomic64.c

diff --git a/util/atomic64.c b/util/atomic64.c
index b198a6c9c80288e8d252eca4000fc6590a5f98b3..c20d071d8e5f00214cfd4e918fdb92c24e34bd88 100644 (file)
--- a/util/atomic64.c
+++ b/util/atomic64.c
@@ -7,6 +7,8 @@
 #include "qemu/osdep.h"
 #include "qemu/atomic.h"
 #include "qemu/thread.h"
+#include "qemu/cacheinfo.h"
+#include "qemu/memalign.h"
 
 #ifdef CONFIG_ATOMIC64
 #error This file must only be compiled if !CONFIG_ATOMIC64
@@ -51,8 +53,8 @@ static QemuSpin *addr_to_lock(const void *addr)
         return ret;                             \
     }
 
-GEN_READ(atomic_read_i64, int64_t)
-GEN_READ(atomic_read_u64, uint64_t)
+GEN_READ(qatomic_read_i64, int64_t)
+GEN_READ(qatomic_read_u64, uint64_t)
 #undef GEN_READ
 
 #define GEN_SET(name, type)                     \
@@ -65,11 +67,11 @@ GEN_READ(atomic_read_u64, uint64_t)
         qemu_spin_unlock(lock);                 \
     }
 
-GEN_SET(atomic_set_i64, int64_t)
-GEN_SET(atomic_set_u64, uint64_t)
+GEN_SET(qatomic_set_i64, int64_t)
+GEN_SET(qatomic_set_u64, uint64_t)
 #undef GEN_SET
 
-void atomic64_init(void)
+void qatomic64_init(void)
 {
     int i;