motorhead/qemu
1
0
Fork 0
mirror of https://github.com/Motorhead1991/qemu.git synced 2025-08-04 00:03:54 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions

migration: improve error reporting of block driver state name

Browse source 
With blockdev, a BlockDriverState may not have a device name,
so using a node name is required as an alternative.

Reviewed-by: Dr. David Alan Gilbert <dgilbert@redhat.com>
Signed-off-by: Daniel P. Berrangé <berrange@redhat.com>
Message-Id: <20200827111606.1408275-2-berrange@redhat.com>
Signed-off-by: Dr. David Alan Gilbert <dgilbert@redhat.com>
This commit is contained in:
Daniel P. Berrangé 2020-08-27 12:16:00 +01:00 • committed by Dr. David Alan Gilbert
parent 9ba3b2baa1
commit aa8a926d3c
2 changed files with 8 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

12
migration/savevm.c
View file

@ -2682,7 +2682,7 @@ int save_snapshot(const char *name, Error **errp)
if (!bdrv_all_can_snapshot(&bs)) { if (!bdrv_all_can_snapshot(&bs)) {
error_setg(errp, "Device '%s' is writable but does not support " error_setg(errp, "Device '%s' is writable but does not support "
"snapshots", bdrv_get_device_name(bs)); "snapshots", bdrv_get_device_or_node_name(bs));
return ret; return ret;
} }
@ -2691,7 +2691,7 @@ int save_snapshot(const char *name, Error **errp)
ret = bdrv_all_delete_snapshot(name, &bs1, errp); ret = bdrv_all_delete_snapshot(name, &bs1, errp);
if (ret < 0) { if (ret < 0) {
error_prepend(errp, "Error while deleting snapshot on device " error_prepend(errp, "Error while deleting snapshot on device "
"'%s': ", bdrv_get_device_name(bs1)); "'%s': ", bdrv_get_device_or_node_name(bs1));
return ret; return ret;
} }
} }
@ -2766,7 +2766,7 @@ int save_snapshot(const char *name, Error **errp)
ret = bdrv_all_create_snapshot(sn, bs, vm_state_size, &bs); ret = bdrv_all_create_snapshot(sn, bs, vm_state_size, &bs);
if (ret < 0) { if (ret < 0) {
error_setg(errp, "Error while creating snapshot on '%s'", error_setg(errp, "Error while creating snapshot on '%s'",
bdrv_get_device_name(bs)); bdrv_get_device_or_node_name(bs));
goto the_end; goto the_end;
} }
@ -2884,14 +2884,14 @@ int load_snapshot(const char *name, Error **errp)
if (!bdrv_all_can_snapshot(&bs)) { if (!bdrv_all_can_snapshot(&bs)) {
error_setg(errp, error_setg(errp,
"Device '%s' is writable but does not support snapshots", "Device '%s' is writable but does not support snapshots",
bdrv_get_device_name(bs)); bdrv_get_device_or_node_name(bs));
return -ENOTSUP; return -ENOTSUP;
} }
ret = bdrv_all_find_snapshot(name, &bs); ret = bdrv_all_find_snapshot(name, &bs);
if (ret < 0) { if (ret < 0) {
error_setg(errp, error_setg(errp,
"Device '%s' does not have the requested snapshot '%s'", "Device '%s' does not have the requested snapshot '%s'",
bdrv_get_device_name(bs), name); bdrv_get_device_or_node_name(bs), name);
return ret; return ret;
} }
@ -2920,7 +2920,7 @@ int load_snapshot(const char *name, Error **errp)
ret = bdrv_all_goto_snapshot(name, &bs, errp); ret = bdrv_all_goto_snapshot(name, &bs, errp);
if (ret < 0) { if (ret < 0) {
error_prepend(errp, "Could not load snapshot '%s' on '%s': ", error_prepend(errp, "Could not load snapshot '%s' on '%s': ",
name, bdrv_get_device_name(bs)); name, bdrv_get_device_or_node_name(bs));
goto err_drain; goto err_drain;
} }

4
tests/qemu-iotests/267.out
View file

@ -81,11 +81,11 @@ Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=134217728
Testing: -blockdev driver=file,filename=TEST_DIR/t.IMGFMT,node-name=file Testing: -blockdev driver=file,filename=TEST_DIR/t.IMGFMT,node-name=file
QEMU X.Y.Z monitor - type 'help' for more information QEMU X.Y.Z monitor - type 'help' for more information
(qemu) savevm snap0 (qemu) savevm snap0
Error: Device '' is writable but does not support snapshots Error: Device 'file' is writable but does not support snapshots
(qemu) info snapshots (qemu) info snapshots
No available block device supports snapshots No available block device supports snapshots
(qemu) loadvm snap0 (qemu) loadvm snap0
Error: Device '' is writable but does not support snapshots Error: Device 'file' is writable but does not support snapshots
(qemu) quit (qemu) quit
Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=134217728 Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=134217728