migration/ram.c: reset complete_round when we gets a queued page

[mirror_qemu.git] / audio / mixeng.c

diff --git a/audio/mixeng.c b/audio/mixeng.c
index 0bf9b5360f896b8ff68827e80657f736049b8a7d..2f5ba71381d43f774acbcda632cd882da8b485f5 100644 (file)
--- a/audio/mixeng.c
+++ b/audio/mixeng.c
@@ -23,7 +23,6 @@
  * THE SOFTWARE.
  */
 #include "qemu/osdep.h"
-#include "qemu-common.h"
 #include "qemu/bswap.h"
 #include "qemu/error-report.h"
 #include "audio.h"
@@ -344,7 +343,7 @@ struct rate {
  */
 void *st_rate_start (int inrate, int outrate)
 {
-    struct rate *rate = audio_calloc (AUDIO_FUNC, 1, sizeof (*rate));
+    struct rate *rate = audio_calloc(__func__, 1, sizeof(*rate));
 
     if (!rate) {
         dolog ("Could not allocate resampler (%zu bytes)\n", sizeof (*rate));