Philippe Mathieu-Daudé <phi...@linaro.org> writes: > If there are no objections I'll queue this patch (fixing > the typo reported by Zoltan). > > On 24/11/23 19:26, Philippe Mathieu-Daudé wrote: >> Since commit f7b4f61f63 ("qdev/isa: convert soundblaster") these >> fields has been converted to qdev properties, so don't need to be >> migrated: >> >> static Property sb16_properties[] = { >> DEFINE_AUDIO_PROPERTIES(SB16State, card), >> DEFINE_PROP_UINT32 ("version", SB16State, ver, 0x0405), /* 4.5 */ >> DEFINE_PROP_UINT32 ("iobase", SB16State, port, 0x220), >> DEFINE_PROP_UINT32 ("irq", SB16State, irq, 5), >> DEFINE_PROP_UINT32 ("dma", SB16State, dma, 1), >> DEFINE_PROP_UINT32 ("dma16", SB16State, hdma, 5), >> DEFINE_PROP_END_OF_LIST (), >> }; >> >> Signed-off-by: Philippe Mathieu-Daudé <phi...@linaro.org> >> --- >> hw/audio/sb16.c | 10 +++++----- >> 1 file changed, 5 insertions(+), 5 deletions(-) >> >> diff --git a/hw/audio/sb16.c b/hw/audio/sb16.c >> index 18f6d252db..be614d7bc3 100644 >> --- a/hw/audio/sb16.c >> +++ b/hw/audio/sb16.c >> @@ -1325,11 +1325,11 @@ static const VMStateDescription vmstate_sb16 = { >> .minimum_version_id = 1, >> .post_load = sb16_post_load, >> .fields = (VMStateField[]) { >> - VMSTATE_UINT32 (irq, SB16State), >> - VMSTATE_UINT32 (dma, SB16State), >> - VMSTATE_UINT32 (hdma, SB16State), >> - VMSTATE_UINT32 (port, SB16State), >> - VMSTATE_UINT32 (ver, SB16State), >> + VMSTATE_UNUSED( 4 /* irq */ >> + + 4 /* dma */ >> + + 4 /* hdma */ >> + + 4 /* port */ >> + + 4 /* ver */), >> VMSTATE_INT32 (in_index, SB16State), >> VMSTATE_INT32 (out_data_len, SB16State), >> VMSTATE_INT32 (fmt_stereo, SB16State), LGTM
Reviewed-by: Fabiano Rosas <faro...@suse.de>