diff options
| author | Peter Maydell | 2018-07-24 21:16:31 +0200 |
|---|---|---|
| committer | Peter Maydell | 2018-07-24 21:16:31 +0200 |
| commit | 8ca2838de2d0c5e5166549e5d15448433efaf348 (patch) | |
| tree | 44d3248bac7edc81fc231656bd942a19b5ffab08 /hw/audio/hda-codec.c | |
| parent | Merge remote-tracking branch 'remotes/berrange/tags/qcrypto-next-pull-request... (diff) | |
| parent | migration: fix duplicate initialization for expected_downtime and cleanup_bh (diff) | |
| download | qemu-8ca2838de2d0c5e5166549e5d15448433efaf348.tar.gz qemu-8ca2838de2d0c5e5166549e5d15448433efaf348.tar.xz qemu-8ca2838de2d0c5e5166549e5d15448433efaf348.zip | |
Merge remote-tracking branch 'remotes/dgilbert/tags/pull-migration-20180724a' into staging
Migration pull for 3.0
Fixes only
# gpg: Signature made Tue 24 Jul 2018 19:31:39 BST
# gpg: using RSA key 0516331EBC5BFDE7
# gpg: Good signature from "Dr. David Alan Gilbert (RH2) <dgilbert@redhat.com>"
# Primary key fingerprint: 45F5 C71B 4A0C B7FB 977A 9FA9 0516 331E BC5B FDE7
* remotes/dgilbert/tags/pull-migration-20180724a:
migration: fix duplicate initialization for expected_downtime and cleanup_bh
tests: only update last_byte when at the edge
migration: disallow recovery for release-ram
migration: update recv bitmap only on dest vm
audio/hda: Fix migration
migrate: Fix cancelling state warning
migration: fix potential overflow in multifd send
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'hw/audio/hda-codec.c')
| -rw-r--r-- | hw/audio/hda-codec.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/hw/audio/hda-codec.c b/hw/audio/hda-codec.c index 2b58c3505b..617a1c1016 100644 --- a/hw/audio/hda-codec.c +++ b/hw/audio/hda-codec.c @@ -786,7 +786,7 @@ static void hda_audio_reset(DeviceState *dev) static bool vmstate_hda_audio_stream_buf_needed(void *opaque) { HDAAudioStream *st = opaque; - return st->state->use_timer; + return st->state && st->state->use_timer; } static const VMStateDescription vmstate_hda_audio_stream_buf = { |