The following changes since commit 5ec2eca83dc478ddf24077e02a8b34dd26cd3ff9:

Merge remote-tracking branch 'remotes/awilliam/tags/vfio-updates-20190613.0' into staging (2019-06-14 09:33:55 +0100)

https://github.com/XanClic/qemu.git tags/pull-block-2019-06-14

for you to fetch changes up to 21c1ce592a144188dfe59b9e156a97da412a59a2:

iotests: Test qemu-img convert -C --salvage (2019-06-14 15:09:42 +0200)

- Allow blockdev-backup from nodes that are not in qemu's main AIO

context to newly added nodes

- Add salvaging mode to qemu-img convert

- Minor fixes to tests, documentation, and for less Valgrind annoyance

Andrey Shinkevich (1):

hw/block/fdc: floppy command FIFO memory initialization

John Snow (6):

blockdev-backup: don't check aio_context too early

iotests.py: do not use infinite waits

QEMUMachine: add events_wait method

iotests.py: rewrite run_job to be pickier

iotests: add iotest 256 for testing blockdev-backup across iothread

contexts

event_match: always match on None value

Max Reitz (12):

iotests: Filter 175's allocation information

iotests: Fix intermittent failure in 219

qemu-img: Fix options leakage in img_rebase()

qapi/block-core: Overlays are not snapshots

blockdev: Overlays are not snapshots

qemu-img: Move quiet into ImgConvertState

qemu-img: Add salvaging mode to convert

blkdebug: Add @iotype error option

blkdebug: Add "none" event

blkdebug: Inject errors on .bdrv_co_block_status()

iotests: Test qemu-img convert --salvage

iotests: Test qemu-img convert -C --salvage

iotests: restrict 254 to support only qcow2

qapi/block-core.json | 53 ++++++++---

block/blkdebug.c | 60 ++++++++++--

blockdev.c | 14 +--

hw/block/fdc.c | 1 +

qemu-img.c | 106 +++++++++++++++------

python/qemu/__init__.py | 67 ++++++++++----

qemu-img-cmds.hx | 4 +-

qemu-img.texi | 4 +

tests/qemu-iotests/082 | 1 +

tests/qemu-iotests/082.out | 3 +

tests/qemu-iotests/085.out | 10 +-

tests/qemu-iotests/175 | 26 +++++-

tests/qemu-iotests/175.out | 8 +-

tests/qemu-iotests/219 | 13 ++-

tests/qemu-iotests/251 | 170 ++++++++++++++++++++++++++++++++++

tests/qemu-iotests/251.out | 43 +++++++++

tests/qemu-iotests/254 | 2 +

tests/qemu-iotests/256 | 122 ++++++++++++++++++++++++

tests/qemu-iotests/256.out | 119 ++++++++++++++++++++++++

tests/qemu-iotests/group | 2 +

tests/qemu-iotests/iotests.py | 60 +++++++-----

21 files changed, 772 insertions(+), 116 deletions(-)

create mode 100755 tests/qemu-iotests/251

create mode 100644 tests/qemu-iotests/251.out

create mode 100755 tests/qemu-iotests/256

create mode 100644 tests/qemu-iotests/256.out

2.21.0

This adds a salvaging mode (--salvage) to qemu-img convert which ignores

read errors and treats the respective areas as containing only zeroes.

This can be used for instance to at least partially recover the data

from terminally corrupted qcow2 images.

qemu-img.c | 90 +++++++++++++++++++++++++++++++++++++-----------

qemu-img-cmds.hx | 4 +--

qemu-img.texi | 4 +++

3 files changed, 75 insertions(+), 23 deletions(-)

diff --git a/qemu-img.c b/qemu-img.c

--- a/qemu-img.c

+++ b/qemu-img.c

