diff options
| author | Peter Maydell <peter.maydell@linaro.org> | 2017-11-07 10:59:07 +0000 |
|---|---|---|
| committer | Peter Maydell <peter.maydell@linaro.org> | 2017-11-07 10:59:07 +0000 |
| commit | d2b8c0910e356f48fa02fe57d04ed29766fe8732 (patch) | |
| tree | a92ac0ecfe88ff6dc7a1a737e9b0f32f7eecd54f | |
| parent | 299d1ea9bb56bd9f45f905125489bdd7d543a1aa (diff) | |
| parent | 267fcadf325e54c6e1cb27321413dbdbe2200510 (diff) | |
Merge remote-tracking branch 'remotes/gkurz/tags/for-upstream' into staging
This fixes a bad errno returned to the guest and a trivial coding style nit.
# gpg: Signature made Mon 06 Nov 2017 18:09:24 GMT
# gpg: using RSA key 0x71D4D5E5822F73D6
# gpg: Good signature from "Greg Kurz <groug@kaod.org>"
# gpg: aka "Gregory Kurz <gregory.kurz@free.fr>"
# gpg: aka "[jpeg image of size 3330]"
# Primary key fingerprint: B482 8BAF 9431 40CE F2A3 4910 71D4 D5E5 822F 73D6
* remotes/gkurz/tags/for-upstream:
9pfs: fix v9fs_mark_fids_unreclaim() return value
9pfs: drop one user of struct V9fsFidState
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
| -rw-r--r-- | hw/9pfs/9p.c | 2 | ||||
| -rw-r--r-- | hw/9pfs/9p.h | 8 |
2 files changed, 5 insertions, 5 deletions
diff --git a/hw/9pfs/9p.c b/hw/9pfs/9p.c index f8bbac251d..52d46632fe 100644 --- a/hw/9pfs/9p.c +++ b/hw/9pfs/9p.c @@ -512,7 +512,7 @@ static int coroutine_fn v9fs_mark_fids_unreclaim(V9fsPDU *pdu, V9fsPath *path) /* reopen the file/dir if already closed */ err = v9fs_reopen_fid(pdu, fidp); if (err < 0) { - return -1; + return err; } /* * Go back to head of fid list because diff --git a/hw/9pfs/9p.h b/hw/9pfs/9p.h index d1cfeaf10e..cdfc4f4ce7 100644 --- a/hw/9pfs/9p.h +++ b/hw/9pfs/9p.h @@ -117,7 +117,7 @@ static inline char *rpath(FsContext *ctx, const char *path) #define P9_IOHDRSZ 24 typedef struct V9fsPDU V9fsPDU; -struct V9fsState; +typedef struct V9fsState V9fsState; typedef struct { uint32_t size_le; @@ -137,7 +137,7 @@ struct V9fsPDU uint8_t id; uint8_t cancelled; CoQueue complete; - struct V9fsState *s; + V9fsState *s; QLIST_ENTRY(V9fsPDU) next; uint32_t idx; }; @@ -230,7 +230,7 @@ struct V9fsFidState V9fsFidState *rclm_lst; }; -typedef struct V9fsState +struct V9fsState { QLIST_HEAD(, V9fsPDU) free_list; QLIST_HEAD(, V9fsPDU) active_list; @@ -251,7 +251,7 @@ typedef struct V9fsState Error *migration_blocker; V9fsConf fsconf; V9fsQID root_qid; -} V9fsState; +}; /* 9p2000.L open flags */ #define P9_DOTL_RDONLY 00000000 |