diff options
| author | Anthony Liguori <aliguori@us.ibm.com> | 2013-06-17 13:14:46 -0500 |
|---|---|---|
| committer | Anthony Liguori <aliguori@us.ibm.com> | 2013-06-17 13:14:46 -0500 |
| commit | 21a885a7e2a0f532f7653a2607efddbd83504430 (patch) | |
| tree | 6c633a6174cda24a78cece7a2b157cb108ad42bb /block | |
| parent | 128dc2d1e4cb98ddbe9c0df2e0c914dc00925dac (diff) | |
| parent | dbfbc6373441e436ac6e2bcf7a8acb284225aa21 (diff) | |
| download | qemu-21a885a7e2a0f532f7653a2607efddbd83504430.tar.gz | |
Merge remote-tracking branch 'luiz/queue/qmp' into staging
# By Luiz Capitulino
# Via Luiz Capitulino
* luiz/queue/qmp:
qerror: drop QERR_OPEN_FILE_FAILED macro
block: bdrv_reopen_prepare(): don't use QERR_OPEN_FILE_FAILED
savevm: qmp_xen_save_devices_state(): use error_setg_file_open()
dump: qmp_dump_guest_memory(): use error_setg_file_open()
cpus: use error_setg_file_open()
blockdev: use error_setg_file_open()
block: mirror_complete(): use error_setg_file_open()
rng-random: use error_setg_file_open()
error: add error_setg_file_open() helper
Message-id: 1371484631-29510-1-git-send-email-lcapitulino@redhat.com
Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
Diffstat (limited to 'block')
| -rw-r--r-- | block/mirror.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/block/mirror.c b/block/mirror.c index 8b07dec314..1ae724f705 100644 --- a/block/mirror.c +++ b/block/mirror.c @@ -512,7 +512,7 @@ static void mirror_complete(BlockJob *job, Error **errp) char backing_filename[PATH_MAX]; bdrv_get_full_backing_filename(s->target, backing_filename, sizeof(backing_filename)); - error_set(errp, QERR_OPEN_FILE_FAILED, backing_filename); + error_setg_file_open(errp, -ret, backing_filename); return; } if (!s->synced) { |