Commit d7c698af 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 Fri 07 Mar 2014 13:30:04 GMT using RSA key ID C88F2FD6
# gpg: Good signature from "Kevin Wolf <kwolf@redhat.com>"

* remotes/kevin/tags/for-upstream:
  block: qemu-iotests 085 - live snapshots tests
  hw/ide/ahci.h: Avoid shifting left into sign bit
  block: Fix error path segfault in bdrv_open()
  qemu-iotests: Test a few blockdev-add error cases
  blockdev: Fix NULL pointer dereference in blockdev-add
  blockdev: Fail blockdev-add with encrypted images
  block/raw-win32: Strip "file:" prefix on creation
  block/raw-win32: Implement bdrv_parse_filename()
  block/raw-posix: Strip "file:" prefix on creation
  block/raw-posix: Implement bdrv_parse_filename()
  block: Keep "filename" option after parsing
  block: mirror - remove code cruft that has no function
  block: make bdrv_swap rebuild the bs graph node list field.
  block: Fix bs->request_alignment assertion for bs->sg=1
  iscsi: Use bs->sg for everything else than disks
  qemu-iotests: Test progress output for conversion
  qemu-img convert: Fix progress output
  gluster: Remove unused defines and header include
  gluster: Change licence to GPLv2+

Signed-off-by: default avatarPeter Maydell <peter.maydell@linaro.org>
parents 6570025e 4089f7c6

block.c

