Merge remote-tracking branch 'remotes/berrange/tags/pull-qio-2017-04-04-1' into staging

[mirror_qemu.git] / block / nfs.c

diff --git a/block/nfs.c b/block/nfs.c
index 890d5d4affd79a10437ff019b00912c3627c6071..0816678307c4c2de4e2d3ff5a2ff7938317c6bac 100644 (file)
--- a/block/nfs.c
+++ b/block/nfs.c
@@ -474,7 +474,14 @@ static NFSServer *nfs_config(QDict *options, Error **errp)
         goto out;
     }
 
-    iv = qobject_input_visitor_new(crumpled_addr, true);
+    /*
+     * Caution: this works only because all scalar members of
+     * NFSServer are QString in @crumpled_addr.  The visitor expects
+     * @crumpled_addr to be typed according to the QAPI schema.  It
+     * is when @options come from -blockdev or blockdev_add.  But when
+     * they come from -drive, they're all QString.
+     */
+    iv = qobject_input_visitor_new(crumpled_addr);
     visit_type_NFSServer(iv, NULL, &server, &local_error);
     if (local_error) {
         error_propagate(errp, local_error);