[Xen-changelog] [qemu-xen master] virtfs: error out gracefully when mandatory suboptions are missing

[patchbot@xxxxxxx]

commit 168ff32c5d1e05d7e11db28d6bcc257783ba849a
Author:     Greg Kurz <groug@xxxxxxxx>
AuthorDate: Mon Sep 4 09:59:01 2017 +0200
Commit:     Michael Roth <mdroth@xxxxxxxxxxxxxxxxxx>
CommitDate: Tue Sep 12 11:25:01 2017 -0500

    virtfs: error out gracefully when mandatory suboptions are missing
    
    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@xxxxxxxxxx>
    Signed-off-by: Greg Kurz <groug@xxxxxxxx>
    Reviewed-by: Thomas Huth <thuth@xxxxxxxxxx>
    (cherry picked from commit 32b6943699948f7adc35ada233fbd25daffad5e9)
    Signed-off-by: Michael Roth <mdroth@xxxxxxxxxxxxxxxxxx>
---
 vl.c | 16 ++++++++++------
 1 file changed, 10 insertions(+), 6 deletions(-)

diff --git a/vl.c b/vl.c
index 8e247cc..d632693 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);
--
generated by git-patchbot for /home/xen/git/qemu-xen.git#master

_______________________________________________
Xen-changelog mailing list
Xen-changelog@xxxxxxxxxxxxx
https://lists.xenproject.org/xen-changelog