On Wed, Apr 08, 2015 at 12:29:17PM +0300, Alberto Garcia wrote: > This series contains a couple of minor changes suggested by Markus in > the previous one. I removed the Reviewed-by line by Max in the > modified patch even if the changes are small, hope that's ok. > > v4: > - Fix documentation of the 'node-name' field in BLOCK_IMAGE_CORRUPTED. > Its annotation is now (json-string, optional). > - Clarify that the 'device' field can be empty even if it's always > present for compatibility reasons. > > v3: > - The node-name field in BLOCK_IMAGE_CORRUPTED is now Since: 2.4 > - Remove the QERR_ macros instead of updating them. The text message > is adapted to each case where applicable, and 'device' is renamed to > 'node' only where it makes sense. > > v2: > - bdrv_get_device_or_node_name() includes a comment explaining its > usage. > - The error messages have been updated to say 'node' instead of > 'device' where appropriate. > - The BLOCK_IMAGE_CORRUPTED event has a new 'node-name' field. > > Regards, > > Berto > > Alberto Garcia (3): > block: add bdrv_get_device_or_node_name() > block: use bdrv_get_device_or_node_name() in error messages > block: add 'node-name' field to BLOCK_IMAGE_CORRUPTED > > block.c | 33 +++++++++++++++++++++------------ > block/qcow.c | 8 ++++---- > block/qcow2.c | 10 +++++++--- > block/qed.c | 2 +- > block/quorum.c | 5 +---- > block/snapshot.c | 12 ++++++------ > block/vdi.c | 6 +++--- > block/vhdx.c | 6 +++--- > block/vmdk.c | 8 ++++---- > block/vpc.c | 6 +++--- > block/vvfat.c | 7 ++++--- > blockdev.c | 9 +++++---- > docs/qmp/qmp-events.txt | 21 +++++++++++++-------- > include/block/block.h | 1 + > include/qapi/qmp/qerror.h | 6 ------ > qapi/block-core.json | 17 +++++++++++------ > 16 files changed, 87 insertions(+), 70 deletions(-)
Thanks, applied to my block-next tree: https://github.com/stefanha/qemu/commits/block-next Stefan
pgpzaPYU0An0k.pgp
Description: PGP signature
