aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDr. David Alan Gilbert <dgilbert@redhat.com>2021-08-09 18:09:56 +0100
committerMichael Roth <michael.roth@amd.com>2021-10-14 21:13:02 -0500
commit4fca33b4bec8afa8e902137c82a0f47a02134c13 (patch)
tree311871d593675fc8a2c8b5d7a2c50465da2a6469
parent978c11b013bfd2a484c6b2ad0edb14bd754f23ac (diff)
downloadqemu-4fca33b4bec8afa8e902137c82a0f47a02134c13.zip
qemu-4fca33b4bec8afa8e902137c82a0f47a02134c13.tar.gz
qemu-4fca33b4bec8afa8e902137c82a0f47a02134c13.tar.bz2
audio: Never send migration section
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. Signed-off-by: Dr. David Alan Gilbert <dgilbert@redhat.com> Reviewed-by: Daniel P. Berrangé <berrange@redhat.com> Tested-by: Daniel P. Berrangé <berrange@redhat.com> Message-Id: <20210809170956.78536-1-dgilbert@redhat.com> Signed-off-by: Gerd Hoffmann <kraxel@redhat.com> (cherry picked from commit da77adbaf619c4d170cb42d769145ad1803fbad9) Signed-off-by: Michael Roth <michael.roth@amd.com>
-rw-r--r--audio/audio.c10
1 files changed, 10 insertions, 0 deletions
diff --git a/audio/audio.c b/audio/audio.c
index 534278e..fa724ea 100644
--- a/audio/audio.c
+++ b/audio/audio.c
@@ -1621,10 +1621,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()
}