Commit 72e775c7 authored by Kevin Wolf's avatar Kevin Wolf
Browse files

block: Always set writeback mode in blk_new_open() 



All callers of blk_new_open() either don't rely on the WCE bit set after
blk_new_open() because they explicitly set it anyway, or they pass
BDRV_O_CACHE_WB unconditionally.

This patch changes blk_new_open() so that it always enables writeback
mode and asserts that BDRV_O_CACHE_WB is clear. For those callers that
used to pass BDRV_O_CACHE_WB unconditionally, the flag is removed now.

Signed-off-by: default avatarKevin Wolf <kwolf@redhat.com>
Reviewed-by: default avatarMax Reitz <mreitz@redhat.com>
parent e4b24b49

block/block-backend.c

+4 −0
Original line number Diff line number Diff line
@@ -148,6 +148,8 @@ BlockBackend *blk_new_open(const char *filename, const char *reference, 
    BlockBackend *blk;

    int ret;



    assert((flags & BDRV_O_CACHE_WB) == 0);



    blk = blk_new_with_bs(errp);

    if (!blk) {

        QDECREF(options);
@@ -160,6 +162,8 @@ BlockBackend *blk_new_open(const char *filename, const char *reference, 
        return NULL;

    }



    blk_set_enable_write_cache(blk, true);



    return blk;

}

block/crypto.c

+1 −2
Original line number Diff line number Diff line
@@ -121,8 +121,7 @@ static ssize_t block_crypto_init_func(QCryptoBlock *block, 
    }



    data->blk = blk_new_open(data->filename, NULL, NULL,

                             BDRV_O_RDWR | BDRV_O_CACHE_WB | BDRV_O_PROTOCOL,

                             errp);

                             BDRV_O_RDWR | BDRV_O_PROTOCOL, errp);

    if (!data->blk) {

        return -1;

    }

block/parallels.c

+1 −2
Original line number Diff line number Diff line
@@ -480,8 +480,7 @@ static int parallels_create(const char *filename, QemuOpts *opts, Error **errp) 
    }



    file = blk_new_open(filename, NULL, NULL,

                        BDRV_O_RDWR | BDRV_O_CACHE_WB | BDRV_O_PROTOCOL,

                        &local_err);

                        BDRV_O_RDWR | BDRV_O_PROTOCOL, &local_err);

    if (file == NULL) {

        error_propagate(errp, local_err);

        return -EIO;

block/qcow.c

+1 −2
Original line number Diff line number Diff line
@@ -804,8 +804,7 @@ static int qcow_create(const char *filename, QemuOpts *opts, Error **errp) 
    }



    qcow_blk = blk_new_open(filename, NULL, NULL,

                            BDRV_O_RDWR | BDRV_O_CACHE_WB | BDRV_O_PROTOCOL,

                            &local_err);

                            BDRV_O_RDWR | BDRV_O_PROTOCOL, &local_err);

    if (qcow_blk == NULL) {

        error_propagate(errp, local_err);

        ret = -EIO;

block/qcow2.c

+3 −6
Original line number Diff line number Diff line
@@ -2168,8 +2168,7 @@ static int qcow2_create2(const char *filename, int64_t total_size, 
    }



    blk = blk_new_open(filename, NULL, NULL,

                       BDRV_O_RDWR | BDRV_O_CACHE_WB | BDRV_O_PROTOCOL,

                       &local_err);

                       BDRV_O_RDWR | BDRV_O_PROTOCOL, &local_err);

    if (blk == NULL) {

        error_propagate(errp, local_err);

        return -EIO;
@@ -2233,8 +2232,7 @@ static int qcow2_create2(const char *filename, int64_t total_size, 
    options = qdict_new();

    qdict_put(options, "driver", qstring_from_str("qcow2"));

    blk = blk_new_open(filename, NULL, options,

                       BDRV_O_RDWR | BDRV_O_CACHE_WB | BDRV_O_NO_FLUSH,

                       &local_err);

                       BDRV_O_RDWR | BDRV_O_NO_FLUSH, &local_err);

    if (blk == NULL) {

        error_propagate(errp, local_err);

        ret = -EIO;
@@ -2295,8 +2293,7 @@ static int qcow2_create2(const char *filename, int64_t total_size, 
    options = qdict_new();

    qdict_put(options, "driver", qstring_from_str("qcow2"));

    blk = blk_new_open(filename, NULL, options,

                       BDRV_O_RDWR | BDRV_O_CACHE_WB | BDRV_O_NO_BACKING,

                       &local_err);

                       BDRV_O_RDWR | BDRV_O_NO_BACKING, &local_err);

    if (blk == NULL) {

        error_propagate(errp, local_err);

        ret = -EIO;