The following changes since commit b62b7ed0fc9c58e373b8946c9bd2e193be98dae6:

  Merge remote-tracking branch 'remotes/gkurz/tags/for-upstream' into staging (2017-09-20 20:33:48 +0100)

are available in the git repository at:

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

for you to fetch changes up to 8acf7b48e0098198057db048340606c7fbfc6518:

  chardev: remove context in chr_update_read_handler (2017-09-22 14:03:27 +0200)

v2 fixes some issues with the new qemu-pr-helper.  make install and systemd
socket activation were broken.  I have now backported it to the Fedora QEMU
packages to shake out any distro-level issues.

----------------------------------------------------------------
* Speed up AddressSpaceDispatch creation (Alexey)
* Fix kvm.c assert (David)
* Memory fixes and further speedup (me)
* Persistent reservation manager infrastructure (me)
* virtio-serial: add enable_backend callback (Pavel)
* chardev GMainContext fixes (Peter)

----------------------------------------------------------------
Alexey Kardashevskiy (17):
      exec: Explicitly export target AS from address_space_translate_internal
      memory: Open code FlatView rendering
      memory: Move FlatView allocation to a helper
      memory: Move AddressSpaceDispatch from AddressSpace to FlatView
      memory: Remove AddressSpace pointer from AddressSpaceDispatch
      memory: Switch memory from using AddressSpace to FlatView
      memory: Cleanup after switching to FlatView
      memory: Rename mem_begin/mem_commit/mem_add helpers
      memory: Store physical root MR in FlatView
      memory: Alloc dispatch tree where topology is generared
      memory: Move address_space_update_ioeventfds
      memory: Share FlatView's and dispatch trees between address spaces
      memory: Do not allocate FlatView in address_space_init
      memory: Rework "info mtree" to print flat views and dispatch trees
      memory: Get rid of address_space_init_shareable
      memory: Create FlatView directly
      memory: Share special empty FlatView

David Hildenbrand (1):
      kvm: drop wrong assertion creating problems with pflash

KONRAD Frederic (1):
      memory: avoid a name clash with access macro

Paolo Bonzini (8):
      atomic: update documentation
      memory: avoid "resurrection" of dead FlatViews
      memory: trace FlatView creation and destruction
      memory: seek FlatView sharing candidates among children subregions
      scsi, file-posix: add support for persistent reservation management
      scsi: build qemu-pr-helper
      scsi: add multipath support to qemu-pr-helper
      scsi: add persistent reservation manager using qemu-pr-helper

Pavel Butsykin (1):
      virtio-serial: add enable_backend callback

Peter Xu (4):
      chardev: new qemu_chr_be_update_read_handlers()
      chardev: add Chardev.gcontext field
      chardev: use per-dev context for io_add_watch_poll
      chardev: remove context in chr_update_read_handler

 Makefile                          |    7 +-
 Makefile.objs                     |    1 +
 accel/kvm/kvm-all.c               |    1 -
 block/file-posix.c                |   30 ++
 chardev/char-fd.c                 |    5 +-
 chardev/char-fe.c                 |    7 +-
 chardev/char-pty.c                |    5 +-
 chardev/char-socket.c             |    7 +-
 chardev/char-udp.c                |    5 +-
 chardev/char.c                    |   11 +
 configure                         |   60 ++-
 cpus.c                            |    5 +-
 docs/devel/atomics.txt            |   14 +-
 docs/interop/pr-helper.rst        |   83 +++
 docs/pr-manager.rst               |  111 ++++
 exec.c                            |  330 +++++++-----
 hmp-commands-info.hx              |    7 +-
 hw/arm/armv7m.c                   |    9 +-
 hw/char/virtio-console.c          |   21 +
 hw/char/virtio-serial-bus.c       |    7 +
 hw/intc/openpic_kvm.c             |    2 +-
 include/chardev/char.h            |   13 +-
 include/exec/memory-internal.h    |   16 +-
 include/exec/memory.h             |   75 ++-
 include/hw/arm/armv7m.h           |    2 +-
 include/hw/virtio/virtio-serial.h |    3 +
 include/qemu/atomic.h             |    8 +
 include/qemu/typedefs.h           |    1 +
 include/scsi/pr-manager.h         |   56 ++
 include/scsi/utils.h              |    4 +
 memory.c                          |  378 ++++++++++---
 monitor.c                         |    3 +-
 qapi/block-core.json              |    4 +
 scsi/Makefile.objs                |    2 +
 scsi/pr-helper.h                  |   41 ++
 scsi/pr-manager-helper.c          |  302 +++++++++++
 scsi/pr-manager.c                 |  109 ++++
 scsi/qemu-pr-helper.c             | 1075 +++++++++++++++++++++++++++++++++++++
 scsi/trace-events                 |    3 +
 scsi/utils.c                      |   10 +
 target/arm/cpu.c                  |   16 +-
 target/i386/cpu.c                 |    5 +-
 trace-events                      |    3 +
 vl.c                              |    3 +-
 44 files changed, 2550 insertions(+), 310 deletions(-)
 create mode 100644 docs/interop/pr-helper.rst
 create mode 100644 docs/pr-manager.rst
 create mode 100644 include/scsi/pr-manager.h
 create mode 100644 scsi/pr-helper.h
 create mode 100644 scsi/pr-manager-helper.c
 create mode 100644 scsi/pr-manager.c
 create mode 100644 scsi/qemu-pr-helper.c
 create mode 100644 scsi/trace-events
