[Qemu-devel] [PULL 0/3] Misc fixes for QEMU 2.8.0-rc1

[Qemu-devel] [PULL 0/3] Misc fixes for QEMU 2.8.0-rc1

[Paolo Bonzini]

The following changes since commit a7764f1548ef9946af30a8f96be9cef10761f0c1:

  Fix FreeBSD (10.x) build after 7dc9ae43 (2016-11-22 10:56:01 +0000)

are available in the git repository at:

  git://github.com/bonzini/qemu.git tags/for-upstream

for you to fetch changes up to 1d895feb3b9e4dd3560f505c309f26abf56c1e82:

  scsi/esp: do not raise an interrupt when reading the FIFO register (2016-11-22 23:26:51 +0100)

----------------------------------------------------------------
Small fixes for rc1.

----------------------------------------------------------------
Bobby Bingham (1):
      cpu_ldst.h: use correct guest address parameter

Eric Blake (1):
      nbd: Allow unmap and fua during write zeroes

Hervé Poussineau (1):
      scsi/esp: do not raise an interrupt when reading the FIFO register

 block/nbd-client.c      | 4 ++++
 hw/scsi/esp.c           | 2 --
 include/exec/cpu_ldst.h | 2 +-
 3 files changed, 5 insertions(+), 3 deletions(-)
-- 
1.8.3.1

[Qemu-devel] [PULL 1/3] cpu_ldst.h: use correct guest address parameter

[Paolo Bonzini]

From: Bobby Bingham <koorogi@koorogi.info>

In the user emulation code path, tlb_vaddr_to_host erronesously passed
vaddr as the guest address to be translated, instead of addr, the parameter
which actually contained the guest address.

This resulted in incorrect addresses being used when emulating block copy
(mvc/mvpg) and block clear (xc) instructions for the s390x target.

Signed-off-by: Bobby Bingham <koorogi@koorogi.info>
Message-Id: <20161113050523.23909-1-koorogi@koorogi.info>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
---
 include/exec/cpu_ldst.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/include/exec/cpu_ldst.h b/include/exec/cpu_ldst.h
index b573df5..6eb5fe8 100644
--- a/include/exec/cpu_ldst.h
+++ b/include/exec/cpu_ldst.h
@@ -401,7 +401,7 @@ static inline void *tlb_vaddr_to_host(CPUArchState *env, target_ulong addr,
                                       int access_type, int mmu_idx)
 {
 #if defined(CONFIG_USER_ONLY)
-    return g2h(vaddr);
+    return g2h(addr);
 #else
     int index = (addr >> TARGET_PAGE_BITS) & (CPU_TLB_SIZE - 1);
     CPUTLBEntry *tlbentry = &env->tlb_table[mmu_idx][index];
-- 
1.8.3.1

[Qemu-devel] [PULL 2/3] nbd: Allow unmap and fua during write zeroes

[Paolo Bonzini]

From: Eric Blake <eblake@redhat.com>

Commit fa778fff wired up support to send the NBD_CMD_WRITE_ZEROES,
but forgot to inform the block layer that FUA unmapping of zeroes is
supported.  Without BDRV_REQ_MAY_UNMAP listed as a supported flag,
the block layer will always insist on the NBD layer passing
NBD_CMD_FLAG_NO_HOLE, resulting in the server always allocating
things even when it was desired to let the server punch holes.
Similarly, failing to set BDRV_REQ_FUA means that the client may
send unnecessary NBD_CMD_FLUSH when it could have instead used the
NBD_CMD_FLAG_FUA bit.

CC: qemu-stable@nongnu.org
Signed-off-by: Eric Blake <eblake@redhat.com>
Message-Id: <1479413642-22463-2-git-send-email-eblake@redhat.com>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
---
 block/nbd-client.c | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/block/nbd-client.c b/block/nbd-client.c
index 2a302de..3779c6c 100644
--- a/block/nbd-client.c
+++ b/block/nbd-client.c
@@ -415,6 +415,10 @@ int nbd_client_init(BlockDriverState *bs,
     }
     if (client->nbdflags & NBD_FLAG_SEND_FUA) {
         bs->supported_write_flags = BDRV_REQ_FUA;
+        bs->supported_zero_flags |= BDRV_REQ_FUA;
+    }
+    if (client->nbdflags & NBD_FLAG_SEND_WRITE_ZEROES) {
+        bs->supported_zero_flags |= BDRV_REQ_MAY_UNMAP;
     }
 
     qemu_co_mutex_init(&client->send_mutex);
-- 
1.8.3.1

[Qemu-devel] [PULL 3/3] scsi/esp: do not raise an interrupt when reading the FIFO register

[Paolo Bonzini]

From: Hervé Poussineau <hpoussin@reactos.org>

This fixes SCSI adapter self-tests done in MIPS Jazz emulation,
broken since ff589551c8e8e9e95e211b9d8daafb4ed39f1aec.

Signed-off-by: Hervé Poussineau <hpoussin@reactos.org>
Message-Id: <1479508397-8443-1-git-send-email-hpoussin@reactos.org>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
---
 hw/scsi/esp.c | 2 --
 1 file changed, 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;
-- 
1.8.3.1

Re: [Qemu-devel] [PULL 0/3] Misc fixes for QEMU 2.8.0-rc1

[Stefan Hajnoczi]

[-- Attachment #1: Type: text/plain, Size: 1231 bytes --]

On Tue, Nov 22, 2016 at 11:27:53PM +0100, Paolo Bonzini wrote:
> The following changes since commit a7764f1548ef9946af30a8f96be9cef10761f0c1:
> 
>   Fix FreeBSD (10.x) build after 7dc9ae43 (2016-11-22 10:56:01 +0000)
> 
> are available in the git repository at:
> 
>   git://github.com/bonzini/qemu.git tags/for-upstream
> 
> for you to fetch changes up to 1d895feb3b9e4dd3560f505c309f26abf56c1e82:
> 
>   scsi/esp: do not raise an interrupt when reading the FIFO register (2016-11-22 23:26:51 +0100)
> 
> ----------------------------------------------------------------
> Small fixes for rc1.
> 
> ----------------------------------------------------------------
> Bobby Bingham (1):
>       cpu_ldst.h: use correct guest address parameter
> 
> Eric Blake (1):
>       nbd: Allow unmap and fua during write zeroes
> 
> Hervé Poussineau (1):
>       scsi/esp: do not raise an interrupt when reading the FIFO register
> 
>  block/nbd-client.c      | 4 ++++
>  hw/scsi/esp.c           | 2 --
>  include/exec/cpu_ldst.h | 2 +-
>  3 files changed, 5 insertions(+), 3 deletions(-)
> -- 
> 1.8.3.1
> 
> 

Thanks, applied to my staging tree:
https://github.com/stefanha/qemu/commits/staging

Stefan

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 455 bytes --]