diff options
author | Peter Maydell <peter.maydell@linaro.org> | 2017-01-25 17:54:14 +0000 |
---|---|---|
committer | Peter Maydell <peter.maydell@linaro.org> | 2017-01-25 17:54:14 +0000 |
commit | c7f1cf01b8245762ca5864e835d84f6677ae8b1f (patch) | |
tree | 52693e41043f4551db64e90833eccff78919b423 /hw/9pfs | |
parent | e32c41e4f65f4d16508fe759a800538a73608839 (diff) | |
parent | fa0eb5c512d17a223d9f9bac45da48d78d12f584 (diff) | |
download | qemu-c7f1cf01b8245762ca5864e835d84f6677ae8b1f.zip qemu-c7f1cf01b8245762ca5864e835d84f6677ae8b1f.tar.gz qemu-c7f1cf01b8245762ca5864e835d84f6677ae8b1f.tar.bz2 |
Merge remote-tracking branch 'remotes/gkurz/tags/for-upstream' into staging
This pull request fixes a 2.9 regression and a long standing bug that can
cause 9p clients to hang. Other patches are minor enhancements.
# gpg: Signature made Wed 25 Jan 2017 10:12:27 GMT
# gpg: using DSA key 0x02FC3AEB0101DBC2
# gpg: Good signature from "Greg Kurz <groug@kaod.org>"
# gpg: aka "Greg Kurz <groug@free.fr>"
# gpg: aka "Greg Kurz <gkurz@fr.ibm.com>"
# gpg: aka "Greg Kurz <gkurz@linux.vnet.ibm.com>"
# gpg: aka "Gregory Kurz (Groug) <groug@free.fr>"
# gpg: aka "Gregory Kurz (Cimai Technology) <gkurz@cimai.com>"
# gpg: aka "Gregory Kurz (Meiosys Technology) <gkurz@meiosys.com>"
# gpg: WARNING: This key is not certified with a trusted signature!
# gpg: There is no indication that the signature belongs to the owner.
# Primary key fingerprint: 2BD4 3B44 535E C0A7 9894 DBA2 02FC 3AEB 0101 DBC2
* remotes/gkurz/tags/for-upstream:
9pfs: fix offset error in v9fs_xattr_read()
9pfs: local: trivial cosmetic fix in pwritev op
9pfs: fix off-by-one error in PDU free list
tests: virtio-9p: improve error reporting
9pfs: add missing coroutine_fn annotations
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'hw/9pfs')
-rw-r--r-- | hw/9pfs/9p-local.c | 3 | ||||
-rw-r--r-- | hw/9pfs/9p.c | 12 |
2 files changed, 7 insertions, 8 deletions
diff --git a/hw/9pfs/9p-local.c b/hw/9pfs/9p-local.c index 845675e..7de07e1 100644 --- a/hw/9pfs/9p-local.c +++ b/hw/9pfs/9p-local.c @@ -436,8 +436,7 @@ static ssize_t local_pwritev(FsContext *ctx, V9fsFidOpenState *fs, const struct iovec *iov, int iovcnt, off_t offset) { - ssize_t ret -; + ssize_t ret; #ifdef CONFIG_PREADV ret = pwritev(fs->fd, iov, iovcnt, offset); #else diff --git a/hw/9pfs/9p.c b/hw/9pfs/9p.c index 06b6e7e..99e9472 100644 --- a/hw/9pfs/9p.c +++ b/hw/9pfs/9p.c @@ -1582,7 +1582,7 @@ out_nofid: v9fs_string_free(&name); } -static void v9fs_fsync(void *opaque) +static void coroutine_fn v9fs_fsync(void *opaque) { int err; int32_t fid; @@ -1666,7 +1666,7 @@ static void v9fs_init_qiov_from_pdu(QEMUIOVector *qiov, V9fsPDU *pdu, if (is_write) { pdu->s->transport->init_out_iov_from_pdu(pdu, &iov, &niov); } else { - pdu->s->transport->init_in_iov_from_pdu(pdu, &iov, &niov, size); + pdu->s->transport->init_in_iov_from_pdu(pdu, &iov, &niov, size + skip); } qemu_iovec_init_external(&elem, iov, niov); @@ -1696,8 +1696,8 @@ static int v9fs_xattr_read(V9fsState *s, V9fsPDU *pdu, V9fsFidState *fidp, } offset += err; - v9fs_init_qiov_from_pdu(&qiov_full, pdu, 0, read_count, false); - err = v9fs_pack(qiov_full.iov, qiov_full.niov, offset, + v9fs_init_qiov_from_pdu(&qiov_full, pdu, offset, read_count, false); + err = v9fs_pack(qiov_full.iov, qiov_full.niov, 0, ((char *)fidp->fs.xattr.value) + off, read_count); qemu_iovec_destroy(&qiov_full); @@ -2348,7 +2348,7 @@ out_nofid: v9fs_string_free(&symname); } -static void v9fs_flush(void *opaque) +static void coroutine_fn v9fs_flush(void *opaque) { ssize_t err; int16_t tag; @@ -3465,7 +3465,7 @@ int v9fs_device_realize_common(V9fsState *s, Error **errp) /* initialize pdu allocator */ QLIST_INIT(&s->free_list); QLIST_INIT(&s->active_list); - for (i = 0; i < (MAX_REQ - 1); i++) { + for (i = 0; i < MAX_REQ; i++) { QLIST_INSERT_HEAD(&s->free_list, &s->pdus[i], next); s->pdus[i].s = s; s->pdus[i].idx = i; |