diff options
| author | Richard Henderson <richard.henderson@linaro.org> | 2021-11-19 17:16:57 +0100 |
|---|---|---|
| committer | Richard Henderson <richard.henderson@linaro.org> | 2021-11-19 17:16:57 +0100 |
| commit | 8627edfb3f1fca24a96a0954148885c3241c10f8 (patch) | |
| tree | ba41aa3263969de04f1a95a0a307e78cfecb91c5 /hw | |
| parent | d434a47905641433e16ef65356d17090fd6fdcb1 (diff) | |
| parent | fdc6e168181d06391711171b7c409b34f2981ced (diff) | |
| download | qemu-8627edfb3f1fca24a96a0954148885c3241c10f8.zip qemu-8627edfb3f1fca24a96a0954148885c3241c10f8.tar.gz qemu-8627edfb3f1fca24a96a0954148885c3241c10f8.tar.bz2 | |
Merge tag 'for-upstream' of https://gitlab.com/bonzini/qemu into staging
Bugfixes for 6.2.
# gpg: Signature made Fri 19 Nov 2021 10:33:29 AM CET
# gpg: using RSA key F13338574B662389866C7682BFFBD25F78C7AE83
# gpg: issuer "pbonzini@redhat.com"
# gpg: Good signature from "Paolo Bonzini <bonzini@gnu.org>" [full]
# gpg: aka "Paolo Bonzini <pbonzini@redhat.com>" [full]
* tag 'for-upstream' of https://gitlab.com/bonzini/qemu:
chardev/wctable: don't free the instance in wctablet_chr_finalize
meson.build: Support ncurses on MacOS and OpenBSD
docs: Spell QEMU all caps
qtest/am53c974-test: add test for reset before transfer
esp: ensure that async_len is reset to 0 during esp_hard_reset()
nvmm: Fix support for stable version
meson: fix botched compile check conversions
Signed-off-by: Richard Henderson <richard.henderson@linaro.org>
Diffstat (limited to 'hw')
| -rw-r--r-- | hw/scsi/esp.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/hw/scsi/esp.c b/hw/scsi/esp.c index 84f935b..58d0edb 100644 --- a/hw/scsi/esp.c +++ b/hw/scsi/esp.c @@ -894,6 +894,7 @@ void esp_hard_reset(ESPState *s) memset(s->wregs, 0, ESP_REGS); s->tchi_written = 0; s->ti_size = 0; + s->async_len = 0; fifo8_reset(&s->fifo); fifo8_reset(&s->cmdfifo); s->dma = 0; |