Remove dead code

Author: Cuda-Chen

virtio-snd.c

@@ -523,6 +523,18 @@ static void virtio_snd_read_pcm_release(const virtio_snd_pcm_hdr_t *query,
     vsnd_props[stream_id].pp.hdr.hdr.code = VIRTIO_SND_R_PCM_RELEASE;
     CNFAClose(vsnd_props[stream_id].audio_host);
 
+    /* Tear down the PCM frames. */
+    virtio_snd_pcm_frame_t *t = NULL;
+    struct queue_head frame_q = vsnd_props[stream_id].pcm_frames_q;
+    virtio_snd_pcm_frame_t *frame = vsnd_props[stream_id].pcm_frames;
+    queue_for_each_entry_safe(frame, t, &frame_q, q)
+    {
+        free(frame->buf);
+        queue_del(&frame->q);
+        free(frame);
+    }
+    assert(queue_empty(&frame_q));
+
     *plen = 0;
     fprintf(stderr, "virtio_snd_read_pcm_release\n");
 }
@@ -671,7 +683,7 @@ static int virtio_snd_tx_desc_handler(virtio_snd_state_t *vsnd,
                                       uint32_t desc_idx,
                                       uint32_t *plen)
 {
-    /* TODO: clarify the usage of last descriptor. */
+    /* TODO: clarify the usage of the last descriptor. */
     /* virtio-snd TX uses arbitrary number of virtqueue descriptors.
      * The first descritor descriptor contains:
      *   struct virtio_snd_hdr hdr (for request)
@@ -692,11 +704,6 @@ static int virtio_snd_tx_desc_handler(virtio_snd_state_t *vsnd,
         const uint32_t *desc = &vsnd->ram[queue->QueueDesc + desc_idx * 4];
 
         /* Retrieve the fields of current descriptor */
-        /*if (i < VSND_DESC_CNT) {
-            vq_desc[i].addr = desc[0];
-            vq_desc[i].len = desc[2];
-            vq_desc[i].flags = desc[3];
-        }*/
         node = (virtq_desc_queue_node_t *) malloc(sizeof(*node));
         node->vq_desc.addr = desc[0];
         node->vq_desc.len = desc[2];
@@ -787,6 +794,7 @@ static int virtio_snd_tx_desc_handler(virtio_snd_state_t *vsnd,
     assert(idx == cnt);
     assert(queue_empty(&q));
 
+#if 0
     /* Tear down the PCM frames. (should use in pcm_release) */
     idx = 0;
     virtio_snd_pcm_frame_t *t = NULL;
@@ -799,6 +807,7 @@ static int virtio_snd_tx_desc_handler(virtio_snd_state_t *vsnd,
     }
     assert(idx == cnt - 2);
     assert(queue_empty(&frame_q));
+#endif
 
     return 0;
 }
@@ -1068,13 +1077,6 @@ bool virtio_snd_init(virtio_snd_state_t *vsnd)
     /* Allocate the memory of private member. */
     vsnd->priv = &vsnd_configs[vsnd_dev_cnt++];
 
-    /*audio_host = CNFAInit(NULL, "semu-virtio-snd", virtio_snd_cb, 44100, 0, 1,
-                          0, 1024, NULL, NULL, &guest_playing);
-    if (!audio_host) {
-        fprintf(stderr, "virtio-snd driver initialization failed.\n");
-        return false;
-    }*/
-
     PRIV(vsnd)->jacks = 1;
     PRIV(vsnd)->streams = 1;
     PRIV(vsnd)->chmaps = 1;