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)

are available in the Git repository at:

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)

Block patches:

- 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

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

Vladimir Sementsov-Ogievskiy (1):

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

A snapshot is something that reflects the state of something at a

certain point in time. It does not change.

The file our snapshot commands create (or the node they install) is not

a snapshot, as it does change over time. It is an overlay. We cannot

do anything about the parameter names, but we can at least adjust the

descriptions to reflect that fact.

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

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

Message-id: 20190603202236.1342-2-mreitz@redhat.com

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

Reviewed-by: Alberto Garcia <berto@igalia.com>

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

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

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

diff --git a/qapi/block-core.json b/qapi/block-core.json

index XXXXXXX..XXXXXXX 100644

--- a/qapi/block-core.json

+++ b/qapi/block-core.json

# Either @device or @node-name must be set but not both.

#

-# @device: the name of the device to generate the snapshot from.

+# @device: the name of the device to take a snapshot of.

#

# @node-name: graph node name to generate the snapshot from (Since 2.0)

#

-# @snapshot-file: the target of the new image. If the file exists, or

-# if it is a device, the snapshot will be created in the existing

-# file/device. Otherwise, a new file will be created.

+# @snapshot-file: the target of the new overlay image. If the file

+# exists, or if it is a device, the overlay will be created in the

+# existing file/device. Otherwise, a new file will be created.

#

# @snapshot-node-name: the graph node name of the new image (Since 2.0)

#

-# @format: the format of the snapshot image, default is 'qcow2'.

+# @format: the format of the overlay image, default is 'qcow2'.

#

# @mode: whether and how QEMU should create a new image, default is

# 'absolute-paths'.

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

##

# @BlockdevSnapshot:

#

-# @node: device or node name that will have a snapshot created.

+# @node: device or node name that will have a snapshot taken.

#

# @overlay: reference to the existing block device that will become

-# the overlay of @node, as part of creating the snapshot.

+# the overlay of @node, as part of taking the snapshot.

# It must not have a current backing file (this can be

# achieved by passing "backing": null to blockdev-add).

#

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

##

# @blockdev-snapshot-sync:

#

-# Generates a synchronous snapshot of a block device.

+# Takes a synchronous snapshot of a block device.

#

# For the arguments, see the documentation of BlockdevSnapshotSync.

#

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

##

# @blockdev-snapshot:

#

-# Generates a snapshot of a block device.

+# Takes a snapshot of a block device.

#

-# Create a snapshot, by installing 'node' as the backing image of

+# Take a snapshot, by installing 'node' as the backing image of

# 'overlay'. Additionally, if 'node' is associated with a block

# device, the block device changes to using 'overlay' as its new active

# image.

2.21.0

From: John Snow <jsnow@redhat.com>

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

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

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

[mreitz: Moved from 250 to 256]

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

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

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

tests/qemu-iotests/group | 1 +

3 files changed, 242 insertions(+)

create mode 100755 tests/qemu-iotests/256

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

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

new file mode 100755

index XXXXXXX..XXXXXXX

--- /dev/null

+++ b/tests/qemu-iotests/256

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

+#!/usr/bin/env python

+#

+# Test incremental/backup across iothread contexts

+#

+# Copyright (c) 2019 John Snow for Red Hat, Inc.

+#

+# This program is free software; you can redistribute it and/or modify

+# it under the terms of the GNU General Public License as published by

+# the Free Software Foundation; either version 2 of the License, or

+# (at your option) any later version.

+#

+# This program is distributed in the hope that it will be useful,

+# but WITHOUT ANY WARRANTY; without even the implied warranty of

+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the

+# GNU General Public License for more details.

+#

+# You should have received a copy of the GNU General Public License

+# along with this program. If not, see <http://www.gnu.org/licenses/>.

+#

+# owner=jsnow@redhat.com

+

+import os

+import iotests

+from iotests import log

+

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

+size = 64 * 1024 * 1024

+

+with iotests.FilePath('img0') as img0_path, \

+ iotests.FilePath('img1') as img1_path, \

+ iotests.FilePath('img0-full') as img0_full_path, \

+ iotests.FilePath('img1-full') as img1_full_path, \

+ iotests.FilePath('img0-incr') as img0_incr_path, \

