Commit 319bd5ed authored by Vladimir Sementsov-Ogievskiy's avatar Vladimir Sementsov-Ogievskiy Committed by John Snow
Browse files

block/backup: deal with zero detection 



We have detect_zeroes option, so at least for blockdev-backup user
should define it if zero-detection is needed. For drive-backup leave
detection enabled by default but do it through existing option instead
of open-coding.

Signed-off-by: default avatarVladimir Sementsov-Ogievskiy <vsementsov@virtuozzo.com>
Reviewed-by: default avatarJohn Snow <jsnow@redhat.com>
Reviewed-by: default avatarMax Reitz <mreitz@redhat.com>
Message-id: 20190730163251.755248-2-vsementsov@virtuozzo.com
Signed-off-by: default avatarJohn Snow <jsnow@redhat.com>
parent 590a63d5

block/backup.c

+6 −9
Original line number Diff line number Diff line
@@ -113,7 +113,10 @@ static int coroutine_fn backup_cow_with_bounce_buffer(BackupBlockJob *job, 
    BlockBackend *blk = job->common.blk;

    int nbytes;

    int read_flags = is_write_notifier ? BDRV_REQ_NO_SERIALISING : 0;

    int write_flags = job->serialize_target_writes ? BDRV_REQ_SERIALISING : 0;

    int write_flags =

            (job->serialize_target_writes ? BDRV_REQ_SERIALISING : 0) |

            (job->compress ? BDRV_REQ_WRITE_COMPRESSED : 0);





    assert(QEMU_IS_ALIGNED(start, job->cluster_size));

    bdrv_reset_dirty_bitmap(job->copy_bitmap, start, job->cluster_size);
@@ -131,14 +134,8 @@ static int coroutine_fn backup_cow_with_bounce_buffer(BackupBlockJob *job, 
        goto fail;

    }



    if (buffer_is_zero(*bounce_buffer, nbytes)) {

        ret = blk_co_pwrite_zeroes(job->target, start,

                                   nbytes, write_flags | BDRV_REQ_MAY_UNMAP);

    } else {

        ret = blk_co_pwrite(job->target, start,

                            nbytes, *bounce_buffer, write_flags |

                            (job->compress ? BDRV_REQ_WRITE_COMPRESSED : 0));

    }

    ret = blk_co_pwrite(job->target, start, nbytes, *bounce_buffer,

                        write_flags);

    if (ret < 0) {

        trace_backup_do_cow_write_fail(job, start, ret);

        if (error_is_read) {

blockdev.c

+4 −4
Original line number Diff line number Diff line
@@ -3615,7 +3615,7 @@ static BlockJob *do_drive_backup(DriveBackup *backup, JobTxn *txn, 
    BlockDriverState *source = NULL;

    BlockJob *job = NULL;

    AioContext *aio_context;

    QDict *options = NULL;

    QDict *options;

    Error *local_err = NULL;

    int flags;

    int64_t size;
@@ -3688,10 +3688,10 @@ static BlockJob *do_drive_backup(DriveBackup *backup, JobTxn *txn, 
        goto out;

    }



    if (backup->format) {

        if (!options) {

    options = qdict_new();

        }

    qdict_put_str(options, "discard", "unmap");

    qdict_put_str(options, "detect-zeroes", "unmap");

    if (backup->format) {

        qdict_put_str(options, "driver", backup->format);

    }