[Qemu-commits] [qemu/qemu] aae91a: 9p: some more cleanup in #include directives

[GitHub]

  Branch: refs/heads/master
  Home:   https://github.com/qemu/qemu
  Commit: aae91ad9ae0677395366ff1f7a3e8763fd8470f2
      
https://github.com/qemu/qemu/commit/aae91ad9ae0677395366ff1f7a3e8763fd8470f2
  Author: Greg Kurz <address@hidden>
  Date:   2016-06-06 (Mon, 06 Jun 2016)

  Changed paths:
    M hw/9pfs/9p-synth.c
    M hw/9pfs/virtio-9p-device.c

  Log Message:
  -----------
  9p: some more cleanup in #include directives

The "9p-attr.h" header isn't needed by 9p synth and virtio 9p.

While here, also drop last references to virtio from 9p synth since it is
now transport agnostic code.

Signed-off-by: Greg Kurz <address@hidden>


  Commit: af8b38b0d1878950d27156fd350e5457fd8a15a1
      
https://github.com/qemu/qemu/commit/af8b38b0d1878950d27156fd350e5457fd8a15a1
  Author: Greg Kurz <address@hidden>
  Date:   2016-06-06 (Mon, 06 Jun 2016)

  Changed paths:
    M fsdev/file-op-9p.h
    M fsdev/qemu-fsdev-dummy.c
    M fsdev/qemu-fsdev-opts.c
    M fsdev/qemu-fsdev.c
    M fsdev/qemu-fsdev.h
    M hw/9pfs/9p.h
    M hw/9pfs/codir.c
    M hw/9pfs/cofile.c
    M hw/9pfs/cofs.c
    M hw/9pfs/coth.c
    M hw/9pfs/coth.h
    M hw/9pfs/coxattr.c

  Log Message:
  -----------
  9p/fsdev: remove obsolete references to virtio

Most of the 9p code is now virtio agnostic. This patch does a final cleanup:
- drop references to Virtio from the header comments
- fix includes

Also drop a couple of leading empty lines while here.

Signed-off-by: Greg Kurz <address@hidden>


  Commit: beff62e6836ca05be3628fcfc78ef30d738ff21d
      
https://github.com/qemu/qemu/commit/beff62e6836ca05be3628fcfc78ef30d738ff21d
  Author: Greg Kurz <address@hidden>
  Date:   2016-06-06 (Mon, 06 Jun 2016)

  Changed paths:
    M hw/9pfs/9p.c
    M hw/9pfs/virtio-9p-device.c

  Log Message:
  -----------
  9p: drop useless inclusion of hw/i386/pc.h

Signed-off-by: Greg Kurz <address@hidden>


  Commit: 8762a46d3637f388fd9d2463dd966814522d5689
      
https://github.com/qemu/qemu/commit/8762a46d3637f388fd9d2463dd966814522d5689
  Author: Greg Kurz <address@hidden>
  Date:   2016-06-06 (Mon, 06 Jun 2016)

  Changed paths:
    M hw/9pfs/9p.c

  Log Message:
  -----------
  9p: drop useless out: label

Reviewed-by: Eric Blake <address@hidden>
Signed-off-by: Greg Kurz <address@hidden>


  Commit: f314ea4e30a1ef87bf8845da952c6dd0bac20b95
      
https://github.com/qemu/qemu/commit/f314ea4e30a1ef87bf8845da952c6dd0bac20b95
  Author: Greg Kurz <address@hidden>
  Date:   2016-06-06 (Mon, 06 Jun 2016)

  Changed paths:
    M hw/9pfs/9p-handle.c
    M hw/9pfs/9p-local.c
    M hw/9pfs/9p-proxy.c
    M hw/9pfs/9p.c
    M hw/9pfs/9p.h

  Log Message:
  -----------
  9p: introduce the V9fsDir type

If we are to switch back to readdir(), we need a more complex type than
DIR * to be able to serialize concurrent accesses to the directory stream.

This patch introduces a placeholder type and fixes all users.

Reviewed-by: Eric Blake <address@hidden>
Signed-off-by: Greg Kurz <address@hidden>


  Commit: 7cde47d4a89d5efefcc805788bc29133f4f3c5c7
      
https://github.com/qemu/qemu/commit/7cde47d4a89d5efefcc805788bc29133f4f3c5c7
  Author: Greg Kurz <address@hidden>
  Date:   2016-06-06 (Mon, 06 Jun 2016)

  Changed paths:
    M hw/9pfs/9p.c
    M hw/9pfs/9p.h

  Log Message:
  -----------
  9p: add locking to V9fsDir

