Succeed to initialize virtio-snd

Author: Cuda-Chen

virtio-snd.c

@@ -246,29 +246,24 @@ static void virtio_snd_update_status(virtio_snd_state_t *vsnd, uint32_t status)
 }
 
 static void virtio_snd_read_jack_info_handler(
-    struct virtq_desc *vq_desc,
+    virtio_snd_jack_info_t *info,
     const virtio_snd_query_info_t *query)
 {
-    uint32_t cnt = query->count;
-    virtio_snd_jack_info_t *info = malloc(sizeof(virtio_snd_jack_info_t) * cnt);
-    for (uint32_t i = 0; i < cnt; i++) {
+    for (uint32_t i = 0; i < query->count; i++) {
         info[i].hdr.hda_fn_nid = 0;
         info[i].features = 0;
         info[i].hda_reg_defconf = 0;
         info[i].hda_reg_caps = 0;
         info[i].connected = 1;
         memset(&info[i].padding, 0, sizeof(info[i].padding));
     }
-    vq_desc[2].addr = (uintptr_t) info;
 }
 
 static void virtio_snd_read_pcm_info_handler(
-    struct virtq_desc *vq_desc,
+    virtio_snd_pcm_info_t *info,
     const virtio_snd_query_info_t *query)
 {
-    uint32_t cnt = query->count;
-    virtio_snd_pcm_info_t *info = malloc(sizeof(virtio_snd_pcm_info_t) * cnt);
-    for (uint32_t i = 0; i < cnt; i++) {
+    for (uint32_t i = 0; i < query->count; i++) {
         info[i].hdr.hda_fn_nid = 0;
         info[i].features = 0;
         info[i].formats = (1 << VIRTIO_SND_PCM_FMT_S16);
@@ -278,23 +273,18 @@ static void virtio_snd_read_pcm_info_handler(
         info[i].channels_max = 1;
         memset(&info[i].padding, 0, sizeof(info[i].padding));
     }
-    vq_desc[2].addr = (uintptr_t) info;
 }
 
 static void virtio_snd_read_chmap_info_handler(
-    struct virtq_desc *vq_desc,
+    virtio_snd_chmap_info_t *info,
     const virtio_snd_query_info_t *query)
 {
-    uint32_t cnt = query->count;
-    virtio_snd_chmap_info_t *info =
-        malloc(sizeof(virtio_snd_chmap_info_t) * cnt);
     for (uint32_t i = 0; i < query->count; i++) {
         info[i].hdr.hda_fn_nid = 0;
         info[i].direction = VIRTIO_SND_D_OUTPUT;
         info[i].channels = 1;
         info[i].positions[0] = VIRTIO_SND_CHMAP_MONO;
     }
-    vq_desc[2].addr = (uintptr_t) info;
 }
 
 static void virtio_snd_read_pcm_set_params(struct virtq_desc *vq_desc,
@@ -438,17 +428,18 @@ static int virtio_snd_desc_handler(virtio_snd_state_t *vsnd,
         (virtio_snd_hdr_t *) ((uintptr_t) vsnd->ram + vq_desc[1].addr);
     const virtio_snd_query_info_t *query =
         (virtio_snd_query_info_t *) ((uintptr_t) vsnd->ram + vq_desc[0].addr);
+    void *info = (void *) (uintptr_t) vsnd->ram + vq_desc[2].addr;
 
     /* Process the data */
     switch (type) {
     case VIRTIO_SND_R_JACK_INFO:
-        virtio_snd_read_jack_info_handler(vq_desc, query);
+        virtio_snd_read_jack_info_handler(info, query);
         break;
     case VIRTIO_SND_R_PCM_INFO:
-        virtio_snd_read_pcm_info_handler(vq_desc, query);
+        virtio_snd_read_pcm_info_handler(info, query);
         break;
     case VIRTIO_SND_R_CHMAP_INFO:
-        virtio_snd_read_chmap_info_handler(vq_desc, query);
+        virtio_snd_read_chmap_info_handler(info, query);
         break;
     case VIRTIO_SND_R_PCM_SET_PARAMS:
         virtio_snd_read_pcm_set_params(vq_desc, query);