Skip to content

Commit d4a6bab

Browse files
committed
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 <[email protected]>" [full] # gpg: aka "Gregory Kurz <[email protected]>" [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: Peter Maydell <[email protected]>
2 parents 8279371 + 353b5a9 commit d4a6bab

File tree

1 file changed

+3
-0
lines changed

1 file changed

+3
-0
lines changed

fsdev/qemu-fsdev.c

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -78,13 +78,15 @@ static FsDriverTable FsDrivers[] = {
7878
"throttling.iops-read-max-length",
7979
"throttling.iops-write-max-length",
8080
"throttling.iops-size",
81+
NULL
8182
},
8283
},
8384
{
8485
.name = "synth",
8586
.ops = &synth_ops,
8687
.opts = (const char * []) {
8788
COMMON_FS_DRIVER_OPTIONS,
89+
NULL
8890
},
8991
},
9092
{
@@ -95,6 +97,7 @@ static FsDriverTable FsDrivers[] = {
9597
"socket",
9698
"sock_fd",
9799
"writeout",
100+
NULL
98101
},
99102
},
100103
};

0 commit comments

Comments
 (0)