On Sun, 2024-02-18 at 09:33 +0100, Volker Rümelin wrote:
> The virtio-sound device is currently not migratable. Add the
> missing VMSTATE fields, enable migration and reconnect the audio
> streams after migration.
>
> The queue_inuse[] array variables mimic the inuse variable in
> struct VirtQueue which is private. They are needed to restart
> the virtio queues after migration.
>
> Signed-off-by: Volker Rümelin <[email protected]>
Hello everyone,
Hi Volker,
I wonder if you are still working on this, cause I'm also interested in
supporting
virtio-sound device live migration. I would like to offer you my help with this
stuff
if you are too busy right now. I can help to fix review suggestions, do tests
and so on.
P.S. Sorry for making a noise in this 2 years old thread...
Kind regards,
Alex
> ---
> hw/audio/virtio-snd.c | 84 +++++++++++++++++++++++++++++++----
> include/hw/audio/virtio-snd.h | 1 +
> 2 files changed, 77 insertions(+), 8 deletions(-)
>
> diff --git a/hw/audio/virtio-snd.c b/hw/audio/virtio-snd.c
> index 06a27ef8d9..b0a0ff2456 100644
> --- a/hw/audio/virtio-snd.c
> +++ b/hw/audio/virtio-snd.c
> @@ -25,7 +25,6 @@
> #include "hw/audio/virtio-snd.h"
> #include "hw/core/cpu.h"
>
> -#define VIRTIO_SOUND_VM_VERSION 1
> #define VIRTIO_SOUND_JACK_DEFAULT 0
> #define VIRTIO_SOUND_STREAM_DEFAULT 2
> #define VIRTIO_SOUND_CHMAP_DEFAULT 0
> @@ -79,17 +78,40 @@ static uint32_t supported_rates =
> BIT(VIRTIO_SND_PCM_RATE_5512)
> | BIT(VIRTIO_SND_PCM_RATE_192000)
> | BIT(VIRTIO_SND_PCM_RATE_384000);
>
> +static const VMStateDescription vmstate_virtio_snd_stream = {
> + .name = "virtio-sound-stream",
> + .fields = (const VMStateField[]) {
> + VMSTATE_UINT32(state, VirtIOSoundPCMStream),
> + VMSTATE_UINT32(info.hdr.hda_fn_nid, VirtIOSoundPCMStream),
> + VMSTATE_UINT32(info.features, VirtIOSoundPCMStream),
> + VMSTATE_UINT64(info.formats, VirtIOSoundPCMStream),
> + VMSTATE_UINT64(info.rates, VirtIOSoundPCMStream),
> + VMSTATE_UINT8(info.direction, VirtIOSoundPCMStream),
> + VMSTATE_UINT8(info.channels_min, VirtIOSoundPCMStream),
> + VMSTATE_UINT8(info.channels_max, VirtIOSoundPCMStream),
> + VMSTATE_UINT32(params.buffer_bytes, VirtIOSoundPCMStream),
> + VMSTATE_UINT32(params.period_bytes, VirtIOSoundPCMStream),
> + VMSTATE_UINT32(params.features, VirtIOSoundPCMStream),
> + VMSTATE_UINT8(params.channels, VirtIOSoundPCMStream),
> + VMSTATE_UINT8(params.format, VirtIOSoundPCMStream),
> + VMSTATE_UINT8(params.rate, VirtIOSoundPCMStream),
> + VMSTATE_END_OF_LIST()
> + },
> +};
> +
> static const VMStateDescription vmstate_virtio_snd_device = {
> - .name = TYPE_VIRTIO_SND,
> - .version_id = VIRTIO_SOUND_VM_VERSION,
> - .minimum_version_id = VIRTIO_SOUND_VM_VERSION,
> + .name = "virtio-sound-device",
> + .fields = (const VMStateField[]) {
> + VMSTATE_UINT32_ARRAY(queue_inuse, VirtIOSound, VIRTIO_SND_VQ_MAX),
> + VMSTATE_STRUCT_VARRAY_POINTER_UINT32(streams, VirtIOSound,
> + snd_conf.streams,
> + vmstate_virtio_snd_stream, VirtIOSoundPCMStream),
> + VMSTATE_END_OF_LIST()
> + },
> };
>
> static const VMStateDescription vmstate_virtio_snd = {
> - .name = TYPE_VIRTIO_SND,
> - .unmigratable = 1,
> - .minimum_version_id = VIRTIO_SOUND_VM_VERSION,
> - .version_id = VIRTIO_SOUND_VM_VERSION,
> + .name = "virtio-sound",
> .fields = (const VMStateField[]) {
> VMSTATE_VIRTIO_DEVICE,
> VMSTATE_END_OF_LIST()
> @@ -812,6 +834,7 @@ process_cmd(VirtIOSound *s, virtio_snd_ctrl_command *cmd)
> sizeof(virtio_snd_hdr));
> virtqueue_push(cmd->vq, cmd->elem,
> sizeof(virtio_snd_hdr) + cmd->payload_size);
> + s->queue_inuse[VIRTIO_SND_VQ_CONTROL] -= 1;
> virtio_notify(VIRTIO_DEVICE(s), cmd->vq);
> }
>
> @@ -858,6 +881,7 @@ static void virtio_snd_handle_ctrl(VirtIODevice *vdev,
> VirtQueue *vq)
>
> elem = virtqueue_pop(vq, sizeof(VirtQueueElement));
> while (elem) {
> + s->queue_inuse[VIRTIO_SND_VQ_CONTROL] += 1;
> cmd = g_new0(virtio_snd_ctrl_command, 1);
> cmd->elem = elem;
> cmd->vq = vq;
> @@ -946,6 +970,7 @@ static void virtio_snd_handle_tx_xfer(VirtIODevice *vdev,
> VirtQueue *vq)
> goto tx_err;
> }
>
> + s->queue_inuse[VIRTIO_SND_VQ_TX] += 1;
> size = iov_size(elem->out_sg, elem->out_num) - msg_sz;
>
> buffer = g_malloc0(sizeof(VirtIOSoundPCMBuffer) + size);
> @@ -1019,6 +1044,8 @@ static void virtio_snd_handle_rx_xfer(VirtIODevice
> *vdev, VirtQueue *vq)
> if (stream->info.direction != VIRTIO_SND_D_INPUT) {
> goto rx_err;
> }
> +
> + s->queue_inuse[VIRTIO_SND_VQ_RX] += 1;
> size = iov_size(elem->in_sg, elem->in_num) -
> sizeof(virtio_snd_pcm_status);
> buffer = g_malloc0(sizeof(VirtIOSoundPCMBuffer) + size);
> @@ -1154,6 +1181,7 @@ static inline void
> return_tx_buffer(VirtIOSoundPCMStream *stream,
> virtqueue_push(buffer->vq,
> buffer->elem,
> sizeof(virtio_snd_pcm_status));
> + stream->s->queue_inuse[VIRTIO_SND_VQ_TX] -= 1;
> virtio_notify(VIRTIO_DEVICE(stream->s), buffer->vq);
> QSIMPLEQ_REMOVE(&stream->queue,
> buffer,
> @@ -1245,6 +1273,7 @@ static inline void
> return_rx_buffer(VirtIOSoundPCMStream *stream,
> virtqueue_push(buffer->vq,
> buffer->elem,
> sizeof(virtio_snd_pcm_status) + buffer->size);
> + stream->s->queue_inuse[VIRTIO_SND_VQ_RX] -= 1;
> virtio_notify(VIRTIO_DEVICE(stream->s), buffer->vq);
> QSIMPLEQ_REMOVE(&stream->queue,
> buffer,
> @@ -1350,6 +1379,40 @@ static void virtio_snd_unrealize(DeviceState *dev)
> virtio_cleanup(vdev);
> }
>
> +static int virtio_snd_post_load(VirtIODevice *vdev)
> +{
> + VirtIOSound *s = VIRTIO_SND(vdev);
> + uint32_t i;
> +
> + for (i = 0; i < s->snd_conf.streams; i++) {
> + struct VirtIOSoundPCMStream *stream;
> +
> + stream = virtio_snd_pcm_get_stream(s, i);
> + if (stream->state & VSND_PCMSTREAM_STATE_F_PREPARED) {
> + virtio_snd_pcm_open(stream);
> +
> + if (stream->state & VSND_PCMSTREAM_STATE_F_ACTIVE) {
> + virtio_snd_pcm_set_active(stream, true);
> + }
> + }
> + }
> +
> + for (i = 0; i < VIRTIO_SND_VQ_MAX; i++) {
> + if (s->queue_inuse[i]) {
> + bool rc;
> +
> + rc = virtqueue_rewind(s->queues[i], s->queue_inuse[i]);
> + if (!rc) {
> + error_report(
> + "virtio-sound: could not rewind %u elements in queue %u",
> + s->queue_inuse[i], i);
> + }
> + s->queue_inuse[i] = 0;
> + }
> + }
> +
> + return 0;
> +}
>
> static void virtio_snd_reset(VirtIODevice *vdev)
> {
> @@ -1375,6 +1438,10 @@ static void virtio_snd_reset(VirtIODevice *vdev)
> virtio_snd_pcm_buffer_free(buffer);
> }
> }
> +
> + for (i = 0; i < VIRTIO_SND_VQ_MAX; i++) {
> + s->queue_inuse[i] = 0;
> + }
> }
>
> static void virtio_snd_class_init(ObjectClass *klass, void *data)
> @@ -1388,6 +1455,7 @@ static void virtio_snd_class_init(ObjectClass *klass,
> void *data)
>
> dc->vmsd = &vmstate_virtio_snd;
> vdc->vmsd = &vmstate_virtio_snd_device;
> + vdc->post_load = virtio_snd_post_load;
> vdc->realize = virtio_snd_realize;
> vdc->unrealize = virtio_snd_unrealize;
> vdc->get_config = virtio_snd_get_config;
> diff --git a/include/hw/audio/virtio-snd.h b/include/hw/audio/virtio-snd.h
> index 65afa6c184..457d18d196 100644
> --- a/include/hw/audio/virtio-snd.h
> +++ b/include/hw/audio/virtio-snd.h
> @@ -196,6 +196,7 @@ struct VirtIOSound {
> VirtIODevice parent_obj;
>
> VirtQueue *queues[VIRTIO_SND_VQ_MAX];
> + uint32_t queue_inuse[VIRTIO_SND_VQ_MAX];
> uint64_t features;
> VirtIOSoundPCMStream *streams;
> QEMUSoundCard card;
