Skip to contentSkip to conversation

audio: Never send migration section

PATCH In review Dr. David Alan Gilbert (git) 5 participants 6 messages Aug 9, 2021 – Aug 10, 2021

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 audio: Never send migration section

From: "Dr. David Alan Gilbert" <[email protected]>

The audio migration vmstate is empty, and always has been; we can't just remove it though because an old qemu might send it us. Changes with -audiodev now mean it's sometimes created when it didn't used to be, and can confuse migration to old qemu.

Change it so that vmstate_audio is never sent; if it's received it should still be accepted, and old qemu's shouldn't be too upset if it's missing.

---
 audio/audio.c | 10 ++++++++++
 1 file changed, 10 insertions(+)
audio/audio.c +10 -0
index 59453ef856..54a153c0ef 100644
@@ -1622,10 +1622,20 @@ void audio_cleanup(void)
     }
 }
 
+static bool vmstate_audio_needed(void *opaque)
+{
+    /*
+     * Never needed, this vmstate only exists in case
+     * an old qemu sends it to us.
+     */
+    return false;
+}
+
 static const VMStateDescription vmstate_audio = {
     .name = "audio",
     .version_id = 1,
     .minimum_version_id = 1,
+    .needed = vmstate_audio_needed,
     .fields = (VMStateField[]) {
         VMSTATE_END_OF_LIST()
     }
Signature · 1 line
2.31.1
Reviewed-by Tested-by on v1 1/1
#1 lore raw
Quoted 7 lines · Dr. David Alan Gilbert (git)

From: "Dr. David Alan Gilbert" <[email protected]>

The audio migration vmstate is empty, and always has been; we can't just remove it though because an old qemu might send it us. Changes with -audiodev now mean it's sometimes created when it didn't used to be, and can confuse migration to old qemu.

Quoted 8 lines

Change it so that vmstate_audio is never sent; if it's received it should still be accepted, and old qemu's shouldn't be too upset if it's missing.

---
 audio/audio.c | 10 ++++++++++
 1 file changed, 10 insertions(+)

For testing I have a VM with -audiodev, but *WITHOUT* any sound frontend devices. Live migrating to a QEMU using QEMU_AUDIO_DRV would previously fail. With this applied it now works, showing that we dont uncessarily send this.

I also tested migration to a QEMU with -audiodev, but without this patch, and that still works as before, showing that QEMU is happy if this section is not sent.

Quoted 29 lines
audio/audio.c +10 -0
index 59453ef856..54a153c0ef 100644
@@ -1622,10 +1622,20 @@ void audio_cleanup(void)
     }
 }
 
+static bool vmstate_audio_needed(void *opaque)
+{
+    /*
+     * Never needed, this vmstate only exists in case
+     * an old qemu sends it to us.
+     */
+    return false;
+}
+
 static const VMStateDescription vmstate_audio = {
     .name = "audio",
     .version_id = 1,
     .minimum_version_id = 1,
+    .needed = vmstate_audio_needed,
     .fields = (VMStateField[]) {
         VMSTATE_END_OF_LIST()
     }
Signature · 1 line
2.31.1

Regards,
Daniel

Signature · 3 lines
|: https://berrange.com      -o-    https://www.flickr.com/photos/dberrange :|
|: https://libvirt.org         -o-            https://fstop138.berrange.com :|
|: https://entangle-photo.org    -o-    https://www.instagram.com/dberrange :|
#2 lore raw
Quoted 7 lines · Daniel P. Berrangé
Quoted 6 lines · Dr. David Alan Gilbert (git)

From: "Dr. David Alan Gilbert" <[email protected]>

The audio migration vmstate is empty, and always has been; we can't just remove it though because an old qemu might send it us. Changes with -audiodev now mean it's sometimes created when it didn't used to be, and can confuse migration to old qemu.

Not a 6.1 regression but easy change for rc3 IMO.

Quoted 3 lines
Quoted 3 lines

Change it so that vmstate_audio is never sent; if it's received it should still be accepted, and old qemu's shouldn't be too upset if it's missing.

Worth Cc: stable@ maybe?

Quoted 51 lines
Quoted 4 lines
---
 audio/audio.c | 10 ++++++++++
 1 file changed, 10 insertions(+)

For testing I have a VM with -audiodev, but *WITHOUT* any sound frontend devices. Live migrating to a QEMU using QEMU_AUDIO_DRV would previously fail. With this applied it now works, showing that we dont uncessarily send this.

I also tested migration to a QEMU with -audiodev, but without this patch, and that still works as before, showing that QEMU is happy if this section is not sent.

Quoted 29 lines
audio/audio.c +10 -0
index 59453ef856..54a153c0ef 100644
@@ -1622,10 +1622,20 @@ void audio_cleanup(void)
     }
 }
 