-- 
2.13.5

On 22 September 2017 at 16:04, Paolo Bonzini <pbonzini@redhat.com> wrote:
> The following changes since commit b62b7ed0fc9c58e373b8946c9bd2e193be98dae6:
>
>   Merge remote-tracking branch 'remotes/gkurz/tags/for-upstream' into staging (2017-09-20 20:33:48 +0100)
>
> are available in the git repository at:
>
>   git://github.com/bonzini/qemu.git tags/for-upstream
>
> for you to fetch changes up to 8acf7b48e0098198057db048340606c7fbfc6518:
>
>   chardev: remove context in chr_update_read_handler (2017-09-22 14:03:27 +0200)
>
> v2 fixes some issues with the new qemu-pr-helper.  make install and systemd
> socket activation were broken.  I have now backported it to the Fedora QEMU
> packages to shake out any distro-level issues.
>
> ----------------------------------------------------------------
> * Speed up AddressSpaceDispatch creation (Alexey)
> * Fix kvm.c assert (David)
> * Memory fixes and further speedup (me)
> * Persistent reservation manager infrastructure (me)
> * virtio-serial: add enable_backend callback (Pavel)
> * chardev GMainContext fixes (Peter)

In today's episode of "compiler whinges" we have

/home/pm215/qemu/scsi/qemu-pr-helper.c: In function ‘main’:
/home/pm215/qemu/scsi/qemu-pr-helper.c:912:5: error: comparison is
always true due to limited range of data type [-Werror=type-limits]
     while ((ch = getopt_long(argc, argv, sopt, lopt, &opt_ind)) != -1) {
     ^

(reported by the gcc on my ppc64, s390x, aarch64, aarch32 setups).

This one's a genuine bug, I think: ch is a char, which is unsigned on
these systems, and so the loop would never terminate.

thanks
-- PMM

On 22/09/2017 20:09, Peter Maydell wrote:
> On 22 September 2017 at 16:04, Paolo Bonzini <pbonzini@redhat.com> wrote:
>> The following changes since commit b62b7ed0fc9c58e373b8946c9bd2e193be98dae6:
>>
>>   Merge remote-tracking branch 'remotes/gkurz/tags/for-upstream' into staging (2017-09-20 20:33:48 +0100)
>>
>> are available in the git repository at:
>>
>>   git://github.com/bonzini/qemu.git tags/for-upstream
>>
>> for you to fetch changes up to 8acf7b48e0098198057db048340606c7fbfc6518:
>>
>>   chardev: remove context in chr_update_read_handler (2017-09-22 14:03:27 +0200)
>>
>> v2 fixes some issues with the new qemu-pr-helper.  make install and systemd
>> socket activation were broken.  I have now backported it to the Fedora QEMU
>> packages to shake out any distro-level issues.
>>
>> ----------------------------------------------------------------
>> * Speed up AddressSpaceDispatch creation (Alexey)
>> * Fix kvm.c assert (David)
>> * Memory fixes and further speedup (me)
>> * Persistent reservation manager infrastructure (me)
>> * virtio-serial: add enable_backend callback (Pavel)
>> * chardev GMainContext fixes (Peter)
> 
> In today's episode of "compiler whinges" we have
> 
> /home/pm215/qemu/scsi/qemu-pr-helper.c: In function ‘main’:
> /home/pm215/qemu/scsi/qemu-pr-helper.c:912:5: error: comparison is
> always true due to limited range of data type [-Werror=type-limits]
>      while ((ch = getopt_long(argc, argv, sopt, lopt, &opt_ind)) != -1) {
>      ^
> 
> (reported by the gcc on my ppc64, s390x, aarch64, aarch32 setups).
> 
> This one's a genuine bug, I think: ch is a char, which is unsigned on
> these systems, and so the loop would never terminate.

Yes, it is a bug.  I copied the line from qemu-nbd, but qemu-nbd has
"int ch".

Paolo