diff options
| author | Stefan Hajnoczi <stefanha@redhat.com> | 2016-11-23 11:44:29 +0000 |
|---|---|---|
| committer | Stefan Hajnoczi <stefanha@redhat.com> | 2016-11-23 11:44:29 +0000 |
| commit | f0c10c392fc23d4bfeca0afe0de80d5036ed92ed (patch) | |
| tree | a21aeb29e28fb40934cc3ea2ce542dfce556f2ed /hw | |
| parent | 00227fefd2059464cd2f59aed29944874c630e2f (diff) | |
| parent | 1d895feb3b9e4dd3560f505c309f26abf56c1e82 (diff) | |
| download | qemu-f0c10c392fc23d4bfeca0afe0de80d5036ed92ed.zip qemu-f0c10c392fc23d4bfeca0afe0de80d5036ed92ed.tar.gz qemu-f0c10c392fc23d4bfeca0afe0de80d5036ed92ed.tar.bz2 | |
Merge remote-tracking branch 'bonzini/tags/for-upstream' into staging
Small fixes for rc1.
# gpg: Signature made Tue 22 Nov 2016 10:26:56 PM GMT
# gpg: using RSA key 0xBFFBD25F78C7AE83
# gpg: Good signature from "Paolo Bonzini <bonzini@gnu.org>"
# gpg: aka "Paolo Bonzini <pbonzini@redhat.com>"
# Primary key fingerprint: 46F5 9FBD 57D6 12E7 BFD4 E2F7 7E15 100C CD36 69B1
# Subkey fingerprint: F133 3857 4B66 2389 866C 7682 BFFB D25F 78C7 AE83
* bonzini/tags/for-upstream:
scsi/esp: do not raise an interrupt when reading the FIFO register
nbd: Allow unmap and fua during write zeroes
cpu_ldst.h: use correct guest address parameter
Message-id: 1479853676-35995-1-git-send-email-pbonzini@redhat.com
Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
Diffstat (limited to 'hw')
| -rw-r--r-- | hw/scsi/esp.c | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/hw/scsi/esp.c b/hw/scsi/esp.c index 1f2f2d3..5a5a4e9 100644 --- a/hw/scsi/esp.c +++ b/hw/scsi/esp.c @@ -406,11 +406,9 @@ uint64_t esp_reg_read(ESPState *s, uint32_t saddr) /* Data out. */ qemu_log_mask(LOG_UNIMP, "esp: PIO data read not implemented\n"); s->rregs[ESP_FIFO] = 0; - esp_raise_irq(s); } else if (s->ti_rptr < s->ti_wptr) { s->ti_size--; s->rregs[ESP_FIFO] = s->ti_buf[s->ti_rptr++]; - esp_raise_irq(s); } if (s->ti_rptr == s->ti_wptr) { s->ti_rptr = 0; |