Commit 3d815ac8 authored by Peter Maydell's avatar Peter Maydell
Browse files

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



Block patches for 2.3

# gpg: Signature made Fri 06 Feb 2015 17:14:10 GMT using RSA key ID C88F2FD6
# gpg: Good signature from "Kevin Wolf <kwolf@redhat.com>"

* remotes/kevin/tags/for-upstream: (47 commits)
  block/raw-posix.c: Fix raw_getlength() on Mac OS X block devices
  block: Eliminate silly QERR_ macros used for encryption keys
  block: New bdrv_add_key(), convert monitor to use it
  blockdev: Eliminate silly QERR_BLOCK_JOB_NOT_ACTIVE macro
  blockdev: Give find_block_job() an Error ** parameter
  qcow2: Rewrite qcow2_alloc_bytes()
  block: Give always priority to unused entries in the qcow2 L2 cache
  nbd: fix max_discard/max_transfer_length
  block: introduce BDRV_REQUEST_MAX_SECTORS
  nbd: Improve error messages
  iotests: Fix 104 for NBD
  iotests: Fix 100 for nbd
  iotests: Fix 083
  block: fix off-by-one error in qcow and qcow2
  qemu-iotests: add 116 invalid QED input file tests
  qed: check for header size overflow
  block/dmg: improve zeroes handling
  block/dmg: support bzip2 block entry types
  block/dmg: factor out block type check
  block/dmg: use SectorNumber from BLKX header
  ...

Signed-off-by: default avatarPeter Maydell <peter.maydell@linaro.org>
parents a2f2d288 728dacbd

block.c

