[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH v2 23/27] 9pfs: move handle_9p_output and make it st
From: |
Wei Liu |
Subject: |
[Qemu-devel] [PATCH v2 23/27] 9pfs: move handle_9p_output and make it static function |
Date: |
Thu, 7 Jan 2016 19:56:20 +0000 |
It's only used in virtio device.
Signed-off-by: Wei Liu <address@hidden>
---
v2: new, part of original "9pfs: break out generic code from
virtio-9p.{c,h}"
---
hw/9pfs/virtio-9p-device.c | 34 ++++++++++++++++++++++++++++++++++
hw/9pfs/virtio-9p.c | 33 ---------------------------------
hw/9pfs/virtio-9p.h | 1 -
3 files changed, 34 insertions(+), 34 deletions(-)
diff --git a/hw/9pfs/virtio-9p-device.c b/hw/9pfs/virtio-9p-device.c
index cfad13a..bc103b7 100644
--- a/hw/9pfs/virtio-9p-device.c
+++ b/hw/9pfs/virtio-9p-device.c
@@ -19,6 +19,7 @@
#include "9p-xattr.h"
#include "coth.h"
#include "hw/virtio/virtio-access.h"
+#include "qemu/iov.h"
void virtio_9p_push_and_notify(V9fsPDU *pdu)
{
@@ -31,6 +32,39 @@ void virtio_9p_push_and_notify(V9fsPDU *pdu)
virtio_notify(VIRTIO_DEVICE(s), s->vq);
}
+static void handle_9p_output(VirtIODevice *vdev, VirtQueue *vq)
+{
+ V9fsState *s = (V9fsState *)vdev;
+ V9fsPDU *pdu;
+ ssize_t len;
+
+ while ((pdu = pdu_alloc(s)) &&
+ (len = virtqueue_pop(vq, &pdu->elem)) != 0) {
+ struct {
+ uint32_t size_le;
+ uint8_t id;
+ uint16_t tag_le;
+ } QEMU_PACKED out;
+ int len;
+
+ BUG_ON(pdu->elem.out_num == 0 || pdu->elem.in_num == 0);
+ QEMU_BUILD_BUG_ON(sizeof out != 7);
+
+ len = iov_to_buf(pdu->elem.out_sg, pdu->elem.out_num, 0,
+ &out, sizeof out);
+ BUG_ON(len != sizeof out);
+
+ pdu->size = le32_to_cpu(out.size_le);
+
+ pdu->id = out.id;
+ pdu->tag = le16_to_cpu(out.tag_le);
+
+ qemu_co_queue_init(&pdu->complete);
+ pdu_submit(pdu);
+ }
+ pdu_free(pdu);
+}
+
static uint64_t virtio_9p_get_features(VirtIODevice *vdev, uint64_t features,
Error **errp)
{
diff --git a/hw/9pfs/virtio-9p.c b/hw/9pfs/virtio-9p.c
index c74e601..e2c047c 100644
--- a/hw/9pfs/virtio-9p.c
+++ b/hw/9pfs/virtio-9p.c
@@ -3271,39 +3271,6 @@ void pdu_submit(V9fsPDU *pdu)
qemu_coroutine_enter(co, pdu);
}
-void handle_9p_output(VirtIODevice *vdev, VirtQueue *vq)
-{
- V9fsState *s = (V9fsState *)vdev;
- V9fsPDU *pdu;
- ssize_t len;
-
- while ((pdu = pdu_alloc(s)) &&
- (len = virtqueue_pop(vq, &pdu->elem)) != 0) {
- struct {
- uint32_t size_le;
- uint8_t id;
- uint16_t tag_le;
- } QEMU_PACKED out;
- int len;
-
- BUG_ON(pdu->elem.out_num == 0 || pdu->elem.in_num == 0);
- QEMU_BUILD_BUG_ON(sizeof out != 7);
-
- len = iov_to_buf(pdu->elem.out_sg, pdu->elem.out_num, 0,
- &out, sizeof out);
- BUG_ON(len != sizeof out);
-
- pdu->size = le32_to_cpu(out.size_le);
-
- pdu->id = out.id;
- pdu->tag = le16_to_cpu(out.tag_le);
-
- qemu_co_queue_init(&pdu->complete);
- pdu_submit(pdu);
- }
- pdu_free(pdu);
-}
-
static void __attribute__((__constructor__)) virtio_9p_set_fd_limit(void)
{
struct rlimit rlim;
diff --git a/hw/9pfs/virtio-9p.h b/hw/9pfs/virtio-9p.h
index a1ac398..474ab94 100644
--- a/hw/9pfs/virtio-9p.h
+++ b/hw/9pfs/virtio-9p.h
@@ -5,7 +5,6 @@
#include "hw/virtio/virtio.h"
#include "9p.h"
-extern void handle_9p_output(VirtIODevice *vdev, VirtQueue *vq);
extern void virtio_9p_push_and_notify(V9fsPDU *pdu);
ssize_t virtio_pdu_vmarshal(V9fsPDU *pdu, size_t offset,
--
2.1.4
- Re: [Qemu-devel] [PATCH v2 12/27] 9pfs: use V9fsBlob to transmit xattr, (continued)
[Qemu-devel] [PATCH v2 10/27] fsdev: break out 9p-marshal.{c, h} from virtio-9p-marshal.{c, h}, Wei Liu, 2016/01/07
[Qemu-devel] [PATCH v2 24/27] 9pfs: rename virtio_9p_set_fd_limit to use v9fs_ prefix, Wei Liu, 2016/01/07
[Qemu-devel] [PATCH v2 26/27] 9pfs: factor out v9fs_device_{, un}realize_common, Wei Liu, 2016/01/07
[Qemu-devel] [PATCH v2 16/27] 9pfs: make pdu_{, un}marshal proper functions, Wei Liu, 2016/01/07
[Qemu-devel] [PATCH v2 14/27] 9pfs: PDU processing functions don't need to take V9fsState as argument, Wei Liu, 2016/01/07
[Qemu-devel] [PATCH v2 13/27] fsdev: rename virtio-9p-marshal.{c, h} to 9p-iov-marshal.{c, h}, Wei Liu, 2016/01/07
[Qemu-devel] [PATCH v2 18/27] 9pfs: factor out pdu_push_and_notify, Wei Liu, 2016/01/07
[Qemu-devel] [PATCH v2 17/27] 9pfs: factor out virtio_pdu_{, un}marshal, Wei Liu, 2016/01/07
[Qemu-devel] [PATCH v2 23/27] 9pfs: move handle_9p_output and make it static function,
Wei Liu <=
[Qemu-devel] [PATCH v2 27/27] 9pfs: disentangle V9fsState, Wei Liu, 2016/01/07
[Qemu-devel] [PATCH v2 20/27] 9pfs: break out 9p.h from virtio-9p.h, Wei Liu, 2016/01/07
[Qemu-devel] [PATCH v2 25/27] 9pfs: rename virtio-9p.c to 9p.c, Wei Liu, 2016/01/07
[Qemu-devel] [PATCH v2 11/27] fsdev: 9p-marshal: introduce V9fsBlob, Wei Liu, 2016/01/07
[Qemu-devel] [PATCH v2 21/27] 9pfs: factor out virtio_9p_push_and_notify, Wei Liu, 2016/01/07
[Qemu-devel] [PATCH v2 19/27] 9pfs: break out virtio_init_iov_from_pdu, Wei Liu, 2016/01/07