Fix warnings

Author: Cuda-Chen

virtio-snd.c

@@ -383,11 +383,11 @@ static void virtio_snd_read_chmap_info_handler(
     *plen = cnt * sizeof(info);
 }
 
-static void virtio_snd_read_pcm_set_params(struct virtq_desc *vq_desc,
-                                           const virtio_snd_query_info_t *query,
-                                           uint32_t *plen)
+static void virtio_snd_read_pcm_set_params(
+    const virtio_snd_pcm_set_params_t *query,
+    uint32_t *plen)
 {
-    virtio_snd_pcm_set_params_t *request = query;
+    const virtio_snd_pcm_set_params_t *request = query;
     uint32_t id = request->hdr.stream_id;
     /* TODO: detect current state of stream */
     uint32_t code = vsnd_props[id].pp.hdr.hdr.code;
@@ -414,11 +414,10 @@ static void virtio_snd_read_pcm_set_params(struct virtq_desc *vq_desc,
     fprintf(stderr, "virtio_snd_read_pcm_set_params\n");
 }
 
-static void virtio_snd_read_pcm_prepare(struct virtq_desc *vq_desc,
-                                        const virtio_snd_query_info_t *query,
+static void virtio_snd_read_pcm_prepare(const virtio_snd_pcm_hdr_t *query,
                                         uint32_t *plen)
 {
-    virtio_snd_pcm_hdr_t *request = query;
+    const virtio_snd_pcm_hdr_t *request = query;
     uint32_t stream_id = request->stream_id;
     uint32_t code = vsnd_props[stream_id].pp.hdr.hdr.code;
     if (code != VIRTIO_SND_R_PCM_RELEASE &&
@@ -449,11 +448,10 @@ static void virtio_snd_read_pcm_prepare(struct virtq_desc *vq_desc,
     fprintf(stderr, "virtio_snd_read_pcm_prepare\n");
 }
 
-static void virtio_snd_read_pcm_start(struct virtq_desc *vq_desc,
-                                      const virtio_snd_query_info_t *query,
+static void virtio_snd_read_pcm_start(const virtio_snd_pcm_hdr_t *query,
                                       uint32_t *plen)
 {
-    virtio_snd_pcm_hdr_t *request = query;
+    const virtio_snd_pcm_hdr_t *request = query;
     uint32_t stream_id = request->stream_id;
     uint32_t code = vsnd_props[stream_id].pp.hdr.hdr.code;
     if (code != VIRTIO_SND_R_PCM_PREPARE && code != VIRTIO_SND_R_PCM_STOP) {
@@ -475,11 +473,10 @@ static void virtio_snd_read_pcm_start(struct virtq_desc *vq_desc,
     fprintf(stderr, "virtio_snd_read_pcm_start\n");
 }
 
-static void virtio_snd_read_pcm_stop(struct virtq_desc *vq_desc,
-                                     const virtio_snd_query_info_t *query,
+static void virtio_snd_read_pcm_stop(const virtio_snd_pcm_hdr_t *query,
                                      uint32_t *plen)
 {
-    virtio_snd_pcm_hdr_t *request = query;
+    const virtio_snd_pcm_hdr_t *request = query;
     uint32_t stream_id = request->stream_id;
     uint32_t code = vsnd_props[stream_id].pp.hdr.hdr.code;
     if (code != VIRTIO_SND_R_PCM_START) {
@@ -500,11 +497,10 @@ static void virtio_snd_read_pcm_stop(struct virtq_desc *vq_desc,
     fprintf(stderr, "virtio_snd_read_pcm_stop\n");
 }
 
-static void virtio_snd_read_pcm_release(struct virtq_desc *vq_desc,
-                                        const virtio_snd_query_info_t *query,
+static void virtio_snd_read_pcm_release(const virtio_snd_pcm_hdr_t *query,
                                         uint32_t *plen)
 {
-    virtio_snd_pcm_hdr_t *request = query;
+    const virtio_snd_pcm_hdr_t *request = query;
     uint32_t stream_id = request->stream_id;
     uint32_t code = vsnd_props[stream_id].pp.hdr.hdr.code;
     if (code != VIRTIO_SND_R_PCM_PREPARE && code != VIRTIO_SND_R_PCM_STOP) {
@@ -613,8 +609,7 @@ static int virtio_snd_desc_handler(virtio_snd_state_t *vsnd,
     uint32_t type = request->code;
     virtio_snd_hdr_t *response =
         (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);
+    const void *query = (void *) ((uintptr_t) vsnd->ram + vq_desc[0].addr);
 
     /* TODO: let the program use this variable selectively according to
      * the type.
@@ -636,19 +631,19 @@ static int virtio_snd_desc_handler(virtio_snd_state_t *vsnd,
         virtio_snd_read_chmap_info_handler(info, query, plen);
         break;
     case VIRTIO_SND_R_PCM_SET_PARAMS:
-        virtio_snd_read_pcm_set_params(vq_desc, query, plen);
+        virtio_snd_read_pcm_set_params(query, plen);
         break;
     case VIRTIO_SND_R_PCM_PREPARE:
-        virtio_snd_read_pcm_prepare(vq_desc, query, plen);
+        virtio_snd_read_pcm_prepare(query, plen);
         break;
     case VIRTIO_SND_R_PCM_RELEASE:
-        virtio_snd_read_pcm_release(vq_desc, query, plen);
+        virtio_snd_read_pcm_release(query, plen);
         break;
     case VIRTIO_SND_R_PCM_START:
-        virtio_snd_read_pcm_start(vq_desc, query, plen);
+        virtio_snd_read_pcm_start(query, plen);
         break;
     case VIRTIO_SND_R_PCM_STOP:
-        virtio_snd_read_pcm_stop(vq_desc, query, plen);
+        virtio_snd_read_pcm_stop(query, plen);
         break;
     default:
         fprintf(stderr, "%d: unsupported virtio-snd operation!\n", type);
@@ -666,7 +661,7 @@ static int virtio_snd_desc_handler(virtio_snd_state_t *vsnd,
 
 
 typedef struct {
-    struct virtq_desc;
+    struct virtq_desc vq_desc;
     struct queue_head q;
 } virtq_desc_queue_t;
 static int virtio_snd_tx_desc_handler(virtio_snd_state_t *vsnd,