+43 −22
Original line number Diff line number Diff line
@@ -2647,7 +2647,7 @@ static int bdrv_check_byte_request(BlockDriverState *bs, int64_t offset, 
{

    int64_t len;



    if (size > INT_MAX) {

    if (size > BDRV_REQUEST_MAX_SECTORS << BDRV_SECTOR_BITS) {

        return -EIO;

    }
@@ -2671,7 +2671,7 @@ static int bdrv_check_byte_request(BlockDriverState *bs, int64_t offset, 
static int bdrv_check_request(BlockDriverState *bs, int64_t sector_num,

                              int nb_sectors)

{

    if (nb_sectors < 0 || nb_sectors > INT_MAX / BDRV_SECTOR_SIZE) {

    if (nb_sectors < 0 || nb_sectors > BDRV_REQUEST_MAX_SECTORS) {

        return -EIO;

    }
@@ -2758,7 +2758,7 @@ static int bdrv_rw_co(BlockDriverState *bs, int64_t sector_num, uint8_t *buf, 
        .iov_len = nb_sectors * BDRV_SECTOR_SIZE,

    };



    if (nb_sectors < 0 || nb_sectors > INT_MAX / BDRV_SECTOR_SIZE) {

    if (nb_sectors < 0 || nb_sectors > BDRV_REQUEST_MAX_SECTORS) {

        return -EINVAL;

    }
@@ -2826,13 +2826,10 @@ int bdrv_make_zero(BlockDriverState *bs, BdrvRequestFlags flags) 
    }



    for (;;) {

        nb_sectors = target_sectors - sector_num;

        nb_sectors = MIN(target_sectors - sector_num, BDRV_REQUEST_MAX_SECTORS);

        if (nb_sectors <= 0) {

            return 0;

        }

        if (nb_sectors > INT_MAX / BDRV_SECTOR_SIZE) {

            nb_sectors = INT_MAX / BDRV_SECTOR_SIZE;

        }

        ret = bdrv_get_block_status(bs, sector_num, nb_sectors, &n);

        if (ret < 0) {

            error_report("error getting block status at sector %" PRId64 ": %s",
@@ -3167,7 +3164,7 @@ static int coroutine_fn bdrv_co_do_readv(BlockDriverState *bs, 
    int64_t sector_num, int nb_sectors, QEMUIOVector *qiov,

    BdrvRequestFlags flags)

{

    if (nb_sectors < 0 || nb_sectors > (UINT_MAX >> BDRV_SECTOR_BITS)) {

    if (nb_sectors < 0 || nb_sectors > BDRV_REQUEST_MAX_SECTORS) {

        return -EINVAL;

    }
@@ -3192,10 +3189,7 @@ int coroutine_fn bdrv_co_copy_on_readv(BlockDriverState *bs, 
                            BDRV_REQ_COPY_ON_READ);

}



/* if no limit is specified in the BlockLimits use a default

 * of 32768 512-byte sectors (16 MiB) per request.

 */

#define MAX_WRITE_ZEROES_DEFAULT 32768

#define MAX_WRITE_ZEROES_BOUNCE_BUFFER 32768



static int coroutine_fn bdrv_co_do_write_zeroes(BlockDriverState *bs,

    int64_t sector_num, int nb_sectors, BdrvRequestFlags flags)
@@ -3205,8 +3199,8 @@ static int coroutine_fn bdrv_co_do_write_zeroes(BlockDriverState *bs, 
    struct iovec iov = {0};

    int ret = 0;



    int max_write_zeroes = bs->bl.max_write_zeroes ?

                           bs->bl.max_write_zeroes : MAX_WRITE_ZEROES_DEFAULT;

    int max_write_zeroes = MIN_NON_ZERO(bs->bl.max_write_zeroes,

                                        BDRV_REQUEST_MAX_SECTORS);



    while (nb_sectors > 0 && !ret) {

        int num = nb_sectors;
@@ -3242,7 +3236,7 @@ static int coroutine_fn bdrv_co_do_write_zeroes(BlockDriverState *bs, 
        if (ret == -ENOTSUP) {

            /* Fall back to bounce buffer if write zeroes is unsupported */

            int max_xfer_len = MIN_NON_ZERO(bs->bl.max_transfer_length,

                                            MAX_WRITE_ZEROES_DEFAULT);

                                            MAX_WRITE_ZEROES_BOUNCE_BUFFER);

            num = MIN(num, max_xfer_len);

            iov.iov_len = num * BDRV_SECTOR_SIZE;

            if (iov.iov_base == NULL) {
@@ -3461,7 +3455,7 @@ static int coroutine_fn bdrv_co_do_writev(BlockDriverState *bs, 
    int64_t sector_num, int nb_sectors, QEMUIOVector *qiov,

    BdrvRequestFlags flags)

{

    if (nb_sectors < 0 || nb_sectors > (INT_MAX >> BDRV_SECTOR_BITS)) {

    if (nb_sectors < 0 || nb_sectors > BDRV_REQUEST_MAX_SECTORS) {

        return -EINVAL;

    }
@@ -3719,6 +3713,36 @@ int bdrv_set_key(BlockDriverState *bs, const char *key) 
    return ret;

}



/*

 * Provide an encryption key for @bs.

 * If @key is non-null:

 *     If @bs is not encrypted, fail.

 *     Else if the key is invalid, fail.

 *     Else set @bs's key to @key, replacing the existing key, if any.

 * If @key is null:

 *     If @bs is encrypted and still lacks a key, fail.

 *     Else do nothing.

 * On failure, store an error object through @errp if non-null.

 */

void bdrv_add_key(BlockDriverState *bs, const char *key, Error **errp)

{

    if (key) {

        if (!bdrv_is_encrypted(bs)) {

            error_setg(errp, "Device '%s' is not encrypted",

                      bdrv_get_device_name(bs));

        } else if (bdrv_set_key(bs, key) < 0) {

            error_set(errp, QERR_INVALID_PASSWORD);

        }

    } else {

        if (bdrv_key_required(bs)) {

            error_set(errp, ERROR_CLASS_DEVICE_ENCRYPTED,

                      "'%s' (%s) is encrypted",

                      bdrv_get_device_name(bs),

                      bdrv_get_encrypted_filename(bs));

        }

    }

}



const char *bdrv_get_format_name(BlockDriverState *bs)

{

    return bs->drv ? bs->drv->format_name : NULL;
@@ -4562,6 +4586,8 @@ static int multiwrite_merge(BlockDriverState *bs, BlockRequest *reqs, 
        }

    }



    block_acct_merge_done(&bs->stats, BLOCK_ACCT_WRITE, num_reqs - outidx - 1);



    return outidx + 1;

}
@@ -5097,11 +5123,6 @@ static void coroutine_fn bdrv_discard_co_entry(void *opaque) 
    rwco->ret = bdrv_co_discard(rwco->bs, rwco->sector_num, rwco->nb_sectors);

}



/* if no limit is specified in the BlockLimits use a default

 * of 32768 512-byte sectors (16 MiB) per request.

 */

#define MAX_DISCARD_DEFAULT 32768



int coroutine_fn bdrv_co_discard(BlockDriverState *bs, int64_t sector_num,

                                 int nb_sectors)

{
@@ -5126,7 +5147,7 @@ int coroutine_fn bdrv_co_discard(BlockDriverState *bs, int64_t sector_num, 
        return 0;

    }



    max_discard = bs->bl.max_discard ?  bs->bl.max_discard : MAX_DISCARD_DEFAULT;

    max_discard = MIN_NON_ZERO(bs->bl.max_discard, BDRV_REQUEST_MAX_SECTORS);

    while (nb_sectors > 0) {

        int ret;

        int num = nb_sectors;

block/Makefile.objs

+2 −0
Original line number Diff line number Diff line
@@ -20,6 +20,7 @@ block-obj-$(CONFIG_GLUSTERFS) += gluster.o 
block-obj-$(CONFIG_ARCHIPELAGO) += archipelago.o

block-obj-$(CONFIG_LIBSSH2) += ssh.o

block-obj-y += accounting.o

block-obj-y += write-threshold.o



common-obj-y += stream.o

common-obj-y += commit.o
@@ -36,5 +37,6 @@ gluster.o-libs := $(GLUSTERFS_LIBS) 
ssh.o-cflags       := $(LIBSSH2_CFLAGS)

ssh.o-libs         := $(LIBSSH2_LIBS)

archipelago.o-libs := $(ARCHIPELAGO_LIBS)

dmg.o-libs         := $(BZIP2_LIBS)

qcow.o-libs        := -lz

linux-aio.o-libs   := -laio

block/accounting.c

+7 −0
Original line number Diff line number Diff line
@@ -54,3 +54,10 @@ void block_acct_highest_sector(BlockAcctStats *stats, int64_t sector_num, 
        stats->wr_highest_sector = sector_num + nb_sectors - 1;

    }

}



void block_acct_merge_done(BlockAcctStats *stats, enum BlockAcctType type,

                      int num_requests)

{

    assert(type < BLOCK_MAX_IOTYPE);

    stats->merged[type] += num_requests;

}

block/block-backend.c

+5 −0
Original line number Diff line number Diff line
@@ -580,6 +580,11 @@ int blk_get_flags(BlockBackend *blk) 
    return bdrv_get_flags(blk->bs);

}



int blk_get_max_transfer_length(BlockBackend *blk)

{

    return blk->bs->bl.max_transfer_length;

}



void blk_set_guest_block_size(BlockBackend *blk, int align)

{

    bdrv_set_guest_block_size(blk->bs, align);

block/dmg.c

+385 −117

File changed.

Preview size limit exceeded, changes collapsed.