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

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



Block layer patches

# gpg: Signature made Wed 02 Dec 2015 15:57:35 GMT using RSA key ID C88F2FD6
# gpg: Good signature from "Kevin Wolf <kwolf@redhat.com>"

* remotes/kevin/tags/for-upstream:
  blkdebug: silence warning under qtest
  qcow2: Fix potential qemu-img check crash on 32 bit hosts

Signed-off-by: default avatarPeter Maydell <peter.maydell@linaro.org>
parents 2196b6f5 ab7fe3a2

block/blkdebug.c

+7 −2
Original line number Diff line number Diff line
@@ -30,6 +30,7 @@ 
#include "qapi/qmp/qdict.h"

#include "qapi/qmp/qint.h"

#include "qapi/qmp/qstring.h"

#include "sysemu/qtest.h"



typedef struct BDRVBlkdebugState {

    int state;
@@ -583,9 +584,13 @@ static void suspend_request(BlockDriverState *bs, BlkdebugRule *rule) 
    remove_rule(rule);

    QLIST_INSERT_HEAD(&s->suspended_reqs, &r, next);



    if (!qtest_enabled()) {

        printf("blkdebug: Suspended request '%s'\n", r.tag);

    }

    qemu_coroutine_yield();

    if (!qtest_enabled()) {

        printf("blkdebug: Resuming request '%s'\n", r.tag);

    }



    QLIST_REMOVE(&r, next);

    g_free(r.tag);

block/qcow2-refcount.c

+1 −1
Original line number Diff line number Diff line
@@ -1244,7 +1244,7 @@ fail: 
/* refcount checking functions */





static size_t refcount_array_byte_size(BDRVQcow2State *s, uint64_t entries)

static uint64_t refcount_array_byte_size(BDRVQcow2State *s, uint64_t entries)

{

    /* This assertion holds because there is no way we can address more than

     * 2^(64 - 9) clusters at once (with cluster size 512 = 2^9, and because