Re: [Qemu-devel] [PULL v2 00/15] NBD, chardev, SCSI patches for 2015-01-15

[Peter Maydell]

On 15 January 2016 at 18:00, Paolo Bonzini  wrote:
> The following changes since commit 5a57acb66f19ee52723aa05b8afbbc41c3e9ec99:
>
>   Merge remote-tracking branch 
> 'remotes/pmaydell/tags/pull-target-arm-20160115' into staging (2016-01-15 
> 15:49:43 +)
>
> are available in the git repository at:
>
>
>   git://github.com/bonzini/qemu.git tags/for-upstream
>
> for you to fetch changes up to fefd749ce29837d399a38d6052ca9968fa7352e7:
>
>   qemu-char: do not leak QemuMutex when freeing a character device 
> (2016-01-15 18:58:02 +0100)
>
> 
> * qemu-char logfile facility
> * NBD coroutine based negotiation
> * bugfixes
>
> 

Applied, thanks.

-- PMM

[Qemu-devel] [PULL v2 00/15] NBD, chardev, SCSI patches for 2015-01-15

[Paolo Bonzini]

The following changes since commit 5a57acb66f19ee52723aa05b8afbbc41c3e9ec99:

  Merge remote-tracking branch 'remotes/pmaydell/tags/pull-target-arm-20160115' 
into staging (2016-01-15 15:49:43 +)

are available in the git repository at:


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

for you to fetch changes up to fefd749ce29837d399a38d6052ca9968fa7352e7:

  qemu-char: do not leak QemuMutex when freeing a character device (2016-01-15 
18:58:02 +0100)


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


Cao jin (1):
  SCSI device: fix to incomplete QOMify

Daniel P. Berrange (2):
  qemu-char: delete send_all/recv_all helper methods
  qemu-char: add logfile facility to all chardev backends

Fam Zheng (3):
  nbd: Always call "close_fn" in nbd_client_new
  nbd: Split nbd.c
  nbd-server: Coroutine based negotiation

P J P (2):
  i386: avoid null pointer dereference
  scsi: initialise info object with appropriate size

Paolo Bonzini (5):
  scsi: revert change to scsi_req_cancel_async and add assertions
  target-i386: do not duplicate page protection checks
  nbd-server: do not check request length except for reads and writes
  nbd-server: do not exit on failed memory allocation
  qemu-char: do not leak QemuMutex when freeing a character device

Shmulik Ladkani (1):
  vmw_pvscsi: x-disable-pcie, x-old-pci-configuration back-compat props are 
2.5 specific

Zhu Lingshan (1):
  iscsi: send readcapacity10 when readcapacity16 failed

 MAINTAINERS|   5 +-
 Makefile.objs  |   3 +-
 backends/baum.c|   7 +-
 backends/msmouse.c |   6 +-
 block/block-backend.c  |   5 +
 block/iscsi.c  |   7 +-
 blockdev-nbd.c |   5 +-
 gdbstub.c  |   3 +-
 hw/i386/kvmvapic.c |  15 +-
 hw/scsi/megasas.c  |  14 +-
 hw/scsi/scsi-bus.c |  15 +-
 hw/scsi/virtio-scsi.c  |   2 +-
 hw/tpm/tpm_passthrough.c   |  29 +-
 include/block/nbd.h|   3 +-
 include/hw/compat.h|  17 +-
 include/qemu/sockets.h |   2 -
 include/sysemu/block-backend.h |   1 +
 include/sysemu/char.h  |   9 +-
 nbd/Makefile.objs  |   1 +
 nbd/client.c   | 361 
 nbd/common.c   |  64 +
 nbd/nbd-internal.h | 113 
 nbd.c => nbd/server.c  | 608 -
 qapi-schema.json   |  49 +++-
 qemu-char.c| 320 ++
 qemu-nbd.c |  10 +-
 qemu-options.hx|  48 ++--
 spice-qemu-char.c  |  20 +-
 target-i386/helper.c   |  65 ++---
 tests/qemu-iotests/083 |   2 +-
 ui/console.c   |   6 +-
 31 files changed, 1077 insertions(+), 738 deletions(-)
 create mode 100644 nbd/Makefile.objs
 create mode 100644 nbd/client.c
 create mode 100644 nbd/common.c
 create mode 100644 nbd/nbd-internal.h
 rename nbd.c => nbd/server.c (62%)
-- 
1.8.3.1

diff --git a/target-i386/helper.c b/target-i386/helper.c
index bf58242..6b10019 100644
--- a/target-i386/helper.c
+++ b/target-i386/helper.c
@@ -927,7 +927,7 @@ do_check_protect_pse36:
 /* only set write access if already dirty... otherwise wait
for dirty access */
 assert(!is_write);
-prot &= ~PROT_WRITE;
+prot &= ~PAGE_WRITE;
 }
 
  do_mapping: