Commit 1b5498f6 authored by Peter Maydell's avatar Peter Maydell
Browse files

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



Block pull request

# gpg: Signature made Fri 09 May 2014 19:57:53 BST using RSA key ID 81AB73C8
# gpg: Good signature from "Stefan Hajnoczi <stefanha@redhat.com>"
# gpg:                 aka "Stefan Hajnoczi <stefanha@gmail.com>"

* remotes/stefanha/tags/block-pull-request:
  glib: fix g_poll early timeout on windows
  block: qemu-iotests - test for live migration
  block: qemu-iotests - update 085 to use common.qemu
  block: qemu-iotests - add common.qemu, for bash-controlled qemu tests
  block/raw-posix: Try both FIEMAP and SEEK_HOLE
  gluster: Correctly propagate errors when volume isn't accessible
  vl.c: remove init_clocks call from main
  block: Fix open flags with BDRV_O_SNAPSHOT
  qemu-iotests: Test converting to streamOptimized from small cluster size
  vmdk: Implement .bdrv_get_info()
  vmdk: Implement .bdrv_write_compressed
  qemu-img: Convert by cluster size if target is compressed
  block/iscsi: bump year in copyright notice
  block/nfs: Check for NULL server part
  qemu-img: sort block formats in help message
  iotests: Use configured python
  qcow2: Fix alloc_clusters_noref() overflow detection

Signed-off-by: default avatarPeter Maydell <peter.maydell@linaro.org>
parents e5bfd640 5a007547

block.c

+19 −15
Original line number Diff line number Diff line
@@ -774,6 +774,16 @@ void bdrv_disable_copy_on_read(BlockDriverState *bs) 
    bs->copy_on_read--;

}



/*

 * Returns the flags that a temporary snapshot should get, based on the

 * originally requested flags (the originally requested image will have flags

 * like a backing file)

 */

static int bdrv_temp_snapshot_flags(int flags)

{

    return (flags & ~BDRV_O_SNAPSHOT) | BDRV_O_TEMPORARY;

}



/*

 * Returns the flags that bs->file should get, based on the given flags for

 * the parent BDS
@@ -787,11 +797,6 @@ static int bdrv_inherited_flags(int flags) 
     * so we can enable both unconditionally on lower layers. */

    flags |= BDRV_O_CACHE_WB | BDRV_O_UNMAP;



    /* The backing file of a temporary snapshot is read-only */

    if (flags & BDRV_O_SNAPSHOT) {

        flags &= ~BDRV_O_RDWR;

    }



    /* Clear flags that only apply to the top layer */

    flags &= ~(BDRV_O_SNAPSHOT | BDRV_O_NO_BACKING | BDRV_O_COPY_ON_READ);
@@ -817,11 +822,6 @@ static int bdrv_open_flags(BlockDriverState *bs, int flags) 
{

    int open_flags = flags | BDRV_O_CACHE_WB;



    /* The backing file of a temporary snapshot is read-only */

    if (flags & BDRV_O_SNAPSHOT) {

        open_flags &= ~BDRV_O_RDWR;

    }



    /*

     * Clear flags that are internal to the block layer before opening the

     * image.
@@ -1206,7 +1206,7 @@ done: 
    return ret;

}



void bdrv_append_temp_snapshot(BlockDriverState *bs, Error **errp)

void bdrv_append_temp_snapshot(BlockDriverState *bs, int flags, Error **errp)

{

    /* TODO: extra byte is a hack to ensure MAX_PATH space on Windows. */

    char *tmp_filename = g_malloc0(PATH_MAX + 1);
@@ -1262,8 +1262,7 @@ void bdrv_append_temp_snapshot(BlockDriverState *bs, Error **errp) 
    bs_snapshot = bdrv_new("", &error_abort);



    ret = bdrv_open(&bs_snapshot, NULL, NULL, snapshot_options,

                    (bs->open_flags & ~BDRV_O_SNAPSHOT) | BDRV_O_TEMPORARY,

                    bdrv_qcow2, &local_err);

                    flags, bdrv_qcow2, &local_err);

    if (ret < 0) {

        error_propagate(errp, local_err);

        goto out;
@@ -1298,6 +1297,7 @@ int bdrv_open(BlockDriverState **pbs, const char *filename, 
    BlockDriverState *file = NULL, *bs;

    const char *drvname;

    Error *local_err = NULL;

    int snapshot_flags = 0;



    assert(pbs);
@@ -1358,6 +1358,10 @@ int bdrv_open(BlockDriverState **pbs, const char *filename, 
    if (flags & BDRV_O_RDWR) {

        flags |= BDRV_O_ALLOW_RDWR;

    }

    if (flags & BDRV_O_SNAPSHOT) {

        snapshot_flags = bdrv_temp_snapshot_flags(flags);

        flags = bdrv_backing_flags(flags);

    }



    assert(file == NULL);

    ret = bdrv_open_image(&file, filename, options, "file",
@@ -1417,8 +1421,8 @@ int bdrv_open(BlockDriverState **pbs, const char *filename, 


    /* For snapshot=on, create a temporary qcow2 overlay. bs points to the

     * temporary snapshot afterwards. */

    if (flags & BDRV_O_SNAPSHOT) {

        bdrv_append_temp_snapshot(bs, &local_err);

    if (snapshot_flags) {

        bdrv_append_temp_snapshot(bs, snapshot_flags, &local_err);

        if (local_err) {

            error_propagate(errp, local_err);

            goto close_and_fail;

block/gluster.c

+6 −1
Original line number Diff line number Diff line
@@ -207,6 +207,11 @@ static struct glfs *qemu_gluster_init(GlusterConf *gconf, const char *filename, 
                         "volume=%s image=%s transport=%s", gconf->server,

                         gconf->port, gconf->volname, gconf->image,

                         gconf->transport);



        /* glfs_init sometimes doesn't set errno although docs suggest that */

        if (errno == 0)

            errno = EINVAL;



        goto out;

    }

    return glfs;
@@ -482,7 +487,7 @@ static int qemu_gluster_create(const char *filename, 


    glfs = qemu_gluster_init(gconf, filename, errp);

    if (!glfs) {

        ret = -EINVAL;

        ret = -errno;

        goto out;

    }

block/iscsi.c

+1 −1
Original line number Diff line number Diff line
@@ -2,7 +2,7 @@ 
 * QEMU Block driver for iSCSI images

 *

 * Copyright (c) 2010-2011 Ronnie Sahlberg <ronniesahlberg@gmail.com>

 * Copyright (c) 2012-2013 Peter Lieven <pl@kamp.de>

 * Copyright (c) 2012-2014 Peter Lieven <pl@kamp.de>

 *

 * Permission is hereby granted, free of charge, to any person obtaining a copy

 * of this software and associated documentation files (the "Software"), to deal

block/nfs.c

+4 −0
Original line number Diff line number Diff line
@@ -256,6 +256,10 @@ static int64_t nfs_client_open(NFSClient *client, const char *filename, 
        error_setg(errp, "Invalid URL specified");

        goto fail;

    }

    if (!uri->server) {

        error_setg(errp, "Invalid URL specified");

        goto fail;

    }

    strp = strrchr(uri->path, '/');

    if (strp == NULL) {

        error_setg(errp, "Invalid URL specified");

block/qcow2-refcount.c

+3 −1
Original line number Diff line number Diff line
@@ -656,7 +656,9 @@ retry: 


    /* Make sure that all offsets in the "allocated" range are representable

     * in an int64_t */

    if (s->free_cluster_index - 1 > (INT64_MAX >> s->cluster_bits)) {

    if (s->free_cluster_index > 0 &&

        s->free_cluster_index - 1 > (INT64_MAX >> s->cluster_bits))

    {

        return -EFBIG;

    }