The following changes since commit 464588675455afda2899e20a0b120e4075de50c7:

  Merge remote-tracking branch 'remotes/sstabellini/tags/xen-20170627-tag' into staging (2017-06-29 11:45:01 +0100)

are available in the git repository at:

  https://github.com/gkurz/qemu.git tags/for-upstream

for you to fetch changes up to 06a37db7b12e4d42a6699c2fef820158f470ec4f:

  9pfs: handle transport errors in pdu_complete() (2017-06-29 15:11:51 +0200)

----------------------------------------------------------------
- fixes a minor bug that could possibly prevent old guests to remove
  directories
- makes default permissions for new files configurable from the cmdline
  when using mapped security modes
- handle transport errors
- g_malloc()+memcpy() converted to g_memdup()

----------------------------------------------------------------
Bruce Rogers (1):
      9pfs: local: remove: use correct path component

Greg Kurz (4):
      virtio-9p: record element after sanity checks
      virtio-9p: message header is 7-byte long
      virtio-9p: break device if buffers are misconfigured
      9pfs: handle transport errors in pdu_complete()

Marc-André Lureau (1):
      9pfs: replace g_malloc()+memcpy() with g_memdup()

Stefano Stabellini (1):
      xen-9pfs: disconnect if buffers are misconfigured

Tobias Schramm (1):
      9pfs: local: Add support for custom fmode/dmode in 9ps mapped security modes

 fsdev/file-op-9p.h         |  4 +++
 fsdev/qemu-fsdev-opts.c    | 12 +++++++
 hw/9pfs/9p-local.c         | 27 +++++++++++---
 hw/9pfs/9p-synth.c         |  3 +-
 hw/9pfs/9p.c               | 28 ++++++++++-----
 hw/9pfs/9p.h               |  7 +++-
 hw/9pfs/virtio-9p-device.c | 51 +++++++++++++++++++++------
 hw/9pfs/xen-9p-backend.c   | 88 ++++++++++++++++++++++++++++++++++------------
 qemu-options.hx            | 20 ++++++++---
 9 files changed, 187 insertions(+), 53 deletions(-)
-- 
2.7.5

On 29 June 2017 at 14:43, Greg Kurz <groug@kaod.org> wrote:
> The following changes since commit 464588675455afda2899e20a0b120e4075de50c7:
>
>   Merge remote-tracking branch 'remotes/sstabellini/tags/xen-20170627-tag' into staging (2017-06-29 11:45:01 +0100)
>
> are available in the git repository at:
>
>   https://github.com/gkurz/qemu.git tags/for-upstream
>
> for you to fetch changes up to 06a37db7b12e4d42a6699c2fef820158f470ec4f:
>
>   9pfs: handle transport errors in pdu_complete() (2017-06-29 15:11:51 +0200)
>
> ----------------------------------------------------------------
> - fixes a minor bug that could possibly prevent old guests to remove
>   directories
> - makes default permissions for new files configurable from the cmdline
>   when using mapped security modes
> - handle transport errors
> - g_malloc()+memcpy() converted to g_memdup()
>
> ----------------------------------------------------------------
> Bruce Rogers (1):
>       9pfs: local: remove: use correct path component
>
> Greg Kurz (4):
>       virtio-9p: record element after sanity checks
>       virtio-9p: message header is 7-byte long
>       virtio-9p: break device if buffers are misconfigured
>       9pfs: handle transport errors in pdu_complete()
>
> Marc-André Lureau (1):
>       9pfs: replace g_malloc()+memcpy() with g_memdup()
>
> Stefano Stabellini (1):
>       xen-9pfs: disconnect if buffers are misconfigured
>
> Tobias Schramm (1):
>       9pfs: local: Add support for custom fmode/dmode in 9ps mapped security modes
>

Applied, thanks.

-- PMM

On Thu, 29 Jun 2017 17:00:51 +0100
Peter Maydell <peter.maydell@linaro.org> wrote:

> On 29 June 2017 at 14:43, Greg Kurz <groug@kaod.org> wrote:
> > The following changes since commit 464588675455afda2899e20a0b120e4075de50c7:
> >
> >   Merge remote-tracking branch 'remotes/sstabellini/tags/xen-20170627-tag' into staging (2017-06-29 11:45:01 +0100)
> >
> > are available in the git repository at:
> >
> >   https://github.com/gkurz/qemu.git tags/for-upstream
> >
> > for you to fetch changes up to 06a37db7b12e4d42a6699c2fef820158f470ec4f:
> >
> >   9pfs: handle transport errors in pdu_complete() (2017-06-29 15:11:51 +0200)
> >
> > ----------------------------------------------------------------
> > - fixes a minor bug that could possibly prevent old guests to remove
> >   directories
> > - makes default permissions for new files configurable from the cmdline
> >   when using mapped security modes
> > - handle transport errors
> > - g_malloc()+memcpy() converted to g_memdup()
> >
> > ----------------------------------------------------------------
> > Bruce Rogers (1):
> >       9pfs: local: remove: use correct path component
> >
> > Greg Kurz (4):
> >       virtio-9p: record element after sanity checks
> >       virtio-9p: message header is 7-byte long
> >       virtio-9p: break device if buffers are misconfigured
> >       9pfs: handle transport errors in pdu_complete()
> >
> > Marc-André Lureau (1):
> >       9pfs: replace g_malloc()+memcpy() with g_memdup()
> >
> > Stefano Stabellini (1):
> >       xen-9pfs: disconnect if buffers are misconfigured
> >
> > Tobias Schramm (1):
> >       9pfs: local: Add support for custom fmode/dmode in 9ps mapped security modes
> >  
> 
> Applied, thanks.
> 

Thanks but I just realize I forgot to add my Signed-off-by to patch 3/8... :-\

Sorry.

--
Greg

> -- PMM