From nobody Wed May 8 23:14:25 2024 Delivered-To: importer2@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer2=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1686239842; cv=none; d=zohomail.com; s=zohoarc; b=CdjJTULnU8iRV+nLspMeNr+xofJISCG3F35XSprNg6nXZ4f+KcP6CmkcwH4llNPrWLqXmfM4QguZ69CQt+QhnVATV/Sk3v6zb3Hr0Uv4HQ1KUQ5NGns4B5tynG4BKU5hTXPJzTtxlR4MPCiyJtckWgIIwmnxW7k99Wzbj6TT9Ew= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1686239842; h=Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=hnHjY9PCFvj9YNaFERDvs5/M7DhqvqbGQ32N3fPu7LI=; b=MRiMfaOY62m8SlChOrNWKS/PzTLWXIMUORNqz2mIj9i7UbObIlxaL/kSUg2CyT2qTAv8HO6STRApyQBP5SYr5hkXyiCUA59idNXudUcr7QiYClbNBxJXnSb/iRO6Jx4NYxdZT6FHGxyPwIJ/6dZhXUQ6NijWCpe+Xl44mSi0pw0= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer2=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 168623984249279.39356167758604; Thu, 8 Jun 2023 08:57:22 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1q7I0N-0005ba-SW; Thu, 08 Jun 2023 11:56:55 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1q7I0F-0005Vz-GU for qemu-devel@nongnu.org; Thu, 08 Jun 2023 11:56:47 -0400 Received: from mail-wm1-x329.google.com ([2a00:1450:4864:20::329]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1q7I0B-0000WF-KB for qemu-devel@nongnu.org; Thu, 08 Jun 2023 11:56:47 -0400 Received: by mail-wm1-x329.google.com with SMTP id 5b1f17b1804b1-3f732d37d7bso5568435e9.0 for ; Thu, 08 Jun 2023 08:56:43 -0700 (PDT) Received: from localhost.localdomain (adsl-175.37.6.3.tellas.gr. [37.6.3.175]) by smtp.gmail.com with ESMTPSA id c17-20020adffb51000000b00307bc4e39e5sm1927105wrs.117.2023.06.08.08.56.39 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 08 Jun 2023 08:56:40 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1686239802; x=1688831802; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=hnHjY9PCFvj9YNaFERDvs5/M7DhqvqbGQ32N3fPu7LI=; b=DI+r6ZlDXZz9nHe/ex2qAVA2OsIqU3BNCpA10CwtijiRH/6SaLFebND+JEAgIoonds UNgzb0v6hPmmQgMy0wN8S3m8ZGeHVg5GT1WOii2g31Pn8pKgR1hJVLHkMxRm+Y4lsxSV Eqm4mO72U3k7KRFY5GunnWO40XEL6oUxgeod1K9LiUWmBI86bkp0ajs+X79Y/NHy834m ru9F5AUk9hTo4oWiLeJd1hhJCo6rVHu4NFZ4Rnk2H7XiMR8Bih4Ha6Zf3eobx2HgaR+I fATFm+R25OGYO2ix7isuTYd+wIOGVvcBSfl4K7fVrgE+6uQxFb5BqK08BC6rj9EwFsFU NlGA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1686239802; x=1688831802; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=hnHjY9PCFvj9YNaFERDvs5/M7DhqvqbGQ32N3fPu7LI=; b=Mmlrp8PSnrBaT7i1IValcfUP4JQGpqSC1CAyCNii2M97x8geFERWr8CLiLrwL5uEHH H/DyW+EWnlbNRieSsUA1cCt2aPnalXpqzzZ4LUGduP6NMfJYOFaXV+DucHPH/xmOO1rt Z1rWUgfwIVq7p7xJZYnEx87H3KPsUs+iAmu8ELlArpb+TAPtG5YzL1bogUf18hEnMGJY nJ7IMjBTu9HDxJ30x3vKAl7oiSut4Wxz9cuyhxnEntyMdq/YqAl+mEeVQ8cuURPJeA+y fnpCjpIIqdrglce8S7bV2NtFMcAdY30xfqRbsff6dIQgcMBnkI2r0oxYcmz/EJATcu9I FSTA== X-Gm-Message-State: AC+VfDxje9lE64QcdN35BfWpqX0QY0xCSpSmFWxe93B9QtX7MZfjRmjS PpiY8jZ7qkL7aK67JbSg9W1o65aoWpNnsLCi0gs= X-Google-Smtp-Source: ACHHUZ69gqvqbiVFb1V+6AQwToFC8LH5jrjHEr3yV7rZbS8qcauFYlOWWmGfSIrlIphc5/7KmCkWuQ== X-Received: by 2002:a05:6000:52:b0:30a:e511:e65c with SMTP id k18-20020a056000005200b0030ae511e65cmr7765334wrx.37.1686239801142; Thu, 08 Jun 2023 08:56:41 -0700 (PDT) From: Manos Pitsidianakis To: qemu-devel@nongnu.org Cc: Manos Pitsidianakis , Igor Skalkin , Anton Yakovlev Subject: [PATCH v2 1/3] Add virtio-sound device Date: Thu, 8 Jun 2023 18:56:17 +0300 Message-Id: <95d564fc1f36c9e12b466c07ea000b38d14aec4e.1686238728.git.manos.pitsidianakis@linaro.org> X-Mailer: git-send-email 2.39.2 In-Reply-To: References: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer2=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=2a00:1450:4864:20::329; envelope-from=manos.pitsidianakis@linaro.org; helo=mail-wm1-x329.google.com X-Spam_score_int: -5 X-Spam_score: -0.6 X-Spam_bar: / X-Spam_report: (-0.6 / 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, RCVD_IN_SORBS_WEB=1.5, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=no autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer2=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer2=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @linaro.org) X-ZM-MESSAGEID: 1686239843335100004 Content-Type: text/plain; charset="utf-8" This patch adds an audio device implementing the recent virtio sound spec (1.2). PCM functionality is implemented, and jack[0], chmaps[1] messages are at the moment left unimplemented. PS2: This patch was based on a draft patch posted by OpenSynergy in 2019. [= 2] [0]: https://www.kernel.org/doc/html/latest/sound/designs/jack-controls.html [1]: https://www.kernel.org/doc/html/latest/sound/designs/channel-mapping-a= pi.html [2]: https://github.com/OpenSynergy/qemu/commit/5a2f350eec5d157b90d9c7b40a8= e603f4da92471#diff-fa5c10be8476fb5385a280885d527b0b40dfc11ddcc74369fce085d8= b5b17bbd Signed-off-by: Emmanouil Pitsidianakis Signed-off-by: Igor Skalkin Signed-off-by: Anton Yakovlev --- MAINTAINERS | 6 + hw/virtio/Kconfig | 5 + hw/virtio/meson.build | 1 + hw/virtio/trace-events | 21 + hw/virtio/virtio-snd.c | 1121 ++++++++++++++++++++++++++++++++ include/hw/virtio/virtio-snd.h | 194 ++++++ 6 files changed, 1348 insertions(+) create mode 100644 hw/virtio/virtio-snd.c create mode 100644 include/hw/virtio/virtio-snd.h diff --git a/MAINTAINERS b/MAINTAINERS index 1c93ab0ee5..5d5475b1c1 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -2218,6 +2218,12 @@ F: hw/virtio/virtio-mem-pci.h F: hw/virtio/virtio-mem-pci.c F: include/hw/virtio/virtio-mem.h =20 +virtio-snd +M: Manos Pitsidianakis +S: Supported +F: hw/virtio/virtio-snd*.c +F: include/hw/virtio/virtio-snd.h + nvme M: Keith Busch M: Klaus Jensen diff --git a/hw/virtio/Kconfig b/hw/virtio/Kconfig index 89e9e426d8..fcc522ed21 100644 --- a/hw/virtio/Kconfig +++ b/hw/virtio/Kconfig @@ -17,6 +17,11 @@ config VIRTIO_PCI depends on PCI select VIRTIO =20 +config VIRTIO_SND + bool + default y + depends on VIRTIO + config VIRTIO_MMIO bool select VIRTIO diff --git a/hw/virtio/meson.build b/hw/virtio/meson.build index bdec78bfc6..8cf49af618 100644 --- a/hw/virtio/meson.build +++ b/hw/virtio/meson.build @@ -68,5 +68,6 @@ softmmu_ss.add(when: 'CONFIG_VIRTIO', if_false: files('vi= rtio-stub.c')) softmmu_ss.add(when: 'CONFIG_ALL', if_true: files('vhost-stub.c')) softmmu_ss.add(when: 'CONFIG_ALL', if_true: files('virtio-stub.c')) softmmu_ss.add(files('virtio-hmp-cmds.c')) +softmmu_ss.add(when: 'CONFIG_VIRTIO_SND', if_true: files('virtio-snd.c')) =20 specific_ss.add_all(when: 'CONFIG_VIRTIO', if_true: specific_virtio_ss) diff --git a/hw/virtio/trace-events b/hw/virtio/trace-events index 8f8d05cf9b..b77d78abdc 100644 --- a/hw/virtio/trace-events +++ b/hw/virtio/trace-events @@ -151,3 +151,24 @@ virtio_pmem_flush_done(int type) "fsync return=3D%d" virtio_gpio_start(void) "start" virtio_gpio_stop(void) "stop" virtio_gpio_set_status(uint8_t status) "0x%x" + +#virtio-snd.c +virtio_snd_pcm_stream_flush(int stream) "flushing stream %d" +virtio_snd_handle_ctrl(void *vdev, void *vq) "snd %p: handle ctrl event fo= r queue %p" +#virtio_snd_handle_jack_info(int jack) "VIRTIO_SND_JACK_INFO called for ja= ck %d" +#virtio_snd_handle_jack_remap(void) "VIRTIO_SND_PCM_JACK_REMAP called" +virtio_snd_handle_pcm_info(int stream) "VIRTIO_SND_R_PCM_INFO called for s= tream %d" +virtio_snd_handle_pcm_set_params(int stream) "VIRTIO_SND_PCM_SET_PARAMS ca= lled for stream %d" +virtio_snd_handle_pcm_start_stop(const char *code, int stream) "%s called = for stream %d" +virtio_snd_handle_pcm_release(int stream) "VIRTIO_SND_PCM_RELEASE called f= or stream %d" +virtio_snd_handle_chmap_info(void) "VIRTIO_SND_CHMAP_INFO called" +virtio_snd_handle_xfer(void) "tx/rx queue callback called" +virtio_snd_handle_event(void) "event queue callback called" +virtio_snd_realize(void *snd) "snd %p: realize" +virtio_snd_unrealize(void *snd) "snd %p: unrealize" +virtio_snd_get_features(void *vdev, uint64_t features) "snd %p: get_featur= es 0x%"PRIx64 +virtio_snd_get_config(void *vdev, uint32_t jacks, uint32_t streams, uint32= _t chmaps) "snd %p: get_config jacks=3D%d streams=3D%d chmaps=3D%d" +virtio_snd_set_config(void *vdev, uint32_t jacks, uint32_t new_jacks, uint= 32_t streams, uint32_t new_streams, uint32_t chmaps, uint32_t new_chmaps) "= snd %p: set_config jacks from %d->%d, streams from %d->%d, chmaps from %d->= %d" +virtio_snd_vm_state_running(void) "vm state running" +virtio_snd_vm_state_stopped(void) "vm state stopped" +virtio_snd_handle_code(int val, const char *code) "ctrl code msg val =3D %= d =3D=3D %s" diff --git a/hw/virtio/virtio-snd.c b/hw/virtio/virtio-snd.c new file mode 100644 index 0000000000..e3b6c353ad --- /dev/null +++ b/hw/virtio/virtio-snd.c @@ -0,0 +1,1121 @@ +/* + * VIRTIO Sound Device conforming to + * + * "Virtual I/O Device (VIRTIO) Version 1.2 + * Committee Specification Draft 01 + * 09 May 2022" + * + * Copyright (c) 2023 Emmanouil Pitsidianakis + * Copyright (C) 2019 OpenSynergy GmbH + * + * This work is licensed under the terms of the GNU GPL, version 2 or + * (at your option) any later version. See the COPYING file in the + * top-level directory. + */ + +#include "qemu/osdep.h" +#include "qemu/iov.h" +#include "qemu/log.h" +#include "include/qemu/lockable.h" +#include "sysemu/runstate.h" +#include "trace.h" +#include "qapi/error.h" +#include "hw/virtio/virtio-snd.h" + +#define VIRTIO_SOUND_VM_VERSION 1 + +#define VIRTIO_SOUND_JACK_DEFAULT 0 +#define VIRTIO_SOUND_STREAM_DEFAULT 1 +#define VIRTIO_SOUND_CHMAP_DEFAULT 0 + +#define VIRTIO_SOUND_HDA_FN_NID 0 + +static const VMStateDescription vmstate_virtio_snd_device =3D { + .name =3D TYPE_VIRTIO_SND, + .version_id =3D VIRTIO_SOUND_VM_VERSION, + .minimum_version_id =3D VIRTIO_SOUND_VM_VERSION, +}; + +static const VMStateDescription vmstate_virtio_snd =3D { + .name =3D "virtio-sound", + .minimum_version_id =3D VIRTIO_SOUND_VM_VERSION, + .version_id =3D VIRTIO_SOUND_VM_VERSION, + .fields =3D (VMStateField[]) { + VMSTATE_VIRTIO_DEVICE, + VMSTATE_END_OF_LIST() + }, +}; + +static Property virtio_snd_properties[] =3D { + DEFINE_AUDIO_PROPERTIES(VirtIOSound, card), + DEFINE_PROP_UINT32("jacks", VirtIOSound, snd_conf.jacks, + VIRTIO_SOUND_JACK_DEFAULT), + DEFINE_PROP_UINT32("streams", VirtIOSound, snd_conf.streams, + VIRTIO_SOUND_STREAM_DEFAULT), + DEFINE_PROP_UINT32("chmaps", VirtIOSound, snd_conf.chmaps, + VIRTIO_SOUND_CHMAP_DEFAULT), + DEFINE_PROP_END_OF_LIST(), +}; + +static void +virtio_snd_get_config(VirtIODevice *vdev, uint8_t *config) +{ + VirtIOSound *s =3D VIRTIO_SND(vdev); + trace_virtio_snd_get_config(vdev, + s->snd_conf.jacks, + s->snd_conf.streams, + s->snd_conf.chmaps); + + memcpy(config, &s->snd_conf, sizeof(s->snd_conf)); +} + +static void +virtio_snd_set_config(VirtIODevice *vdev, const uint8_t *config) +{ + VirtIOSound *s =3D VIRTIO_SND(vdev); + const virtio_snd_config *sndconfig =3D + (const virtio_snd_config *)config; + + + trace_virtio_snd_set_config(vdev, + s->snd_conf.jacks, + sndconfig->jacks, + s->snd_conf.streams, + sndconfig->streams, + s->snd_conf.chmaps, + sndconfig->chmaps); + + memcpy(&s->snd_conf, sndconfig, sizeof(s->snd_conf)); +} + +static void virtio_snd_process_cmdq(VirtIOSound *s); +static void virtio_snd_pcm_flush(VirtIOSoundPCMStream *stream); +static void virtio_snd_pcm_out_cb(void *data, int available); +static uint32_t virtio_snd_pcm_read_write(VirtIOSoundPCMStream *stream, + VirtQueue *vq, + VirtQueueElement *element, + bool read); + +/* + * Get a specific stream from the virtio sound card device. + * Returns NULL if @stream_id is invalid or not allocated. + * + * @s: VirtIOSound device + * @stream_id: stream id + */ +static VirtIOSoundPCMStream *virtio_snd_pcm_get_stream(VirtIOSound *s, + uint32_t stream_id) +{ + if (stream_id >=3D s->snd_conf.streams) { + return NULL; + } + return s->pcm->streams[stream_id]; +} + +/* + * Get params for a specific stream. + * + * @s: VirtIOSound device + * @stream_id: stream id + */ +static VirtIOSoundPCMParams *virtio_snd_pcm_get_params(VirtIOSound *s, + uint32_t stream_id) +{ + if (stream_id >=3D s->snd_conf.streams) { + return NULL; + } + return s->pcm->pcm_params[stream_id]; +} + +/* + * Handle the VIRTIO_SND_R_PCM_INFO request. + * The function writes the info structs to the request element. + * + * @s: VirtIOSound device + * @cmd: The request command queue element from VirtIOSound cmdq field + */ +static void virtio_snd_handle_pcm_info(VirtIOSound *s, + virtio_snd_ctrl_command *cmd) +{ + virtio_snd_query_info req; + uint32_t sz; + VirtIOSoundPCMStream *stream =3D NULL; + g_autofree virtio_snd_pcm_info *pcm_info =3D NULL; + + sz =3D iov_to_buf(cmd->elem->out_sg, + cmd->elem->out_num, + 0, + &req, + sizeof(req)); + assert(sz =3D=3D sizeof(virtio_snd_query_info)); + + if (iov_size(cmd->elem->in_sg, cmd->elem->in_num) < + sizeof(virtio_snd_hdr) + req.size * req.count) { + error_report("pcm info: buffer too small, got: %lu, needed: %lu", + iov_size(cmd->elem->in_sg, cmd->elem->in_num), + sizeof(virtio_snd_pcm_info)); + cmd->resp.code =3D VIRTIO_SND_S_BAD_MSG; + return; + } + + pcm_info =3D g_new0(virtio_snd_pcm_info, req.count); + for (int i =3D req.start_id; i < req.start_id + req.count; i++) { + trace_virtio_snd_handle_pcm_info(i); + stream =3D virtio_snd_pcm_get_stream(s, i); + + if (!stream) { + error_report("Invalid stream id: %d", i); + cmd->resp.code =3D VIRTIO_SND_S_BAD_MSG; + return; + } + + pcm_info[i - req.start_id].hdr.hda_fn_nid =3D stream->info.hdr.hda= _fn_nid; + pcm_info[i - req.start_id].features =3D stream->features; + pcm_info[i - req.start_id].formats =3D stream->formats; + pcm_info[i - req.start_id].rates =3D stream->rates; + pcm_info[i - req.start_id].direction =3D stream->direction; + pcm_info[i - req.start_id].channels_min =3D stream->channels_min; + pcm_info[i - req.start_id].channels_max =3D stream->channels_max; + + memset(&pcm_info[i].padding, 0, sizeof(pcm_info[i].padding)); + } + + cmd->resp.code =3D VIRTIO_SND_S_OK; + + sz =3D iov_from_buf(cmd->elem->in_sg, + cmd->elem->in_num, + sizeof(virtio_snd_hdr), + pcm_info, + sizeof(virtio_snd_pcm_info) * req.count); + assert(sz =3D=3D req.size * req.count); + + return; +} + +/* + * Set the given stream params. + * Called by both virtio_snd_handle_pcm_set_params and during device + * initialization. + * Returns the response status code. (VIRTIO_SND_S_*). + * + * @s: VirtIOSound device + * @params: The PCM params as defined in the virtio specification + */ +static +uint32_t virtio_snd_pcm_set_params_impl(VirtIOSound *s, + virtio_snd_pcm_set_params *params) +{ + uint32_t supported_formats, supported_rates; + VirtIOSoundPCMParams *st_params; + uint32_t stream_id =3D params->hdr.stream_id; + + if (stream_id > s->snd_conf.streams || !(s->pcm->pcm_params)) { + virtio_error(VIRTIO_DEVICE(s), "Streams have not been initialized.= \n"); + return VIRTIO_SND_S_BAD_MSG; + } + + if (!s->pcm->pcm_params[stream_id]) { + s->pcm->pcm_params[stream_id] =3D g_new0(VirtIOSoundPCMParams, 1); + } + st_params =3D virtio_snd_pcm_get_params(s, stream_id); + + st_params->features =3D params->features; + st_params->buffer_bytes =3D params->buffer_bytes; + st_params->period_bytes =3D params->period_bytes; + + if (params->channels < 1 || params->channels > AUDIO_MAX_CHANNELS) { + error_report("Number of channels is not supported."); + return VIRTIO_SND_S_NOT_SUPP; + } + st_params->channels =3D params->channels; + + supported_formats =3D 1 << VIRTIO_SND_PCM_FMT_S8 + | 1 << VIRTIO_SND_PCM_FMT_U8 + | 1 << VIRTIO_SND_PCM_FMT_S16 + | 1 << VIRTIO_SND_PCM_FMT_U16 + | 1 << VIRTIO_SND_PCM_FMT_S32 + | 1 << VIRTIO_SND_PCM_FMT_U32 + | 1 << VIRTIO_SND_PCM_FMT_FLOAT; + + supported_rates =3D 1 << VIRTIO_SND_PCM_RATE_5512 + | 1 << VIRTIO_SND_PCM_RATE_8000 + | 1 << VIRTIO_SND_PCM_RATE_11025 + | 1 << VIRTIO_SND_PCM_RATE_16000 + | 1 << VIRTIO_SND_PCM_RATE_22050 + | 1 << VIRTIO_SND_PCM_RATE_32000 + | 1 << VIRTIO_SND_PCM_RATE_44100 + | 1 << VIRTIO_SND_PCM_RATE_48000 + | 1 << VIRTIO_SND_PCM_RATE_64000 + | 1 << VIRTIO_SND_PCM_RATE_88200 + | 1 << VIRTIO_SND_PCM_RATE_96000 + | 1 << VIRTIO_SND_PCM_RATE_176400 + | 1 << VIRTIO_SND_PCM_RATE_192000 + | 1 << VIRTIO_SND_PCM_RATE_384000; + + if (!(supported_formats & (1 << params->format))) { + error_report("Stream format is not supported."); + return VIRTIO_SND_S_NOT_SUPP; + } + st_params->format =3D params->format; + + if (!(supported_rates & (1 << params->rate))) { + error_report("Stream rate is not supported."); + return VIRTIO_SND_S_NOT_SUPP; + } + st_params->rate =3D params->rate; + st_params->period_bytes =3D params->period_bytes; + st_params->buffer_bytes =3D params->buffer_bytes; + + return 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; + uint32_t sz; + + sz =3D iov_to_buf(cmd->elem->out_sg, + cmd->elem->out_num, + 0, + &req, + sizeof(req)); + assert(sz =3D=3D sizeof(virtio_snd_pcm_set_params)); + + trace_virtio_snd_handle_pcm_set_params(req.hdr.stream_id); + cmd->resp.code =3D virtio_snd_pcm_set_params_impl(s, &req); + + return; +} + +/* + * Get a QEMU Audiosystem compatible format value from a VIRTIO_SND_PCM_FM= T_* + */ +static AudioFormat virtio_snd_get_qemu_format(uint32_t format) +{ + switch (format) { + case VIRTIO_SND_PCM_FMT_U8: + return AUDIO_FORMAT_U8; + case VIRTIO_SND_PCM_FMT_S8: + return AUDIO_FORMAT_S8; + case VIRTIO_SND_PCM_FMT_U16: + return AUDIO_FORMAT_U16; + case VIRTIO_SND_PCM_FMT_S16: + return AUDIO_FORMAT_S16; + case VIRTIO_SND_PCM_FMT_U32: + return AUDIO_FORMAT_U32; + case VIRTIO_SND_PCM_FMT_S32: + return AUDIO_FORMAT_S32; + case VIRTIO_SND_PCM_FMT_FLOAT: + return AUDIO_FORMAT_F32; + default: + return -1; + } +} + +/* + * Get a QEMU Audiosystem compatible frequency value from a + * VIRTIO_SND_PCM_RATE_* + */ +static uint32_t virtio_snd_get_qemu_freq(uint32_t rate) +{ + switch (rate) { + case VIRTIO_SND_PCM_RATE_5512: + return 5512; + case VIRTIO_SND_PCM_RATE_8000: + return 8000; + case VIRTIO_SND_PCM_RATE_11025: + return 11025; + case VIRTIO_SND_PCM_RATE_16000: + return 16000; + case VIRTIO_SND_PCM_RATE_22050: + return 22050; + case VIRTIO_SND_PCM_RATE_32000: + return 32000; + case VIRTIO_SND_PCM_RATE_44100: + return 44100; + case VIRTIO_SND_PCM_RATE_48000: + return 48000; + case VIRTIO_SND_PCM_RATE_64000: + return 64000; + case VIRTIO_SND_PCM_RATE_88200: + return 88200; + case VIRTIO_SND_PCM_RATE_96000: + return 96000; + case VIRTIO_SND_PCM_RATE_176400: + return 176400; + case VIRTIO_SND_PCM_RATE_192000: + return 192000; + case VIRTIO_SND_PCM_RATE_384000: + return 384000; + default: + return -1; + } +} + +/* + * Get QEMU Audiosystem compatible audsettings from virtio based pcm stream + * params. + */ +static void virtio_snd_get_qemu_audsettings(audsettings *as, + VirtIOSoundPCMParams *params) +{ + as->nchannels =3D MIN(AUDIO_MAX_CHANNELS, params->channels); + as->fmt =3D virtio_snd_get_qemu_format(params->format); + as->freq =3D virtio_snd_get_qemu_freq(params->rate); + as->endianness =3D AUDIO_HOST_ENDIANNESS; +} + +/* + * Prepares a VirtIOSound card stream. + * Returns the response status code. (VIRTIO_SND_S_*). + * + * @s: VirtIOSound device + * @stream_id: stream id + */ +static uint32_t virtio_snd_pcm_prepare_impl(VirtIOSound *s, uint32_t strea= m_id) +{ + audsettings as; + uint32_t supported_formats, supported_rates; + VirtIOSoundPCMParams *params; + VirtIOSoundPCMStream *stream; + + if (!s->pcm->streams + || !s->pcm->pcm_params + || !s->pcm->pcm_params[stream_id]) { + return VIRTIO_SND_S_BAD_MSG; + } + + supported_formats =3D 1 << VIRTIO_SND_PCM_FMT_S8 + | 1 << VIRTIO_SND_PCM_FMT_U8 + | 1 << VIRTIO_SND_PCM_FMT_S16 + | 1 << VIRTIO_SND_PCM_FMT_U16 + | 1 << VIRTIO_SND_PCM_FMT_S32 + | 1 << VIRTIO_SND_PCM_FMT_U32 + | 1 << VIRTIO_SND_PCM_FMT_FLOAT; + + supported_rates =3D 1 << VIRTIO_SND_PCM_RATE_5512 + | 1 << VIRTIO_SND_PCM_RATE_8000 + | 1 << VIRTIO_SND_PCM_RATE_11025 + | 1 << VIRTIO_SND_PCM_RATE_16000 + | 1 << VIRTIO_SND_PCM_RATE_22050 + | 1 << VIRTIO_SND_PCM_RATE_32000 + | 1 << VIRTIO_SND_PCM_RATE_44100 + | 1 << VIRTIO_SND_PCM_RATE_48000 + | 1 << VIRTIO_SND_PCM_RATE_64000 + | 1 << VIRTIO_SND_PCM_RATE_88200 + | 1 << VIRTIO_SND_PCM_RATE_96000 + | 1 << VIRTIO_SND_PCM_RATE_176400 + | 1 << VIRTIO_SND_PCM_RATE_192000 + | 1 << VIRTIO_SND_PCM_RATE_384000; + + params =3D virtio_snd_pcm_get_params(s, stream_id); + assert(params); + + virtio_snd_get_qemu_audsettings(&as, params); + + stream =3D g_new0(VirtIOSoundPCMStream, 1); + + stream->id =3D stream_id; + stream->pcm =3D s->pcm; + stream->direction =3D stream_id < s->snd_conf.streams / 2 + + (s->snd_conf.streams & 1) ? VIRTIO_SND_D_OUTPUT : VIRTIO_SND_D_INP= UT; + stream->info.hdr.hda_fn_nid =3D VIRTIO_SOUND_HDA_FN_NID; + stream->features =3D 0; + stream->channels_min =3D 1; + stream->channels_max =3D as.nchannels; + stream->formats =3D supported_formats; + stream->rates =3D supported_rates; + stream->s =3D s; + + stream->buffer_bytes =3D params->buffer_bytes; + stream->period_bytes =3D params->period_bytes; + + stream->positions[0] =3D VIRTIO_SND_CHMAP_FL; + stream->positions[1] =3D VIRTIO_SND_CHMAP_FR; + + + if (stream->direction =3D=3D VIRTIO_SND_D_OUTPUT) { + stream->voice.out =3D AUD_open_out(&s->card, + stream->voice.out, + "virtio_snd_card", + stream, + virtio_snd_pcm_out_cb, + &as); + + } else { + qemu_log_mask(LOG_UNIMP, "virtio_snd: input/capture is unimplement= ed."); + /* + * stream->voice.in =3D AUD_open_in(&s->card, + * stream->voice.in, + * "virtio_snd_card", + * stream, + * virtio_snd_input_cb, + * &as); + */ + } + + stream->as =3D as; + stream->desired_as =3D stream->as; + qemu_mutex_init(&stream->queue_mutex); + QSIMPLEQ_INIT(&stream->queue); + + s->pcm->streams[stream_id] =3D stream; + + return VIRTIO_SND_S_OK; +} + +/* + * Handles VIRTIO_SND_R_PCM_PREPARE. + * + * @s: VirtIOSound device + * @cmd: The request command queue element from VirtIOSound cmdq field + */ +static void virtio_snd_handle_pcm_prepare(VirtIOSound *s, + virtio_snd_ctrl_command *cmd) +{ + uint32_t stream_id; + size_t sz; + + sz =3D iov_to_buf(cmd->elem->out_sg, cmd->elem->out_num, + sizeof(virtio_snd_hdr), &stream_id, sizeof(stream_id)); + assert(sz =3D=3D sizeof(uint32_t)); + + cmd->resp.code =3D virtio_snd_pcm_prepare_impl(s, stream_id); + return; +} + +/* + * Handles VIRTIO_SND_R_PCM_START. + * + * @s: VirtIOSound device + * @cmd: The request command queue element from VirtIOSound cmdq field + * @start: whether to start or stop the device + */ +static void virtio_snd_handle_pcm_start_stop(VirtIOSound *s, + virtio_snd_ctrl_command *cmd, + bool start) +{ + VirtIOSoundPCMStream *stream; + virtio_snd_pcm_hdr req; + size_t sz; + + sz =3D iov_to_buf(cmd->elem->out_sg, + cmd->elem->out_num, + 0, + &req, + sizeof(req)); + assert(sz =3D=3D sizeof(virtio_snd_pcm_hdr)); + + cmd->resp.code =3D VIRTIO_SND_S_OK; + trace_virtio_snd_handle_pcm_start_stop(start ? "VIRTIO_SND_R_PCM_START= " : + "VIRTIO_SND_R_PCM_STOP", req.stream_id); + + stream =3D virtio_snd_pcm_get_stream(s, req.stream_id); + + if (stream) { + if (stream->direction =3D=3D VIRTIO_SND_D_OUTPUT) { + AUD_set_active_out(stream->voice.out, start); + } + } else { + cmd->resp.code =3D VIRTIO_SND_S_BAD_MSG; + } + return; +} + +/* + * Returns the number of bytes that have not been passed to AUD_write yet. + * + * @stream: VirtIOSoundPCMStream + */ +static int virtio_snd_pcm_get_pending_bytes(VirtIOSoundPCMStream *stream) +{ + VirtIOSoundPCMBlock *block; + VirtIOSoundPCMBlock *next; + int size =3D 0; + + WITH_QEMU_LOCK_GUARD(&stream->queue_mutex) { + QSIMPLEQ_FOREACH_SAFE(block, &stream->queue, entry, next) { + size +=3D block->size; + } + } + return size; +} + +/* + * Releases the buffer resources allocated to a stream. Seperated from the + * handler so that the code can be reused in the unrealize function. Retur= ns + * the response status code. (VIRTIO_SND_S_*). + * + * @stream: VirtIOSoundPCMStream stream + * @stream_id: stream id + */ +static uint32_t virtio_snd_pcm_release_impl(VirtIOSoundPCMStream *stream, + uint32_t stream_id) +{ + assert(stream->s->pcm->streams[stream_id] =3D=3D stream); + + if (virtio_snd_pcm_get_pending_bytes(stream)) { + /* + * virtio-v1.2-csd01, 5.14.6.6.5.1, + * Device Requirements: Stream Release + * + * - The device MUST complete all pending I/O messages for the + * specified stream ID. + * - The device MUST NOT complete the control request while there + * are pending I/O messages for the specified stream ID. + */ + virtio_snd_process_cmdq(stream->s); + trace_virtio_snd_pcm_stream_flush(stream_id); + virtio_snd_pcm_flush(stream); + } + + return VIRTIO_SND_S_OK; +} + +/* + * Handles VIRTIO_SND_R_PCM_RELEASE. + * + * @s: VirtIOSound device + * @cmd: The request command queue element from VirtIOSound cmdq field + */ +static void virtio_snd_handle_pcm_release(VirtIOSound *s, + virtio_snd_ctrl_command *cmd) +{ + uint32_t stream_id; + size_t sz; + VirtIOSoundPCMStream *stream; + + sz =3D iov_to_buf(cmd->elem->out_sg, cmd->elem->out_num, + sizeof(virtio_snd_hdr), &stream_id, sizeof(stream_id)); + assert(sz =3D=3D sizeof(uint32_t)); + + trace_virtio_snd_handle_pcm_release(stream_id); + + stream =3D virtio_snd_pcm_get_stream(s, stream_id); + if (!stream) { + error_report("already released stream %d", stream_id); + virtio_error(VIRTIO_DEVICE(s), "already released stream %d", strea= m_id); + cmd->resp.code =3D VIRTIO_SND_S_BAD_MSG; + return; + } + cmd->resp.code =3D virtio_snd_pcm_release_impl(stream, stream_id); + return; +} + +/* + * The actual processing done in virtio_snd_process_cmdq(). + * + * @s: VirtIOSound device + * @cmd: control command request + */ +static inline void +process_cmd(VirtIOSound *s, virtio_snd_ctrl_command *cmd) +{ + VIRTIO_SND_FILL_CMD(cmd->ctrl); + size_t sz; + + trace_virtio_snd_handle_code(cmd->ctrl.code, + print_code(cmd->ctrl.code)); + + switch (cmd->ctrl.code) { + case VIRTIO_SND_R_JACK_INFO: + case VIRTIO_SND_R_JACK_REMAP: + qemu_log_mask(LOG_UNIMP, + "virtio_snd: jack functionality is unimplemented."); + break; + case VIRTIO_SND_R_PCM_INFO: + virtio_snd_handle_pcm_info(s, cmd); + break; + case VIRTIO_SND_R_PCM_SET_PARAMS: + virtio_snd_handle_pcm_set_params(s, cmd); + break; + case VIRTIO_SND_R_PCM_PREPARE: + virtio_snd_handle_pcm_prepare(s, cmd); + break; + case VIRTIO_SND_R_PCM_START: + virtio_snd_handle_pcm_start_stop(s, cmd, true); + break; + case VIRTIO_SND_R_PCM_STOP: + virtio_snd_handle_pcm_start_stop(s, cmd, false); + break; + case VIRTIO_SND_R_PCM_RELEASE: + virtio_snd_handle_pcm_release(s, cmd); + break; + case VIRTIO_SND_R_CHMAP_INFO: + qemu_log_mask(LOG_UNIMP, + "virtio_snd: chmap info functionality is unimplemente= d."); + trace_virtio_snd_handle_chmap_info(); + break; + default: + /* error */ + error_report("virtio snd header not recognized: %d", cmd->ctrl.cod= e); + cmd->resp.code =3D VIRTIO_SND_S_BAD_MSG; + } + + sz =3D iov_from_buf(cmd->elem->in_sg, + cmd->elem->in_num, + 0, + &cmd->resp, + sizeof(cmd->resp)); + assert(sz =3D=3D sizeof(cmd->resp)); + virtqueue_push(cmd->vq, cmd->elem, sizeof(cmd->elem)); + virtio_notify(VIRTIO_DEVICE(s), cmd->vq); + cmd->finished =3D true; +} + +/* + * Consume all elements in command queue. + * + * @s: VirtIOSound device + */ +static void virtio_snd_process_cmdq(VirtIOSound *s) +{ + virtio_snd_ctrl_command *cmd; + + if (unlikely(qatomic_read(&s->processing_cmdq))) { + return; + } + + WITH_QEMU_LOCK_GUARD(&s->cmdq_mutex) { + qatomic_set(&s->processing_cmdq, true); + while (!QTAILQ_EMPTY(&s->cmdq)) { + cmd =3D QTAILQ_FIRST(&s->cmdq); + + /* process command */ + process_cmd(s, cmd); + + QTAILQ_REMOVE(&s->cmdq, cmd, next); + + assert(cmd->finished); + g_free(cmd); + } + qatomic_set(&s->processing_cmdq, false); + } +} + +/* + * The control message handler. Pops an element from the control virtqueue, + * and stores them to VirtIOSound's cmdq queue and finally calls + * virtio_snd_process_cmdq() for processing. + * + * @vdev: VirtIOSound device + * @vq: Control virtqueue + */ +static void virtio_snd_handle_ctrl(VirtIODevice *vdev, VirtQueue *vq) +{ + VirtIOSound *s =3D VIRTIO_SND(vdev); + VirtQueueElement *elem; + virtio_snd_ctrl_command *cmd; + + trace_virtio_snd_handle_ctrl(vdev, vq); + + if (!virtio_queue_ready(vq)) { + return; + } + + elem =3D virtqueue_pop(vq, sizeof(VirtQueueElement)); + while (elem) { + cmd =3D g_new0(virtio_snd_ctrl_command, 1); + cmd->elem =3D elem; + cmd->vq =3D vq; + cmd->finished =3D false; + cmd->resp.code =3D VIRTIO_SND_S_OK; + QTAILQ_INSERT_TAIL(&s->cmdq, cmd, next); + elem =3D virtqueue_pop(vq, sizeof(VirtQueueElement)); + } + + virtio_snd_process_cmdq(s); +} + +/* + * The event virtqueue handler. + * Not implemented yet. + * + * @vdev: VirtIOSound device + * @vq: event vq + */ +static void virtio_snd_handle_event(VirtIODevice *vdev, VirtQueue *vq) +{ + qemu_log_mask(LOG_UNIMP, "virtio_snd: event queue is unimplemented."); + trace_virtio_snd_handle_event(); +} + +/* + * The tx virtqueue handler. Makes the buffers available to their respecti= ve + * streams for consumption. + * + * @vdev: VirtIOSound device + * @vq: tx virtqueue + */ +static void virtio_snd_handle_xfer(VirtIODevice *vdev, VirtQueue *vq) +{ + VirtIOSound *s =3D VIRTIO_SND(vdev); + VirtIOSoundPCMStream *stream =3D NULL; + VirtQueueElement *elem; + size_t sz; + virtio_snd_pcm_xfer hdr; + virtio_snd_pcm_status resp =3D { 0 }; + + trace_virtio_snd_handle_xfer(); + + for (;;) { + elem =3D virtqueue_pop(vq, sizeof(VirtQueueElement)); + if (!elem) { + break; + } + /* get the message hdr object */ + sz =3D iov_to_buf(elem->out_sg, + elem->out_num, + 0, + &hdr, + sizeof(hdr)); + assert(sz =3D=3D sizeof(hdr)); + stream =3D s->pcm->streams[hdr.stream_id]; + assert(stream); + + WITH_QEMU_LOCK_GUARD(&stream->queue_mutex) { + virtio_snd_pcm_read_write(stream, + vq, + elem, + hdr.stream_id =3D=3D VIRTIO_SND_D_INPUT); + + resp.status =3D VIRTIO_SND_S_OK; + sz =3D iov_from_buf(elem->in_sg, + elem->in_num, + 0, + &resp, + sizeof(resp)); + assert(sz =3D=3D sizeof(virtio_snd_pcm_status)); + } + } + + /* + * Notify vq about virtio_snd_pcm_status responses. + * Buffer responses must be notified separately later. + */ + virtio_notify(VIRTIO_DEVICE(s), vq); +} + +static uint64_t get_features(VirtIODevice *vdev, uint64_t features, + Error **errp) +{ + /* + * virtio-v1.2-csd01, 5.14.3, + * Feature Bits + * None currently defined. + */ + trace_virtio_snd_get_features(vdev, features); + return features | 1UL << VIRTIO_F_VERSION_1 | 1UL << VIRTIO_F_IN_ORDER; +} + +static void virtio_snd_set_pcm(VirtIOSound *snd) +{ + VirtIOSoundPCM *pcm; + + pcm =3D g_new0(VirtIOSoundPCM, 1); + pcm->snd =3D snd; + + pcm->streams =3D g_new0(VirtIOSoundPCMStream *, snd->snd_conf.streams); + pcm->pcm_params =3D g_new0(VirtIOSoundPCMParams *, snd->snd_conf.strea= ms); + pcm->jacks =3D g_new0(struct virtio_snd_jack *, snd->snd_conf.jacks); + + snd->pcm =3D pcm; + + return; +} + +void virtio_snd_common_realize(DeviceState *dev, + VirtIOHandleOutput ctrl, + VirtIOHandleOutput evt, + VirtIOHandleOutput txq, + VirtIOHandleOutput rxq, + Error **errp) +{ + VirtIODevice *vdev =3D VIRTIO_DEVICE(dev); + VirtIOSound *vsnd =3D VIRTIO_SND(dev); + virtio_snd_pcm_set_params default_params; + uint32_t status; + + virtio_snd_set_pcm(vsnd); + + virtio_init(vdev, VIRTIO_ID_SOUND, sizeof(virtio_snd_config)); + + /* set number of jacks and streams */ + if (vsnd->snd_conf.jacks > 8) { + error_setg(errp, + "Invalid number of jacks: %d", + vsnd->snd_conf.jacks); + return; + } + if (vsnd->snd_conf.streams < 1 || vsnd->snd_conf.streams > 10) { + error_setg(errp, + "Invalid number of streams: %d", + vsnd->snd_conf.streams); + return; + } + + if (vsnd->snd_conf.chmaps > VIRTIO_SND_CHMAP_MAX_SIZE) { + error_setg(errp, + "Invalid number of channel maps: %d", + vsnd->snd_conf.chmaps); + return; + } + + AUD_register_card("virtio-sound", &vsnd->card); + + /* set default params for all streams */ + default_params.features =3D 0; + default_params.buffer_bytes =3D 8192; + default_params.period_bytes =3D 4096; + default_params.channels =3D 2; + default_params.format =3D VIRTIO_SND_PCM_FMT_S16; + default_params.rate =3D VIRTIO_SND_PCM_RATE_44100; + + vsnd->queues[VIRTIO_SND_VQ_CONTROL] =3D virtio_add_queue(vdev, 64, ctr= l); + vsnd->queues[VIRTIO_SND_VQ_EVENT] =3D virtio_add_queue(vdev, 64, evt); + vsnd->queues[VIRTIO_SND_VQ_TX] =3D virtio_add_queue(vdev, 64, txq); + vsnd->queues[VIRTIO_SND_VQ_RX] =3D virtio_add_queue(vdev, 64, rxq); + qemu_mutex_init(&vsnd->cmdq_mutex); + QTAILQ_INIT(&vsnd->cmdq); + + for (int i =3D 0; i < vsnd->snd_conf.streams; i++) { + default_params.hdr.stream_id =3D i; + status =3D virtio_snd_pcm_set_params_impl(vsnd, &default_params); + if (status !=3D VIRTIO_SND_S_OK) { + error_setg(errp, + "Can't initalize stream params, device responded wi= th %s.", + print_code(status)); + return; + } + status =3D virtio_snd_pcm_prepare_impl(vsnd, i); + if (status !=3D VIRTIO_SND_S_OK) { + error_setg(errp, + "Can't prepare streams, device responded with %s.", + print_code(status)); + return; + } + } +} + +static void +virtio_snd_vm_state_change(void *opaque, bool running, RunState state) +{ + if (running) { + trace_virtio_snd_vm_state_running(); + } else { + trace_virtio_snd_vm_state_stopped(); + } +} + +static void virtio_snd_realize(DeviceState *dev, Error **errp) +{ + VirtIOSound *vsnd =3D VIRTIO_SND(dev); + Error *err =3D NULL; + + vsnd->pcm =3D NULL; + vsnd->vmstate =3D + qemu_add_vm_change_state_handler(virtio_snd_vm_state_change, vsnd); + + trace_virtio_snd_realize(vsnd); + + virtio_snd_common_realize(dev, + virtio_snd_handle_ctrl, + virtio_snd_handle_event, + virtio_snd_handle_xfer, + virtio_snd_handle_xfer, + &err); + if (err !=3D NULL) { + error_propagate(errp, err); + return; + } +} + +/* + * AUD_* output callback. + * + * @data: VirtIOSoundPCMStream stream + * @available: number of bytes that can be written with AUD_write() + */ +static void virtio_snd_pcm_out_cb(void *data, int available) +{ + VirtIOSoundPCMStream *stream =3D data; + VirtIOSoundPCMBlock *block; + VirtIOSoundPCMBlock *next; + int size; + + WITH_QEMU_LOCK_GUARD(&stream->queue_mutex) { + QSIMPLEQ_FOREACH_SAFE(block, &stream->queue, entry, next) { + for (;;) { + size =3D MIN(block->size, available); + size =3D AUD_write(stream->voice.out, + block->data + block->offset, + size); + block->size -=3D size; + block->offset +=3D size; + if (!block->size) { + virtqueue_push(block->vq, + block->elem, + sizeof(block->elem)); + virtio_notify(VIRTIO_DEVICE(stream->s), + block->vq); + QSIMPLEQ_REMOVE_HEAD(&stream->queue, entry); + g_free(block); + available -=3D size; + break; + } + + available -=3D size; + if (!available) { + break; + } + } + if (!available) { + break; + } + } + } +} + +/* + * Flush all buffer data from this stream's queue into the driver's virtual + * queue. + * + * @stream: VirtIOSoundPCMStream *stream + */ +static void virtio_snd_pcm_flush(VirtIOSoundPCMStream *stream) +{ + VirtIOSoundPCMBlock *block; + VirtIOSoundPCMBlock *next; + + WITH_QEMU_LOCK_GUARD(&stream->queue_mutex) { + QSIMPLEQ_FOREACH_SAFE(block, &stream->queue, entry, next) { + AUD_write(stream->voice.out, block->data, block->size); + virtqueue_push(block->vq, block->elem, sizeof(block->elem)); + virtio_notify(VIRTIO_DEVICE(stream->s), block->vq); + QSIMPLEQ_REMOVE(&stream->queue, block, VirtIOSoundPCMBlock, en= try); + } + } +} + +/* + * Close the sound card. + * + * @stream: VirtIOSoundPCMStream *stream + */ +static void virtio_snd_pcm_close(VirtIOSoundPCMStream *stream) +{ + virtio_snd_process_cmdq(stream->s); + if (stream->direction =3D=3D VIRTIO_SND_D_OUTPUT) { + AUD_close_out(&stream->pcm->snd->card, stream->voice.out); + stream->voice.out =3D NULL; + } else { + AUD_close_in(&stream->pcm->snd->card, stream->voice.in); + stream->voice.in =3D NULL; + } + +} + +static void virtio_snd_unrealize(DeviceState *dev) +{ + VirtIODevice *vdev =3D VIRTIO_DEVICE(dev); + VirtIOSound *vsnd =3D VIRTIO_SND(dev); + VirtIOSoundPCMStream *stream; + + qemu_del_vm_change_state_handler(vsnd->vmstate); + virtio_del_queue(vdev, 0); + + trace_virtio_snd_unrealize(vsnd); + + for (int i =3D VIRTIO_SND_D_OUTPUT; i <=3D VIRTIO_SND_D_INPUT; i++) { + stream =3D vsnd->pcm->streams[i]; + virtio_snd_pcm_close(stream); + g_free(stream); + } + + AUD_remove_card(&vsnd->card); + g_free(vsnd->pcm); + virtio_cleanup(vdev); +} + + +static uint32_t +virtio_snd_pcm_read_write(VirtIOSoundPCMStream *stream, + VirtQueue *vq, + VirtQueueElement *element, + bool read) +{ + VirtIOSoundPCMBlock *fragment; + size_t size =3D iov_size(element->out_sg, element->out_num) - + sizeof(virtio_snd_pcm_xfer); + assert(size <=3D stream->period_bytes); + + fragment =3D g_malloc0(sizeof(VirtIOSoundPCMBlock) + size); + fragment->elem =3D element; + fragment->vq =3D vq; + fragment->size =3D size; + fragment->offset =3D 0; + + iov_to_buf(element->out_sg, element->out_num, + sizeof(virtio_snd_pcm_xfer), + fragment->data, + size); + + QSIMPLEQ_INSERT_TAIL(&stream->queue, fragment, entry); + + return fragment->size; +} + +static void virtio_snd_reset(VirtIODevice *vdev) +{ + VirtIOSound *s =3D VIRTIO_SND(vdev); + virtio_snd_ctrl_command *cmd; + + WITH_QEMU_LOCK_GUARD(&s->cmdq_mutex) { + while (!QTAILQ_EMPTY(&s->cmdq)) { + cmd =3D QTAILQ_FIRST(&s->cmdq); + QTAILQ_REMOVE(&s->cmdq, cmd, next); + g_free(cmd); + } + } +} + +static void virtio_snd_class_init(ObjectClass *klass, void *data) +{ + DeviceClass *dc =3D DEVICE_CLASS(klass); + VirtioDeviceClass *vdc =3D VIRTIO_DEVICE_CLASS(klass); + + + set_bit(DEVICE_CATEGORY_SOUND, dc->categories); + device_class_set_props(dc, virtio_snd_properties); + + dc->vmsd =3D &vmstate_virtio_snd; + vdc->vmsd =3D &vmstate_virtio_snd_device; + vdc->realize =3D virtio_snd_realize; + vdc->unrealize =3D virtio_snd_unrealize; + vdc->get_config =3D virtio_snd_get_config; + vdc->set_config =3D virtio_snd_set_config; + vdc->get_features =3D get_features; + vdc->reset =3D virtio_snd_reset; + vdc->legacy_features =3D 0; +} + +static const TypeInfo virtio_snd_info =3D { + .name =3D TYPE_VIRTIO_SND, + .parent =3D TYPE_VIRTIO_DEVICE, + .instance_size =3D sizeof(VirtIOSound), + .class_init =3D virtio_snd_class_init, +}; + +static void virtio_snd_register(void) +{ + type_register_static(&virtio_snd_info); +} + +type_init(virtio_snd_register); diff --git a/include/hw/virtio/virtio-snd.h b/include/hw/virtio/virtio-snd.h new file mode 100644 index 0000000000..c19e71f40f --- /dev/null +++ b/include/hw/virtio/virtio-snd.h @@ -0,0 +1,194 @@ +/* + * VIRTIO Sound Device conforming to + * + * "Virtual I/O Device (VIRTIO) Version 1.2 + * Committee Specification Draft 01 + * 09 May 2022" + * + * Copyright (c) 2023 Emmanouil Pitsidianakis + * Copyright (C) 2019 OpenSynergy GmbH + * + * This work is licensed under the terms of the GNU GPL, version 2 or + * (at your option) any later version. See the COPYING file in the + * top-level directory. + */ + +#ifndef QEMU_VIRTIO_SOUND_H +#define QEMU_VIRTIO_SOUND_H + +#include "hw/virtio/virtio.h" +#include "audio/audio.h" +#include "standard-headers/linux/virtio_ids.h" +#include "standard-headers/linux/virtio_snd.h" + +#define TYPE_VIRTIO_SND "virtio-sound-device" +#define VIRTIO_SND(obj) \ + OBJECT_CHECK(VirtIOSound, (obj), TYPE_VIRTIO_SND) + +typedef struct VirtIOSound { + VirtIODevice parent_obj; + struct VirtQueue *queues[VIRTIO_SND_VQ_MAX]; + struct VirtIOSoundPCM *pcm; + bool virtio_access_is_big_endian; + QEMUSoundCard card; + VMChangeStateEntry *vmstate; + char *audiodev; + struct virtio_snd_config snd_conf; + QemuMutex cmdq_mutex; + QTAILQ_HEAD(, virtio_snd_ctrl_command) cmdq; + bool processing_cmdq; +} VirtIOSound; + +typedef struct virtio_snd_ctrl_command { + struct VirtQueueElement *elem; + struct VirtQueue *vq; + struct virtio_snd_hdr ctrl; + struct virtio_snd_hdr resp; + bool finished; + QTAILQ_ENTRY(virtio_snd_ctrl_command) next; +} virtio_snd_ctrl_command; + +#define VIRTIO_SND_FILL_CMD(out) do { \ + size_t s; \ + s =3D iov_to_buf(cmd->elem->out_sg, cmd->elem->out_num, 0, \ + &out, sizeof(out)); \ + if (s !=3D sizeof(out)) { \ + qemu_log_mask(LOG_GUEST_ERROR, \ + "%s: virtio-snd command size incorrect %zu vs \ + %zu\n", __func__, s, sizeof(out)); \ + return; \ + } \ + } while (0) + +/* CONFIGURATION SPACE */ + +typedef struct virtio_snd_config virtio_snd_config; + +/* COMMON DEFINITIONS */ + +/* common header for request/response*/ +typedef struct virtio_snd_hdr virtio_snd_hdr; + +/* event notification */ +typedef struct virtio_snd_event virtio_snd_event; + +/* common control request to query an item information */ +typedef struct virtio_snd_query_info virtio_snd_query_info; + +/* JACK CONTROL MESSAGES */ + +typedef struct virtio_snd_jack_hdr virtio_snd_jack_hdr; + +/* jack information structure */ +typedef struct virtio_snd_jack_info virtio_snd_jack_info; + +/* jack remapping control request */ +typedef struct virtio_snd_jack_remap virtio_snd_jack_remap; + +/* + * PCM CONTROL MESSAGES + */ +typedef struct virtio_snd_pcm_hdr virtio_snd_pcm_hdr; + +/* PCM stream info structure */ +typedef struct virtio_snd_pcm_info virtio_snd_pcm_info; + +/* set PCM stream params */ +typedef struct virtio_snd_pcm_set_params virtio_snd_pcm_set_params; + +/* I/O request header */ +typedef struct virtio_snd_pcm_xfer virtio_snd_pcm_xfer; + +/* I/O request status */ +typedef struct virtio_snd_pcm_status virtio_snd_pcm_status; + +/* Stream params */ +typedef struct VirtIOSoundPCMParams { + uint32_t features; + uint32_t buffer_bytes; /* size of hardware buffer in bytes */ + uint32_t period_bytes; /* size of hardware period in bytes */ + uint8_t channels; + uint8_t format; + uint8_t rate; +} VirtIOSoundPCMParams; + +#define VIRTIO_SND_PCM_MIN_CHANNELS 2 + +typedef struct VirtIOSoundPCMBlock VirtIOSoundPCMBlock; +typedef struct VirtIOSoundPCM VirtIOSoundPCM; + +struct VirtIOSoundPCMBlock { + QSIMPLEQ_ENTRY(VirtIOSoundPCMBlock) entry; + struct VirtQueueElement *elem; + struct VirtQueue *vq; + int size; + int offset; + uint8_t data[]; +}; + +typedef struct VirtIOSoundPCMStream { + VirtIOSoundPCM *pcm; + struct virtio_snd_pcm_info info; + uint32_t id; + uint32_t buffer_bytes; + uint32_t period_bytes; + /* channel position values (VIRTIO_SND_CHMAP_XXX) */ + uint8_t positions[VIRTIO_SND_CHMAP_MAX_SIZE]; + VirtIOSound *s; + uint32_t features; /* 1 << VIRTIO_SND_PCM_F_XXX */ + uint64_t formats; /* 1 << VIRTIO_SND_PCM_FMT_XXX */ + uint64_t rates; /* 1 << VIRTIO_SND_PCM_RATE_XXX */ + uint8_t direction; + uint8_t channels_min; + uint8_t channels_max; + bool flushing; + struct audsettings as; + struct audsettings desired_as; + union { + SWVoiceIn *in; + SWVoiceOut *out; + } voice; + QemuMutex queue_mutex; + QSIMPLEQ_HEAD(, VirtIOSoundPCMBlock) queue; +} VirtIOSoundPCMStream; + +struct VirtIOSoundPCM { + VirtIOSound *snd; + struct VirtIOSoundPCMParams **pcm_params; + VirtIOSoundPCMStream **streams; + struct virtio_snd_jack **jacks; +}; + +void virtio_snd_common_realize(DeviceState *dev, + VirtIOHandleOutput ctrl, + VirtIOHandleOutput evt, + VirtIOHandleOutput txq, + VirtIOHandleOutput rxq, + Error **errp); + +static inline const char *print_code(int code) +{ + switch (code) { + case VIRTIO_SND_R_JACK_INFO: + return "VIRTIO_SND_R_JACK_INFO"; + case VIRTIO_SND_R_JACK_REMAP: + return "VIRTIO_SND_R_JACK_REMAP"; + case VIRTIO_SND_R_PCM_INFO: + return "VIRTIO_SND_R_PCM_INFO"; + case VIRTIO_SND_R_PCM_SET_PARAMS: + return "VIRTIO_SND_R_PCM_SET_PARAMS"; + case VIRTIO_SND_R_PCM_PREPARE: + return "VIRTIO_SND_R_PCM_PREPARE"; + case VIRTIO_SND_R_PCM_RELEASE: + return "VIRTIO_SND_R_PCM_RELEASE"; + case VIRTIO_SND_R_PCM_START: + return "VIRTIO_SND_R_PCM_START"; + case VIRTIO_SND_R_PCM_STOP: + return "VIRTIO_SND_R_PCM_STOP"; + case VIRTIO_SND_R_CHMAP_INFO: + return "VIRTIO_SND_R_CHMAP_INFO"; + default: + return "invalid code"; + } +}; +#endif --=20 2.39.2 From nobody Wed May 8 23:14:25 2024 Delivered-To: importer2@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer2=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1686239842; cv=none; d=zohomail.com; s=zohoarc; b=SnnMSa73PZbmIDfxdxVdPaXaAjS+OAz8eVWtyqpEWF8rDLWie2NzKkHkrILt0Ax4olAqRIiOzzYfdLcQrEZ27TVyeTdNyLWGkq830tZwdFzzFUxU0zgWdLTldD7+03lDV7ikFue8SYLAFN9rOjA2am45PONhHiHp350o6ylhqTM= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1686239842; h=Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=aybT6UL78NLonUc1tWPB0Kb1vjetHrTvcGJ9R5o8QOQ=; b=l4OPmG2f7Zm14WbSr2ggm3gI7vy9kIF2y9WaD82HHbNAj31rt6YtRYx53hPbrnjP++7KX/Wl7tr+u/77wuXM7J7aS0kX2xZaaS2IGkcyBLixQlLPsdkAtQSrw4tQxvAI+2psLAyIv3gxdlttG/907bTMePjy55sFyDsbVrD94Fg= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer2=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1686239842429757.426267374509; Thu, 8 Jun 2023 08:57:22 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1q7I0J-0005Wo-63; Thu, 08 Jun 2023 11:56:51 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1q7I0G-0005W3-0E for qemu-devel@nongnu.org; Thu, 08 Jun 2023 11:56:49 -0400 Received: from mail-wm1-x330.google.com ([2a00:1450:4864:20::330]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1q7I0E-0000WQ-8c for qemu-devel@nongnu.org; Thu, 08 Jun 2023 11:56:47 -0400 Received: by mail-wm1-x330.google.com with SMTP id 5b1f17b1804b1-3f7e7fc9fe6so7246505e9.3 for ; Thu, 08 Jun 2023 08:56:45 -0700 (PDT) Received: from localhost.localdomain (adsl-175.37.6.3.tellas.gr. [37.6.3.175]) by smtp.gmail.com with ESMTPSA id c17-20020adffb51000000b00307bc4e39e5sm1927105wrs.117.2023.06.08.08.56.43 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 08 Jun 2023 08:56:44 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1686239804; x=1688831804; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=aybT6UL78NLonUc1tWPB0Kb1vjetHrTvcGJ9R5o8QOQ=; b=woM1mNsaRhAvtI9dcTkDW//UceOoCdasijVUJ5+3pAl6pX0Qefn3EeIb8efLcy2g28 2kkzL6+qiYsyaH1ThPjgKvzhAbQg9QJNFODM/MXHT8Avg688U5JNljQo16cl6sfPn7U3 /GBVssmo4RITMoi7dkdZWAxmhMX6pzXlq1RsxoEB5kS4uAkkVbgTaiUGOlLmlF2vikBa q8hjKL/WYp1NxItiTKLSa5yx2B0iT31q+rBCVdScC/6se8wgndmxTnIQRBeMCI17OHBF Rpr61EtHRbHj1ZYjO9JlFjIJP0dUSFz3JuOyTmzmZl2w02dUmLrP0WlIjUMBEzcOI2yN HfCQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1686239804; x=1688831804; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=aybT6UL78NLonUc1tWPB0Kb1vjetHrTvcGJ9R5o8QOQ=; b=QCnluwukb6yNOjjbr9EZ0At/w/eBpMR713rpgfhyMbiugIOXpzFg/B6YuSsCG1woXG EK83khxSJiX3l41x4yBnWt+JVjZr0TH2ezOjDQm6vcDSRsMk7oUNHl3+K0HF4dr0yJ6T buqDHRNyTjdl+tNm+G9AqIhsuSvStm58uxn++it4OV+8YX5AsWvrHzSPyx/6/RBxtp+p gJLOzAGejsTIhsvyLVgvI8JQggZk2bze/48ecSJgGHP50wGxxpePh/Q7vJ46X/gprXbR VWEe0P7dX+shirhE5F6iOCohDEBaqtwrcJGO5WmDi4+/yeN8aHveCv6QUS/cQnjcqqeu 9lEA== X-Gm-Message-State: AC+VfDz8ubI+NDb9fx+LEAdxiSamnir+XA5nz4o0OARWHkW5Ne48Ff0J uTzxQU/cgj+mFaqHcaDH2b5MyiDYyEqCU5Yp7e4= X-Google-Smtp-Source: ACHHUZ7LhR/hJ85v7W7Kmd/moO6zC/ZKzSsbgqOzAA0VBsjqSCrheYSMD6gG7Ve2gNB1Yh8CQBNsig== X-Received: by 2002:a1c:f719:0:b0:3f7:f584:5791 with SMTP id v25-20020a1cf719000000b003f7f5845791mr1785035wmh.35.1686239804466; Thu, 08 Jun 2023 08:56:44 -0700 (PDT) From: Manos Pitsidianakis To: qemu-devel@nongnu.org Cc: Manos Pitsidianakis , Igor Skalkin , Anton Yakovlev Subject: [PATCH v2 2/3] Add virtio-sound-pci device Date: Thu, 8 Jun 2023 18:56:18 +0300 Message-Id: X-Mailer: git-send-email 2.39.2 In-Reply-To: References: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer2=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=2a00:1450:4864:20::330; envelope-from=manos.pitsidianakis@linaro.org; helo=mail-wm1-x330.google.com X-Spam_score_int: -5 X-Spam_score: -0.6 X-Spam_bar: / X-Spam_report: (-0.6 / 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, RCVD_IN_SORBS_WEB=1.5, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=no autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer2=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer2=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @linaro.org) X-ZM-MESSAGEID: 1686239844562100007 Content-Type: text/plain; charset="utf-8" This patch adds a PCI wrapper device for the virtio-sound device. To test this, you'll need a >=3D5.13 kernel compiled with CONFIG_SND_VIRTIO=3Dy, which at the time of writing most distros have off by default. Use with following flags in the invocation: -device virtio-sound-pci,disable-legacy=3Don And an audio backend listed with `-audio driver=3Dhelp` that works on your host machine, e.g.: Pulseaudio: -audio driver=3Dpa,model=3Dvirtio-sound sdl: -audio driver=3Dsdl,model=3Dvirtio-sound coreaudio (macos/darwin): -audio driver=3Dcoreaudio,model=3Dvirtio-sound etc. You can use speaker-test from alsa-tools to play noise, sines, or WAV files. Signed-off-by: Emmanouil Pitsidianakis --- --- hw/virtio/meson.build | 1 + hw/virtio/virtio-snd-pci.c | 102 +++++++++++++++++++++++++++++++++++++ include/hw/pci/pci.h | 1 + softmmu/qdev-monitor.c | 1 + 4 files changed, 105 insertions(+) create mode 100644 hw/virtio/virtio-snd-pci.c diff --git a/hw/virtio/meson.build b/hw/virtio/meson.build index 8cf49af618..55d9426415 100644 --- a/hw/virtio/meson.build +++ b/hw/virtio/meson.build @@ -58,6 +58,7 @@ virtio_pci_ss.add(when: 'CONFIG_VIRTIO_SERIAL', if_true: = files('virtio-serial-pc virtio_pci_ss.add(when: 'CONFIG_VIRTIO_PMEM', if_true: files('virtio-pmem-= pci.c')) virtio_pci_ss.add(when: 'CONFIG_VIRTIO_IOMMU', if_true: files('virtio-iomm= u-pci.c')) virtio_pci_ss.add(when: 'CONFIG_VIRTIO_MEM', if_true: files('virtio-mem-pc= i.c')) +virtio_pci_ss.add(when: 'CONFIG_VIRTIO_SND', if_true: files('virtio-snd-pc= i.c')) virtio_pci_ss.add(when: 'CONFIG_VHOST_VDPA_DEV', if_true: files('vdpa-dev-= pci.c')) =20 specific_virtio_ss.add_all(when: 'CONFIG_VIRTIO_PCI', if_true: virtio_pci_= ss) diff --git a/hw/virtio/virtio-snd-pci.c b/hw/virtio/virtio-snd-pci.c new file mode 100644 index 0000000000..1a41b53e07 --- /dev/null +++ b/hw/virtio/virtio-snd-pci.c @@ -0,0 +1,102 @@ +/* + * VIRTIO Sound Device PCI Bindings + * + * Copyright (c) 2023 Emmanouil Pitsidianakis + * + * This work is licensed under the terms of the GNU GPL, version 2 or + * (at your option) any later version. See the COPYING file in the + * top-level directory. + */ + +#include "qemu/osdep.h" +#include "hw/audio/soundhw.h" +#include "hw/virtio/virtio-pci.h" +#include "hw/virtio/virtio-snd.h" + +typedef struct VirtIOSoundPCI VirtIOSoundPCI; + +/* + * virtio-snd-pci: This extends VirtioPCIProxy. + */ +#define TYPE_VIRTIO_SND_PCI "virtio-sound-pci-base" +DECLARE_INSTANCE_CHECKER(VirtIOSoundPCI, VIRTIO_SOUND_PCI, + TYPE_VIRTIO_SND_PCI) + +struct VirtIOSoundPCI { + VirtIOPCIProxy parent; + VirtIOSound vdev; +}; + +static Property virtio_snd_pci_properties[] =3D { + DEFINE_PROP_UINT32("class", VirtIOPCIProxy, class_code, 0), + DEFINE_PROP_END_OF_LIST(), +}; + +static const char *audiodev_id; + +static int virtio_snd_init_pci(PCIBus *init_bus, const char *audiodev) +{ + audiodev_id =3D audiodev; + return 0; +} + +static void virtio_snd_pci_realize(VirtIOPCIProxy *vpci_dev, Error **errp) +{ + VirtIOSoundPCI *dev =3D VIRTIO_SOUND_PCI(vpci_dev); + DeviceState *vdev =3D DEVICE(&dev->vdev); + VirtIOSound *vsnd =3D VIRTIO_SND(&dev->vdev); + + /* + * According to spec, non-legacy virtio PCI devices are always little + * endian + */ + vsnd->virtio_access_is_big_endian =3D false; + + + qdev_set_parent_bus(vdev, BUS(&vpci_dev->bus), errp); + + qdev_prop_set_string(vdev, "audiodev", audiodev_id); + + object_property_set_bool(OBJECT(vdev), "realized", true, errp); +} + +static void virtio_snd_pci_class_init(ObjectClass *klass, void *data) +{ + DeviceClass *dc =3D DEVICE_CLASS(klass); + VirtioPCIClass *vpciklass =3D VIRTIO_PCI_CLASS(klass); + PCIDeviceClass *pcidev_k =3D PCI_DEVICE_CLASS(klass); + + vpciklass->realize =3D virtio_snd_pci_realize; + set_bit(DEVICE_CATEGORY_SOUND, dc->categories); + + pcidev_k->vendor_id =3D PCI_VENDOR_ID_REDHAT_QUMRANET; + pcidev_k->device_id =3D PCI_DEVICE_ID_VIRTIO_SND; + pcidev_k->revision =3D VIRTIO_PCI_ABI_VERSION; + pcidev_k->class_id =3D PCI_CLASS_MULTIMEDIA_AUDIO; + device_class_set_props(dc, virtio_snd_pci_properties); +} + +static void virtio_snd_pci_instance_init(Object *obj) +{ + VirtIOSoundPCI *dev =3D VIRTIO_SOUND_PCI(obj); + + virtio_instance_init_common(obj, &dev->vdev, sizeof(dev->vdev), + TYPE_VIRTIO_SND); +} + +static const VirtioPCIDeviceTypeInfo virtio_snd_pci_info =3D { + .base_name =3D TYPE_VIRTIO_SND_PCI, + .generic_name =3D "virtio-sound-pci", + .instance_size =3D sizeof(VirtIOSoundPCI), + .instance_init =3D virtio_snd_pci_instance_init, + .class_init =3D virtio_snd_pci_class_init, +}; + +static void virtio_snd_pci_register(void) +{ + virtio_pci_types_register(&virtio_snd_pci_info); + pci_register_soundhw("virtio-sound", "Virtio Sound Device", + virtio_snd_init_pci); +} + +type_init(virtio_snd_pci_register); diff --git a/include/hw/pci/pci.h b/include/hw/pci/pci.h index e6d0574a29..cf4216df81 100644 --- a/include/hw/pci/pci.h +++ b/include/hw/pci/pci.h @@ -85,6 +85,7 @@ extern bool pci_available; #define PCI_DEVICE_ID_VIRTIO_RNG 0x1005 #define PCI_DEVICE_ID_VIRTIO_9P 0x1009 #define PCI_DEVICE_ID_VIRTIO_VSOCK 0x1012 +#define PCI_DEVICE_ID_VIRTIO_SND 0x1019 =20 /* * modern virtio-pci devices get their id assigned automatically, diff --git a/softmmu/qdev-monitor.c b/softmmu/qdev-monitor.c index b8d2c4dadd..49d68495a3 100644 --- a/softmmu/qdev-monitor.c +++ b/softmmu/qdev-monitor.c @@ -108,6 +108,7 @@ static const QDevAlias qdev_alias_table[] =3D { { "virtio-serial-device", "virtio-serial", QEMU_ARCH_VIRTIO_MMIO }, { "virtio-serial-ccw", "virtio-serial", QEMU_ARCH_VIRTIO_CCW }, { "virtio-serial-pci", "virtio-serial", QEMU_ARCH_VIRTIO_PCI}, + { "virtio-sound-pci", "virtio-sound", QEMU_ARCH_VIRTIO_PCI}, { "virtio-tablet-device", "virtio-tablet", QEMU_ARCH_VIRTIO_MMIO }, { "virtio-tablet-ccw", "virtio-tablet", QEMU_ARCH_VIRTIO_CCW }, { "virtio-tablet-pci", "virtio-tablet", QEMU_ARCH_VIRTIO_PCI }, --=20 2.39.2 From nobody Wed May 8 23:14:25 2024 Delivered-To: importer2@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer2=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1686239855; cv=none; d=zohomail.com; s=zohoarc; b=IGbbWYxcsNQ9pUVFPZgOO5lSDHZuniVVMad86kQLmSZETl7+1l7nv1U6f26Oii8oZmnTWyiIrM5P6Pov36PxN2p1/1pi2WUjB72I0KmgG8NIw6j9Uy8aV85SL5ahrP9BzO6RMCY9mspezRy90pD89Di2M3SvTs0kTiI+ZlZZDrA= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1686239855; h=Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=8+St/cNjhfZOYAVPddWdTAJq1qrsE4cJ+BFd3Ppf/lg=; b=GSVWEY878dMz0LewQQDvJ5sa+DySkt/eUeDKzRj+ti4Zkekn7A9t80/ktlLLp3glaJv/oBazwLXHbyMMUthn21COulyX+4Et5hc7n/2c5W/jMaPF2pGQ69rJugKn4cjqPAxXlWqgPL1klA4Uwwm2UXoHTNj0HSvNvFXP3O9eRuA= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer2=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1686239855284976.605924470459; Thu, 8 Jun 2023 08:57:35 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1q7I0O-0005bk-Ey; Thu, 08 Jun 2023 11:56:56 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1q7I0L-0005a0-1q for qemu-devel@nongnu.org; Thu, 08 Jun 2023 11:56:54 -0400 Received: from mail-wm1-x333.google.com ([2a00:1450:4864:20::333]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1q7I0I-0000Wm-0O for qemu-devel@nongnu.org; Thu, 08 Jun 2023 11:56:52 -0400 Received: by mail-wm1-x333.google.com with SMTP id 5b1f17b1804b1-3f7f6341bf9so7269785e9.1 for ; Thu, 08 Jun 2023 08:56:49 -0700 (PDT) Received: from localhost.localdomain (adsl-175.37.6.3.tellas.gr. [37.6.3.175]) by smtp.gmail.com with ESMTPSA id c17-20020adffb51000000b00307bc4e39e5sm1927105wrs.117.2023.06.08.08.56.47 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 08 Jun 2023 08:56:48 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1686239808; x=1688831808; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=8+St/cNjhfZOYAVPddWdTAJq1qrsE4cJ+BFd3Ppf/lg=; b=elbwwQ2f3lf+gNIDfwt3iSe1c5TXFIAXi66Oxqry9mmAautH4PyuS4mNbC9QwYPxbq g5Nxxz6SpHx+aDRp5yz3MYTH2vlGk8cWji2El1arDsGdnGepfd3WQNLxmNylMAv1Ps81 PmA1mS79ohFAEwq4v1B9BainJ+MuGpQGeW6ITl16XPCqV6mK55tOLL+7wFzfcwyxV7yN 79QCy9fO3T7uUTQfUmSL0hvM1InB7q2PA/4B62wr+lmH8C5mzRy6Op/NugvPR0fRN7Ll 95gJfzljAQX3uC6TuQ95iuFwN5cJtbAhSx5Sk+W+gA3RPUj8a8AGT64nnhutOykiI61f 62Hg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1686239808; x=1688831808; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=8+St/cNjhfZOYAVPddWdTAJq1qrsE4cJ+BFd3Ppf/lg=; b=BEK7VpYtChObopOTbYDh8rLxU48k9P349aa8FHQSZ3l/EFQzSkrTWHz9eqlthkXdYV 8r3z6VjjGYD8mPixc5bwQh+MG5yu01KDp6NIZnuABZADSO0HNbTQWV73j2MFMdeeE7ew uR2PpYG2L/P3y8ITVyDzX3UaLIiT1q41YfjeeHFx5X8PirVdrohn3IWo4tOy3GL+XdDX n7Ja9kobID/jQwRSxXg3+IpjwJzynfYlKvAOr5AMTqyBtXMNkx2okSIKL8eljsDmSOwv 0hFJOqmYjep6pl5jGMCcXnxQUVoA56NA0AY1ItgbnWjEtdSAA41mVlahqKFsdr8YsFWA /DrQ== X-Gm-Message-State: AC+VfDz3nLd45Dz+/hZBwq+/BPXuj84uhM1ezVfRMT9UzO/st4CBFwFT WQ1a8akL3crhT8c9vxKElRvVv/PeJJ6Ypcjquqc= X-Google-Smtp-Source: ACHHUZ4PZDkAAKmAizdC2u7bMzYBAaacmmkl2Q5dZe03Q19K2cYQ1fVW4JM5nPZjcfWmEp7VLiw9pw== X-Received: by 2002:a05:600c:364b:b0:3f1:93c2:4df7 with SMTP id y11-20020a05600c364b00b003f193c24df7mr1656483wmq.5.1686239808244; Thu, 08 Jun 2023 08:56:48 -0700 (PDT) From: Manos Pitsidianakis To: qemu-devel@nongnu.org Cc: Manos Pitsidianakis , Igor Skalkin , Anton Yakovlev Subject: [PATCH v2 3/3] Implement audio capture in virtio-snd device Date: Thu, 8 Jun 2023 18:56:19 +0300 Message-Id: <4c130f066d87fd9dce82dfdae7c4bb3b2fbc5ffd.1686238728.git.manos.pitsidianakis@linaro.org> X-Mailer: git-send-email 2.39.2 In-Reply-To: References: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer2=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=2a00:1450:4864:20::333; envelope-from=manos.pitsidianakis@linaro.org; helo=mail-wm1-x333.google.com X-Spam_score_int: -5 X-Spam_score: -0.6 X-Spam_bar: / X-Spam_report: (-0.6 / 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, RCVD_IN_SORBS_WEB=1.5, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=no autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer2=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer2=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @linaro.org) X-ZM-MESSAGEID: 1686239856007100001 Content-Type: text/plain; charset="utf-8" Signed-off-by: Emmanouil Pitsidianakis --- hw/virtio/trace-events | 3 +- hw/virtio/virtio-snd.c | 239 +++++++++++++++++++++++++++++++++++------ 2 files changed, 206 insertions(+), 36 deletions(-) diff --git a/hw/virtio/trace-events b/hw/virtio/trace-events index b77d78abdc..b58c007297 100644 --- a/hw/virtio/trace-events +++ b/hw/virtio/trace-events @@ -162,7 +162,8 @@ virtio_snd_handle_pcm_set_params(int stream) "VIRTIO_SN= D_PCM_SET_PARAMS called f virtio_snd_handle_pcm_start_stop(const char *code, int stream) "%s called = for stream %d" virtio_snd_handle_pcm_release(int stream) "VIRTIO_SND_PCM_RELEASE called f= or stream %d" virtio_snd_handle_chmap_info(void) "VIRTIO_SND_CHMAP_INFO called" -virtio_snd_handle_xfer(void) "tx/rx queue callback called" +virtio_snd_handle_tx_xfer(void) "tx queue callback called" +virtio_snd_handle_rx_xfer(void) "rx queue callback called" virtio_snd_handle_event(void) "event queue callback called" virtio_snd_realize(void *snd) "snd %p: realize" virtio_snd_unrealize(void *snd) "snd %p: unrealize" diff --git a/hw/virtio/virtio-snd.c b/hw/virtio/virtio-snd.c index e3b6c353ad..fe7d70ff06 100644 --- a/hw/virtio/virtio-snd.c +++ b/hw/virtio/virtio-snd.c @@ -25,7 +25,7 @@ #define VIRTIO_SOUND_VM_VERSION 1 =20 #define VIRTIO_SOUND_JACK_DEFAULT 0 -#define VIRTIO_SOUND_STREAM_DEFAULT 1 +#define VIRTIO_SOUND_STREAM_DEFAULT 2 #define VIRTIO_SOUND_CHMAP_DEFAULT 0 =20 #define VIRTIO_SOUND_HDA_FN_NID 0 @@ -89,12 +89,16 @@ virtio_snd_set_config(VirtIODevice *vdev, const uint8_t= *config) } =20 static void virtio_snd_process_cmdq(VirtIOSound *s); -static void virtio_snd_pcm_flush(VirtIOSoundPCMStream *stream); +static void virtio_snd_pcm_out_flush(VirtIOSoundPCMStream *stream); +static void virtio_snd_pcm_in_flush(VirtIOSoundPCMStream *stream); static void virtio_snd_pcm_out_cb(void *data, int available); -static uint32_t virtio_snd_pcm_read_write(VirtIOSoundPCMStream *stream, +static void virtio_snd_pcm_in_cb(void *data, int available); +static uint32_t virtio_snd_pcm_write(VirtIOSoundPCMStream *stream, VirtQueue *vq, - VirtQueueElement *element, - bool read); + VirtQueueElement *element); +static uint32_t virtio_snd_pcm_read(VirtIOSoundPCMStream *stream, + VirtQueue *vq, + VirtQueueElement *element); =20 /* * Get a specific stream from the virtio sound card device. @@ -450,15 +454,12 @@ static uint32_t virtio_snd_pcm_prepare_impl(VirtIOSou= nd *s, uint32_t stream_id) &as); =20 } else { - qemu_log_mask(LOG_UNIMP, "virtio_snd: input/capture is unimplement= ed."); - /* - * stream->voice.in =3D AUD_open_in(&s->card, - * stream->voice.in, - * "virtio_snd_card", - * stream, - * virtio_snd_input_cb, - * &as); - */ + stream->voice.in =3D AUD_open_in(&s->card, + stream->voice.in, + "virtio_snd_card", + stream, + virtio_snd_pcm_in_cb, + &as); } =20 stream->as =3D as; @@ -522,6 +523,8 @@ static void virtio_snd_handle_pcm_start_stop(VirtIOSoun= d *s, if (stream) { if (stream->direction =3D=3D VIRTIO_SND_D_OUTPUT) { AUD_set_active_out(stream->voice.out, start); + } else { + AUD_set_active_in(stream->voice.in, start); } } else { cmd->resp.code =3D VIRTIO_SND_S_BAD_MSG; @@ -573,7 +576,11 @@ static uint32_t virtio_snd_pcm_release_impl(VirtIOSoun= dPCMStream *stream, */ virtio_snd_process_cmdq(stream->s); trace_virtio_snd_pcm_stream_flush(stream_id); - virtio_snd_pcm_flush(stream); + if (stream->direction =3D=3D VIRTIO_SND_D_OUTPUT) { + virtio_snd_pcm_out_flush(stream); + } else { + virtio_snd_pcm_in_flush(stream); + } } =20 return VIRTIO_SND_S_OK; @@ -754,7 +761,7 @@ static void virtio_snd_handle_event(VirtIODevice *vdev,= VirtQueue *vq) * @vdev: VirtIOSound device * @vq: tx virtqueue */ -static void virtio_snd_handle_xfer(VirtIODevice *vdev, VirtQueue *vq) +static void virtio_snd_handle_tx_xfer(VirtIODevice *vdev, VirtQueue *vq) { VirtIOSound *s =3D VIRTIO_SND(vdev); VirtIOSoundPCMStream *stream =3D NULL; @@ -763,7 +770,7 @@ static void virtio_snd_handle_xfer(VirtIODevice *vdev, = VirtQueue *vq) virtio_snd_pcm_xfer hdr; virtio_snd_pcm_status resp =3D { 0 }; =20 - trace_virtio_snd_handle_xfer(); + trace_virtio_snd_handle_tx_xfer(); =20 for (;;) { elem =3D virtqueue_pop(vq, sizeof(VirtQueueElement)); @@ -780,11 +787,11 @@ static void virtio_snd_handle_xfer(VirtIODevice *vdev= , VirtQueue *vq) stream =3D s->pcm->streams[hdr.stream_id]; assert(stream); =20 + assert(hdr.stream_id !=3D VIRTIO_SND_D_INPUT); WITH_QEMU_LOCK_GUARD(&stream->queue_mutex) { - virtio_snd_pcm_read_write(stream, + virtio_snd_pcm_write(stream, vq, - elem, - hdr.stream_id =3D=3D VIRTIO_SND_D_INPUT); + elem); =20 resp.status =3D VIRTIO_SND_S_OK; sz =3D iov_from_buf(elem->in_sg, @@ -803,6 +810,53 @@ static void virtio_snd_handle_xfer(VirtIODevice *vdev,= VirtQueue *vq) virtio_notify(VIRTIO_DEVICE(s), vq); } =20 +/* + * The rx virtqueue handler. Makes the buffers available to their respecti= ve + * streams for consumption. + * + * @vdev: VirtIOSound device + * @vq: tx virtqueue + */ +static void virtio_snd_handle_rx_xfer(VirtIODevice *vdev, VirtQueue *vq) +{ + VirtIOSound *s =3D VIRTIO_SND(vdev); + VirtIOSoundPCMStream *stream =3D NULL; + VirtQueueElement *elem; + size_t sz; + virtio_snd_pcm_xfer hdr; + + trace_virtio_snd_handle_rx_xfer(); + + for (;;) { + elem =3D virtqueue_pop(vq, sizeof(VirtQueueElement)); + if (!elem) { + break; + } + /* get the message hdr object */ + sz =3D iov_to_buf(elem->out_sg, + elem->out_num, + 0, + &hdr, + sizeof(hdr)); + assert(sz =3D=3D sizeof(hdr)); + stream =3D s->pcm->streams[hdr.stream_id]; + assert(stream); + + assert(hdr.stream_id =3D=3D VIRTIO_SND_D_INPUT); + WITH_QEMU_LOCK_GUARD(&stream->queue_mutex) { + virtio_snd_pcm_read(stream, vq, elem); + + } + } + + /* + * Notify vq about virtio_snd_pcm_status responses. + * Buffer responses must be notified separately later. + */ + virtio_notify(VIRTIO_DEVICE(s), vq); +} + + static uint64_t get_features(VirtIODevice *vdev, uint64_t features, Error **errp) { @@ -928,8 +982,8 @@ static void virtio_snd_realize(DeviceState *dev, Error = **errp) virtio_snd_common_realize(dev, virtio_snd_handle_ctrl, virtio_snd_handle_event, - virtio_snd_handle_xfer, - virtio_snd_handle_xfer, + virtio_snd_handle_tx_xfer, + virtio_snd_handle_rx_xfer, &err); if (err !=3D NULL) { error_propagate(errp, err); @@ -984,26 +1038,124 @@ static void virtio_snd_pcm_out_cb(void *data, int a= vailable) } =20 /* - * Flush all buffer data from this stream's queue into the driver's virtual - * queue. + * AUD_* input callback. * - * @stream: VirtIOSoundPCMStream *stream + * @data: VirtIOSoundPCMStream stream + * @available: number of bytes that can be read with AUD_read() */ -static void virtio_snd_pcm_flush(VirtIOSoundPCMStream *stream) +static void virtio_snd_pcm_in_cb(void *data, int available) { + VirtIOSoundPCMStream *stream =3D data; VirtIOSoundPCMBlock *block; - VirtIOSoundPCMBlock *next; + uint32_t sz; + virtio_snd_pcm_status resp =3D { 0 }; + int size; =20 WITH_QEMU_LOCK_GUARD(&stream->queue_mutex) { - QSIMPLEQ_FOREACH_SAFE(block, &stream->queue, entry, next) { - AUD_write(stream->voice.out, block->data, block->size); - virtqueue_push(block->vq, block->elem, sizeof(block->elem)); - virtio_notify(VIRTIO_DEVICE(stream->s), block->vq); - QSIMPLEQ_REMOVE(&stream->queue, block, VirtIOSoundPCMBlock, en= try); + while (!QSIMPLEQ_EMPTY(&stream->queue)) { + block =3D QSIMPLEQ_FIRST(&stream->queue); + assert(block !=3D NULL); + + for (;;) { + size =3D AUD_read(stream->voice.in, + block->data + block->offset, + MIN(stream->period_bytes - block->offset, availabl= e)); + block->offset +=3D size; + block->size +=3D size; + if (size =3D=3D 0 || block->size =3D=3D stream->period_byt= es) { + resp.status =3D VIRTIO_SND_S_OK; + sz =3D iov_from_buf(block->elem->in_sg, + block->elem->in_num, + 0, + &resp, + sizeof(resp)); + assert(sz =3D=3D sizeof(virtio_snd_pcm_status)); + + /* Copy data -if any- to guest */ + if (block->size) { + sz =3D iov_from_buf(block->elem->in_sg, + block->elem->in_num, + sz, + &block->data, + block->size); + assert(sz <=3D stream->period_bytes); + } + virtqueue_push(block->vq, + block->elem, + sizeof(block->elem)); + virtio_notify(VIRTIO_DEVICE(stream->s), + block->vq); + QSIMPLEQ_REMOVE_HEAD(&stream->queue, entry); + g_free(block); + available -=3D size; + break; + } + + available -=3D size; + if (!available) { + break; + } + } + if (!available) { + break; + } } } } =20 +#define virtio_snd_pcm_flush(AUD_CB) \ + VirtIOSoundPCMBlock *block; \ + VirtIOSoundPCMBlock *next; \ + WITH_QEMU_LOCK_GUARD(&stream->queue_mutex) { \ + QSIMPLEQ_FOREACH_SAFE(block, &stream->queue, entry, next) { \ + do { \ + AUD_CB; \ + } while (0) \ + ; \ + virtqueue_push(block->vq, block->elem, sizeof(block->elem));\ + virtio_notify(VIRTIO_DEVICE(stream->s), block->vq); \ + QSIMPLEQ_REMOVE(&stream->queue, \ + block, \ + VirtIOSoundPCMBlock, \ + entry); \ + } \ + } \ + + +/* + * Flush all buffer data from this output stream's queue into the driver's + * virtual queue. + * + * @stream: VirtIOSoundPCMStream *stream + */ +static void virtio_snd_pcm_out_flush(VirtIOSoundPCMStream *stream) +{ + virtio_snd_pcm_flush( + AUD_write(stream->voice.out, + block->data, + block->size); + ); +} + +/* + * Flush all buffer data from this input stream's queue into the driver's + * virtual queue. + * + * @stream: VirtIOSoundPCMStream *stream + */ +static void virtio_snd_pcm_in_flush(VirtIOSoundPCMStream *stream) +{ + uint32_t sz; + virtio_snd_pcm_flush( + sz =3D iov_from_buf(block->elem->in_sg, + block->elem->in_num, + sizeof(virtio_snd_pcm_info), + block->data, + block->offset); + assert(sz <=3D block->size); + ); +} + /* * Close the sound card. * @@ -1046,10 +1198,9 @@ static void virtio_snd_unrealize(DeviceState *dev) =20 =20 static uint32_t -virtio_snd_pcm_read_write(VirtIOSoundPCMStream *stream, +virtio_snd_pcm_write(VirtIOSoundPCMStream *stream, VirtQueue *vq, - VirtQueueElement *element, - bool read) + VirtQueueElement *element) { VirtIOSoundPCMBlock *fragment; size_t size =3D iov_size(element->out_sg, element->out_num) - @@ -1072,6 +1223,24 @@ virtio_snd_pcm_read_write(VirtIOSoundPCMStream *stre= am, return fragment->size; } =20 +static uint32_t +virtio_snd_pcm_read(VirtIOSoundPCMStream *stream, + VirtQueue *vq, + VirtQueueElement *element) +{ + VirtIOSoundPCMBlock *fragment; + + fragment =3D g_malloc0(sizeof(VirtIOSoundPCMBlock) + stream->period_by= tes); + fragment->elem =3D element; + fragment->vq =3D vq; + fragment->size =3D 0; + fragment->offset =3D 0; + + QSIMPLEQ_INSERT_TAIL(&stream->queue, fragment, entry); + + return fragment->size; +} + static void virtio_snd_reset(VirtIODevice *vdev) { VirtIOSound *s =3D VIRTIO_SND(vdev); --=20 2.39.2