mirrors/qemu
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

This fixes a bad errno returned to the guest and a trivial coding style nit.

Browse Source 
-----BEGIN PGP SIGNATURE-----
 
 iQIzBAABCAAdFiEEtIKLr5QxQM7yo0kQcdTV5YIvc9YFAloApVQACgkQcdTV5YIv
 c9aLCA/8CJyTPSTVRTdRb0oF9aB8s6NynFKkkkU7aRqjvwIM47TEy96nmBA/W8e8
 4A5Wohwh5RJeJS8EzyamGFHKi1dcd6DOsPIm9G8A3eztGNO8zV5rmLx2LfqCLWyZ
 NojVyMTFVoaX/yphBNFtC19QsoDbm0UV3EP9bx+oWYYO1d5HmuAoB8czzIMSp4qj
 mkbrZ8RKO+8w+Y4pQ66oslg8GliSRKtiaMR5CTcHAkNy1juVWw5ISujfD1LjU7W+
 0y7nVlnhomTfce+K8wc2DkovDczDtomom4fQWHR0FXzzUUoO/RN/yzzDfByfN65g
 9U3GkY7fD/hrSBMTObPF8/F0B9sSOzbX4u4w0xiJ8w2dm2pFPeJegWEBkuNFxVBJ
 929vI/9ZGnMzOuS5k7aJqHl29KemRTQ/5BkSR7e/pLniT6sZvs9ttJEomzCiuopQ
 gZpAbwEMA+VzEqRsUk8lsi08vKnDH2eFOjC01W/FjKzeLw2t0o6EAqRfztrReKT3
 P34C+8DocQEXQBGZCq45ZjzUhcH94gJrg9bkHSkn4cCyALoMaLIJyF4soYuCCKfn
 HJrF3rZrFDsDJ9DAVlCuPV7qSufoXwgZSaZIuAp9wZtB/XwMfdKV38K4mkzqWihT
 Jf2iNZRnuhNnlvI5q4d+/YZIJ+099mnCuojFV2NsjIPL9ziNmZs=
 =qH6G
 -----END PGP SIGNATURE-----

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>
This commit is contained in:
Peter Maydell 2017-11-07 10:59:07 +00:00
commit d2b8c0910e
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
hw/9pfs/9p.c
View File

@ -512,7 +512,7 @@ static int coroutine_fn v9fs_mark_fids_unreclaim(V9fsPDU *pdu, V9fsPath *path)
/* reopen the file/dir if already closed */ /* reopen the file/dir if already closed */
err = v9fs_reopen_fid(pdu, fidp); err = v9fs_reopen_fid(pdu, fidp);
if (err < 0) { if (err < 0) {
return -1; return err;
} }
/* /*
* Go back to head of fid list because * Go back to head of fid list because

8
hw/9pfs/9p.h
View File

@ -117,7 +117,7 @@ static inline char *rpath(FsContext *ctx, const char *path)
#define P9_IOHDRSZ 24 #define P9_IOHDRSZ 24
typedef struct V9fsPDU V9fsPDU; typedef struct V9fsPDU V9fsPDU;
struct V9fsState; typedef struct V9fsState V9fsState;
typedef struct { typedef struct {
uint32_t size_le; uint32_t size_le;
@ -137,7 +137,7 @@ struct V9fsPDU
uint8_t id; uint8_t id;
uint8_t cancelled; uint8_t cancelled;
CoQueue complete; CoQueue complete;
struct V9fsState *s; V9fsState *s;
QLIST_ENTRY(V9fsPDU) next; QLIST_ENTRY(V9fsPDU) next;
uint32_t idx; uint32_t idx;
}; };
@ -230,7 +230,7 @@ struct V9fsFidState
V9fsFidState *rclm_lst; V9fsFidState *rclm_lst;
}; };
typedef struct V9fsState struct V9fsState
{ {
QLIST_HEAD(, V9fsPDU) free_list; QLIST_HEAD(, V9fsPDU) free_list;
QLIST_HEAD(, V9fsPDU) active_list; QLIST_HEAD(, V9fsPDU) active_list;
@ -251,7 +251,7 @@ typedef struct V9fsState
Error *migration_blocker; Error *migration_blocker;
V9fsConf fsconf; V9fsConf fsconf;
V9fsQID root_qid; V9fsQID root_qid;
} V9fsState; };
/* 9p2000.L open flags */ /* 9p2000.L open flags */
#define P9_DOTL_RDONLY 00000000 #define P9_DOTL_RDONLY 00000000