Commit 6c607666 authored by Peter Maydell's avatar Peter Maydell
Browse files

Merge remote-tracking branch 'remotes/bonzini/tags/for-upstream' into staging 



* gdbstub fixes (Alex)
* IOMMU MemoryRegion subclass (Alexey)
* Chardev hotswap (Anton)
* NBD_OPT_GO support (Eric)
* Misc bugfixes
* DEFINE_PROP_LINK (minus the ARM patches - Fam)
* MAINTAINERS updates (Philippe)

# gpg: Signature made Fri 14 Jul 2017 11:06:27 BST
# 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

* remotes/bonzini/tags/for-upstream: (55 commits)
  spapr_rng: Convert to DEFINE_PROP_LINK
  cpu: Convert to DEFINE_PROP_LINK
  mips_cmgcr: Convert to DEFINE_PROP_LINK
  ivshmem: Convert to DEFINE_PROP_LINK
  dimm: Convert to DEFINE_PROP_LINK
  virtio-crypto: Convert to DEFINE_PROP_LINK
  virtio-rng: Convert to DEFINE_PROP_LINK
  virtio-scsi: Convert to DEFINE_PROP_LINK
  virtio-blk: Convert to DEFINE_PROP_LINK
  qdev: Add const qualifier to PropertyInfo definitions
  qmp: Use ObjectProperty.type if present
  qdev: Introduce DEFINE_PROP_LINK
  qdev: Introduce PropertyInfo.create
  qom: enforce readonly nature of link's check callback
  translate-all: remove redundant !tcg_enabled check in dump_exec_info
  vl: fix breakage of -tb-size
  nbd: Implement NBD_INFO_BLOCK_SIZE on client
  nbd: Implement NBD_INFO_BLOCK_SIZE on server
  nbd: Implement NBD_OPT_GO on client
  nbd: Implement NBD_OPT_GO on server
  ...

Signed-off-by: default avatarPeter Maydell <peter.maydell@linaro.org>
parents 7d367e70 68c761e1

MAINTAINERS

+10 −8
Original line number Diff line number Diff line
@@ -84,14 +84,10 @@ M: Paolo Bonzini <pbonzini@redhat.com> 
M: Peter Crosthwaite <crosthwaite.peter@gmail.com>

M: Richard Henderson <rth@twiddle.net>

S: Maintained

F: cpu-exec.c

F: cpu-exec-common.c

F: cpus.c

F: cputlb.c

F: exec.c

F: softmmu_template.h

F: translate-all.*

F: translate-common.c

F: accel/tcg/

F: include/exec/cpu*.h

F: include/exec/exec-all.h

F: include/exec/helper*.h
@@ -277,8 +273,8 @@ Overall 
M: Paolo Bonzini <pbonzini@redhat.com>

L: kvm@vger.kernel.org

S: Supported

F: kvm-*

F: */kvm.*

F: accel/kvm/

F: include/sysemu/kvm*.h



ARM
@@ -327,7 +323,6 @@ M: Stefano Stabellini <sstabellini@kernel.org> 
M: Anthony Perard <anthony.perard@citrix.com>

L: xen-devel@lists.xenproject.org

S: Supported

F: xen-*

F: */xen*

F: hw/9pfs/xen-9p-backend.c

F: hw/char/xen_console.c
@@ -1160,6 +1155,13 @@ F: docs/specs/vmgenid.txt 
F: tests/vmgenid-test.c

F: stubs/vmgenid.c



Unimplemented device

M: Peter Maydell <peter.maydell@linaro.org>

R: Philippe Mathieu-Daudé <f4bug@amsat.org>

S: Maintained

F: include/hw/misc/unimp.h

F: hw/misc/unimp.c



Subsystems

----------

Audio
@@ -1650,7 +1652,7 @@ TCI target 
M: Stefan Weil <sw@weilnetz.de>

S: Maintained

F: tcg/tci/

F: tci.c

F: tcg/tci.c

F: disas/tci.c



Block drivers

accel/tcg/translate-all.c

+0 −5
Original line number Diff line number Diff line
@@ -1851,11 +1851,6 @@ void dump_exec_info(FILE *f, fprintf_function cpu_fprintf) 


    tb_lock();



    if (!tcg_enabled()) {

        cpu_fprintf(f, "TCG not enabled\n");

        return;

    }



    target_code_size = 0;

    max_target_code_size = 0;

    cross_page = 0;