+27 −7
Original line number Diff line number Diff line
@@ -935,7 +935,7 @@ static int bdrv_open_common(BlockDriverState *bs, BlockDriverState *file, 


    bdrv_refresh_limits(bs);

    assert(bdrv_opt_mem_align(bs) != 0);

    assert(bs->request_alignment != 0);

    assert((bs->request_alignment != 0) || bs->sg);



#ifndef _WIN32

    if (bs->is_temporary) {
@@ -1017,7 +1017,12 @@ static int bdrv_file_open(BlockDriverState *bs, const char *filename, 
            ret = -EINVAL;

            goto fail;

        }



        if (!drv->bdrv_needs_filename) {

            qdict_del(*options, "filename");

        } else {

            filename = qdict_get_str(*options, "filename");

        }

    }



    if (!drv->bdrv_file_open) {
@@ -1229,6 +1234,7 @@ int bdrv_open(BlockDriverState **pbs, const char *filename, 
        ret = bdrv_file_open(bs, filename, &options, flags & ~BDRV_O_PROTOCOL,

                             &local_err);

        if (!ret) {

            drv = bs->drv;

            goto done;

        } else if (bs->drv) {

            goto close_and_fail;
@@ -1847,11 +1853,6 @@ static void bdrv_move_feature_fields(BlockDriverState *bs_dest, 
    pstrcpy(bs_dest->device_name, sizeof(bs_dest->device_name),

            bs_src->device_name);

    bs_dest->device_list = bs_src->device_list;



    /* keep the same entry in graph_bdrv_states

     * We do want to swap name but don't want to swap linked list entries

     */

    bs_dest->node_list   = bs_src->node_list;

}



/*
@@ -1870,6 +1871,17 @@ void bdrv_swap(BlockDriverState *bs_new, BlockDriverState *bs_old) 
{

    BlockDriverState tmp;



    /* The code needs to swap the node_name but simply swapping node_list won't

     * work so first remove the nodes from the graph list, do the swap then

     * insert them back if needed.

     */

    if (bs_new->node_name[0] != '\0') {

        QTAILQ_REMOVE(&graph_bdrv_states, bs_new, node_list);

    }

    if (bs_old->node_name[0] != '\0') {

        QTAILQ_REMOVE(&graph_bdrv_states, bs_old, node_list);

    }



    /* bs_new must be anonymous and shouldn't have anything fancy enabled */

    assert(bs_new->device_name[0] == '\0');

    assert(QLIST_EMPTY(&bs_new->dirty_bitmaps));
@@ -1898,6 +1910,14 @@ void bdrv_swap(BlockDriverState *bs_new, BlockDriverState *bs_old) 
    assert(bs_new->io_limits_enabled == false);

    assert(!throttle_have_timer(&bs_new->throttle_state));



    /* insert the nodes back into the graph node list if needed */

    if (bs_new->node_name[0] != '\0') {

        QTAILQ_INSERT_TAIL(&graph_bdrv_states, bs_new, node_list);

    }

    if (bs_old->node_name[0] != '\0') {

        QTAILQ_INSERT_TAIL(&graph_bdrv_states, bs_old, node_list);

    }



    bdrv_rebind(bs_new);

    bdrv_rebind(bs_old);

}

block/gluster.c

+2 −14
Original line number Diff line number Diff line
@@ -3,21 +3,12 @@ 
 *

 * Copyright (C) 2012 Bharata B Rao <bharata@linux.vnet.ibm.com>

 *

 * Pipe handling mechanism in AIO implementation is derived from

 * block/rbd.c. Hence,

 * This work is licensed under the terms of the GNU GPL, version 2 or later.

 * See the COPYING file in the top-level directory.

 *

 * Copyright (C) 2010-2011 Christian Brunner <chb@muc.de>,

 *                         Josh Durgin <josh.durgin@dreamhost.com>

 *

 * This work is licensed under the terms of the GNU GPL, version 2.  See

 * the COPYING file in the top-level directory.

 *

 * Contributions after 2012-01-13 are licensed under the terms of the

 * GNU GPL, version 2 or (at your option) any later version.

 */

#include <glusterfs/api/glfs.h>

#include "block/block_int.h"

#include "qemu/sockets.h"

#include "qemu/uri.h"



typedef struct GlusterAIOCB {
@@ -32,9 +23,6 @@ typedef struct BDRVGlusterState { 
    struct glfs_fd *fd;

} BDRVGlusterState;



#define GLUSTER_FD_READ  0

#define GLUSTER_FD_WRITE 1



typedef struct GlusterConf {

    char *server;

    int port;

block/iscsi.c

+4 −5
Original line number Diff line number Diff line
@@ -1231,12 +1231,11 @@ static int iscsi_open(BlockDriverState *bs, QDict *options, int flags, 
    bs->total_sectors = sector_lun2qemu(iscsilun->num_blocks, iscsilun);

    bs->request_alignment = iscsilun->block_size;



    /* Medium changer or tape. We dont have any emulation for this so this must

     * be sg ioctl compatible. We force it to be sg, otherwise qemu will try

     * to read from the device to guess the image format.

    /* We don't have any emulation for devices other than disks and CD-ROMs, so

     * this must be sg ioctl compatible. We force it to be sg, otherwise qemu

     * will try to read from the device to guess the image format.

     */

    if (iscsilun->type == TYPE_MEDIUM_CHANGER ||

        iscsilun->type == TYPE_TAPE) {

    if (iscsilun->type != TYPE_DISK && iscsilun->type != TYPE_ROM) {

        bs->sg = 1;

    }

block/mirror.c

+0 −3
Original line number Diff line number Diff line
@@ -520,9 +520,6 @@ static void mirror_complete(BlockJob *job, Error **errp) 


    ret = bdrv_open_backing_file(s->target, NULL, &local_err);

    if (ret < 0) {

        char backing_filename[PATH_MAX];

        bdrv_get_full_backing_filename(s->target, backing_filename,

                                       sizeof(backing_filename));

        error_propagate(errp, local_err);

        return;

    }

block/raw-posix.c

+14 −0
Original line number Diff line number Diff line
@@ -336,6 +336,17 @@ error: 
}

#endif



static void raw_parse_filename(const char *filename, QDict *options,

                               Error **errp)

{

    /* The filename does not have to be prefixed by the protocol name, since

     * "file" is the default protocol; therefore, the return value of this

     * function call can be ignored. */

    strstart(filename, "file:", &filename);



    qdict_put_obj(options, "filename", QOBJECT(qstring_from_str(filename)));

}



static QemuOptsList raw_runtime_opts = {

    .name = "raw",

    .head = QTAILQ_HEAD_INITIALIZER(raw_runtime_opts.head),
@@ -1230,6 +1241,8 @@ static int raw_create(const char *filename, QEMUOptionParameter *options, 
    int result = 0;

    int64_t total_size = 0;



    strstart(filename, "file:", &filename);



    /* Read out options */

    while (options && options->name) {

        if (!strcmp(options->name, BLOCK_OPT_SIZE)) {
@@ -1412,6 +1425,7 @@ static BlockDriver bdrv_file = { 
    .instance_size = sizeof(BDRVRawState),

    .bdrv_needs_filename = true,

    .bdrv_probe = NULL, /* no probe for protocols */

    .bdrv_parse_filename = raw_parse_filename,

    .bdrv_file_open = raw_open,

    .bdrv_reopen_prepare = raw_reopen_prepare,

    .bdrv_reopen_commit = raw_reopen_commit,