[Qemu-commits] [qemu/qemu] 1bd84e: qcow2: remove unnecessary check

[GitHub]

  Branch: refs/heads/master
  Home:   https://github.com/qemu/qemu
  Commit: 1bd84ee717bf146c19281cce48a36a2f4d71748d
      
https://github.com/qemu/qemu/commit/1bd84ee717bf146c19281cce48a36a2f4d71748d
  Author: Alberto Garcia <address@hidden>
  Date:   2015-07-07 (Tue, 07 Jul 2015)

  Changed paths:
    M block/qcow2-cache.c

  Log Message:
  -----------
  qcow2: remove unnecessary check

The value of 'i' is guaranteed to be >= 0

Signed-off-by: Alberto Garcia <address@hidden>
Message-id: address@hidden
Signed-off-by: Stefan Hajnoczi <address@hidden>


  Commit: 7a63f3cdc44230109c91cdc0ee912c3cc7837141
      
https://github.com/qemu/qemu/commit/7a63f3cdc44230109c91cdc0ee912c3cc7837141
  Author: Stefan Hajnoczi <address@hidden>
  Date:   2015-07-07 (Tue, 07 Jul 2015)

  Changed paths:
    M block/io.c

  Log Message:
  -----------
  block: update bdrv_drain_all()/bdrv_drain() comments

The doc comments for bdrv_drain_all() and bdrv_drain() are outdated:

 * The bdrv_drain() comment is a poor man's bdrv_lock()/bdrv_unlock()
   which Fam Zheng is currently developing.  Unfortunately this warning
   was never really enough because devices keep submitting I/O and op
   blockers don't prevent that.

 * The bdrv_drain_all() comment is still partially correct but reflects
   the nature of the implementation rather than API documentation.

Do make it clear that bdrv_drain() is only appropriate within an
AioContext.  For anything spanning AioContexts you need
bdrv_drain_all().

Cc: Markus Armbruster <address@hidden>
Cc: Paolo Bonzini <address@hidden>
Signed-off-by: Stefan Hajnoczi <address@hidden>
Reviewed-by: Markus Armbruster <address@hidden>
Reviewed-by: Fam Zheng <address@hidden>
Message-id: address@hidden


  Commit: c2e0dbbfd7265eb9a7170ab195d8f9f8a1cbd1af
      
https://github.com/qemu/qemu/commit/c2e0dbbfd7265eb9a7170ab195d8f9f8a1cbd1af
  Author: Fam Zheng <address@hidden>
  Date:   2015-07-07 (Tue, 07 Jul 2015)

  Changed paths:
    M block.c

  Log Message:
  -----------
  block: Initialize local_err in bdrv_append_temp_snapshot

Cc: address@hidden
Signed-off-by: Fam Zheng <address@hidden>
Message-id: address@hidden
Signed-off-by: Stefan Hajnoczi <address@hidden>


  Commit: 53ec73e264f481b79b52efcadc9ceb8f8996975c
      
https://github.com/qemu/qemu/commit/53ec73e264f481b79b52efcadc9ceb8f8996975c
  Author: Fam Zheng <address@hidden>
  Date:   2015-07-07 (Tue, 07 Jul 2015)

  Changed paths:
    M block.c
    M block/snapshot.c
    M migration/block.c

  Log Message:
  -----------
  block: Use bdrv_drain to replace uncessary bdrv_drain_all

There callers work on a single BlockDriverState subtree, where using
bdrv_drain() is more accurate.

Signed-off-by: Fam Zheng <address@hidden>
Signed-off-by: Stefan Hajnoczi <address@hidden>


  Commit: 25d9747b6427de8253221d544b45e50888d4cef7
      
https://github.com/qemu/qemu/commit/25d9747b6427de8253221d544b45e50888d4cef7
  Author: Richard W.M. Jones <address@hidden>
  Date:   2015-07-07 (Tue, 07 Jul 2015)

  Changed paths:
    M block/raw-posix.c

  Log Message:
  -----------
  block/raw-posix: Don't think /dev/fd/<NN> is a floppy drive.

In libguestfs we use /dev/fd/<NN> to pass pre-opened file descriptors
to qemu-img.  Lately I've discovered that although this works, qemu
believes that these are floppy disk images.  That in itself isn't much
of a problem, but now qemu prints a warning about host floppy
pass-thru being deprecated.

Extend the existing test so that it ignores /dev/fd/ as well as
/dev/fdset/

A simple test of this, if you are using the bash shell, is:

  qemu-img info <( cat /dev/null )

without this patch:

  $ qemu-img info <( cat /dev/null )
  qemu-img: Host floppy pass-through is deprecated
  Support for it will be removed in a future release.
  qemu-img: Could not open '/dev/fd/63': Could not refresh total sector count: 
Illegal seek

with this patch:

  $ qemu-img info <( cat /dev/null )
  qemu-img: Could not open '/dev/fd/63': Could not refresh total sector count: 
Illegal seek

Signed-off-by: Richard W.M. Jones <address@hidden>
Reviewed-by: Markus Armbruster <address@hidden>
Message-id: address@hidden
Fixes: https://bugs.launchpad.net/qemu/+bug/1470536
Signed-off-by: Stefan Hajnoczi <address@hidden>


  Commit: 970311646a701eecb103eb28093e8924d2fa6861
      
https://github.com/qemu/qemu/commit/970311646a701eecb103eb28093e8924d2fa6861
  Author: Ting Wang <address@hidden>
  Date:   2015-07-07 (Tue, 07 Jul 2015)

  Changed paths:
    M block/mirror.c
    M blockjob.c
    M include/block/blockjob.h

  Log Message:
  -----------
  blockjob: add block_job_release function

There is job resource leak in function mirror_start_job,
although bdrv_create_dirty_bitmap is unlikely failed.
Add block_job_release for each release when needed.

Signed-off-by: Ting Wang <address@hidden>
Reviewed-by: John Snow <address@hidden>
Message-id: address@hidden
Signed-off-by: Stefan Hajnoczi <address@hidden>


  Commit: 30c6672aa4b4bc9bdba3a7e46c49bba191660143
      
https://github.com/qemu/qemu/commit/30c6672aa4b4bc9bdba3a7e46c49bba191660143
  Author: Peter Maydell <address@hidden>
  Date:   2015-07-07 (Tue, 07 Jul 2015)

  Changed paths:
    M block.c
    M block/io.c
    M block/mirror.c
    M block/qcow2-cache.c
    M block/raw-posix.c
    M block/snapshot.c
    M blockjob.c
    M include/block/blockjob.h
    M migration/block.c

  Log Message:
  -----------
  Merge remote-tracking branch 'remotes/stefanha/tags/block-pull-request' into 
staging

Pull request

v2:
 * Drop block/nfs patch since it exposes an unfinished QAPI interface [kwolf]

# gpg: Signature made Tue Jul  7 14:29:47 2015 BST using RSA key ID 81AB73C8
# gpg: Good signature from "Stefan Hajnoczi <address@hidden>"
# gpg:                 aka "Stefan Hajnoczi <address@hidden>"

* remotes/stefanha/tags/block-pull-request:
  blockjob: add block_job_release function
  block/raw-posix: Don't think /dev/fd/<NN> is a floppy drive.
  block: Use bdrv_drain to replace uncessary bdrv_drain_all
  block: Initialize local_err in bdrv_append_temp_snapshot
  block: update bdrv_drain_all()/bdrv_drain() comments
  qcow2: remove unnecessary check

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


Compare: https://github.com/qemu/qemu/compare/9861b71fd63f...30c6672aa4b4