diff options
| author | Peter Maydell <peter.maydell@linaro.org> | 2021-01-25 13:48:38 +0000 |
|---|---|---|
| committer | Peter Maydell <peter.maydell@linaro.org> | 2021-01-25 13:48:38 +0000 |
| commit | 3dcfd4e3f285cd69d7cf581d3a688e421d28e07e (patch) | |
| tree | 58d7269e8f0ae069a8e7365b036429f739ae12b6 /hw/9pfs/9p-proxy.c | |
| parent | 55d98950a642d3526a0b2e1e106744b007c8adf6 (diff) | |
| parent | 81f9766b7a16ccfcfd19e0b4525a5eeba862c851 (diff) | |
| download | focaccia-qemu-3dcfd4e3f285cd69d7cf581d3a688e421d28e07e.tar.gz focaccia-qemu-3dcfd4e3f285cd69d7cf581d3a688e421d28e07e.zip | |
Merge remote-tracking branch 'remotes/gkurz-gitlab/tags/9p-next-pull-request' into staging
This fixes a Coverity report and improves the fid reclaim logic. # gpg: Signature made Mon 25 Jan 2021 09:37:28 GMT # 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-gitlab/tags/9p-next-pull-request: 9pfs: Convert reclaim list to QSLIST 9pfs: Improve unreclaim loop 9pfs: Convert V9fsFidState::fid_list to QSIMPLEQ 9pfs: Convert V9fsFidState::clunked to bool 9pfs/proxy: Check return value of proxy_marshal() Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'hw/9pfs/9p-proxy.c')
| -rw-r--r-- | hw/9pfs/9p-proxy.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/hw/9pfs/9p-proxy.c b/hw/9pfs/9p-proxy.c index 6f598a0f11..4aa4e0a3ba 100644 --- a/hw/9pfs/9p-proxy.c +++ b/hw/9pfs/9p-proxy.c @@ -537,7 +537,8 @@ static int v9fs_request(V9fsProxy *proxy, int type, void *response, ...) } /* marshal the header details */ - proxy_marshal(iovec, 0, "dd", header.type, header.size); + retval = proxy_marshal(iovec, 0, "dd", header.type, header.size); + assert(retval == 4 * 2); header.size += PROXY_HDR_SZ; retval = qemu_write_full(proxy->sockfd, iovec->iov_base, header.size); |