[Qemu-devel] [PATCH 1/3] wavaudio: Use stdio instead of QEMUFile

[Juan Quintela]

QEMUFile * is only intended for migration nowadays.  Using it for
anything else just adds pain and a layer of buffers for no good
reason.

Signed-off-by: Juan Quintela <address@hidden>
CC:  malc <address@hidden>

---
 audio/wavaudio.c |   34 ++++++++++++++++++++++++----------
 1 files changed, 24 insertions(+), 10 deletions(-)

diff --git a/audio/wavaudio.c b/audio/wavaudio.c
index aed1817..7b7c081 100644
--- a/audio/wavaudio.c
+++ b/audio/wavaudio.c
@@ -30,7 +30,7 @@

 typedef struct WAVVoiceOut {
     HWVoiceOut hw;
-    QEMUFile *f;
+    FILE *f;
     int64_t old_ticks;
     void *pcm_buf;
     int total_samples;
@@ -76,7 +76,9 @@ static int wav_run_out (HWVoiceOut *hw, int live)
         dst = advance (wav->pcm_buf, rpos << hw->info.shift);

         hw->clip (dst, src, convert_samples);
-        qemu_put_buffer (wav->f, dst, convert_samples << hw->info.shift);
+        if (fwrite (dst, convert_samples << hw->info.shift, 1, wav->f) != 1) {
+            dolog ("wav_run_out: fwrite error '%s'\n", strerror(errno));
+        }

         rpos = (rpos + convert_samples) % hw->samples;
         samples -= convert_samples;
@@ -152,7 +154,7 @@ static int wav_init_out (HWVoiceOut *hw, struct audsettings 
*as)
     le_store (hdr + 28, hw->info.freq << (bits16 + stereo), 4);
     le_store (hdr + 32, 1 << (bits16 + stereo), 2);

-    wav->f = qemu_fopen (conf.wav_path, "wb");
+    wav->f = fopen (conf.wav_path, "wb");
     if (!wav->f) {
         dolog ("Failed to open wave file `%s'\nReason: %s\n",
                conf.wav_path, strerror (errno));
@@ -161,7 +163,10 @@ static int wav_init_out (HWVoiceOut *hw, struct 
audsettings *as)
         return -1;
     }

-    qemu_put_buffer (wav->f, hdr, sizeof (hdr));
+    if (fwrite (hdr, sizeof (hdr), 1, wav->f) != 1) {
+        dolog ("wav_init_out: fwrite error '%s'\n", strerror(errno));
+        return -1;
+    }
     return 0;
 }

@@ -180,13 +185,22 @@ static void wav_fini_out (HWVoiceOut *hw)
     le_store (rlen, rifflen, 4);
     le_store (dlen, datalen, 4);

-    qemu_fseek (wav->f, 4, SEEK_SET);
-    qemu_put_buffer (wav->f, rlen, 4);
-
-    qemu_fseek (wav->f, 32, SEEK_CUR);
-    qemu_put_buffer (wav->f, dlen, 4);
+    if (fseek (wav->f, 4, SEEK_SET) == -1) {
+        dolog ("wav_fini_out: fseek error '%s'\n", strerror(errno));
+    }
+    if (fwrite (rlen, 1, 4, wav->f) != 4) {
+        dolog ("wav_fini_out: fwrite error writing rlen '%s'\n",
+               strerror(errno));
+    }
+    if (fseek (wav->f, 32, SEEK_CUR) == -1) {
+        dolog ("wav_fini_out: fseek error '%s'\n", strerror(errno));
+    }
+    if (fwrite (dlen, 1, 4, wav->f) != 4) {
+        dolog ("wav_fini_out: fwrite error writing dlen '%s'\n",
+               strerror(errno));
+    }

-    qemu_fclose (wav->f);
+    fclose (wav->f);
     wav->f = NULL;

     g_free (wav->pcm_buf);
-- 
1.7.6.2