[Qemu-commits] [qemu/qemu] c4c2da: docs: update bitmaps.md

[GitHub]

  Branch: refs/heads/master
  Home:   https://github.com/qemu/qemu
  Commit: c4c2daa1ae9ed03c6dd78477a9b132edbce9e08c
      
https://github.com/qemu/qemu/commit/c4c2daa1ae9ed03c6dd78477a9b132edbce9e08c
  Author: John Snow <address@hidden>
  Date:   2015-11-17 (Tue, 17 Nov 2015)

  Changed paths:
    M docs/bitmaps.md

  Log Message:
  -----------
  docs: update bitmaps.md

Include new error handling scenarios for 2.5.

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


  Commit: a12e52a151ab48fbfe462110a36d2399713271e6
      
https://github.com/qemu/qemu/commit/a12e52a151ab48fbfe462110a36d2399713271e6
  Author: Eric Blake <address@hidden>
  Date:   2015-11-17 (Tue, 17 Nov 2015)

  Changed paths:
    M tests/.gitignore

  Log Message:
  -----------
  tests: Ignore recent test binaries

Commits 6c6f312d and bd797fc1 added new tests (test-blockjob-txn
and test-timed-average, respectively), but did not mark them for
exclusion in .gitignore.

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


  Commit: 886ce6f8b6ede74eb04314ef62d15bcdf5df7ef1
      
https://github.com/qemu/qemu/commit/886ce6f8b6ede74eb04314ef62d15bcdf5df7ef1
  Author: Stefan Hajnoczi <address@hidden>
  Date:   2015-11-17 (Tue, 17 Nov 2015)

  Changed paths:
    M hw/tpm/tpm_tis.c

  Log Message:
  -----------
  tpm: avoid clang shifting negative signed warning

clang 3.7.0 on x86_64 warns about the following:

  hw/tpm/tpm_tis.c:1000:36: warning: shifting a negative signed value is 
undefined [-Wshift-negative-value]
      tis->loc[c].iface_id = TPM_TIS_IFACE_ID_SUPPORTED_FLAGS1_3;
                             ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
  hw/tpm/tpm_tis.c:144:10: note: expanded from macro 
'TPM_TIS_IFACE_ID_SUPPORTED_FLAGS1_3'
     (~0 << 4)/* all of it is don't care */)
      ~~ ^

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


  Commit: 02460c3b4287776062715b95c59cd8829015615d
      
https://github.com/qemu/qemu/commit/02460c3b4287776062715b95c59cd8829015615d
  Author: Stefan Hajnoczi <address@hidden>
  Date:   2015-11-17 (Tue, 17 Nov 2015)

  Changed paths:
    M disas/arm.c

  Log Message:
  -----------
  disas/arm: avoid clang shifting negative signed warning

clang 3.7.0 on x86_64 warns about the following:

  disas/arm.c:1782:17: warning: shifting a negative signed value is undefined 
[-Wshift-negative-value]
    imm |= (-1 << 7);
      ~~ ^

Note that this patch preserves the tab indent in this source file
because the surrounding code still uses tabs.

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


  Commit: 0ed39f3df2d3cf7f0fc3468b057f952a3b251ad9
      
https://github.com/qemu/qemu/commit/0ed39f3df2d3cf7f0fc3468b057f952a3b251ad9
  Author: Fam Zheng <address@hidden>
  Date:   2015-11-17 (Tue, 17 Nov 2015)

  Changed paths:
    M aio-posix.c

  Log Message:
  -----------
  aio-epoll: Fix use-after-free of node

aio_epoll_update needs the fields in node, so delay the free.

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


  Commit: 40119effc5c36dbd0ca19ca85a5897d5b3d37d6d
      
https://github.com/qemu/qemu/commit/40119effc5c36dbd0ca19ca85a5897d5b3d37d6d
  Author: Alberto Garcia <address@hidden>
  Date:   2015-11-17 (Tue, 17 Nov 2015)

  Changed paths:
    M blockdev.c
    M qapi/block-core.json
    M tests/qemu-iotests/136

  Log Message:
  -----------
  block: make 'stats-interval' an array of ints instead of a string

This is the natural JSON representation and prevents us from having to
decode the list manually.

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


  Commit: 10f5a72f70862d299ddbdf226d6dc71fa4ae34dd
      
https://github.com/qemu/qemu/commit/10f5a72f70862d299ddbdf226d6dc71fa4ae34dd
  Author: Fam Zheng <address@hidden>
  Date:   2015-11-17 (Tue, 17 Nov 2015)

  Changed paths:
    M hw/block/virtio-blk.c

  Log Message:
  -----------
  virtio-blk: Fix double completion for werror=stop

When a request R is absorbed by request M, it is appended to the
"mr_next" queue led by M, and is completed together with the completion
of M, in virtio_blk_rw_complete.

During DMA restart in virtio_blk_dma_restart_bh, requests in s->rq are
parsed and submitted again, possibly with a stale req->mr_next. It could
be a problem if the request merging in virtio_blk_handle_request hasn't
refreshed every mr_next pointer, in which case, virtio_blk_rw_complete
could walk through unexpected requests following the stale pointers.

Fix this by unsetting the pointer in virtio_blk_rw_complete. It is safe
because this req is either completed and freed right away, or it will be
restarted and parsed from scratch out of the vq later.

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


  Commit: 9be060f5278dc0d732ebfcf2bf0a293f88b833eb
      
https://github.com/qemu/qemu/commit/9be060f5278dc0d732ebfcf2bf0a293f88b833eb
  Author: Peter Maydell <address@hidden>
  Date:   2015-11-17 (Tue, 17 Nov 2015)

  Changed paths:
    M aio-posix.c
    M blockdev.c
    M disas/arm.c
    M docs/bitmaps.md
    M hw/block/virtio-blk.c
    M hw/tpm/tpm_tis.c
    M qapi/block-core.json
    M tests/.gitignore
    M tests/qemu-iotests/136

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

# gpg: Signature made Tue 17 Nov 2015 11:13:05 GMT 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:
  virtio-blk: Fix double completion for werror=stop
  block: make 'stats-interval' an array of ints instead of a string
  aio-epoll: Fix use-after-free of node
  disas/arm: avoid clang shifting negative signed warning
  tpm: avoid clang shifting negative signed warning
  tests: Ignore recent test binaries
  docs: update bitmaps.md

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


Compare: https://github.com/qemu/qemu/compare/361cb26827ff...9be060f5278d