backends/rng-egd.c

+1 −1
Original line number Diff line number Diff line
@@ -106,7 +106,7 @@ static void rng_egd_opened(RngBackend *b, Error **errp) 


    /* FIXME we should resubmit pending requests when the CDS reconnects. */

    qemu_chr_fe_set_handlers(&s->chr, rng_egd_chr_can_read,

                             rng_egd_chr_read, NULL, s, NULL, true);

                             rng_egd_chr_read, NULL, NULL, s, NULL, true);

}



static void rng_egd_set_chardev(Object *obj, const char *value, Error **errp)

block/nbd-client.c

+12 −10
Original line number Diff line number Diff line
@@ -242,7 +242,7 @@ int nbd_client_co_pwritev(BlockDriverState *bs, uint64_t offset, 
    ssize_t ret;



    if (flags & BDRV_REQ_FUA) {

        assert(client->nbdflags & NBD_FLAG_SEND_FUA);

        assert(client->info.flags & NBD_FLAG_SEND_FUA);

        request.flags |= NBD_CMD_FLAG_FUA;

    }
@@ -270,12 +270,12 @@ int nbd_client_co_pwrite_zeroes(BlockDriverState *bs, int64_t offset, 
    };

    NBDReply reply;



    if (!(client->nbdflags & NBD_FLAG_SEND_WRITE_ZEROES)) {

    if (!(client->info.flags & NBD_FLAG_SEND_WRITE_ZEROES)) {

        return -ENOTSUP;

    }



    if (flags & BDRV_REQ_FUA) {

        assert(client->nbdflags & NBD_FLAG_SEND_FUA);

        assert(client->info.flags & NBD_FLAG_SEND_FUA);

        request.flags |= NBD_CMD_FLAG_FUA;

    }

    if (!(flags & BDRV_REQ_MAY_UNMAP)) {
@@ -299,7 +299,7 @@ int nbd_client_co_flush(BlockDriverState *bs) 
    NBDReply reply;

    ssize_t ret;



    if (!(client->nbdflags & NBD_FLAG_SEND_FLUSH)) {

    if (!(client->info.flags & NBD_FLAG_SEND_FLUSH)) {

        return 0;

    }
@@ -327,7 +327,7 @@ int nbd_client_co_pdiscard(BlockDriverState *bs, int64_t offset, int bytes) 
    NBDReply reply;

    ssize_t ret;



    if (!(client->nbdflags & NBD_FLAG_SEND_TRIM)) {

    if (!(client->info.flags & NBD_FLAG_SEND_TRIM)) {

        return 0;

    }
@@ -384,22 +384,24 @@ int nbd_client_init(BlockDriverState *bs, 
    logout("session init %s\n", export);

    qio_channel_set_blocking(QIO_CHANNEL(sioc), true, NULL);



    client->info.request_sizes = true;

    ret = nbd_receive_negotiate(QIO_CHANNEL(sioc), export,

                                &client->nbdflags,

                                tlscreds, hostname,

                                &client->ioc,

                                &client->size, errp);

                                &client->ioc, &client->info, errp);

    if (ret < 0) {

        logout("Failed to negotiate with the NBD server\n");

        return ret;

    }

    if (client->nbdflags & NBD_FLAG_SEND_FUA) {

    if (client->info.flags & 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) {

    if (client->info.flags & NBD_FLAG_SEND_WRITE_ZEROES) {

        bs->supported_zero_flags |= BDRV_REQ_MAY_UNMAP;

    }

    if (client->info.min_block > bs->bl.request_alignment) {

        bs->bl.request_alignment = client->info.min_block;

    }



    qemu_co_mutex_init(&client->send_mutex);

    qemu_co_queue_init(&client->free_sema);

block/nbd-client.h

+1 −2
Original line number Diff line number Diff line
@@ -20,8 +20,7 @@ 
typedef struct NBDClientSession {

    QIOChannelSocket *sioc; /* The master data channel */

    QIOChannel *ioc; /* The current I/O channel which may differ (eg TLS) */

    uint16_t nbdflags;

    off_t size;

    NBDExportInfo info;



    CoMutex send_mutex;

    CoQueue free_sema;