From: Thomas Huth <thuth@redhat.com>
To: Greg Kurz <groug@kaod.org>, qemu-devel@nongnu.org
Cc: qemu-stable@nongnu.org
Subject: Re: [Qemu-devel] [PATCH] virtfs: error out gracefully when mandatory suboptions are missing
Date: Tue, 5 Sep 2017 15:35:34 +0200 [thread overview]
Message-ID: <1d5efdef-21b8-9b7b-6939-339b97fd9bce@redhat.com> (raw)
In-Reply-To: <150451194093.7046.18254446012958612468.stgit@bahia>
On 04.09.2017 09:59, Greg Kurz wrote:
> We internally convert -virtfs to -fsdev/-device. If the user doesn't
> provide the path or security_model suboptions, and the fsdev backend
> requires them, we hit an assertion when populating the internal -fsdev
> option:
>
> util/qemu-option.c:547: opt_set: Assertion `opt->str' failed.
> Aborted (core dumped)
>
> Let's test the suboption presence on the command line before trying
> to set it in the internal -fsdev option, and let the backend code
> error out gracefully (ie, like it already does when the user passes
> -fsdev on the command line).
>
> Reported-by: Thomas Huth <thuth@redhat.com>
> Signed-off-by: Greg Kurz <groug@kaod.org>
> ---
> vl.c | 16 ++++++++++------
> 1 file changed, 10 insertions(+), 6 deletions(-)
>
> diff --git a/vl.c b/vl.c
> index 8e247cc2a239..d63269332fed 100644
> --- a/vl.c
> +++ b/vl.c
> @@ -3557,7 +3557,7 @@ int main(int argc, char **argv, char **envp)
> case QEMU_OPTION_virtfs: {
> QemuOpts *fsdev;
> QemuOpts *device;
> - const char *writeout, *sock_fd, *socket;
> + const char *writeout, *sock_fd, *socket, *path, *security_model;
>
> olist = qemu_find_opts("virtfs");
> if (!olist) {
> @@ -3596,11 +3596,15 @@ int main(int argc, char **argv, char **envp)
> }
> qemu_opt_set(fsdev, "fsdriver",
> qemu_opt_get(opts, "fsdriver"), &error_abort);
> - qemu_opt_set(fsdev, "path", qemu_opt_get(opts, "path"),
> - &error_abort);
> - qemu_opt_set(fsdev, "security_model",
> - qemu_opt_get(opts, "security_model"),
> - &error_abort);
> + path = qemu_opt_get(opts, "path");
> + if (path) {
> + qemu_opt_set(fsdev, "path", path, &error_abort);
> + }
> + security_model = qemu_opt_get(opts, "security_model");
> + if (security_model) {
> + qemu_opt_set(fsdev, "security_model", security_model,
> + &error_abort);
> + }
> socket = qemu_opt_get(opts, "socket");
> if (socket) {
> qemu_opt_set(fsdev, "socket", socket, &error_abort);
By the way, I think this should be CC:-ed to stable, too.
Thomas
next prev parent reply other threads:[~2017-09-05 13:35 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-09-04 7:59 [Qemu-devel] [PATCH] virtfs: error out gracefully when mandatory suboptions are missing Greg Kurz
2017-09-05 11:50 ` Thomas Huth
2017-09-05 13:35 ` Thomas Huth [this message]
2017-09-05 14:24 ` Greg Kurz
2017-09-05 15:20 ` Michael Roth
2017-09-05 17:00 ` Greg Kurz
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=1d5efdef-21b8-9b7b-6939-339b97fd9bce@redhat.com \
--to=thuth@redhat.com \
--cc=groug@kaod.org \
--cc=qemu-devel@nongnu.org \
--cc=qemu-stable@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.