diff options
| author | Paolo Bonzini <pbonzini@redhat.com> | 2014-02-17 14:44:01 +0100 |
|---|---|---|
| committer | Kevin Wolf <kwolf@redhat.com> | 2014-02-21 21:02:23 +0100 |
| commit | c0f92b526dbd45fc5b539f51b7379156814dafe9 (patch) | |
| tree | 26d580f02ce38ac8cd527b7d153d1e0806ed0b93 /block/vvfat.c | |
| parent | 6890aad46b14849318053fe3ace6109e0f9c5932 (diff) | |
| download | qemu-c0f92b526dbd45fc5b539f51b7379156814dafe9.zip qemu-c0f92b526dbd45fc5b539f51b7379156814dafe9.tar.gz qemu-c0f92b526dbd45fc5b539f51b7379156814dafe9.tar.bz2 | |
vvfat: correctly propagate errors
Before:
$ ./qemu-io-old
qemu-io-old> open -r -o driver=vvfat,fat-type=24,dir=i386-softmmu
Valid FAT types are only 12, 16 and 32
qemu-io-old: can't open device (null): Could not open image: Invalid argument
After:
$ ./qemu-io
qemu-io> open -r -o driver=vvfat,fat-type=24,dir=i386-softmmu
qemu-io: can't open device (null): Valid FAT types are only 12, 16 and 32
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
Reviewed-by: Fam Zheng <famz@redhat.com>
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
Diffstat (limited to 'block/vvfat.c')
| -rw-r--r-- | block/vvfat.c | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/block/vvfat.c b/block/vvfat.c index 4bde3bd..f966ea5 100644 --- a/block/vvfat.c +++ b/block/vvfat.c @@ -1086,16 +1086,14 @@ DLOG(if (stderr == NULL) { opts = qemu_opts_create(&runtime_opts, NULL, 0, &error_abort); qemu_opts_absorb_qdict(opts, options, &local_err); if (local_err) { - qerror_report_err(local_err); - error_free(local_err); + error_propagate(errp, local_err); ret = -EINVAL; goto fail; } dirname = qemu_opt_get(opts, "dir"); if (!dirname) { - qerror_report(ERROR_CLASS_GENERIC_ERROR, "vvfat block driver requires " - "a 'dir' option"); + error_setg(errp, "vvfat block driver requires a 'dir' option"); ret = -EINVAL; goto fail; } @@ -1135,8 +1133,7 @@ DLOG(if (stderr == NULL) { case 12: break; default: - qerror_report(ERROR_CLASS_GENERIC_ERROR, "Valid FAT types are only " - "12, 16 and 32"); + error_setg(errp, "Valid FAT types are only 12, 16 and 32"); ret = -EINVAL; goto fail; } |