aboutsummaryrefslogtreecommitdiff
path: root/hw/9pfs/xen-9p-backend.c
diff options
context:
space:
mode:
authorPeter Maydell <peter.maydell@linaro.org>2017-06-01 12:06:58 +0100
committerPeter Maydell <peter.maydell@linaro.org>2017-06-01 12:06:58 +0100
commit066ae4f829bcc6b8c98994a7c22fe570d500d548 (patch)
treeac7258ee8e5a24dd358d838bb103aaa36144be4f /hw/9pfs/xen-9p-backend.c
parent70f31414e71250c6049a46851372ee6ea76f40dd (diff)
parent81ffbf5ab1458e357a761f1272105a55829b351e (diff)
downloadqemu-066ae4f829bcc6b8c98994a7c22fe570d500d548.zip
qemu-066ae4f829bcc6b8c98994a7c22fe570d500d548.tar.gz
qemu-066ae4f829bcc6b8c98994a7c22fe570d500d548.tar.bz2
Merge remote-tracking branch 'remotes/gkurz/tags/for-upstream' into staging
Various bugfixes and code cleanups. Most notably, it fixes metadata handling in mapped-file security mode (especially for the virtfs root). # gpg: Signature made Tue 30 May 2017 14:36:22 BST # 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@linux.vnet.ibm.com>" # gpg: aka "Gregory Kurz (Groug) <groug@free.fr>" # gpg: aka "[jpeg image of size 3330]" # 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: local: metadata file for the VirtFS root 9pfs: local: simplify file opening 9pfs: local: resolve special directories in paths 9pfs: check return value of v9fs_co_name_to_path() util: drop old utimensat() compat code 9pfs: assume utimensat() and futimens() are present fsdev: fix virtfs-proxy-helper cwd 9pfs: local: fix unlink of alien files in mapped-file mode 9pfs: drop pdu_push_and_notify() fsdev: don't allow unknown format in marshal/unmarshal virtio-9p/xen-9p: move 9p specific bits to core 9p code Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'hw/9pfs/xen-9p-backend.c')
-rw-r--r--hw/9pfs/xen-9p-backend.c6
1 files changed, 1 insertions, 5 deletions
diff --git a/hw/9pfs/xen-9p-backend.c b/hw/9pfs/xen-9p-backend.c
index 5df97c9..922cc96 100644
--- a/hw/9pfs/xen-9p-backend.c
+++ b/hw/9pfs/xen-9p-backend.c
@@ -243,14 +243,10 @@ static int xen_9pfs_receive(Xen9pfsRing *ring)
/* cannot fail, because we only handle one request per ring at a time */
pdu = pdu_alloc(&ring->priv->state);
- pdu->size = le32_to_cpu(h.size_le);
- pdu->id = h.id;
- pdu->tag = le32_to_cpu(h.tag_le);
ring->out_size = le32_to_cpu(h.size_le);
ring->out_cons = cons + le32_to_cpu(h.size_le);
- qemu_co_queue_init(&pdu->complete);
- pdu_submit(pdu);
+ pdu_submit(pdu, &h);
return 0;
}