diff options
| author | Peter Maydell | 2020-07-11 16:11:30 +0200 |
|---|---|---|
| committer | Peter Maydell | 2020-07-11 16:11:30 +0200 |
| commit | d4a6bab1ecf23d86e20e2f08a144e4e48643a6e4 (patch) | |
| tree | 90fc15e64c6782b5a6706eb9b58cbc0b31c8583b | |
| parent | Merge remote-tracking branch 'remotes/aperard/tags/pull-xen-20200710' into st... (diff) | |
| parent | 9p: null terminate fs driver options list (diff) | |
| download | qemu-d4a6bab1ecf23d86e20e2f08a144e4e48643a6e4.tar.gz qemu-d4a6bab1ecf23d86e20e2f08a144e4e48643a6e4.tar.xz qemu-d4a6bab1ecf23d86e20e2f08a144e4e48643a6e4.zip | |
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: Peter Maydell <peter.maydell@linaro.org>
| -rw-r--r-- | fsdev/qemu-fsdev.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/fsdev/qemu-fsdev.c b/fsdev/qemu-fsdev.c index a9e069c0c7..3da64e9f72 100644 --- a/fsdev/qemu-fsdev.c +++ b/fsdev/qemu-fsdev.c @@ -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 }, }, }; |