ShuriZma
/
xqemu
mirror of https://github.com/xqemu/xqemu.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

9pfs: move handle_9p_output and make it static function 

It's only used in virtio device.

Signed-off-by: Wei Liu <wei.liu2@citrix.com>
Signed-off-by: Aneesh Kumar K.V <aneesh.kumar@linux.vnet.ibm.com>
This commit is contained in:
Wei Liu 2016-01-07 18:37:25 +00:00 committed by Aneesh Kumar K.V
parent 4b311c5f0b
commit 0192cc5d79
3 changed files with 34 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -19,6 +19,7 @@
#include "9p-xattr.h" #include "9p-xattr.h"
#include "coth.h" #include "coth.h"
#include "hw/virtio/virtio-access.h" #include "hw/virtio/virtio-access.h"
#include "qemu/iov.h"
void virtio_9p_push_and_notify(V9fsPDU *pdu) 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); 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, static uint64_t virtio_9p_get_features(VirtIODevice *vdev, uint64_t features,
Error **errp) Error **errp)
{ {

33
hw/9pfs/virtio-9p.c
View File

@ -3266,39 +3266,6 @@ void pdu_submit(V9fsPDU *pdu)
qemu_coroutine_enter(co, 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) static void __attribute__((__constructor__)) virtio_9p_set_fd_limit(void)
{ {
struct rlimit rlim; struct rlimit rlim;

1
hw/9pfs/virtio-9p.h
View File

@ -5,7 +5,6 @@
#include "hw/virtio/virtio.h" #include "hw/virtio/virtio.h"
#include "9p.h" #include "9p.h"
extern void handle_9p_output(VirtIODevice *vdev, VirtQueue *vq);
extern void virtio_9p_push_and_notify(V9fsPDU *pdu); extern void virtio_9p_push_and_notify(V9fsPDU *pdu);
ssize_t virtio_pdu_vmarshal(V9fsPDU *pdu, size_t offset, ssize_t virtio_pdu_vmarshal(V9fsPDU *pdu, size_t offset,