Commit f72b4939 authored by Peter Maydell's avatar Peter Maydell
Browse files

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



Block patches

# gpg: Signature made Mon 02 Jun 2014 14:56:00 BST using RSA key ID C88F2FD6
# gpg: Good signature from "Kevin Wolf <kwolf@redhat.com>"

* remotes/kevin/tags/for-upstream:
  qemu-img: Report error even with --oformat=json
  vmdk: Fix local_err in vmdk_create
  block/raw-posix.c: Avoid nonstandard LONG_LONG_MAX
  qemu-img: Plug memory leak in convert command
  block/sheepdog: Plug memory leak in sd_snapshot_create()
  block/vvfat: Plug memory leak in read_directory()
  block/vvfat: Plug memory leak in check_directory_consistency()
  block/qapi: Plug memory leak in dump_qobject() case QTYPE_QERROR
  blockdev: Plug memory leak in drive_init()
  blockdev: Plug memory leak in blockdev_init()
  qemu-io: Don't print NULL when open without non-option arg fails
  qemu-io: Plug memory leak in open command
  qemu-io: Support multiple -o in open command
  block: Plug memory leak on brv_open_image() error path
  qcow2: Plug memory leak on qcow2_invalidate_cache() error paths
  block/vvfat: Plug memory leak in enable_write_target()
  qemu-img: Plug memory leak on block option help error path

Signed-off-by: default avatarPeter Maydell <peter.maydell@linaro.org>
parents 9bb93180 55d492d7

block.c

+1 −0
Original line number Diff line number Diff line
@@ -1228,6 +1228,7 @@ int bdrv_open_image(BlockDriverState **pbs, const char *filename, 
                       bdref_key);

            ret = -EINVAL;

        }

        QDECREF(image_options);

        goto done;

    }

block/qapi.c

+1 −0
Original line number Diff line number Diff line
@@ -475,6 +475,7 @@ static void dump_qobject(fprintf_function func_fprintf, void *f, 
        case QTYPE_QERROR: {

            QString *value = qerror_human((QError *)obj);

            func_fprintf(f, "%s", qstring_get_str(value));

            QDECREF(value);

            break;

        }

        case QTYPE_NONE:

block/qcow2.c

+1 −2
Original line number Diff line number Diff line
@@ -1308,6 +1308,7 @@ static void qcow2_invalidate_cache(BlockDriverState *bs, Error **errp) 
    options = qdict_clone_shallow(bs->options);



    ret = qcow2_open(bs, options, flags, &local_err);

    QDECREF(options);

    if (local_err) {

        error_setg(errp, "Could not reopen qcow2 layer: %s",

                   error_get_pretty(local_err));
@@ -1318,8 +1319,6 @@ static void qcow2_invalidate_cache(BlockDriverState *bs, Error **errp) 
        return;

    }



    QDECREF(options);



    if (crypt_method) {

        s->crypt_method = crypt_method;

        memcpy(&s->aes_encrypt_key, &aes_encrypt_key, sizeof(aes_encrypt_key));

block/raw-posix.c

+1 −1
Original line number Diff line number Diff line
@@ -1192,7 +1192,7 @@ again: 
        if (size == 0)

#endif

#if defined(__APPLE__) && defined(__MACH__)

        size = LONG_LONG_MAX;

        size = LLONG_MAX;

#else

        size = lseek(fd, 0LL, SEEK_END);

#endif

block/sheepdog.c

+2 −2
Original line number Diff line number Diff line
@@ -2176,6 +2176,7 @@ static int sd_snapshot_create(BlockDriverState *bs, QEMUSnapshotInfo *sn_info) 
    strncpy(s->inode.tag, sn_info->name, sizeof(s->inode.tag));

    /* we don't need to update entire object */

    datalen = SD_INODE_SIZE - sizeof(s->inode.data_vdi_id);

    inode = g_malloc(datalen);



    /* refresh inode. */

    fd = connect_to_sdog(s, &local_err);
@@ -2202,8 +2203,6 @@ static int sd_snapshot_create(BlockDriverState *bs, QEMUSnapshotInfo *sn_info) 
        goto cleanup;

    }



    inode = (SheepdogInode *)g_malloc(datalen);



    ret = read_object(fd, (char *)inode, vid_to_vdi_oid(new_vid),

                      s->inode.nr_copies, datalen, 0, s->cache_flags);
@@ -2217,6 +2216,7 @@ static int sd_snapshot_create(BlockDriverState *bs, QEMUSnapshotInfo *sn_info) 
            s->inode.name, s->inode.snap_id, s->inode.vdi_id);



cleanup:

    g_free(inode);

    closesocket(fd);

    return ret;

}