diff options
| author | Wei Liu | 2015-12-02 15:22:04 +0100 |
|---|---|---|
| committer | Aneesh Kumar K.V | 2016-01-08 10:23:39 +0100 |
| commit | 0e2082d9e5aafbde9d1cf71159ce0123cd9fda05 (patch) | |
| tree | 7bd14a6c77b3a8efb35f3950bc4e47f9037435f5 /hw/9pfs | |
| parent | 9pfs: PDU processing functions should start pdu_ prefix (diff) | |
| download | qemu-0e2082d9e5aafbde9d1cf71159ce0123cd9fda05.tar.gz qemu-0e2082d9e5aafbde9d1cf71159ce0123cd9fda05.tar.xz qemu-0e2082d9e5aafbde9d1cf71159ce0123cd9fda05.zip | |
9pfs: make pdu_{,un}marshal proper functions
Factor out v9fs_iov_v{,un}marshal. Implement pdu_{,un}marshal with those
functions.
Signed-off-by: Wei Liu <wei.liu2@citrix.com>
Signed-off-by: Aneesh Kumar K.V <aneesh.kumar@linux.vnet.ibm.com>
Diffstat (limited to 'hw/9pfs')
| -rw-r--r-- | hw/9pfs/virtio-9p.c | 26 | ||||
| -rw-r--r-- | hw/9pfs/virtio-9p.h | 6 |
2 files changed, 28 insertions, 4 deletions
diff --git a/hw/9pfs/virtio-9p.c b/hw/9pfs/virtio-9p.c index d8ce12ed88..a740f85625 100644 --- a/hw/9pfs/virtio-9p.c +++ b/hw/9pfs/virtio-9p.c @@ -39,6 +39,32 @@ enum { Oappend = 0x80, }; +ssize_t pdu_marshal(V9fsPDU *pdu, size_t offset, const char *fmt, ...) +{ + ssize_t ret; + va_list ap; + + va_start(ap, fmt); + ret = v9fs_iov_vmarshal(pdu->elem.in_sg, pdu->elem.in_num, + offset, 1, fmt, ap); + va_end(ap); + + return ret; +} + +ssize_t pdu_unmarshal(V9fsPDU *pdu, size_t offset, const char *fmt, ...) +{ + ssize_t ret; + va_list ap; + + va_start(ap, fmt); + ret = v9fs_iov_vunmarshal(pdu->elem.out_sg, pdu->elem.out_num, + offset, 1, fmt, ap); + va_end(ap); + + return ret; +} + static int omode_to_uflags(int8_t mode) { int ret = 0; diff --git a/hw/9pfs/virtio-9p.h b/hw/9pfs/virtio-9p.h index 3a7e136ab6..d6f3ac08a7 100644 --- a/hw/9pfs/virtio-9p.h +++ b/hw/9pfs/virtio-9p.h @@ -320,10 +320,8 @@ extern void v9fs_path_copy(V9fsPath *lhs, V9fsPath *rhs); extern int v9fs_name_to_path(V9fsState *s, V9fsPath *dirpath, const char *name, V9fsPath *path); -#define pdu_marshal(pdu, offset, fmt, args...) \ - v9fs_iov_marshal(pdu->elem.in_sg, pdu->elem.in_num, offset, 1, fmt, ##args) -#define pdu_unmarshal(pdu, offset, fmt, args...) \ - v9fs_iov_unmarshal(pdu->elem.out_sg, pdu->elem.out_num, offset, 1, fmt, ##args) +ssize_t pdu_marshal(V9fsPDU *pdu, size_t offset, const char *fmt, ...); +ssize_t pdu_unmarshal(V9fsPDU *pdu, size_t offset, const char *fmt, ...); #define TYPE_VIRTIO_9P "virtio-9p-device" #define VIRTIO_9P(obj) \ |