Commit 9db6ffc7 authored by Peter Maydell's avatar Peter Maydell
Browse files

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



Block layer patches for 2.10.0-rc3

# gpg: Signature made Fri 11 Aug 2017 15:02:58 BST
# gpg:                using RSA key 0x7F09B272C88F2FD6
# gpg: Good signature from "Kevin Wolf <kwolf@redhat.com>"
# Primary key fingerprint: DC3D EB15 9A9A F95D 3D74  56FE 7F09 B272 C88F 2FD6

* remotes/kevin/tags/for-upstream:
  qemu-iotests: fix 185
  file-posix: Do runtime check for ofd lock API
  osdep: Add runtime OFD lock detection
  qcow2: Check failure of bdrv_getlength()
  qcow2: Drop debugging dump_refcounts()
  vpc: Check failure of bdrv_getlength()
  tests/multiboot: Fix whitespace failure

Signed-off-by: default avatarPeter Maydell <peter.maydell@linaro.org>
parents 95766c2c 8565c3ab

block/file-posix.c

+8 −11
Original line number Diff line number Diff line
@@ -457,22 +457,19 @@ static int raw_open_common(BlockDriverState *bs, QDict *options, 
    switch (locking) {

    case ON_OFF_AUTO_ON:

        s->use_lock = true;

#ifndef F_OFD_SETLK

        if (!qemu_has_ofd_lock()) {

            fprintf(stderr,

                "File lock requested but OFD locking syscall is unavailable, "

                "falling back to POSIX file locks.\n"

                "Due to the implementation, locks can be lost unexpectedly.\n");

#endif

                    "File lock requested but OFD locking syscall is "

                    "unavailable, falling back to POSIX file locks.\n"

                    "Due to the implementation, locks can be lost "

                    "unexpectedly.\n");

        }

        break;

    case ON_OFF_AUTO_OFF:

        s->use_lock = false;

        break;

    case ON_OFF_AUTO_AUTO:

#ifdef F_OFD_SETLK

        s->use_lock = true;

#else

        s->use_lock = false;

#endif

        s->use_lock = qemu_has_ofd_lock();

        break;

    default:

        abort();

block/qcow2.c

+4 −22
Original line number Diff line number Diff line
@@ -3282,12 +3282,15 @@ qcow2_co_pwritev_compressed(BlockDriverState *bs, uint64_t offset, 
    z_stream strm;

    int ret, out_len;

    uint8_t *buf, *out_buf;

    uint64_t cluster_offset;

    int64_t cluster_offset;



    if (bytes == 0) {

        /* align end of file to a sector boundary to ease reading with

           sector based I/Os */

        cluster_offset = bdrv_getlength(bs->file->bs);

        if (cluster_offset < 0) {

            return cluster_offset;

        }

        return bdrv_truncate(bs->file, cluster_offset, PREALLOC_MODE_OFF, NULL);

    }
@@ -3798,27 +3801,6 @@ static ImageInfoSpecific *qcow2_get_specific_info(BlockDriverState *bs) 
    return spec_info;

}



#if 0

static void dump_refcounts(BlockDriverState *bs)

{

    BDRVQcow2State *s = bs->opaque;

    int64_t nb_clusters, k, k1, size;

    int refcount;



    size = bdrv_getlength(bs->file->bs);

    nb_clusters = size_to_clusters(s, size);

    for(k = 0; k < nb_clusters;) {

        k1 = k;

        refcount = get_refcount(bs, k);

        k++;

        while (k < nb_clusters && get_refcount(bs, k) == refcount)

            k++;

        printf("%" PRId64 ": refcount=%d nb=%" PRId64 "\n", k, refcount,

               k - k1);

    }

}

#endif



static int qcow2_save_vmstate(BlockDriverState *bs, QEMUIOVector *qiov,

                              int64_t pos)

{

block/vpc.c

+8 −1
Original line number Diff line number Diff line
@@ -219,6 +219,7 @@ static int vpc_open(BlockDriverState *bs, QDict *options, int flags, 
    uint64_t pagetable_size;

    int disk_type = VHD_DYNAMIC;

    int ret;

    int64_t bs_size;



    bs->file = bdrv_open_child(NULL, options, "file", bs, &child_file,

                               false, errp);
@@ -411,7 +412,13 @@ static int vpc_open(BlockDriverState *bs, QDict *options, int flags, 
            }

        }



        if (s->free_data_block_offset > bdrv_getlength(bs->file->bs)) {

        bs_size = bdrv_getlength(bs->file->bs);

        if (bs_size < 0) {

            error_setg_errno(errp, -bs_size, "Unable to learn image size");

            ret = bs_size;

            goto fail;

        }

        if (s->free_data_block_offset > bs_size) {

            error_setg(errp, "block-vpc: free_data_block_offset points after "

                             "the end of file. The image has been truncated.");

            ret = -EINVAL;

include/qemu/osdep.h

+1 −0
Original line number Diff line number Diff line
@@ -357,6 +357,7 @@ int qemu_dup(int fd); 
int qemu_lock_fd(int fd, int64_t start, int64_t len, bool exclusive);

int qemu_unlock_fd(int fd, int64_t start, int64_t len);

int qemu_lock_fd_test(int fd, int64_t start, int64_t len, bool exclusive);

bool qemu_has_ofd_lock(void);



#if defined(__HAIKU__) && defined(__i386__)

#define FMT_pid "%ld"

tests/multiboot/run_test.sh

+1 −1
Original line number Diff line number Diff line
@@ -26,7 +26,7 @@ run_qemu() { 
    local kernel=$1

    shift



    printf %b "\n\n=== Running test case: $kernel $@ ===\n\n" >> test.log

    printf %b "\n\n=== Running test case: $kernel $* ===\n\n" >> test.log



    $QEMU \

        -kernel $kernel \