fridtjof/qemu-cr16
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

hw/audio: generalize audio_model.init()

Browse source 
It is no longer PCI bus only.

Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com>
Reviewed-by: Philippe Mathieu-Daudé <philmd@linaro.org>
This commit is contained in:
Marc-André Lureau 2025-10-13 14:22:45 +04:00
parent 96da2b29f4
commit b181226e4e
3 changed files with 6 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

4
hw/audio/intel-hda.c
View file

@ -1303,7 +1303,7 @@ static const TypeInfo hda_codec_device_type_info = {
* create intel hda controller with codec attached to it,
* so '-soundhw hda' works.
*/
static int intel_hda_and_codec_init(PCIBus *bus, const char *audiodev)
static void intel_hda_and_codec_init(const char *audiodev)
{
g_autoptr(QDict) props = qdict_new();
DeviceState *intel_hda, *codec;
@ -1317,8 +1317,6 @@ static int intel_hda_and_codec_init(PCIBus *bus, const char *audiodev)
qdev_prop_set_string(codec, "audiodev", audiodev);
qdev_realize_and_unref(codec, hdabus, &error_fatal);
object_unref(intel_hda);
return 0;
}
static void intel_hda_register_types(void)

12
hw/audio/model.c
View file

@ -24,14 +24,11 @@
#include "qemu/osdep.h"
#include "hw/qdev-core.h"
#include "monitor/qdev.h"
#include "qemu/option.h"
#include "qemu/help_option.h"
#include "qemu/error-report.h"
#include "qapi/error.h"
#include "qom/object.h"
#include "hw/qdev-properties.h"
#include "hw/isa/isa.h"
#include "hw/pci/pci.h"
#include "hw/audio/model.h"
struct audio_model {
@ -39,20 +36,20 @@ struct audio_model {
const char *descr;
const char *typename;
int isa;
int (*init_pci) (PCIBus *bus, const char *audiodev);
void (*init)(const char *audiodev);
};
static struct audio_model audio_models[9];
static int audio_models_count;
void audio_register_model_with_cb(const char *name, const char *descr,
int (*init_pci)(PCIBus *bus, const char *audiodev))
void (*init_audio_model)(const char *audiodev))
{
assert(audio_models_count < ARRAY_SIZE(audio_models) - 1);
audio_models[audio_models_count].name = name;
audio_models[audio_models_count].descr = descr;
audio_models[audio_models_count].isa = 0;
audio_models[audio_models_count].init_pci = init_pci;
audio_models[audio_models_count].init = init_audio_model;
audio_models_count++;
}
@ -124,7 +121,6 @@ void audio_model_init(void)
qdev_realize_and_unref(dev, bus, &error_fatal);
} else {
assert(!c->isa);
PCIBus *pci_bus = (PCIBus *) object_resolve_path_type("", TYPE_PCI_BUS, NULL);
c->init_pci(pci_bus, audiodev_id);
c->init(audiodev_id);
}
}

2
include/hw/audio/model.h
View file

@ -3,7 +3,7 @@
#define HW_AUDIO_MODEL_H
void audio_register_model_with_cb(const char *name, const char *descr,
int (*init_pci)(PCIBus *bus, const char *audiodev));
void (*init_audio_model)(const char *audiodev));
void audio_register_model(const char *name, const char *descr,
int isa, const char *typename);