From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from lists1p.gnu.org (lists1p.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 07DD2C55184 for ; Mon, 3 Aug 2026 08:12:50 +0000 (UTC) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists1p.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1wqnmU-0001eq-En; Mon, 03 Aug 2026 04:12:18 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists1p.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1wqnmS-0001eJ-1y for qemu-devel@nongnu.org; Mon, 03 Aug 2026 04:12:16 -0400 Received: from mail-wr1-x435.google.com ([2a00:1450:4864:20::435]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1wqnmQ-0003gO-5r for qemu-devel@nongnu.org; Mon, 03 Aug 2026 04:12:15 -0400 Received: by mail-wr1-x435.google.com with SMTP id ffacd0b85a97d-47f904e80eeso2837216f8f.1 for ; Mon, 03 Aug 2026 01:12:13 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=mihalicyn.com; s=mihalicyn; t=1785744732; x=1786349532; darn=nongnu.org; h=content-transfer-encoding:content-type:mime-version:references :in-reply-to:message-id:date:subject:cc:to:from:from:to:cc:subject :date:message-id:reply-to:content-type; bh=+ELrjsZqo0Fw4SJlqfLv6tV+ltQSyYmy368fF7LwM9E=; b=UYbWnKMnKPG8gJjBaFoeZnfV2lAcd3f7gGbHEBuLW1M4ur5d2x+NifMdp46rlS1d6j tELzotUd6ckWpUu/dsWCDckiqX6mZbDKdpluxUZVJe2a5ccUo52/0u5YqKRoNYPBtHgR iSGlRuSYdF+vYUVKrkwRVKMHjzx9p4Kx8GFK0= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1785744732; x=1786349532; h=content-transfer-encoding:content-type:mime-version:references :in-reply-to:message-id:date:subject:cc:to:from:x-gm-gg :x-gm-message-state:from:to:cc:subject:date:message-id:reply-to :content-type; bh=+ELrjsZqo0Fw4SJlqfLv6tV+ltQSyYmy368fF7LwM9E=; b=cJeimmZMdQfcDazu9va6jTEs/9OnSDQ43u6qIU72EyDTJaxsE8o4nhXRpaKrzUm9gH 4YEsKOoEFrFAcxcYbGRaSsvx/E9tnjy37fEvjmHxIBa4PHIsCVAluISDL/VV8N3CKZ5T zaq4YblYbLWYfxPtxhP36ieE3fGRxVwnbKUmrY3wFQtyP+k2a7AagS+YcrDjwKDpt41p V55GDdKc1VBoY/K0O2T7uW1jjN22LD/rpN+bAwT3GbeleFFRhIyBS0tVqLZoT6RZsLTQ 12kbgZEWym2cyzviJj9+L0OeAxKi9GTJLUjQURr2M4+WvKuMxiC6T/1odstZWKPt4jqM Y5Vg== X-Gm-Message-State: AOJu0YydPaZ2hatCOSf5nmxxJex4HTzsgU8HuyWVeJixfIPEw0kk5DlP yG/5CkX/Vmj3kAYkhClugy6byKNPTB6KFd2tLCyb3iMkQIx2ZvEm9ivlc5PGc1PKrzcAmfsZcGv 9D2mt X-Gm-Gg: AR+sD13MaDutYnlFc9wcZHzcgHmSE9EWQ9FY3772LFPiO+TWZxszyEFrRqUfBX9cFaK jKkYyx4kh3RoBY9bwBL49o2+3E18S3rJQcZuwaPmSFoxM9d71n+tN8UUjOY0QnRLe0z6JYp6FcU PNyD3+mLR/eO1OFp/sBXu/PMqWGu1t6+HY13q1dSvABi5UkAux01a3fVoJbJlwSyRN4sUYrpoMo 4/my9OmVnjIK0XN4oQOS+0KO6t2arFT0xI4Hu8lboWJWhviAgQ2Furq4qHpsr/MhHBkwSoBMmF8 eHRxqYlc1T4pQIYMI3E/DqUtlywOj/sZtNyda6rgaobCjHLe9wxrlzm/eT5rjdcsSFV4UU6ctRi LGm4Nw10R9ZveptehJYl+TMzRPTJyf+2OQ64qwQRyBZuqp8HwhcI7ACvyH8BrCV+rU6RCTjc7eA K2pXKfRINhCKgQHZE20/w3VppN10aE91EEm341+khCsx+0aLUMFr9FC+0yCpAX/Y2lMmlZn8LT7 H9rSd2d9/vtjaqSEVbIMzlxa6bV7YwOY4FZKK0L6ZJBjCOiRokw3S5w5GTI X-Received: by 2002:a05:600c:a016:b0:495:573e:1c54 with SMTP id 5b1f17b1804b1-4980c6523bamr229663095e9.9.1785744732393; Mon, 03 Aug 2026 01:12:12 -0700 (PDT) Received: from alex-laptop.lan (p200300cf574a7200803110ea947f174a.dip0.t-ipconnect.de. [2003:cf:574a:7200:8031:10ea:947f:174a]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-49807b98284sm209358435e9.12.2026.08.03.01.12.11 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 03 Aug 2026 01:12:11 -0700 (PDT) From: Alexander Mikhalitsyn To: qemu-devel@nongnu.org Cc: Manos Pitsidianakis , =?UTF-8?q?Volker=20R=C3=BCmelin?= , =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= , Gerd Hoffmann , =?UTF-8?q?Daniel=20P=20=2E=20Berrang=C3=A9?= , Alexander Mikhalitsyn , "Michael S. Tsirkin" , =?UTF-8?q?St=C3=A9phane=20Graber?= , Alexander Mikhalitsyn Subject: [PATCH v5 10/10] hw/audio/virtio-sound: add missing vmstate fields Date: Mon, 3 Aug 2026 10:11:59 +0200 Message-ID: <20260803081159.91981-11-alexander@mihalicyn.com> X-Mailer: git-send-email 2.47.3 In-Reply-To: <20260803081159.91981-1-alexander@mihalicyn.com> References: <20260803081159.91981-1-alexander@mihalicyn.com> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Received-SPF: pass client-ip=2a00:1450:4864:20::435; envelope-from=alexander@mihalicyn.com; helo=mail-wr1-x435.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: qemu development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org From: Volker Rümelin 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 [AM: trivial rebase changes] Signed-off-by: Alexander Mikhalitsyn Reviewed-by: Marc-André Lureau --- v4: - added assert(. > 0) before decremeting s->queue_inuse[.] (suggested by Manos Pitsidianakis) v3: - added latency_bytes field to VMStateDescription As suggested by Marc-André Lureau: - removed the "rc" variable from virtio_snd_post_load() - dropped info field from VMStateDescription, because it can't be modified by guest and initialized only from realize - added minimum_version_id/version_id so we can extend VMStateDescription without breaking compatibility in the future --- hw/audio/virtio-snd.c | 83 +++++++++++++++++++++++++++++++---- include/hw/audio/virtio-snd.h | 1 + 2 files changed, 76 insertions(+), 8 deletions(-) diff --git a/hw/audio/virtio-snd.c b/hw/audio/virtio-snd.c index 12473862d24..6df7ea0eb04 100644 --- a/hw/audio/virtio-snd.c +++ b/hw/audio/virtio-snd.c @@ -24,7 +24,6 @@ #include "qapi/error.h" #include "hw/audio/virtio-snd.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 @@ -74,17 +73,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", + .version_id = 1, + .minimum_version_id = 1, + .fields = (const VMStateField[]) { + VMSTATE_UINT32(state, 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_UINT32(latency_bytes, 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", + .version_id = 1, + .minimum_version_id = 1, + .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", + .version_id = 1, + .minimum_version_id = 1, .fields = (const VMStateField[]) { VMSTATE_VIRTIO_DEVICE, VMSTATE_END_OF_LIST() @@ -813,6 +835,8 @@ 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); + g_assert(s->queue_inuse[VIRTIO_SND_VQ_CONTROL] > 0); + s->queue_inuse[VIRTIO_SND_VQ_CONTROL] -= 1; virtio_notify(VIRTIO_DEVICE(s), cmd->vq); } @@ -859,6 +883,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; @@ -976,6 +1001,7 @@ static void virtio_snd_handle_tx_xfer(VirtIODevice *vdev, VirtQueue *vq) goto tx_err; } + vsnd->queue_inuse[VIRTIO_SND_VQ_TX] += 1; buffer = g_malloc0(sizeof(VirtIOSoundPCMBuffer) + size); buffer->elem = elem; buffer->populated = false; @@ -1060,6 +1086,7 @@ static void virtio_snd_handle_rx_xfer(VirtIODevice *vdev, VirtQueue *vq) goto rx_err; } + vsnd->queue_inuse[VIRTIO_SND_VQ_RX] += 1; buffer = g_malloc0(sizeof(VirtIOSoundPCMBuffer) + size); buffer->elem = elem; buffer->vq = vq; @@ -1200,6 +1227,8 @@ static inline void return_tx_buffer(VirtIOSoundPCMStream *stream, virtqueue_push(buffer->vq, buffer->elem, sizeof(virtio_snd_pcm_status)); + g_assert(stream->s->queue_inuse[VIRTIO_SND_VQ_TX] > 0); + stream->s->queue_inuse[VIRTIO_SND_VQ_TX] -= 1; virtio_notify(VIRTIO_DEVICE(stream->s), buffer->vq); QSIMPLEQ_REMOVE(&stream->queue, buffer, @@ -1293,6 +1322,8 @@ static inline void return_rx_buffer(VirtIOSoundPCMStream *stream, virtqueue_push(buffer->vq, buffer->elem, sizeof(virtio_snd_pcm_status) + buffer->size); + g_assert(stream->s->queue_inuse[VIRTIO_SND_VQ_RX] > 0); + stream->s->queue_inuse[VIRTIO_SND_VQ_RX] -= 1; virtio_notify(VIRTIO_DEVICE(stream->s), buffer->vq); QSIMPLEQ_REMOVE(&stream->queue, buffer, @@ -1411,6 +1442,37 @@ 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 (virtio_snd_pcm_state_prepared(stream->state)) { + virtio_snd_pcm_open(stream); + + if (stream->state == VIRTIO_SND_PCM_STATE_STARTED) { + virtio_snd_pcm_set_active(stream, true); + } + } + } + + for (i = 0; i < VIRTIO_SND_VQ_MAX; i++) { + if (s->queue_inuse[i]) { + if (!virtqueue_rewind(s->queues[i], s->queue_inuse[i])) { + error_report( + "virtio-snd: 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) { @@ -1442,6 +1504,10 @@ static void virtio_snd_reset(VirtIODevice *vdev) virtio_snd_pcm_buffer_free(buffer); } } + + for (uint32_t i = 0; i < VIRTIO_SND_VQ_MAX; i++) { + vsnd->queue_inuse[i] = 0; + } } static void virtio_snd_class_init(ObjectClass *klass, const void *data) @@ -1455,6 +1521,7 @@ static void virtio_snd_class_init(ObjectClass *klass, const 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 85d5d7c8619..384d2868c19 100644 --- a/include/hw/audio/virtio-snd.h +++ b/include/hw/audio/virtio-snd.h @@ -194,6 +194,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; AudioBackend *audio_be; -- 2.47.3