mirrors/qemu
0
0
Fork 0
mirror of https://github.com/qemu/qemu.git synced 2024-11-29 14:53:35 +08:00
Code Issues Packages Projects Releases Wiki Activity

9pfs: factor out virtio_pdu_{,un}marshal

Browse Source 
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 2015-12-03 12:40:28 +00:00 committed by Aneesh Kumar K.V
parent 0e2082d9e5
commit fe9fa96d7c
3 changed files with 21 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -156,6 +156,20 @@ static void virtio_9p_device_unrealize(DeviceState *dev, Error **errp)
g_free(s->tag); g_free(s->tag);
} }
ssize_t virtio_pdu_vmarshal(V9fsPDU *pdu, size_t offset,
const char *fmt, va_list ap)
{
return v9fs_iov_vmarshal(pdu->elem.in_sg, pdu->elem.in_num,
offset, 1, fmt, ap);
}
ssize_t virtio_pdu_vunmarshal(V9fsPDU *pdu, size_t offset,
const char *fmt, va_list ap)
{
return v9fs_iov_vunmarshal(pdu->elem.out_sg, pdu->elem.out_num,
offset, 1, fmt, ap);
}
/* virtio-9p device */ /* virtio-9p device */
static Property virtio_9p_properties[] = { static Property virtio_9p_properties[] = {

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

@ -45,8 +45,7 @@ ssize_t pdu_marshal(V9fsPDU *pdu, size_t offset, const char *fmt, ...)
va_list ap; va_list ap;
va_start(ap, fmt); va_start(ap, fmt);
ret = v9fs_iov_vmarshal(pdu->elem.in_sg, pdu->elem.in_num, ret = virtio_pdu_vmarshal(pdu, offset, fmt, ap);
offset, 1, fmt, ap);
va_end(ap); va_end(ap);
return ret; return ret;
@ -58,8 +57,7 @@ ssize_t pdu_unmarshal(V9fsPDU *pdu, size_t offset, const char *fmt, ...)
va_list ap; va_list ap;
va_start(ap, fmt); va_start(ap, fmt);
ret = v9fs_iov_vunmarshal(pdu->elem.out_sg, pdu->elem.out_num, ret = virtio_pdu_vunmarshal(pdu, offset, fmt, ap);
offset, 1, fmt, ap);
va_end(ap); va_end(ap);
return ret; return ret;

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

@ -323,6 +323,11 @@ extern int v9fs_name_to_path(V9fsState *s, V9fsPath *dirpath,
ssize_t pdu_marshal(V9fsPDU *pdu, size_t offset, const char *fmt, ...); 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, ...);
ssize_t virtio_pdu_vmarshal(V9fsPDU *pdu, size_t offset,
const char *fmt, va_list ap);
ssize_t virtio_pdu_vunmarshal(V9fsPDU *pdu, size_t offset,
const char *fmt, va_list ap);
#define TYPE_VIRTIO_9P "virtio-9p-device" #define TYPE_VIRTIO_9P "virtio-9p-device"
#define VIRTIO_9P(obj) \ #define VIRTIO_9P(obj) \
OBJECT_CHECK(V9fsState, (obj), TYPE_VIRTIO_9P) OBJECT_CHECK(V9fsState, (obj), TYPE_VIRTIO_9P)