david.venhoff/QEMU-Nyx-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

qemu-nbd: Clean up "Failed to load snapshot" error message

Browse Source 
bdrv_snapshot_load_tmp() sets an error and returns -errno on failure.
We report both even though the error message is self-contained.  Drop
the redundant strerror().

While there: setting errno right before exit() is pointless, so drop
that, too.

Signed-off-by: Markus Armbruster <armbru@redhat.com>
Reviewed-by: Eric Blake <eblake@redhat.com>
Message-Id: <1450452927-8346-8-git-send-email-armbru@redhat.com>
This commit is contained in:
Markus Armbruster 2015-12-18 16:35:10 +01:00
parent cd5c2dac2e
commit a4699e55f5
1 changed files with 5 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
qemu-nbd.c
View File

@ -156,8 +156,7 @@ static int find_partition(BlockBackend *blk, int partition,
int ret;
if ((ret = blk_read(blk, 0, data, 1)) < 0) {
errno = -ret;
error_report("error while reading: %s", strerror(errno));
error_report("error while reading: %s", strerror(-ret));
exit(EXIT_FAILURE);
}
@ -178,8 +177,7 @@ static int find_partition(BlockBackend *blk, int partition,
int j;
if ((ret = blk_read(blk, mbr[i].start_sector_abs, data1, 1)) < 0) {
errno = -ret;
error_report("error while reading: %s", strerror(errno));
error_report("error while reading: %s", strerror(-ret));
exit(EXIT_FAILURE);
}
@ -721,9 +719,8 @@ int main(int argc, char **argv)
&local_err);
}
if (ret < 0) {
errno = -ret;
error_report("Failed to load snapshot: %s: %s",
error_get_pretty(local_err), strerror(errno));
error_report("Failed to load snapshot: %s",
error_get_pretty(local_err));
exit(EXIT_FAILURE);
}
@ -738,9 +735,8 @@ int main(int argc, char **argv)
if (partition != -1) {
ret = find_partition(blk, partition, &dev_offset, &fd_size);
if (ret < 0) {
errno = -ret;
error_report("Could not find partition %d: %s", partition,
strerror(errno));
strerror(-ret));
exit(EXIT_FAILURE);
}
}