From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:42723) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WCR1f-0001Mg-22 for qemu-devel@nongnu.org; Sun, 09 Feb 2014 04:50:18 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1WCR1X-0008AR-GM for qemu-devel@nongnu.org; Sun, 09 Feb 2014 04:50:10 -0500 Received: from mail-ee0-f41.google.com ([74.125.83.41]:37461) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WCR1X-00087t-Ad for qemu-devel@nongnu.org; Sun, 09 Feb 2014 04:50:03 -0500 Received: by mail-ee0-f41.google.com with SMTP id e51so2004836eek.0 for ; Sun, 09 Feb 2014 01:49:27 -0800 (PST) Sender: Paolo Bonzini From: Paolo Bonzini Date: Sun, 9 Feb 2014 10:48:49 +0100 Message-Id: <1391939335-31580-15-git-send-email-pbonzini@redhat.com> In-Reply-To: <1391939335-31580-1-git-send-email-pbonzini@redhat.com> References: <1391939335-31580-1-git-send-email-pbonzini@redhat.com> Subject: [Qemu-devel] [PATCH 14/20] vvfat: correctly propagate errors List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: kwolf@redhat.com, stefanha@redhat.com, mreitz@redhat.com 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 --- block/vvfat.c | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/block/vvfat.c b/block/vvfat.c index 664941c..7c3521a 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 (error_is_set(&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; } -- 1.8.5.3