summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStefano Stabellini <sstabellini@kernel.org>2017-03-21 13:51:34 -0700
committerStefano Stabellini <sstabellini@kernel.org>2017-04-21 12:41:29 -0700
commitc9fb47e7d028b7c76655625880eb30666619f636 (patch)
tree63207288fb5d20eaac5317d1ac1db53150c55f2a
parentf65eadb6394340ccf7d23533c7844b6e21c056e9 (diff)
9p: introduce a type for the 9p header
Use the new type in virtio-9p-device. Signed-off-by: Stefano Stabellini <stefano@aporeto.com> Reviewed-by: Greg Kurz <groug@kaod.org> Reviewed-by: Philippe Mathieu-Daudé <f4bug@amsat.org> CC: anthony.perard@citrix.com CC: jgross@suse.com CC: Aneesh Kumar K.V <aneesh.kumar@linux.vnet.ibm.com> CC: Greg Kurz <groug@kaod.org>
-rw-r--r--hw/9pfs/9p.h6
-rw-r--r--hw/9pfs/virtio-9p-device.c6
2 files changed, 7 insertions, 5 deletions
diff --git a/hw/9pfs/9p.h b/hw/9pfs/9p.h
index b7e836251e..5312d8a424 100644
--- a/hw/9pfs/9p.h
+++ b/hw/9pfs/9p.h
@@ -119,6 +119,12 @@ static inline char *rpath(FsContext *ctx, const char *path)
typedef struct V9fsPDU V9fsPDU;
struct V9fsState;
+typedef struct {
+ uint32_t size_le;
+ uint8_t id;
+ uint16_t tag_le;
+} QEMU_PACKED P9MsgHeader;
+
struct V9fsPDU
{
uint32_t size;
diff --git a/hw/9pfs/virtio-9p-device.c b/hw/9pfs/virtio-9p-device.c
index 27a4a32f5c..3782f43702 100644
--- a/hw/9pfs/virtio-9p-device.c
+++ b/hw/9pfs/virtio-9p-device.c
@@ -46,11 +46,7 @@ static void handle_9p_output(VirtIODevice *vdev, VirtQueue *vq)
VirtQueueElement *elem;
while ((pdu = pdu_alloc(s))) {
- struct {
- uint32_t size_le;
- uint8_t id;
- uint16_t tag_le;
- } QEMU_PACKED out;
+ P9MsgHeader out;
elem = virtqueue_pop(vq, sizeof(VirtQueueElement));
if (!elem) {