diff options
| -rw-r--r-- | .mailmap | 3 | ||||
| -rw-r--r-- | MAINTAINERS | 10 | ||||
| -rw-r--r-- | hw/9pfs/9p.c | 2 | ||||
| -rw-r--r-- | hw/9pfs/9p.h | 8 | ||||
| -rw-r--r-- | util/aio-posix.c | 7 |
5 files changed, 13 insertions, 17 deletions
diff --git a/.mailmap b/.mailmap index 28defa1b2c..ee81ac801e 100644 --- a/.mailmap +++ b/.mailmap @@ -8,8 +8,11 @@ Aurelien Jarno <aurelien@aurel32.net> aurel32 <aurel32@c046a42c-6fe2-441c-8c8c-7 Blue Swirl <blauwirbel@gmail.com> blueswir1 <blueswir1@c046a42c-6fe2-441c-8c8c-71466251a162> Edgar E. Iglesias <edgar.iglesias@gmail.com> edgar_igl <edgar_igl@c046a42c-6fe2-441c-8c8c-71466251a162> Fabrice Bellard <fabrice@bellard.org> bellard <bellard@c046a42c-6fe2-441c-8c8c-71466251a162> +James Hogan <jhogan@kernel.org> <james.hogan@imgtec.com> Jocelyn Mayer <l_indien@magic.fr> j_mayer <j_mayer@c046a42c-6fe2-441c-8c8c-71466251a162> Paul Brook <paul@codesourcery.com> pbrook <pbrook@c046a42c-6fe2-441c-8c8c-71466251a162> +Paul Burton <paul.burton@mips.com> <paul.burton@imgtec.com> +Paul Burton <paul.burton@mips.com> <paul@archlinuxmips.org> Thiemo Seufer <ths@networkno.de> ths <ths@c046a42c-6fe2-441c-8c8c-71466251a162> malc <av1474@comtv.ru> malc <malc@c046a42c-6fe2-441c-8c8c-71466251a162> # There is also a: diff --git a/MAINTAINERS b/MAINTAINERS index 1fd7a6273c..0cd4d028aa 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -162,7 +162,7 @@ F: disas/microblaze.c MIPS M: Aurelien Jarno <aurelien@aurel32.net> -M: Yongbok Kim <yongbok.kim@imgtec.com> +M: Yongbok Kim <yongbok.kim@mips.com> S: Maintained F: target/mips/ F: hw/mips/ @@ -285,7 +285,7 @@ S: Maintained F: target/arm/kvm.c MIPS -M: James Hogan <james.hogan@imgtec.com> +M: James Hogan <jhogan@kernel.org> S: Maintained F: target/mips/kvm.c @@ -626,7 +626,7 @@ S: Maintained F: hw/mips/mips_malta.c Mipssim -M: Yongbok Kim <yongbok.kim@imgtec.com> +M: Yongbok Kim <yongbok.kim@mips.com> S: Odd Fixes F: hw/mips/mips_mipssim.c F: hw/net/mipsnet.c @@ -637,12 +637,12 @@ S: Maintained F: hw/mips/mips_r4k.c Fulong 2E -M: Yongbok Kim <yongbok.kim@imgtec.com> +M: Yongbok Kim <yongbok.kim@mips.com> S: Odd Fixes F: hw/mips/mips_fulong2e.c Boston -M: Paul Burton <paul.burton@imgtec.com> +M: Paul Burton <paul.burton@mips.com> S: Maintained F: hw/core/loader-fit.c F: hw/mips/boston.c 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 diff --git a/util/aio-posix.c b/util/aio-posix.c index 5946ac09f0..1427f49b4a 100644 --- a/util/aio-posix.c +++ b/util/aio-posix.c @@ -701,13 +701,6 @@ bool aio_poll(AioContext *ctx, bool blocking) void aio_context_setup(AioContext *ctx) { - /* TODO remove this in final patch submission */ - if (getenv("QEMU_AIO_POLL_MAX_NS")) { - fprintf(stderr, "The QEMU_AIO_POLL_MAX_NS environment variable has " - "been replaced with -object iothread,poll-max-ns=NUM\n"); - exit(1); - } - #ifdef CONFIG_EPOLL_CREATE1 assert(!ctx->epollfd); ctx->epollfd = epoll_create1(EPOLL_CLOEXEC); |