| Message ID | f68a8f30642a95f2a64a943beede32815c43fcdb.1697709630.git.manos.pitsidianakis@linaro.org (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | Add VIRTIO sound card | expand |
Am 19.10.23 um 12:03 schrieb Emmanouil Pitsidianakis: > This patch adds a PCI wrapper device for the virtio-sound device. > It is necessary to instantiate a virtio-snd device in a guest. > All sound logic will be added to the virtio-snd device in the following > commits. > > To add this device with a guest, you'll need a >=5.13 kernel compiled > with CONFIG_SND_VIRTIO=y, which at the time of writing most distros have > off by default. > > Use with following flags in the invocation: > > Pulseaudio: > -audio driver=pa,model=virtio > or > -audio driver=pa,model=virtio,server=/run/user/1000/pulse/native > sdl: > -audio driver=sdl,model=virtio > coreaudio (macos/darwin): > -audio driver=coreaudio,model=virtio > etc. > > Based-on: https://github.com/OpenSynergy/qemu/commit/5a2f350eec5d157b90d9c7b40a8e603f4da92471 > Reviewed-by: Alex Bennée <alex.bennee@linaro.org> > Signed-off-by: Igor Skalkin <Igor.Skalkin@opensynergy.com> > Signed-off-by: Anton Yakovlev <Anton.Yakovlev@opensynergy.com> > Signed-off-by: Emmanouil Pitsidianakis <manos.pitsidianakis@linaro.org> > --- > MAINTAINERS | 1 + > hw/audio/meson.build | 1 + > hw/audio/virtio-snd-pci.c | 93 +++++++++++++++++++++++++++++++++++++++ > system/qdev-monitor.c | 1 + > 4 files changed, 96 insertions(+) > create mode 100644 hw/audio/virtio-snd-pci.c > diff --git a/system/qdev-monitor.c b/system/qdev-monitor.c > index 1b8005ae55..f007ee6953 100644 > --- a/system/qdev-monitor.c > +++ b/system/qdev-monitor.c > @@ -111,6 +111,7 @@ static const QDevAlias qdev_alias_table[] = { > { "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}, Hi Manos, the virtio-sound device alias doesn't work. > ./qemu-system-x86_64 -machine q35 -device virtio-sound,audiodev=audio0 -audiodev pipewire,id=audio0 qemu-system-x86_64: -device virtio-sound,audiodev=audio0: No 'virtio-bus' bus found for device 'virtio-sound' This can be fixed if you change --- a/include/hw/audio/virtio-snd.h +++ b/include/hw/audio/virtio-snd.h @@ -21,7 +21,7 @@ #include "standard-headers/linux/virtio_ids.h" #include "standard-headers/linux/virtio_snd.h" -#define TYPE_VIRTIO_SND "virtio-sound" +#define TYPE_VIRTIO_SND "virtio-sound-device" #define VIRTIO_SND(obj) \ OBJECT_CHECK(VirtIOSound, (obj), TYPE_VIRTIO_SND) in patch 01/11. The other virtio devices also have a device suffix in their type name. Additionally I would insert this line + { "virtio-sound-device", "virtio-sound", QEMU_ARCH_VIRTIO_MMIO}, here. With best regards, Volker > + { "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 },
Hello Volker,
On Sat, 21 Oct 2023 12:07, Volker Rümelin <vr_qemu@t-online.de> wrote:
>the virtio-sound device alias doesn't work.
Yes, there's no virtio-sound alias hence why it does not work.
I will wait a bit before spinning a new version of the series because
the goal post keeps moving forward everytime there's a new version while
there is still stuff to address. If this is the only change I'd like to
hear from Gerd if this is ok to merge otherwise, and perhaps I can send
a new version of this patch only?
Manos
Am 22.10.23 um 11:58 schrieb Manos Pitsidianakis: > Hello Volker, > > On Sat, 21 Oct 2023 12:07, Volker Rümelin <vr_qemu@t-online.de> wrote: >> the virtio-sound device alias doesn't work. > > Yes, there's no virtio-sound alias hence why it does not work. Sorry, I don't understand your last sentence. You add this alias with the following line in patch 02/11, so there is a virtio-sound alias. This alias doesn't work because there is a device with the same name. + { "virtio-sound-pci", "virtio-sound", QEMU_ARCH_VIRTIO_PCI}, With best regards, Volker > > I will wait a bit before spinning a new version of the series because > the goal post keeps moving forward everytime there's a new version > while there is still stuff to address. If this is the only change I'd > like to hear from Gerd if this is ok to merge otherwise, and perhaps I > can send a new version of this patch only? > > Manos
Good morning Volker, On Sun, 22 Oct 2023 14:51, Volker Rümelin <vr_qemu@t-online.de> wrote: >Sorry, I don't understand your last sentence. You add this alias with >the following line in patch 02/11, so there is a virtio-sound alias. >This alias doesn't work because there is a device with the same name. My bad, I thought you were talking about a non-pci alias and I also did not express myself clearly. Sorry for the noise and thanks for spotting this! :) Will send a new version. Manos
diff --git a/MAINTAINERS b/MAINTAINERS index 3b7c467280..cd2663ada8 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -2272,6 +2272,7 @@ M: Gerd Hoffmann <kraxel@redhat.com> R: Manos Pitsidianakis <manos.pitsidianakis@linaro.org> S: Supported F: hw/audio/virtio-snd.c +F: hw/audio/virtio-snd-pci.c F: include/hw/audio/virtio-snd.h nvme diff --git a/hw/audio/meson.build b/hw/audio/meson.build index 7a503be1fd..2990974449 100644 --- a/hw/audio/meson.build +++ b/hw/audio/meson.build @@ -14,3 +14,4 @@ system_ss.add(when: 'CONFIG_SB16', if_true: files('sb16.c')) system_ss.add(when: 'CONFIG_VT82C686', if_true: files('via-ac97.c')) system_ss.add(when: 'CONFIG_WM8750', if_true: files('wm8750.c')) system_ss.add(when: ['CONFIG_VIRTIO_SND', 'CONFIG_VIRTIO'], if_true: files('virtio-snd.c')) +system_ss.add(when: ['CONFIG_VIRTIO_SND', 'CONFIG_VIRTIO', 'CONFIG_VIRTIO_PCI'], if_true: files('virtio-snd-pci.c')) diff --git a/hw/audio/virtio-snd-pci.c b/hw/audio/virtio-snd-pci.c new file mode 100644 index 0000000000..0f92e0752b --- /dev/null +++ b/hw/audio/virtio-snd-pci.c @@ -0,0 +1,93 @@ +/* + * VIRTIO Sound Device PCI Bindings + * + * Copyright (c) 2023 Emmanouil Pitsidianakis <manos.pitsidianakis@linaro.org> + * + * 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 "qom/object.h" +#include "qapi/error.h" +#include "hw/audio/soundhw.h" +#include "hw/virtio/virtio-pci.h" +#include "hw/audio/virtio-snd.h" + +/* + * virtio-snd-pci: This extends VirtioPCIProxy. + */ +#define TYPE_VIRTIO_SND_PCI "virtio-sound-pci" +OBJECT_DECLARE_SIMPLE_TYPE(VirtIOSoundPCI, VIRTIO_SND_PCI) + +struct VirtIOSoundPCI { + VirtIOPCIProxy parent_obj; + + VirtIOSound vdev; +}; + +static Property virtio_snd_pci_properties[] = { + DEFINE_PROP_BIT("ioeventfd", VirtIOPCIProxy, flags, + VIRTIO_PCI_FLAG_USE_IOEVENTFD_BIT, true), + DEFINE_PROP_UINT32("vectors", VirtIOPCIProxy, nvectors, 2), + DEFINE_PROP_END_OF_LIST(), +}; + +static void virtio_snd_pci_realize(VirtIOPCIProxy *vpci_dev, Error **errp) +{ + VirtIOSoundPCI *dev = VIRTIO_SND_PCI(vpci_dev); + DeviceState *vdev = DEVICE(&dev->vdev); + + virtio_pci_force_virtio_1(vpci_dev); + qdev_realize(vdev, BUS(&vpci_dev->bus), errp); +} + +static void virtio_snd_pci_class_init(ObjectClass *klass, void *data) +{ + DeviceClass *dc = DEVICE_CLASS(klass); + VirtioPCIClass *vpciklass = VIRTIO_PCI_CLASS(klass); + + device_class_set_props(dc, virtio_snd_pci_properties); + dc->desc = "Virtio Sound"; + set_bit(DEVICE_CATEGORY_SOUND, dc->categories); + + vpciklass->realize = virtio_snd_pci_realize; +} + +static void virtio_snd_pci_instance_init(Object *obj) +{ + VirtIOSoundPCI *dev = VIRTIO_SND_PCI(obj); + + virtio_instance_init_common(obj, &dev->vdev, sizeof(dev->vdev), + TYPE_VIRTIO_SND); +} + +static const VirtioPCIDeviceTypeInfo virtio_snd_pci_info = { + .generic_name = TYPE_VIRTIO_SND_PCI, + .instance_size = sizeof(VirtIOSoundPCI), + .instance_init = virtio_snd_pci_instance_init, + .class_init = virtio_snd_pci_class_init, +}; + +/* Create a Virtio Sound PCI device, so '-audio driver,model=virtio' works. */ +static int virtio_snd_pci_init(PCIBus *bus, const char *audiodev) +{ + DeviceState *vdev = NULL; + VirtIOSoundPCI *dev = NULL; + + vdev = qdev_new(TYPE_VIRTIO_SND_PCI); + assert(vdev); + dev = VIRTIO_SND_PCI(vdev); + qdev_prop_set_string(DEVICE(&dev->vdev), "audiodev", audiodev); + qdev_realize_and_unref(vdev, BUS(bus), &error_fatal); + return 0; +} + +static void virtio_snd_pci_register(void) +{ + virtio_pci_types_register(&virtio_snd_pci_info); + pci_register_soundhw("virtio", "Virtio Sound", virtio_snd_pci_init); +} + +type_init(virtio_snd_pci_register); diff --git a/system/qdev-monitor.c b/system/qdev-monitor.c index 1b8005ae55..f007ee6953 100644 --- a/system/qdev-monitor.c +++ b/system/qdev-monitor.c @@ -111,6 +111,7 @@ static const QDevAlias qdev_alias_table[] = { { "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 },