From: Philippe Mathieu-Daudé Date: Fri, 6 Jan 2023 21:06:36 +0000 (+0100) Subject: hw/audio/hda-codec: Avoid forward-declaring HDAAudioState X-Git-Tag: v8.0.0-rc0~41^2~56 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=acab7d6022943a710472028e4e7f0010ee4f9376;p=thirdparty%2Fqemu.git hw/audio/hda-codec: Avoid forward-declaring HDAAudioState To avoid forward-declaring HDAAudioState, declare HDA_AUDIO QOM definitions before its use in the HDAAudioStream structure. Signed-off-by: Philippe Mathieu-Daudé Reviewed-by: Richard Henderson Message-Id: <20230220131837.26292-2-philmd@linaro.org> --- diff --git a/hw/audio/hda-codec.c b/hw/audio/hda-codec.c index feb8f9e2bb7..c51d8ba6177 100644 --- a/hw/audio/hda-codec.c +++ b/hw/audio/hda-codec.c @@ -145,7 +145,9 @@ static const char *fmt2name[] = { [ AUDIO_FORMAT_S32 ] = "PCM-S32", }; -typedef struct HDAAudioState HDAAudioState; +#define TYPE_HDA_AUDIO "hda-audio" +OBJECT_DECLARE_SIMPLE_TYPE(HDAAudioState, HDA_AUDIO) + typedef struct HDAAudioStream HDAAudioStream; struct HDAAudioStream { @@ -171,9 +173,6 @@ struct HDAAudioStream { int64_t buft_start; }; -#define TYPE_HDA_AUDIO "hda-audio" -OBJECT_DECLARE_SIMPLE_TYPE(HDAAudioState, HDA_AUDIO) - struct HDAAudioState { HDACodecDevice hda; const char *name;