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

virtio-9p/xen-9p: move 9p specific bits to core 9p code

Browse Source 
These bits aren't related to the transport so let's move them to the core
code.

Signed-off-by: Greg Kurz <groug@kaod.org>
Reviewed-by: Stefano Stabellini <sstabellini@kernel.org>
This commit is contained in:
Greg Kurz 2017-05-25 10:30:13 +02:00
parent 9964e96dc9
commit 506f327582
4 changed files with 10 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -3446,12 +3446,16 @@ static inline bool is_read_only_op(V9fsPDU *pdu)
} }
} }
void pdu_submit(V9fsPDU *pdu) void pdu_submit(V9fsPDU *pdu, P9MsgHeader *hdr)
{ {
Coroutine *co; Coroutine *co;
CoroutineEntry *handler; CoroutineEntry *handler;
V9fsState *s = pdu->s; V9fsState *s = pdu->s;
pdu->size = le32_to_cpu(hdr->size_le);
pdu->id = hdr->id;
pdu->tag = le16_to_cpu(hdr->tag_le);
if (pdu->id >= ARRAY_SIZE(pdu_co_handlers) || if (pdu->id >= ARRAY_SIZE(pdu_co_handlers) ||
(pdu_co_handlers[pdu->id] == NULL)) { (pdu_co_handlers[pdu->id] == NULL)) {
handler = v9fs_op_not_supp; handler = v9fs_op_not_supp;
@ -3462,6 +3466,8 @@ void pdu_submit(V9fsPDU *pdu)
if (is_ro_export(&s->ctx) && !is_read_only_op(pdu)) { if (is_ro_export(&s->ctx) && !is_read_only_op(pdu)) {
handler = v9fs_fs_ro; handler = v9fs_fs_ro;
} }
qemu_co_queue_init(&pdu->complete);
co = qemu_coroutine_create(handler, pdu); co = qemu_coroutine_create(handler, pdu);
qemu_coroutine_enter(co); qemu_coroutine_enter(co);
} }

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

@ -347,7 +347,7 @@ ssize_t pdu_marshal(V9fsPDU *pdu, size_t offset, const char *fmt, ...);
ssize_t pdu_unmarshal(V9fsPDU *pdu, size_t offset, const char *fmt, ...); ssize_t pdu_unmarshal(V9fsPDU *pdu, size_t offset, const char *fmt, ...);
V9fsPDU *pdu_alloc(V9fsState *s); V9fsPDU *pdu_alloc(V9fsState *s);
void pdu_free(V9fsPDU *pdu); void pdu_free(V9fsPDU *pdu);
void pdu_submit(V9fsPDU *pdu); void pdu_submit(V9fsPDU *pdu, P9MsgHeader *hdr);
void v9fs_reset(V9fsState *s); void v9fs_reset(V9fsState *s);
struct V9fsTransport { struct V9fsTransport {

8
hw/9pfs/virtio-9p-device.c
View File

@ -70,13 +70,7 @@ static void handle_9p_output(VirtIODevice *vdev, VirtQueue *vq)
goto out_free_req; goto out_free_req;
} }
pdu->size = le32_to_cpu(out.size_le); pdu_submit(pdu, &out);
pdu->id = out.id;
pdu->tag = le16_to_cpu(out.tag_le);
qemu_co_queue_init(&pdu->complete);
pdu_submit(pdu);
} }
return; return;

6
hw/9pfs/xen-9p-backend.c
View File

@ -243,14 +243,10 @@ static int xen_9pfs_receive(Xen9pfsRing *ring)
/* cannot fail, because we only handle one request per ring at a time */ /* cannot fail, because we only handle one request per ring at a time */
pdu = pdu_alloc(&ring->priv->state); 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_size = le32_to_cpu(h.size_le);
ring->out_cons = cons + 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, &h);
pdu_submit(pdu);
return 0; return 0;
} }