* [PATCH] hw/audio/sb16: Do not migrate qdev properties
@ 2023-11-24 18:26 Philippe Mathieu-Daudé
2023-12-13 17:36 ` Philippe Mathieu-Daudé
2024-01-04 16:48 ` Philippe Mathieu-Daudé
0 siblings, 2 replies; 7+ messages in thread
From: Philippe Mathieu-Daudé @ 2023-11-24 18:26 UTC (permalink / raw)
To: qemu-devel; +Cc: Juan Quintela, Gerd Hoffmann, Philippe Mathieu-Daudé
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é <philmd@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),
--
2.41.0
^ permalink raw reply related [flat|nested] 7+ messages in thread* Re: [PATCH] hw/audio/sb16: Do not migrate qdev properties
2023-11-24 18:26 [PATCH] hw/audio/sb16: Do not migrate qdev properties Philippe Mathieu-Daudé
@ 2023-12-13 17:36 ` Philippe Mathieu-Daudé
2023-12-13 19:34 ` BALATON Zoltan
2024-01-04 16:48 ` Philippe Mathieu-Daudé
1 sibling, 1 reply; 7+ messages in thread
From: Philippe Mathieu-Daudé @ 2023-12-13 17:36 UTC (permalink / raw)
To: qemu-devel; +Cc: Juan Quintela, Gerd Hoffmann, Peter Maydell
ping?
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é <philmd@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),
^ permalink raw reply [flat|nested] 7+ messages in thread* Re: [PATCH] hw/audio/sb16: Do not migrate qdev properties
2023-12-13 17:36 ` Philippe Mathieu-Daudé
@ 2023-12-13 19:34 ` BALATON Zoltan
0 siblings, 0 replies; 7+ messages in thread
From: BALATON Zoltan @ 2023-12-13 19:34 UTC (permalink / raw)
To: Philippe Mathieu-Daudé
Cc: qemu-devel, Juan Quintela, Gerd Hoffmann, Peter Maydell
[-- Attachment #1: Type: text/plain, Size: 1853 bytes --]
On Wed, 13 Dec 2023, Philippe Mathieu-Daudé wrote:
> ping?
>
> 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
Typo: fields have been
>> 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é <philmd@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),
>
>
>
^ permalink raw reply [flat|nested] 7+ messages in thread
* Re: [PATCH] hw/audio/sb16: Do not migrate qdev properties
2023-11-24 18:26 [PATCH] hw/audio/sb16: Do not migrate qdev properties Philippe Mathieu-Daudé
2023-12-13 17:36 ` Philippe Mathieu-Daudé
@ 2024-01-04 16:48 ` Philippe Mathieu-Daudé
2024-01-04 17:05 ` Fabiano Rosas
2024-01-05 1:59 ` Peter Xu
1 sibling, 2 replies; 7+ messages in thread
From: Philippe Mathieu-Daudé @ 2024-01-04 16:48 UTC (permalink / raw)
To: qemu-devel; +Cc: Juan Quintela, Gerd Hoffmann, Peter Xu, Fabiano Rosas
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é <philmd@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),
^ permalink raw reply [flat|nested] 7+ messages in thread* Re: [PATCH] hw/audio/sb16: Do not migrate qdev properties
2024-01-04 16:48 ` Philippe Mathieu-Daudé
@ 2024-01-04 17:05 ` Fabiano Rosas
2024-01-05 1:59 ` Peter Xu
1 sibling, 0 replies; 7+ messages in thread
From: Fabiano Rosas @ 2024-01-04 17:05 UTC (permalink / raw)
To: Philippe Mathieu-Daudé, qemu-devel
Cc: Juan Quintela, Gerd Hoffmann, Peter Xu
Philippe Mathieu-Daudé <philmd@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é <philmd@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 <farosas@suse.de>
^ permalink raw reply [flat|nested] 7+ messages in thread* Re: [PATCH] hw/audio/sb16: Do not migrate qdev properties
2024-01-04 16:48 ` Philippe Mathieu-Daudé
2024-01-04 17:05 ` Fabiano Rosas
@ 2024-01-05 1:59 ` Peter Xu
2024-01-05 22:01 ` Philippe Mathieu-Daudé
1 sibling, 1 reply; 7+ messages in thread
From: Peter Xu @ 2024-01-05 1:59 UTC (permalink / raw)
To: Philippe Mathieu-Daudé
Cc: qemu-devel, Juan Quintela, Gerd Hoffmann, Fabiano Rosas
On Thu, Jan 04, 2024 at 05:48:18PM +0100, Philippe Mathieu-Daudé wrote:
> If there are no objections I'll queue this patch (fixing
> the typo reported by Zoltan).
Yes feel free to. Thanks,
--
Peter Xu
^ permalink raw reply [flat|nested] 7+ messages in thread
* Re: [PATCH] hw/audio/sb16: Do not migrate qdev properties
2024-01-05 1:59 ` Peter Xu
@ 2024-01-05 22:01 ` Philippe Mathieu-Daudé
0 siblings, 0 replies; 7+ messages in thread
From: Philippe Mathieu-Daudé @ 2024-01-05 22:01 UTC (permalink / raw)
To: Peter Xu; +Cc: qemu-devel, Juan Quintela, Gerd Hoffmann, Fabiano Rosas
On 5/1/24 02:59, Peter Xu wrote:
> On Thu, Jan 04, 2024 at 05:48:18PM +0100, Philippe Mathieu-Daudé wrote:
>> If there are no objections I'll queue this patch (fixing
>> the typo reported by Zoltan).
>
> Yes feel free to. Thanks,
Thanks, merged as commit fa293f8125.
^ permalink raw reply [flat|nested] 7+ messages in thread
end of thread, other threads:[~2024-01-05 22:02 UTC | newest]
Thread overview: 7+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2023-11-24 18:26 [PATCH] hw/audio/sb16: Do not migrate qdev properties Philippe Mathieu-Daudé
2023-12-13 17:36 ` Philippe Mathieu-Daudé
2023-12-13 19:34 ` BALATON Zoltan
2024-01-04 16:48 ` Philippe Mathieu-Daudé
2024-01-04 17:05 ` Fabiano Rosas
2024-01-05 1:59 ` Peter Xu
2024-01-05 22:01 ` Philippe Mathieu-Daudé
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).