mirror of
https://github.com/Motorhead1991/qemu.git
synced 2025-07-31 14:23:53 -06:00
e87b6efb11
Use virtio_get_config_size() rather than sizeof(struct virtio_snd_config) for the config_size in the vhost-user-snd frontend. The frontend shall rely on device features for the size of the device configuration space. The presence of `controls` in the config space depends on VIRTIO_SND_F_CTLS according to the specification (v1.3): ` 5.14.4 Device Configuration Layout ... controls (driver-read-only) indicates a total number of all available control elements if VIRTIO_SND_F_CTLS has been negotiated. ` This fixes an issue introduced by commitab0c7fb2("linux-headers: update to current kvm/next") in which the optional field `controls` is added to the virtio_snd_config structure. This breaks vhost-user-device backends that do not implement the `controls` field. Fixes:ab0c7fb22b("linux-headers: update to current kvm/next") Resolves: https://gitlab.com/qemu-project/qemu/-/issues/2805 Reviewed-by: Philippe Mathieu-Daudé <philmd@linaro.org> Suggested-by: Stefano Garzarella <sgarzare@redhat.com> Signed-off-by: Matias Ezequiel Vara Larsen <mvaralar@redhat.com> Message-Id: <20250217131255.829892-1-mvaralar@redhat.com> Cc: qemu-stable@nongnu.org Reviewed-by: Stefano Garzarella <sgarzare@redhat.com> Reviewed-by: Dorinda Bassey <dbassey@redhat.com> Reviewed-by: Michael S. Tsirkin <mst@redhat.com> Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
82 lines
2.3 KiB
C
82 lines
2.3 KiB
C
/*
|
|
* Vhost-user snd virtio device
|
|
*
|
|
* Copyright (c) 2023 Manos Pitsidianakis <manos.pitsidianakis@linaro.org>
|
|
*
|
|
* Simple wrapper of the generic vhost-user-device.
|
|
*
|
|
* SPDX-License-Identifier: GPL-2.0-or-later
|
|
*/
|
|
|
|
#include "qemu/osdep.h"
|
|
#include "qapi/error.h"
|
|
#include "hw/qdev-properties.h"
|
|
#include "hw/virtio/virtio-bus.h"
|
|
#include "hw/virtio/vhost-user-snd.h"
|
|
#include "standard-headers/linux/virtio_ids.h"
|
|
#include "standard-headers/linux/virtio_snd.h"
|
|
|
|
static const VirtIOFeature feature_sizes[] = {
|
|
{.flags = 1ULL << VIRTIO_SND_F_CTLS,
|
|
.end = endof(struct virtio_snd_config, controls)},
|
|
{}
|
|
};
|
|
|
|
static const VirtIOConfigSizeParams cfg_size_params = {
|
|
.min_size = endof(struct virtio_snd_config, chmaps),
|
|
.max_size = sizeof(struct virtio_snd_config),
|
|
.feature_sizes = feature_sizes
|
|
};
|
|
|
|
static const VMStateDescription vu_snd_vmstate = {
|
|
.name = "vhost-user-snd",
|
|
.unmigratable = 1,
|
|
};
|
|
|
|
static const Property vsnd_properties[] = {
|
|
DEFINE_PROP_CHR("chardev", VHostUserBase, chardev),
|
|
DEFINE_PROP_BIT64("controls", VHostUserBase,
|
|
parent_obj.host_features, VIRTIO_SND_F_CTLS, false),
|
|
};
|
|
|
|
static void vu_snd_base_realize(DeviceState *dev, Error **errp)
|
|
{
|
|
VHostUserBase *vub = VHOST_USER_BASE(dev);
|
|
VHostUserBaseClass *vubs = VHOST_USER_BASE_GET_CLASS(dev);
|
|
VirtIODevice *vdev = &vub->parent_obj;
|
|
|
|
vub->virtio_id = VIRTIO_ID_SOUND;
|
|
vub->num_vqs = 4;
|
|
vub->config_size = virtio_get_config_size(&cfg_size_params,
|
|
vdev->host_features);
|
|
vub->vq_size = 64;
|
|
|
|
vubs->parent_realize(dev, errp);
|
|
}
|
|
|
|
static void vu_snd_class_init(ObjectClass *klass, void *data)
|
|
{
|
|
DeviceClass *dc = DEVICE_CLASS(klass);
|
|
VHostUserBaseClass *vubc = VHOST_USER_BASE_CLASS(klass);
|
|
|
|
dc->vmsd = &vu_snd_vmstate;
|
|
device_class_set_props(dc, vsnd_properties);
|
|
device_class_set_parent_realize(dc, vu_snd_base_realize,
|
|
&vubc->parent_realize);
|
|
|
|
set_bit(DEVICE_CATEGORY_SOUND, dc->categories);
|
|
}
|
|
|
|
static const TypeInfo vu_snd_info = {
|
|
.name = TYPE_VHOST_USER_SND,
|
|
.parent = TYPE_VHOST_USER_BASE,
|
|
.instance_size = sizeof(VHostUserSound),
|
|
.class_init = vu_snd_class_init,
|
|
};
|
|
|
|
static void vu_snd_register_types(void)
|
|
{
|
|
type_register_static(&vu_snd_info);
|
|
}
|
|
|
|
type_init(vu_snd_register_types)
|