Skip to content
Snippets Groups Projects
Commit d4a6bab1 authored by Peter Maydell's avatar Peter Maydell
Browse files

Merge remote-tracking branch 'remotes/gkurz/tags/9p-fix-2020-07-10' into staging


Add missing NULL terminating element in fsdev option lists. Never
crashed QEMU by pure luck.

# gpg: Signature made Fri 10 Jul 2020 17:26:01 BST
# gpg:                using RSA key B4828BAF943140CEF2A3491071D4D5E5822F73D6
# gpg: Good signature from "Greg Kurz <groug@kaod.org>" [full]
# gpg:                 aka "Gregory Kurz <gregory.kurz@free.fr>" [full]
# gpg:                 aka "[jpeg image of size 3330]" [full]
# Primary key fingerprint: B482 8BAF 9431 40CE F2A3  4910 71D4 D5E5 822F 73D6

* remotes/gkurz/tags/9p-fix-2020-07-10:
  9p: null terminate fs driver options list

Signed-off-by: default avatarPeter Maydell <peter.maydell@linaro.org>
parents 82793715 353b5a91
No related branches found
No related tags found
No related merge requests found
......@@ -78,6 +78,7 @@ static FsDriverTable FsDrivers[] = {
"throttling.iops-read-max-length",
"throttling.iops-write-max-length",
"throttling.iops-size",
NULL
},
},
{
......@@ -85,6 +86,7 @@ static FsDriverTable FsDrivers[] = {
.ops = &synth_ops,
.opts = (const char * []) {
COMMON_FS_DRIVER_OPTIONS,
NULL
},
},
{
......@@ -95,6 +97,7 @@ static FsDriverTable FsDrivers[] = {
"socket",
"sock_fd",
"writeout",
NULL
},
},
};
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment