diff options
| author | Peter Maydell | 2017-11-21 16:50:13 +0100 |
|---|---|---|
| committer | Peter Maydell | 2017-11-21 16:50:13 +0100 |
| commit | fc7dbc119e0852a70dc9fa68bb41a318e49e4cd6 (patch) | |
| tree | 535d1798759ae6766765377947d76528ad26055f /migration/savevm.c | |
| parent | build: disarm the TCG unit test trap (diff) | |
| parent | Merge remote-tracking branch 'mreitz/tags/pull-block-2017-11-21' into queue-b... (diff) | |
| download | qemu-fc7dbc119e0852a70dc9fa68bb41a318e49e4cd6.tar.gz qemu-fc7dbc119e0852a70dc9fa68bb41a318e49e4cd6.tar.xz qemu-fc7dbc119e0852a70dc9fa68bb41a318e49e4cd6.zip | |
Merge remote-tracking branch 'remotes/kevin/tags/for-upstream' into staging
Block layer patches for 2.11.0-rc2
# gpg: Signature made Tue 21 Nov 2017 15:09:12 GMT
# gpg: using RSA key 0x7F09B272C88F2FD6
# gpg: Good signature from "Kevin Wolf <kwolf@redhat.com>"
# Primary key fingerprint: DC3D EB15 9A9A F95D 3D74 56FE 7F09 B272 C88F 2FD6
* remotes/kevin/tags/for-upstream:
iotests: Fix 176 on 32-bit host
block: Close a BlockDriverState completely even when bs->drv is NULL
block: Error out on load_vm with active dirty bitmaps
block: Add errp to bdrv_all_goto_snapshot()
block: Add errp to bdrv_snapshot_goto()
block: Don't request I/O permission with BDRV_O_NO_IO
block: Don't use BLK_PERM_CONSISTENT_READ for format probing
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'migration/savevm.c')
| -rw-r--r-- | migration/savevm.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/migration/savevm.c b/migration/savevm.c index 4a88228614..192f2d82cd 100644 --- a/migration/savevm.c +++ b/migration/savevm.c @@ -2346,10 +2346,10 @@ int load_snapshot(const char *name, Error **errp) /* Flush all IO requests so they don't interfere with the new state. */ bdrv_drain_all_begin(); - ret = bdrv_all_goto_snapshot(name, &bs); + ret = bdrv_all_goto_snapshot(name, &bs, errp); if (ret < 0) { - error_setg(errp, "Error %d while activating snapshot '%s' on '%s'", - ret, name, bdrv_get_device_name(bs)); + error_prepend(errp, "Could not load snapshot '%s' on '%s': ", + name, bdrv_get_device_name(bs)); goto err_drain; } |