[Qemu-commits] [qemu/qemu] 03c698: block/sheepdog: fix argument passed to qemu_strtou...

[GitHub]

  Branch: refs/heads/master
  Home:   https://github.com/qemu/qemu
  Commit: 03c698f0a229c8f76cfc33f0d8f755047c41f5e6
      
https://github.com/qemu/qemu/commit/03c698f0a229c8f76cfc33f0d8f755047c41f5e6
  Author: Jeff Cody <address@hidden>
  Date:   2016-03-16 (Wed, 16 Mar 2016)

  Changed paths:
    M block/sheepdog.c

  Log Message:
  -----------
  block/sheepdog: fix argument passed to qemu_strtoul()

The function qemu_strtoul() reads 'unsigned long' sized data,
which is larger than uint32_t on 64-bit machines.

Even though the snap_id field in the header is 32-bits, we must
accommodate the full size in qemu_strtoul().

This patch also adds more meaningful error handling to the
qemu_strtoul() call, and subsequent results.

Reported-by: Paolo Bonzini <address@hidden>
Signed-off-by: Jeff Cody <address@hidden>
Reviewed-by: Max Reitz <address@hidden>
Reviewed-by: Hitoshi Mitake <address@hidden>
Message-id: address@hidden


  Commit: 773460256bb65b7ef5948cedc31aa8bc889ac86f
      
https://github.com/qemu/qemu/commit/773460256bb65b7ef5948cedc31aa8bc889ac86f
  Author: Jeff Cody <address@hidden>
  Date:   2016-03-16 (Wed, 16 Mar 2016)

  Changed paths:
    M MAINTAINERS

  Log Message:
  -----------
  MAINTAINERS: Fix typo, block/stream.h -> block/stream.c

There is no block/stream.h, the intended filename is block/stream.c
instead.

Signed-off-by: Jeff Cody <address@hidden>
Reviewed-by: Fam Zheng <address@hidden>
Message-id: address@hidden


  Commit: 33616ace9f3da93cbc967761a173d96eb744fcda
      
https://github.com/qemu/qemu/commit/33616ace9f3da93cbc967761a173d96eb744fcda
  Author: Peter Maydell <address@hidden>
  Date:   2016-03-16 (Wed, 16 Mar 2016)

  Changed paths:
    M MAINTAINERS
    M block/sheepdog.c

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

# gpg: Signature made Wed 16 Mar 2016 17:33:44 GMT using RSA key ID C0DE3057
# gpg: Good signature from "Jeffrey Cody <address@hidden>"
# gpg:                 aka "Jeffrey Cody <address@hidden>"
# gpg:                 aka "Jeffrey Cody <address@hidden>"

* remotes/cody/tags/block-pull-request:
  MAINTAINERS: Fix typo, block/stream.h -> block/stream.c
  block/sheepdog: fix argument passed to qemu_strtoul()

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


Compare: https://github.com/qemu/qemu/compare/d1f876409902...33616ace9f3d