Commit ab7fe3a2 authored by Kevin Wolf's avatar Kevin Wolf
Browse files

Merge remote-tracking branch 'mreitz/tags/pull-block-for-kevin-2015-12-02' into queue-block 



One block patch for qemu 2.5-rc3.

# gpg: Signature made Wed Dec  2 16:29:17 2015 CET using RSA key ID E838ACAD
# gpg: Good signature from "Max Reitz <mreitz@redhat.com>"

* mreitz/tags/pull-block-for-kevin-2015-12-02:
  blkdebug: silence warning under qtest

Signed-off-by: default avatarKevin Wolf <kwolf@redhat.com>
parents c2551b47 20873526

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);