+static bool vmstate_audio_needed(void *opaque)
+{
+    /*
+     * Never needed, this vmstate only exists in case
+     * an old qemu sends it to us.
+     */
+    return false;
+}
+
 static const VMStateDescription vmstate_audio = {
     .name = "audio",
     .version_id = 1,
     .minimum_version_id = 1,
+    .needed = vmstate_audio_needed,
     .fields = (VMStateField[]) {
         VMSTATE_END_OF_LIST()
     }
Signature · 1 line
2.31.1

Regards,
Daniel

#3 lore raw
Quoted 9 lines · * Philippe Mathieu-Daudé ([email protected]) wrote:
Quoted 7 lines · Daniel P. Berrangé
Quoted 6 lines · Dr. David Alan Gilbert (git)

From: "Dr. David Alan Gilbert" <[email protected]>

The audio migration vmstate is empty, and always has been; we can't just remove it though because an old qemu might send it us. Changes with -audiodev now mean it's sometimes created when it didn't used to be, and can confuse migration to old qemu.

Quoted 7 lines

Not a 6.1 regression but easy change for rc3 IMO.

Quoted 3 lines
Quoted 3 lines

Change it so that vmstate_audio is never sent; if it's received it should still be accepted, and old qemu's shouldn't be too upset if it's missing.

Worth Cc: stable@ maybe?

Hmm yes, cc'd this reply.

Dave

Quoted 52 lines
Quoted 51 lines
Quoted 4 lines
---
 audio/audio.c | 10 ++++++++++
 1 file changed, 10 insertions(+)

For testing I have a VM with -audiodev, but *WITHOUT* any sound frontend devices. Live migrating to a QEMU using QEMU_AUDIO_DRV would previously fail. With this applied it now works, showing that we dont uncessarily send this.

I also tested migration to a QEMU with -audiodev, but without this patch, and that still works as before, showing that QEMU is happy if this section is not sent.

Quoted 29 lines
audio/audio.c +10 -0
index 59453ef856..54a153c0ef 100644
@@ -1622,10 +1622,20 @@ void audio_cleanup(void)
     }
 }
 
+static bool vmstate_audio_needed(void *opaque)
+{
+    /*
+     * Never needed, this vmstate only exists in case
+     * an old qemu sends it to us.
+     */
+    return false;
+}
+
 static const VMStateDescription vmstate_audio = {
     .name = "audio",
     .version_id = 1,
     .minimum_version_id = 1,
+    .needed = vmstate_audio_needed,
     .fields = (VMStateField[]) {
         VMSTATE_END_OF_LIST()
     }
Signature · 1 line
2.31.1

Regards,
Daniel

Signature · 1 line
Dr. David Alan Gilbert / [email protected] / Manchester, UK
#4 lore raw
In reply to Dr. David Alan Gilbert (git)
Quoted 7 lines · Dr. David Alan Gilbert (git)

From: "Dr. David Alan Gilbert" <[email protected]>

The audio migration vmstate is empty, and always has been; we can't just remove it though because an old qemu might send it us. Changes with -audiodev now mean it's sometimes created when it didn't used to be, and can confuse migration to old qemu.

Quoted 5 lines

Change it so that vmstate_audio is never sent; if it's received it should still be accepted, and old qemu's shouldn't be too upset if it's missing.

Queued for 6.1

thanks,
Gerd

Reviewed-by on v1 1/1
#5 lore raw
In reply to Dr. David Alan Gilbert (git)
Quoted 7 lines · Dr. David Alan Gilbert (git)

From: "Dr. David Alan Gilbert" <[email protected]>

The audio migration vmstate is empty, and always has been; we can't just remove it though because an old qemu might send it us. Changes with -audiodev now mean it's sometimes created when it didn't used to be, and can confuse migration to old qemu.

Quoted 5 lines

Change it so that vmstate_audio is never sent; if it's received it should still be accepted, and old qemu's shouldn't be too upset if it's missing.