+ iotests.FilePath('img1-incr') as img1_incr_path, \

+ iotests.VM() as vm:

+

+ def create_target(filepath, name, size):

+ basename = os.path.basename(filepath)

+ nodename = "file_{}".format(basename)

+ log(vm.command('blockdev-create', job_id='job1',

+ options={

+ 'driver': 'file',

+ 'filename': filepath,

+ 'size': 0,

+ }))

+ vm.run_job('job1')

+ log(vm.command('blockdev-add', driver='file',

+ node_name=nodename, filename=filepath))

+ log(vm.command('blockdev-create', job_id='job2',

+ options={

+ 'driver': iotests.imgfmt,

+ 'file': nodename,

+ 'size': size,

+ }))

+ vm.run_job('job2')

+ log(vm.command('blockdev-add', driver=iotests.imgfmt,

+ node_name=name,

+ file=nodename))

+

+ log('--- Preparing images & VM ---\n')

+ vm.add_object('iothread,id=iothread0')

+ vm.add_object('iothread,id=iothread1')

+ vm.add_device('virtio-scsi-pci,id=scsi0,iothread=iothread0')

+ vm.add_device('virtio-scsi-pci,id=scsi1,iothread=iothread1')

+ iotests.qemu_img_create('-f', iotests.imgfmt, img0_path, str(size))

+ iotests.qemu_img_create('-f', iotests.imgfmt, img1_path, str(size))

+ vm.add_drive(img0_path, interface='none')

+ vm.add_device('scsi-hd,id=device0,drive=drive0,bus=scsi0.0')

+ vm.add_drive(img1_path, interface='none')

+ vm.add_device('scsi-hd,id=device1,drive=drive1,bus=scsi1.0')

+

+ log('--- Starting VM ---\n')

+ vm.launch()

+

+ log('--- Create Targets & Full Backups ---\n')

+ create_target(img0_full_path, 'img0-full', size)

+ create_target(img1_full_path, 'img1-full', size)

+ ret = vm.qmp_log('transaction', indent=2, actions=[

+ { 'type': 'block-dirty-bitmap-add',

+ 'data': { 'node': 'drive0', 'name': 'bitmap0' }},

+ { 'type': 'block-dirty-bitmap-add',

+ 'data': { 'node': 'drive1', 'name': 'bitmap1' }},

+ { 'type': 'blockdev-backup',

+ 'data': { 'device': 'drive0',

+ 'target': 'img0-full',

+ 'sync': 'full',

+ 'job-id': 'j0' }},

+ { 'type': 'blockdev-backup',

+ 'data': { 'device': 'drive1',

+ 'target': 'img1-full',

+ 'sync': 'full',

+ 'job-id': 'j1' }}

+ ])

+ if "error" in ret:

+ raise Exception(ret['error']['desc'])

+ vm.run_job('j0', auto_dismiss=True)

+ vm.run_job('j1', auto_dismiss=True)

+

+ log('\n--- Create Targets & Incremental Backups ---\n')

+ create_target(img0_incr_path, 'img0-incr', size)

+ create_target(img1_incr_path, 'img1-incr', size)

+ ret = vm.qmp_log('transaction', indent=2, actions=[

+ { 'type': 'blockdev-backup',

+ 'data': { 'device': 'drive0',

+ 'target': 'img0-incr',

+ 'sync': 'incremental',

+ 'bitmap': 'bitmap0',

+ 'job-id': 'j2' }},

+ { 'type': 'blockdev-backup',

+ 'data': { 'device': 'drive1',

+ 'target': 'img1-incr',

+ 'sync': 'incremental',

+ 'bitmap': 'bitmap1',

+ 'job-id': 'j3' }}

+ ])

+ if "error" in ret:

+ raise Exception(ret['error']['desc'])

+ vm.run_job('j2', auto_dismiss=True)

+ vm.run_job('j3', auto_dismiss=True)

+

+ log('\n--- Done ---')

+ vm.shutdown()

diff --git a/tests/qemu-iotests/256.out b/tests/qemu-iotests/256.out

+++ b/tests/qemu-iotests/256.out

+--- Preparing images & VM ---

+

+--- Starting VM ---

+

+--- Create Targets & Full Backups ---

