[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PULL 13/63] virtio-sound: handle VIRTIO_SND_R_PCM_SET_PARAMS
|
From: |
Michael S. Tsirkin |
|
Subject: |
[PULL 13/63] virtio-sound: handle VIRTIO_SND_R_PCM_SET_PARAMS |
|
Date: |
Tue, 7 Nov 2023 05:10:25 -0500 |
From: Manos Pitsidianakis <manos.pitsidianakis@linaro.org>
Handle the set parameters control request. It reconfigures a stream
based on a guest's preference if the values are valid and supported.
Based-on:
https://github.com/OpenSynergy/qemu/commit/5a2f350eec5d157b90d9c7b40a8e603f4da92471
Signed-off-by: Igor Skalkin <Igor.Skalkin@opensynergy.com>
Signed-off-by: Anton Yakovlev <Anton.Yakovlev@opensynergy.com>
Signed-off-by: Manos Pitsidianakis <manos.pitsidianakis@linaro.org>
Reviewed-by: Alex Bennée <alex.bennee@linaro.org>
Tested-by: Alex Bennée <alex.bennee@linaro.org>
Message-Id:
<d0d19928691f9375bfd83388806786cb7b161301.1698062525.git.manos.pitsidianakis@linaro.org>
Acked-by: Michael S. Tsirkin <mst@redhat.com>
Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
---
hw/audio/virtio-snd.c | 34 ++++++++++++++++++++++++++++++++++
hw/audio/trace-events | 1 +
2 files changed, 35 insertions(+)
diff --git a/hw/audio/virtio-snd.c b/hw/audio/virtio-snd.c
index e6791de6c6..084890e52b 100644
--- a/hw/audio/virtio-snd.c
+++ b/hw/audio/virtio-snd.c
@@ -287,6 +287,38 @@ uint32_t virtio_snd_set_pcm_params(VirtIOSound *s,
return cpu_to_le32(VIRTIO_SND_S_OK);
}
+/*
+ * Handles the VIRTIO_SND_R_PCM_SET_PARAMS request.
+ *
+ * @s: VirtIOSound device
+ * @cmd: The request command queue element from VirtIOSound cmdq field
+ */
+static void virtio_snd_handle_pcm_set_params(VirtIOSound *s,
+ virtio_snd_ctrl_command *cmd)
+{
+ virtio_snd_pcm_set_params req = { 0 };
+ uint32_t stream_id;
+ size_t msg_sz = iov_to_buf(cmd->elem->out_sg,
+ cmd->elem->out_num,
+ 0,
+ &req,
+ sizeof(virtio_snd_pcm_set_params));
+
+ if (msg_sz != sizeof(virtio_snd_pcm_set_params)) {
+ /*
+ * TODO: do we need to set DEVICE_NEEDS_RESET?
+ */
+ qemu_log_mask(LOG_GUEST_ERROR,
+ "%s: virtio-snd command size incorrect %zu vs \
+ %zu\n", __func__, msg_sz, sizeof(virtio_snd_pcm_set_params));
+ cmd->resp.code = cpu_to_le32(VIRTIO_SND_S_BAD_MSG);
+ return;
+ }
+ stream_id = le32_to_cpu(req.hdr.stream_id);
+ trace_virtio_snd_handle_pcm_set_params(stream_id);
+ cmd->resp.code = virtio_snd_set_pcm_params(s, stream_id, &req);
+}
+
/*
* Get a QEMU Audiosystem compatible format value from a VIRTIO_SND_PCM_FMT_*
*/
@@ -534,6 +566,8 @@ process_cmd(VirtIOSound *s, virtio_snd_ctrl_command *cmd)
virtio_snd_handle_pcm_start_stop(s, cmd, false);
break;
case VIRTIO_SND_R_PCM_SET_PARAMS:
+ virtio_snd_handle_pcm_set_params(s, cmd);
+ break;
case VIRTIO_SND_R_PCM_PREPARE:
case VIRTIO_SND_R_PCM_RELEASE:
cmd->resp.code = cpu_to_le32(VIRTIO_SND_S_NOT_SUPP);
diff --git a/hw/audio/trace-events b/hw/audio/trace-events
index db48ff04fe..3badcab2e8 100644
--- a/hw/audio/trace-events
+++ b/hw/audio/trace-events
@@ -47,6 +47,7 @@ virtio_snd_vm_state_running(void) "vm state running"
virtio_snd_vm_state_stopped(void) "vm state stopped"
virtio_snd_realize(void *snd) "snd %p: realize"
virtio_snd_unrealize(void *snd) "snd %p: unrealize"
+virtio_snd_handle_pcm_set_params(uint32_t stream) "VIRTIO_SND_PCM_SET_PARAMS
called for stream %"PRIu32
virtio_snd_handle_ctrl(void *vdev, void *vq) "snd %p: handle ctrl event for
queue %p"
virtio_snd_handle_pcm_info(uint32_t stream) "VIRTIO_SND_R_PCM_INFO called for
stream %"PRIu32
virtio_snd_handle_pcm_start_stop(const char *code, uint32_t stream) "%s called
for stream %"PRIu32
--
MST
- [PULL 11/63] virtio-sound: handle VIRTIO_SND_R_PCM_INFO request, (continued)
- [PULL 11/63] virtio-sound: handle VIRTIO_SND_R_PCM_INFO request, Michael S. Tsirkin, 2023/11/07
- [PULL 05/63] vhost-user: Interface for migration state transfer, Michael S. Tsirkin, 2023/11/07
- [PULL 04/63] vhost-user.rst: Migrating back-end-internal state, Michael S. Tsirkin, 2023/11/07
- [PULL 12/63] virtio-sound: handle VIRTIO_SND_R_PCM_{START,STOP}, Michael S. Tsirkin, 2023/11/07
- [PULL 08/63] Add virtio-sound device stub, Michael S. Tsirkin, 2023/11/07
- [PULL 10/63] virtio-sound: handle control messages and streams, Michael S. Tsirkin, 2023/11/07
- [PULL 13/63] virtio-sound: handle VIRTIO_SND_R_PCM_SET_PARAMS,
Michael S. Tsirkin <=
- [PULL 09/63] Add virtio-sound-pci device, Michael S. Tsirkin, 2023/11/07
- [PULL 14/63] virtio-sound: handle VIRTIO_SND_R_PCM_PREPARE, Michael S. Tsirkin, 2023/11/07
- [PULL 15/63] virtio-sound: handle VIRTIO_SND_R_PCM_RELEASE, Michael S. Tsirkin, 2023/11/07
- [PULL 19/63] vdpa: Restore hash calculation state, Michael S. Tsirkin, 2023/11/07
- [PULL 16/63] virtio-sound: implement audio output (TX), Michael S. Tsirkin, 2023/11/07
- [PULL 17/63] virtio-sound: implement audio capture (RX), Michael S. Tsirkin, 2023/11/07
- [PULL 20/63] vdpa: Allow VIRTIO_NET_F_HASH_REPORT in SVQ, Michael S. Tsirkin, 2023/11/07
- [PULL 18/63] docs/system: add basic virtio-snd documentation, Michael S. Tsirkin, 2023/11/07
- [PULL 22/63] vdpa: Restore receive-side scaling state, Michael S. Tsirkin, 2023/11/07
- [PULL 21/63] vdpa: Add SetSteeringEBPF method for NetClientState, Michael S. Tsirkin, 2023/11/07