Commit 19b6d843 authored by Peter Maydell's avatar Peter Maydell
Browse files

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



* qemu-char logfile facility
* NBD coroutine based negotiation
* bugfixes

# gpg: Signature made Fri 15 Jan 2016 17:58:28 GMT using RSA key ID 78C7AE83
# gpg: Good signature from "Paolo Bonzini <bonzini@gnu.org>"
# gpg:                 aka "Paolo Bonzini <pbonzini@redhat.com>"

* remotes/bonzini/tags/for-upstream:
  qemu-char: do not leak QemuMutex when freeing a character device
  qemu-char: add logfile facility to all chardev backends
  nbd-server: do not exit on failed memory allocation
  nbd-server: do not check request length except for reads and writes
  nbd-server: Coroutine based negotiation
  nbd: Split nbd.c
  nbd: Always call "close_fn" in nbd_client_new
  SCSI device: fix to incomplete QOMify
  iscsi: send readcapacity10 when readcapacity16 failed
  qemu-char: delete send_all/recv_all helper methods
  vmw_pvscsi: x-disable-pcie, x-old-pci-configuration back-compat props are 2.5 specific
  scsi: initialise info object with appropriate size
  i386: avoid null pointer dereference
  target-i386: do not duplicate page protection checks
  scsi: revert change to scsi_req_cancel_async and add assertions

Signed-off-by: default avatarPeter Maydell <peter.maydell@linaro.org>
parents 5a57acb6 fefd749c

MAINTAINERS

+3 −2
Original line number Diff line number Diff line
@@ -1116,8 +1116,9 @@ F: net/netmap.c 
Network Block Device (NBD)

M: Paolo Bonzini <pbonzini@redhat.com>

S: Odd Fixes

F: block/nbd.c

F: nbd.*

F: block/nbd*

F: nbd/

F: include/block/nbd*

F: qemu-nbd.c

T: git git://github.com/bonzini/qemu.git nbd-next

Makefile.objs

+2 −1
Original line number Diff line number Diff line
@@ -8,7 +8,8 @@ util-obj-y += qmp-introspect.o qapi-types.o qapi-visit.o qapi-event.o 
# block-obj-y is code used by both qemu system emulation and qemu-img



block-obj-y = async.o thread-pool.o

block-obj-y += nbd.o block.o blockjob.o

block-obj-y += nbd/

block-obj-y += block.o blockjob.o

block-obj-y += main-loop.o iohandler.o qemu-timer.o

block-obj-$(CONFIG_POSIX) += aio-posix.o

block-obj-$(CONFIG_WIN32) += aio-win32.o

backends/baum.c

+6 −1
Original line number Diff line number Diff line
@@ -566,6 +566,7 @@ static CharDriverState *chr_baum_init(const char *id, 
                                      ChardevReturn *ret,

                                      Error **errp)

{

    ChardevCommon *common = qapi_ChardevDummy_base(backend->u.braille);

    BaumDriverState *baum;

    CharDriverState *chr;

    brlapi_handle_t *handle;
@@ -576,8 +577,12 @@ static CharDriverState *chr_baum_init(const char *id, 
#endif

    int tty;



    chr = qemu_chr_alloc(common, errp);

    if (!chr) {

        return NULL;

    }

    baum = g_malloc0(sizeof(BaumDriverState));

    baum->chr = chr = qemu_chr_alloc();

    baum->chr = chr;



    chr->opaque = baum;

    chr->chr_write = baum_write;

backends/msmouse.c

+5 −1
Original line number Diff line number Diff line
@@ -68,9 +68,13 @@ static CharDriverState *qemu_chr_open_msmouse(const char *id, 
                                              ChardevReturn *ret,

                                              Error **errp)

{

    ChardevCommon *common = qapi_ChardevDummy_base(backend->u.msmouse);

    CharDriverState *chr;



    chr = qemu_chr_alloc();

    chr = qemu_chr_alloc(common, errp);

    if (!chr) {

        return NULL;

    }

    chr->chr_write = msmouse_chr_write;

    chr->chr_close = msmouse_chr_close;

    chr->explicit_be_open = true;

block/block-backend.c

+5 −0
Original line number Diff line number Diff line
@@ -1033,6 +1033,11 @@ void blk_set_guest_block_size(BlockBackend *blk, int align) 
    blk->guest_block_size = align;

}



void *blk_try_blockalign(BlockBackend *blk, size_t size)

{

    return qemu_try_blockalign(blk ? blk->bs : NULL, size);

}



void *blk_blockalign(BlockBackend *blk, size_t size)

{

    return qemu_blockalign(blk ? blk->bs : NULL, size);