From: Nir Soffer <nirsof@gmail.com>
To: qemu-devel@nongnu.org
Cc: kwolf@redhat.com, qemu-block@nongnu.org,
Nir Soffer <nsoffer@redhat.com>, Nir Soffer <nirsof@gmail.com>
Subject: [Qemu-devel] [PATCH v3 1/3] qemu-io: Return non-zero exit code on failure
Date: Mon, 30 Jan 2017 13:55:49 +0200 [thread overview]
Message-ID: <20170130115551.27254-1-nirsof@gmail.com> (raw)
From: Nir Soffer <nsoffer@redhat.com>
The result of openfile was not checked, leading to failure deep in the
actual command with confusing error message, and exiting with exit code 0.
Here is a simple example - trying to read with the wrong format:
$ touch file
$ qemu-io -f qcow2 -c 'read -P 1 0 1024' file; echo $?
can't open device file: Image is not in qcow2 format
no file open, try 'help open'
0
With this patch, we fail earlier with exit code 1:
$ ./qemu-io -f qcow2 -c 'read -P 1 0 1024' file; echo $?
can't open device file: Image is not in qcow2 format
1
Signed-off-by: Nir Soffer <nirsof@gmail.com>
Reviewed-by: Eric Blake <eblake@redhat.com>
Reviewed-by: Fam Zheng <famz@redhat.com>
---
Changes since v2:
- Adding missing signed-off-by
- Fix tests expecting the wrong output
qemu-io.c | 8 ++++++--
1 file changed, 6 insertions(+), 2 deletions(-)
diff --git a/qemu-io.c b/qemu-io.c
index 23a229f..427cbae 100644
--- a/qemu-io.c
+++ b/qemu-io.c
@@ -595,13 +595,17 @@ int main(int argc, char **argv)
exit(1);
}
opts = qemu_opts_to_qdict(qopts, NULL);
- openfile(NULL, flags, writethrough, opts);
+ if (openfile(NULL, flags, writethrough, opts)) {
+ exit(1);
+ }
} else {
if (format) {
opts = qdict_new();
qdict_put(opts, "driver", qstring_from_str(format));
}
- openfile(argv[optind], flags, writethrough, opts);
+ if (openfile(argv[optind], flags, writethrough, opts)) {
+ exit(1);
+ }
}
}
command_loop();
--
2.9.3
next reply other threads:[~2017-01-30 12:01 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-01-30 11:55 Nir Soffer [this message]
2017-01-30 11:55 ` [Qemu-devel] [PATCH v3 2/3] qemu-io: Add regression tests Nir Soffer
2017-01-30 11:55 ` [Qemu-devel] [PATCH v3 3/3] qemu-io: Fix tests expecting the wrong output Nir Soffer
-- strict thread matches above, loose matches on Subject: below --
2017-01-28 3:59 [Qemu-devel] [PATCH v3 1/3] qemu-io: Return non-zero exit code on failure Nir Soffer
2017-01-30 16:44 ` Eric Blake
2017-01-31 11:30 ` Nir Soffer
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20170130115551.27254-1-nirsof@gmail.com \
--to=nirsof@gmail.com \
--cc=kwolf@redhat.com \
--cc=nsoffer@redhat.com \
--cc=qemu-block@nongnu.org \
--cc=qemu-devel@nongnu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.