[Qemu-commits] [qemu/qemu] a184e7: nand: fix address overflow

[GitHub]

  Branch: refs/heads/master
  Home:   https://github.com/qemu/qemu
  Commit: a184e74f24f83935c8fc7cd76c06ad0717f89fdb
      
https://github.com/qemu/qemu/commit/a184e74f24f83935c8fc7cd76c06ad0717f89fdb
  Author: Rabin Vincent <address@hidden>
  Date:   2015-11-18 (Wed, 18 Nov 2015)

  Changed paths:
    M hw/block/nand.c

  Log Message:
  -----------
  nand: fix address overflow

The shifts of the address mask and value shift beyond 32 bits when there
are 5 address cycles.

Cc: address@hidden
Signed-off-by: Rabin Vincent <address@hidden>
Reviewed-by: Paolo Bonzini <address@hidden>
Reviewed-by: Peter Crosthwaite <address@hidden>
Signed-off-by: Kevin Wolf <address@hidden>


  Commit: 01809194a06d8e6c51c3e69600f14355225f4855
      
https://github.com/qemu/qemu/commit/01809194a06d8e6c51c3e69600f14355225f4855
  Author: John Snow <address@hidden>
  Date:   2015-11-18 (Wed, 18 Nov 2015)

  Changed paths:
    M tests/qemu-iotests/030

  Log Message:
  -----------
  iotests: fix race in 030

the stop_test case tests that we can resume a block-stream
command after it has stopped/paused due to error. We cannot
always reliably query it before it finishes after resume, though,
so make this a conditional.

The important thing is that we are still testing that it has stopped,
and that it finishes successfully after we send a resume command.

Signed-off-by: John Snow <address@hidden>
Reviewed-by: Fam Zheng <address@hidden>
Reviewed-by: Alberto Garcia <address@hidden>
Reviewed-by: Jeff Cody <address@hidden>
Signed-off-by: Kevin Wolf <address@hidden>


  Commit: 0702d3d88c2059814212b83f01e14ff3bb7b0c66
      
https://github.com/qemu/qemu/commit/0702d3d88c2059814212b83f01e14ff3bb7b0c66
  Author: Max Reitz <address@hidden>
  Date:   2015-11-18 (Wed, 18 Nov 2015)

  Changed paths:
    M blockdev.c

  Log Message:
  -----------
  blockdev: Add missing bdrv_unref() in drive-backup

All error paths after a successful bdrv_open() of target_bs should
contain a bdrv_unref(target_bs). This one did not yet, so add it.

Signed-off-by: Max Reitz <address@hidden>
Reviewed-by: Alberto Garcia <address@hidden>
Reviewed-by: Kevin Wolf <address@hidden>
Reviewed-by: Fam Zheng <address@hidden>
Signed-off-by: Kevin Wolf <address@hidden>


  Commit: 4ad6f3db7db154d5274274bd0079d6318367ab16
      
https://github.com/qemu/qemu/commit/4ad6f3db7db154d5274274bd0079d6318367ab16
  Author: Alberto Garcia <address@hidden>
  Date:   2015-11-18 (Wed, 18 Nov 2015)

  Changed paths:
    M blockdev.c

  Log Message:
  -----------
  block: Call external_snapshot_clean after blockdev-snapshot

Otherwise the AioContext will never be released.

Signed-off-by: Alberto Garcia <address@hidden>
Message-id: address@hidden
Reviewed-by: Fam Zheng <address@hidden>
Signed-off-by: Max Reitz <address@hidden>


  Commit: ca4fa82fe66076284f702adcfe7c319ebbf909ec
      
https://github.com/qemu/qemu/commit/ca4fa82fe66076284f702adcfe7c319ebbf909ec
  Author: Kevin Wolf <address@hidden>
  Date:   2015-11-18 (Wed, 18 Nov 2015)

  Changed paths:
    M blockdev.c

  Log Message:
  -----------
  Merge remote-tracking branch 'mreitz/tags/pull-block-for-kevin-2015-11-18' 
into queue-block

One block patch for qemu 2.5-rc1.

# gpg: Signature made Wed Nov 18 16:26:59 2015 CET using RSA key ID E838ACAD
# gpg: Good signature from "Max Reitz <address@hidden>"

* mreitz/tags/pull-block-for-kevin-2015-11-18:
  block: Call external_snapshot_clean after blockdev-snapshot

Signed-off-by: Kevin Wolf <address@hidden>


  Commit: 8f280309030331a912fd8924c129d8bd59e1bdc7
      
https://github.com/qemu/qemu/commit/8f280309030331a912fd8924c129d8bd59e1bdc7
  Author: Peter Maydell <address@hidden>
  Date:   2015-11-18 (Wed, 18 Nov 2015)

  Changed paths:
    M blockdev.c
    M hw/block/nand.c
    M tests/qemu-iotests/030

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

Block layer patches

# gpg: Signature made Wed 18 Nov 2015 15:28:32 GMT using RSA key ID C88F2FD6
# gpg: Good signature from "Kevin Wolf <address@hidden>"

* remotes/kevin/tags/for-upstream:
  block: Call external_snapshot_clean after blockdev-snapshot
  blockdev: Add missing bdrv_unref() in drive-backup
  iotests: fix race in 030
  nand: fix address overflow

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


Compare: https://github.com/qemu/qemu/compare/7199c89d8c6b...8f2803090303