[Qemu-commits] [qemu/qemu] 4bae2b: 9pfs: fix v9fs_lock error case

[GitHub]

  Branch: refs/heads/master
  Home:   https://github.com/qemu/qemu
  Commit: 4bae2b397fc91bd7eca48bc861dd67f125d4fd1b
      
https://github.com/qemu/qemu/commit/4bae2b397fc91bd7eca48bc861dd67f125d4fd1b
  Author: Paolo Bonzini <address@hidden>
  Date:   2017-02-28 (Tue, 28 Feb 2017)

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

  Log Message:
  -----------
  9pfs: fix v9fs_lock error case

In this case, we are marshaling an error status instead of the errno value.
Reorganize the out and out_nofid labels to look like all the other cases.
Coverity reports this because the "err = -ENOENT" and "err = -EINVAL"
assignments above are dead, overwritten by the call to pdu_marshal.

(Coverity issues CID1348512 and CID1348513)

Signed-off-by: Paolo Bonzini <address@hidden>
(also open-coded the success path since locking is a nop for us, Greg Kurz)
Signed-off-by: Greg Kurz <address@hidden>


  Commit: b8bbdb886ebf9cce631e5e792b328eed98511a38
      
https://github.com/qemu/qemu/commit/b8bbdb886ebf9cce631e5e792b328eed98511a38
  Author: Pradeep Jagadeesh <address@hidden>
  Date:   2017-02-28 (Tue, 28 Feb 2017)

  Changed paths:
    M fsdev/Makefile.objs
    M fsdev/file-op-9p.h
    M fsdev/qemu-fsdev-opts.c
    A fsdev/qemu-fsdev-throttle.c
    A fsdev/qemu-fsdev-throttle.h
    M hw/9pfs/9p-local.c
    M hw/9pfs/9p.c
    M hw/9pfs/cofile.c
    M qemu-options.hx

  Log Message:
  -----------
  fsdev: add IO throttle support to fsdev devices

This patchset adds the throttle support for the 9p-local driver.
For now this functionality can be enabled only through qemu cli options.
QMP interface and support to other drivers need further extensions.
To make it simple for other 9p drivers, the throttle code has been put in
separate files.

Signed-off-by: Pradeep Jagadeesh <address@hidden>
Reviewed-by: Alberto Garcia <address@hidden>
(pass extra NULL CoMutex * argument to qemu_co_queue_wait(),
 added options to qemu-options.hx, Greg Kurz)
Signed-off-by: Greg Kurz <address@hidden>


  Commit: a2a7862ca9ab1689f094c319ec92ecbd6fd1b46d
      
https://github.com/qemu/qemu/commit/a2a7862ca9ab1689f094c319ec92ecbd6fd1b46d
  Author: Pradeep Jagadeesh <address@hidden>
  Date:   2017-02-28 (Tue, 28 Feb 2017)

  Changed paths:
    M blockdev.c
    M fsdev/qemu-fsdev-opts.c
    A include/qemu/throttle-options.h

  Log Message:
  -----------
  throttle: factor out duplicate code

This patch removes the redundant throttle code that was present in
block and fsdev device files. Now the common code is moved
to a single file.

Signed-off-by: Pradeep Jagadeesh <address@hidden>
Reviewed-by: Stefan Hajnoczi <address@hidden>
Reviewed-by: Alberto Garcia <address@hidden>
(fix indent nit, Greg Kurz)
Signed-off-by: Greg Kurz <address@hidden>


  Commit: 9514f2648ca05b38e852b490a12b8cd98d5808c1
      
https://github.com/qemu/qemu/commit/9514f2648ca05b38e852b490a12b8cd98d5808c1
  Author: Peter Maydell <address@hidden>
  Date:   2017-02-28 (Tue, 28 Feb 2017)

  Changed paths:
    M blockdev.c
    M fsdev/Makefile.objs
    M fsdev/file-op-9p.h
    M fsdev/qemu-fsdev-opts.c
    A fsdev/qemu-fsdev-throttle.c
    A fsdev/qemu-fsdev-throttle.h
    M hw/9pfs/9p-local.c
    M hw/9pfs/9p.c
    M hw/9pfs/cofile.c
    A include/qemu/throttle-options.h
    M qemu-options.hx

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

This pull request brings:
- a fix to a minor bug reported by Coverity
- throttling support in the local backend (command line only)

# gpg: Signature made Tue 28 Feb 2017 09:32:30 GMT
# 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 "[jpeg image of size 3330]"
# 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:
  throttle: factor out duplicate code
  fsdev: add IO throttle support to fsdev devices
  9pfs: fix v9fs_lock error case

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


Compare: https://github.com/qemu/qemu/compare/7d1730b7d9d8...9514f2648ca0