Commit f0c10c39 authored by Stefan Hajnoczi's avatar Stefan Hajnoczi
Browse files

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: default avatarStefan Hajnoczi <stefanha@redhat.com>
parents 00227fef 1d895feb

block/nbd-client.c

+4 −0
Original line number Diff line number Diff line
@@ -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);

hw/scsi/esp.c

+0 −2
Original line number Diff line number Diff line
@@ -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;

include/exec/cpu_ldst.h

+1 −1
Original line number Diff line number Diff line
@@ -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];