Browse Source
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: 5a2f350eec
Signed-off-by: Igor Skalkin <Igor.Skalkin@opensynergy.com>
Signed-off-by: Anton Yakovlev <Anton.Yakovlev@opensynergy.com>
Signed-off-by: Manos Pitsidianakis <manos.pitsidianakis@linaro.org>
Reviewed-by: Alex Bennée <alex.bennee@linaro.org>
Tested-by: Alex Bennée <alex.bennee@linaro.org>
Message-Id: <b223598d59f56ead6a6d8d9bb6801e17489ddaa4.1698062525.git.manos.pitsidianakis@linaro.org>
Acked-by: Michael S. Tsirkin <mst@redhat.com>
Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
pull/257/head
committed by
Michael S. Tsirkin
4 changed files with 96 additions and 0 deletions
@ -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); |
|||
Loading…
Reference in new issue