[Qemu-commits] [qemu/qemu] 8d85a2: 9p: don't include <sys/uio.h>

[GitHub]

  Branch: refs/heads/master
  Home:   https://github.com/qemu/qemu
  Commit: 8d85a22aab279f827af0c68c0459642fcd613c8c
      
https://github.com/qemu/qemu/commit/8d85a22aab279f827af0c68c0459642fcd613c8c
  Author: Greg Kurz <address@hidden>
  Date:   2016-07-01 (Fri, 01 Jul 2016)

  Changed paths:
    M fsdev/9p-iov-marshal.c
    M fsdev/9p-marshal.c
    M fsdev/file-op-9p.h

  Log Message:
  -----------
  9p: don't include <sys/uio.h>

The <sys/uio.h> system header doesn't exist on all host platforms. Code
should include "qemu/osdep.h" instead to avoid build breaks on plafforms
that don't define CONFIG_IOVEC (like win32, if it is to support 9p one day).

Acked-by: Cédric Le Goater <address@hidden>
Acked-by: Michael Fritscher <address@hidden>
Signed-off-by: Greg Kurz <address@hidden>


  Commit: b05528b53354f7373fe15a8225cc475a6a66101a
      
https://github.com/qemu/qemu/commit/b05528b53354f7373fe15a8225cc475a6a66101a
  Author: Greg Kurz <address@hidden>
  Date:   2016-07-01 (Fri, 01 Jul 2016)

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

  Log Message:
  -----------
  9p: synth: drop v9fs_ prefix

To have shorter lines and be consistent with other fs devices.

Acked-by: Cédric Le Goater <address@hidden>
Signed-off-by: Greg Kurz <address@hidden>


  Commit: 96b39d8327883094f52b0a3d3f25dba83d6d1d63
      
https://github.com/qemu/qemu/commit/96b39d8327883094f52b0a3d3f25dba83d6d1d63
  Author: Peter Maydell <address@hidden>
  Date:   2016-07-01 (Fri, 01 Jul 2016)

  Changed paths:
    M fsdev/9p-iov-marshal.c
    M fsdev/9p-marshal.c
    M fsdev/file-op-9p.h
    M hw/9pfs/9p-synth.c

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

Only trivial fixes.

# gpg: Signature made Fri 01 Jul 2016 13:39:06 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: synth: drop v9fs_ prefix
  9p: don't include <sys/uio.h>

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


Compare: https://github.com/qemu/qemu/compare/9a48e3670030...96b39d832788