+

+{}

+{"execute": "job-dismiss", "arguments": {"id": "job1"}}

+{"return": {}}

+{}

+{}

+{"execute": "job-dismiss", "arguments": {"id": "job2"}}

+{"return": {}}

+{}

+{}

+{"execute": "job-dismiss", "arguments": {"id": "job1"}}

+{"return": {}}

+{}

+{}

+{"execute": "job-dismiss", "arguments": {"id": "job2"}}

+{"return": {}}

+{}

+{

+ "execute": "transaction",

+ "arguments": {

+ "actions": [

+ {

+ "data": {

+ "name": "bitmap0",

+ "node": "drive0"

+ },

+ "type": "block-dirty-bitmap-add"

+ },

+ {

+ "data": {

+ "name": "bitmap1",

+ "node": "drive1"

+ },

+ "type": "block-dirty-bitmap-add"

+ },

+ {

+ "data": {

+ "device": "drive0",

+ "job-id": "j0",

+ "sync": "full",

+ "target": "img0-full"

+ },

+ "type": "blockdev-backup"

+ },

+ {

+ "data": {

+ "device": "drive1",

+ "job-id": "j1",

+ "sync": "full",

+ "target": "img1-full"

+ },

+ "type": "blockdev-backup"

+ }

+ ]

+ }

+}

+{

+ "return": {}

+}

+{"data": {"device": "j0", "len": 67108864, "offset": 67108864, "speed": 0, "type": "backup"}, "event": "BLOCK_JOB_COMPLETED", "timestamp": {"microseconds": "USECS", "seconds": "SECS"}}

+{"data": {"device": "j1", "len": 67108864, "offset": 67108864, "speed": 0, "type": "backup"}, "event": "BLOCK_JOB_COMPLETED", "timestamp": {"microseconds": "USECS", "seconds": "SECS"}}

+

+--- Create Targets & Incremental Backups ---

+

+{}

+{"execute": "job-dismiss", "arguments": {"id": "job1"}}

+{"return": {}}

+{}

+{}

+{"execute": "job-dismiss", "arguments": {"id": "job2"}}

+{"return": {}}

+{}

+{}

+{"execute": "job-dismiss", "arguments": {"id": "job1"}}

+{"return": {}}

+{}

+{}

+{"execute": "job-dismiss", "arguments": {"id": "job2"}}

+{"return": {}}

+{}

+{

+ "execute": "transaction",

+ "arguments": {

+ "actions": [

+ {

+ "data": {

+ "bitmap": "bitmap0",

+ "device": "drive0",

+ "job-id": "j2",

+ "sync": "incremental",

+ "target": "img0-incr"

+ },

+ "type": "blockdev-backup"

+ },

+ {

+ "data": {

+ "bitmap": "bitmap1",

+ "device": "drive1",

+ "job-id": "j3",

+ "sync": "incremental",

+ "target": "img1-incr"

+ },

+ "type": "blockdev-backup"

+ }

+ ]

+ }

+}

+{

+ "return": {}

+}

+{"data": {"device": "j2", "len": 67108864, "offset": 67108864, "speed": 0, "type": "backup"}, "event": "BLOCK_JOB_COMPLETED", "timestamp": {"microseconds": "USECS", "seconds": "SECS"}}

+{"data": {"device": "j3", "len": 67108864, "offset": 67108864, "speed": 0, "type": "backup"}, "event": "BLOCK_JOB_COMPLETED", "timestamp": {"microseconds": "USECS", "seconds": "SECS"}}

+

+--- Done ---

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

--- a/tests/qemu-iotests/group

+++ b/tests/qemu-iotests/group

253 rw auto quick

254 rw auto backing quick

255 rw auto quick

+256 rw auto quick

2.21.0

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

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

Reviewed-by: Vladimir Sementsov-Ogievskiy <vsementsov@virtuozzo.com>

Message-id: 20190507203508.18026-6-mreitz@redhat.com

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

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

block/blkdebug.c | 8 ++++++++

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

diff --git a/qapi/block-core.json b/qapi/block-core.json

--- a/qapi/block-core.json

+++ b/qapi/block-core.json

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

#

# @flush: .bdrv_co_flush_to_disk()

#