Commit 33616ace authored by Peter Maydell's avatar Peter Maydell
Browse files

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 <jcody@redhat.com>"
# gpg:                 aka "Jeffrey Cody <jeff@codyprime.org>"
# gpg:                 aka "Jeffrey Cody <codyprime@gmail.com>"

* 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: default avatarPeter Maydell <peter.maydell@linaro.org>
parents d1f87640 77346025

MAINTAINERS

+1 −1
Original line number Diff line number Diff line
@@ -1016,7 +1016,7 @@ F: blockjob.c 
F: include/block/blockjob.h

F: block/backup.c

F: block/commit.c

F: block/stream.h

F: block/stream.c

F: block/mirror.c

T: git git://github.com/codyprime/qemu-kvm-jtc.git block

block/sheepdog.c

+7 −4
Original line number Diff line number Diff line
@@ -2549,7 +2549,7 @@ static int sd_snapshot_delete(BlockDriverState *bs, 
                              const char *name,

                              Error **errp)

{

    uint32_t snap_id = 0;

    unsigned long snap_id = 0;

    char snap_tag[SD_MAX_VDI_TAG_LEN];

    Error *local_err = NULL;

    int fd, ret;
@@ -2571,12 +2571,15 @@ static int sd_snapshot_delete(BlockDriverState *bs, 
    memset(buf, 0, sizeof(buf));

    memset(snap_tag, 0, sizeof(snap_tag));

    pstrcpy(buf, SD_MAX_VDI_LEN, s->name);

    if (qemu_strtoul(snapshot_id, NULL, 10, (unsigned long *)&snap_id)) {

        return -1;

    ret = qemu_strtoul(snapshot_id, NULL, 10, &snap_id);

    if (ret || snap_id > UINT32_MAX) {

        error_setg(errp, "Invalid snapshot ID: %s",

                         snapshot_id ? snapshot_id : "<null>");

        return -EINVAL;

    }



    if (snap_id) {

        hdr.snapid = snap_id;

        hdr.snapid = (uint32_t) snap_id;

    } else {

        pstrcpy(snap_tag, sizeof(snap_tag), snapshot_id);

        pstrcpy(buf + SD_MAX_VDI_LEN, SD_MAX_VDI_TAG_LEN, snap_tag);