diff mbox

[v3,3/9] 9p: introduce a type for the 9p header

Message ID 1489694518-16978-3-git-send-email-sstabellini@kernel.org
State New
Headers show

Commit Message

Stefano Stabellini March 16, 2017, 8:01 p.m. UTC 
Use the new type in virtio-9p-device.

Signed-off-by: Stefano Stabellini <stefano@aporeto.com>
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>
---
 hw/9pfs/9p.h               | 6 ++++++
 hw/9pfs/virtio-9p-device.c | 6 +-----
 2 files changed, 7 insertions(+), 5 deletions(-)

Comments

Greg Kurz March 17, 2017, 11:16 a.m. UTC | #1 
On Thu, 16 Mar 2017 13:01:52 -0700
Stefano Stabellini <sstabellini@kernel.org> wrote:

> Use the new type in virtio-9p-device.
> 
> Signed-off-by: Stefano Stabellini <stefano@aporeto.com>
> 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>
> ---

Reviewed-by: Greg Kurz <groug@kaod.org>

>  hw/9pfs/9p.h               | 6 ++++++
>  hw/9pfs/virtio-9p-device.c | 6 +-----
>  2 files changed, 7 insertions(+), 5 deletions(-)
> 
> diff --git a/hw/9pfs/9p.h b/hw/9pfs/9p.h
> index b7e8362..5312d8a 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 27a4a32..3782f43 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) {
Philippe Mathieu-Daudé March 17, 2017, 9:06 p.m. UTC | #2 
On 03/17/2017 08:16 AM, Greg Kurz wrote:
> On Thu, 16 Mar 2017 13:01:52 -0700
> Stefano Stabellini <sstabellini@kernel.org> wrote:
>
>> Use the new type in virtio-9p-device.
>>
>> Signed-off-by: Stefano Stabellini <stefano@aporeto.com>
>> 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>
>> ---
>
> Reviewed-by: Greg Kurz <groug@kaod.org>
>

Reviewed-by: Philippe Mathieu-Daudé <f4bug@amsat.org>

>>  hw/9pfs/9p.h               | 6 ++++++
>>  hw/9pfs/virtio-9p-device.c | 6 +-----
>>  2 files changed, 7 insertions(+), 5 deletions(-)
>>
>> diff --git a/hw/9pfs/9p.h b/hw/9pfs/9p.h
>> index b7e8362..5312d8a 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 27a4a32..3782f43 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) {
>
diff mbox

Patch

diff --git a/hw/9pfs/9p.h b/hw/9pfs/9p.h
index b7e8362..5312d8a 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 27a4a32..3782f43 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) {