typedef enum OutputFormat {

@@ -XXX,XX +XXX,XX @@ typedef struct ImgConvertState {

int64_t target_backing_sectors; /* negative if unknown */

bool wr_in_order;

bool copy_range;

+ bool salvage;

bool quiet;

int min_sparse;

int alignment;

@@ -XXX,XX +XXX,XX @@ static int convert_iteration_sectors(ImgConvertState *s, int64_t sector_num)

}

if (s->sector_next_status <= sector_num) {

- int64_t count = n * BDRV_SECTOR_SIZE;

+ uint64_t offset = (sector_num - src_cur_offset) * BDRV_SECTOR_SIZE;

+ int64_t count;

- if (s->target_has_backing) {

+ do {

+ count = n * BDRV_SECTOR_SIZE;

+

+ if (s->target_has_backing) {

+ ret = bdrv_block_status(blk_bs(s->src[src_cur]), offset,

+ count, &count, NULL, NULL);

+ } else {

+ ret = bdrv_block_status_above(blk_bs(s->src[src_cur]), NULL,

+ offset, count, &count, NULL,

+ NULL);

+ }

+

+ if (ret < 0) {

+ if (s->salvage) {

+ if (n == 1) {

+ if (!s->quiet) {

+ warn_report("error while reading block status at "

+ "offset %" PRIu64 ": %s", offset,

+ strerror(-ret));

+ }

+ /* Just try to read the data, then */

+ ret = BDRV_BLOCK_DATA;

+ count = BDRV_SECTOR_SIZE;

+ } else {

+ /* Retry on a shorter range */

+ n = DIV_ROUND_UP(n, 4);

+ }

+ } else {

+ error_report("error while reading block status at offset "

+ "%" PRIu64 ": %s", offset, strerror(-ret));

+ return ret;

+ }

+ }

+ } while (ret < 0);

- ret = bdrv_block_status(blk_bs(s->src[src_cur]),

- (sector_num - src_cur_offset) *

- BDRV_SECTOR_SIZE,

- count, &count, NULL, NULL);

- } else {

- ret = bdrv_block_status_above(blk_bs(s->src[src_cur]), NULL,

- (sector_num - src_cur_offset) *

- BDRV_SECTOR_SIZE,

- count, &count, NULL, NULL);

- }

- if (ret < 0) {

- error_report("error while reading block status of sector %" PRId64

- ": %s", sector_num, strerror(-ret));

- return ret;

- }

n = DIV_ROUND_UP(count, BDRV_SECTOR_SIZE);

if (ret & BDRV_BLOCK_ZERO) {

@@ -XXX,XX +XXX,XX @@ static int convert_iteration_sectors(ImgConvertState *s, int64_t sector_num)

static int coroutine_fn convert_co_read(ImgConvertState *s, int64_t sector_num,

int nb_sectors, uint8_t *buf)

{

+ uint64_t single_read_until = 0;

int n, ret;

assert(nb_sectors <= s->buf_sectors);

@@ -XXX,XX +XXX,XX @@ static int coroutine_fn convert_co_read(ImgConvertState *s, int64_t sector_num,

BlockBackend *blk;

int src_cur;

int64_t bs_sectors, src_cur_offset;

+ uint64_t offset;

/* In the case of compression with multiple source files, we can get a

* nb_sectors that spreads into the next part. So we must be able to

@@ -XXX,XX +XXX,XX @@ static int coroutine_fn convert_co_read(ImgConvertState *s, int64_t sector_num,

blk = s->src[src_cur];

bs_sectors = s->src_sectors[src_cur];

+ offset = (sector_num - src_cur_offset) << BDRV_SECTOR_BITS;

+

n = MIN(nb_sectors, bs_sectors - (sector_num - src_cur_offset));

+ if (single_read_until > offset) {

+ n = 1;

+ }

- ret = blk_co_pread(

- blk, (sector_num - src_cur_offset) << BDRV_SECTOR_BITS,

- n << BDRV_SECTOR_BITS, buf, 0);

+ ret = blk_co_pread(blk, offset, n << BDRV_SECTOR_BITS, buf, 0);

if (ret < 0) {

- return ret;

+ if (s->salvage) {

+ if (n > 1) {

+ single_read_until = offset + (n << BDRV_SECTOR_BITS);

+ continue;

+ } else {

+ if (!s->quiet) {

+ warn_report("error while reading offset %" PRIu64

+ ": %s", offset, strerror(-ret));

+ }

+ memset(buf, 0, BDRV_SECTOR_SIZE);

+ }

+ } else {

+ return ret;

+ }

}

sector_num += n;

@@ -XXX,XX +XXX,XX @@ static int img_convert(int argc, char **argv)

{"image-opts", no_argument, 0, OPTION_IMAGE_OPTS},

{"force-share", no_argument, 0, 'U'},

{"target-image-opts", no_argument, 0, OPTION_TARGET_IMAGE_OPTS},

+ {"salvage", no_argument, 0, OPTION_SALVAGE},

{0, 0, 0, 0}

};

c = getopt_long(argc, argv, ":hf:O:B:Cco:l:S:pt:T:qnm:WU",

@@ -XXX,XX +XXX,XX @@ static int img_convert(int argc, char **argv)

case OPTION_IMAGE_OPTS:

image_opts = true;

break;

+ case OPTION_SALVAGE:

+ s.salvage = true;

+ break;

case OPTION_TARGET_IMAGE_OPTS:

tgt_image_opts = true;

break;

@@ -XXX,XX +XXX,XX @@ static int img_convert(int argc, char **argv)

goto fail_getopt;

}

+ if (s.copy_range && s.salvage) {

+ error_report("Cannot use copy offloading in salvaging mode");

+ goto fail_getopt;

+ }

+

if (tgt_image_opts && !skip_create) {

error_report("--target-image-opts requires use of -n flag");

goto fail_getopt;

diff --git a/qemu-img-cmds.hx b/qemu-img-cmds.hx

index XXXXXXX..XXXXXXX 100644

--- a/qemu-img-cmds.hx

+++ b/qemu-img-cmds.hx

@@ -XXX,XX +XXX,XX @@ STEXI

ETEXI

DEF("convert", img_convert,

- "convert [--object objectdef] [--image-opts] [--target-image-opts] [-U] [-C] [-c] [-p] [-q] [-n] [-f fmt] [-t cache] [-T src_cache] [-O output_fmt] [-B backing_file] [-o options] [-l snapshot_param] [-S sparse_size] [-m num_coroutines] [-W] filename [filename2 [...]] output_filename")

+ "convert [--object objectdef] [--image-opts] [--target-image-opts] [-U] [-C] [-c] [-p] [-q] [-n] [-f fmt] [-t cache] [-T src_cache] [-O output_fmt] [-B backing_file] [-o options] [-l snapshot_param] [-S sparse_size] [-m num_coroutines] [-W] [--salvage] filename [filename2 [...]] output_filename")

STEXI

-@item convert [--object @var{objectdef}] [--image-opts] [--target-image-opts] [-U] [-C] [-c] [-p] [-q] [-n] [-f @var{fmt}] [-t @var{cache}] [-T @var{src_cache}] [-O @var{output_fmt}] [-B @var{backing_file}] [-o @var{options}] [-l @var{snapshot_param}] [-S @var{sparse_size}] [-m @var{num_coroutines}] [-W] @var{filename} [@var{filename2} [...]] @var{output_filename}

+@item convert [--object @var{objectdef}] [--image-opts] [--target-image-opts] [-U] [-C] [-c] [-p] [-q] [-n] [-f @var{fmt}] [-t @var{cache}] [-T @var{src_cache}] [-O @var{output_fmt}] [-B @var{backing_file}] [-o @var{options}] [-l @var{snapshot_param}] [-S @var{sparse_size}] [-m @var{num_coroutines}] [-W] [--salvage] @var{filename} [@var{filename2} [...]] @var{output_filename}

ETEXI

DEF("create", img_create,

diff --git a/qemu-img.texi b/qemu-img.texi

index XXXXXXX..XXXXXXX 100644

--- a/qemu-img.texi

+++ b/qemu-img.texi

@@ -XXX,XX +XXX,XX @@ improve performance if the data is remote, such as with NFS or iSCSI backends,

but will not automatically sparsify zero sectors, and may result in a fully

allocated target image depending on the host support for getting allocation

information.

+@item --salvage

+Try to ignore I/O errors when reading. Unless in quiet mode (@code{-q}), errors

+will still be printed. Areas that cannot be read from the source will be

+treated as containing only zeroes.

@end table

Parameters to dd subcommand:

2.21.0

Move img_convert()'s quiet flag into the ImgConvertState so it is

accessible by nested functions. -q dictates that it suppresses anything

but errors, so if those functions want to emit warnings, they need to

query this flag first. (There currently are no such warnings, but there

will be as of the next patch.)

Reviewed-by: Eric Blake <eblake@redhat.com>

qemu-img.c | 13 +++++++------

1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/qemu-img.c b/qemu-img.c

--- a/qemu-img.c

+++ b/qemu-img.c

@@ -XXX,XX +XXX,XX @@ typedef struct ImgConvertState {

int64_t target_backing_sectors; /* negative if unknown */

bool wr_in_order;

bool copy_range;

+ bool quiet;

int min_sparse;

int alignment;

size_t cluster_sectors;

@@ -XXX,XX +XXX,XX @@ static int img_convert(int argc, char **argv)

QDict *open_opts = NULL;

char *options = NULL;

Error *local_err = NULL;

- bool writethrough, src_writethrough, quiet = false, image_opts = false,

+ bool writethrough, src_writethrough, image_opts = false,

skip_create = false, progress = false, tgt_image_opts = false;

int64_t ret = -EINVAL;

bool force_share = false;

@@ -XXX,XX +XXX,XX @@ static int img_convert(int argc, char **argv)

src_cache = optarg;

break;

case 'q':

- quiet = true;

+ s.quiet = true;

break;

case 'n':

skip_create = true;

@@ -XXX,XX +XXX,XX @@ static int img_convert(int argc, char **argv)

2.21.0

Together with @iotypes and @sector, this can be used to trap e.g. the

first read or write access to a certain sector without having to know

what happens internally in the block layer, i.e. which "real" events

happen right before such an access.

qapi/block-core.json | 4 +++-

block/blkdebug.c | 2 ++

2 files changed, 5 insertions(+), 1 deletion(-)

# @cluster_alloc_space: an allocation of file space for a cluster (since 4.1)

+# @none: triggers once at creation of the blkdebug node (since 4.1)

{ 'enum': 'BlkdebugEvent', 'prefix': 'BLKDBG',

'pwritev_rmw_tail', 'pwritev_rmw_after_tail', 'pwritev',

'pwritev_zero', 'pwritev_done', 'empty_image_prepare',

'l1_shrink_write_table', 'l1_shrink_free_l2_clusters',

- 'cor_write', 'cluster_alloc_space'] }

+ 'cor_write', 'cluster_alloc_space', 'none'] }

# @BlkdebugIOType:

diff --git a/block/blkdebug.c b/block/blkdebug.c

index XXXXXXX..XXXXXXX 100644

--- a/block/blkdebug.c

+++ b/block/blkdebug.c

@@ -XXX,XX +XXX,XX @@ static int blkdebug_open(BlockDriverState *bs, QDict *options, int flags,

goto out;

}

+ bdrv_debug_event(bs, BLKDBG_NONE);

+

ret = 0;

out:

if (ret < 0) {

2.21.0

From: John Snow <jsnow@redhat.com>

Cap waits to 60 seconds so that iotests can fail gracefully if something

goes wrong.

Signed-off-by: John Snow <jsnow@redhat.com>

Message-id: 20190523170643.20794-3-jsnow@redhat.com

Reviewed-by: Max Reitz <mreitz@redhat.com>

tests/qemu-iotests/iotests.py | 14 +++++++-------

1 file changed, 7 insertions(+), 7 deletions(-)

- def wait_until_completed(self, drive='drive0', check_offset=True):

+ def wait_until_completed(self, drive='drive0', check_offset=True, wait=60.0):

- for event in self.vm.get_qmp_events(wait=True):

+ for event in self.vm.get_qmp_events(wait=wait):

self.assert_qmp_absent(event, 'data/error')

2.21.0

Test fails at least for qcow, because of different cluster sizes in

base and top (and therefore different granularities of bitmaps we are

trying to merge).

The test aim is to check block-dirty-bitmap-merge between different

nodes functionality, no needs to check all formats. So, let's just drop

support for anything except qcow2.

Message-id: 20190605155405.104384-1-vsementsov@virtuozzo.com

tests/qemu-iotests/254 | 2 ++

1 file changed, 2 insertions(+)

diff --git a/tests/qemu-iotests/254 b/tests/qemu-iotests/254

index XXXXXXX..XXXXXXX 100755

--- a/tests/qemu-iotests/254

+++ b/tests/qemu-iotests/254

@@ -XXX,XX +XXX,XX @@

import iotests

from iotests import qemu_img_create, file_path, log

+iotests.verify_image_format(supported_fmts=['qcow2'])

disk, top = file_path('disk', 'top')

size = 1024 * 1024

2.21.0