If several threads concurrently call readdir() with the same directory
stream pointer, it is possible that they all get a pointer to the same
dirent structure, whose content is overwritten each time readdir() is
called.

We must thus serialize accesses to the dirent structure.

This may be achieved with a mutex like below:

lock_mutex();

readdir();

// work with the dirent

unlock_mutex();

This patch adds all the locking, to prepare the switch to readdir().

Reviewed-by: Eric Blake <address@hidden>
Signed-off-by: Greg Kurz <address@hidden>


  Commit: 635324e83e238598e86628dba5ab62ce910e6f72
      
https://github.com/qemu/qemu/commit/635324e83e238598e86628dba5ab62ce910e6f72
  Author: Greg Kurz <address@hidden>
  Date:   2016-06-06 (Mon, 06 Jun 2016)

  Changed paths:
    M fsdev/file-op-9p.h
    M hw/9pfs/9p-handle.c
    M hw/9pfs/9p-local.c
    M hw/9pfs/9p-proxy.c
    M hw/9pfs/9p-synth.c
    M hw/9pfs/9p-synth.h
    M hw/9pfs/9p.c
    M hw/9pfs/codir.c
    M hw/9pfs/coth.h

  Log Message:
  -----------
  9p: switch back to readdir()

This patch changes the 9p code to use readdir() again instead of
readdir_r(), which is deprecated in glibc 2.24.

All the locking was put in place by a previous patch.

Reviewed-by: Eric Blake <address@hidden>
Signed-off-by: Greg Kurz <address@hidden>


  Commit: 280b2358cd1fc88003773bff3c4d4219f8bd3ae6
      
https://github.com/qemu/qemu/commit/280b2358cd1fc88003773bff3c4d4219f8bd3ae6
  Author: Peter Maydell <address@hidden>
  Date:   2016-06-06 (Mon, 06 Jun 2016)

  Changed paths:
    M fsdev/file-op-9p.h
    M fsdev/qemu-fsdev-dummy.c
    M fsdev/qemu-fsdev-opts.c
    M fsdev/qemu-fsdev.c
    M fsdev/qemu-fsdev.h
    M hw/9pfs/9p-handle.c
    M hw/9pfs/9p-local.c
    M hw/9pfs/9p-proxy.c
    M hw/9pfs/9p-synth.c
    M hw/9pfs/9p-synth.h
    M hw/9pfs/9p.c
    M hw/9pfs/9p.h
    M hw/9pfs/codir.c
    M hw/9pfs/cofile.c
    M hw/9pfs/cofs.c
    M hw/9pfs/coth.c
    M hw/9pfs/coth.h
    M hw/9pfs/coxattr.c
    M hw/9pfs/virtio-9p-device.c

  Log Message:
  -----------
  Merge remote-tracking branch 'remotes/gkurz/tags/for-upstream' into staging

readdir_r() to readdir() conversion, various minor cleanups

# gpg: Signature made Mon 06 Jun 2016 10:52:52 BST
# gpg:                using DSA key 0x02FC3AEB0101DBC2
# gpg: Good signature from "Greg Kurz <address@hidden>"
# gpg:                 aka "Greg Kurz <address@hidden>"
# gpg:                 aka "Greg Kurz <address@hidden>"
# gpg:                 aka "Gregory Kurz (Groug) <address@hidden>"
# gpg:                 aka "Gregory Kurz (Cimai Technology) <address@hidden>"
# gpg:                 aka "Gregory Kurz (Meiosys Technology) <address@hidden>"
# gpg: WARNING: This key is not certified with a trusted signature!
# gpg:          There is no indication that the signature belongs to the owner.
# Primary key fingerprint: 2BD4 3B44 535E C0A7 9894  DBA2 02FC 3AEB 0101 DBC2

* remotes/gkurz/tags/for-upstream:
  9p: switch back to readdir()
  9p: add locking to V9fsDir
  9p: introduce the V9fsDir type
  9p: drop useless out: label
  9p: drop useless inclusion of hw/i386/pc.h
  9p/fsdev: remove obsolete references to virtio
  9p: some more cleanup in #include directives

Signed-off-by: Peter Maydell <address@hidden>


Compare: https://github.com/qemu/qemu/compare/e854d0cf7847...280b2358cd1f