Patchwork [2/8] virtio: put struct VirtIOFeature in a header

login
register
mail settings
Submitter Jesse Larrew
Date Feb. 18, 2013, 10:22 p.m.
Message ID <1361226165-19030-3-git-send-email-jlarrew@linux.vnet.ibm.com>
Download mbox | patch
Permalink /patch/221563/
State New
Headers show

Comments

Jesse Larrew - Feb. 18, 2013, 10:22 p.m.
Move the definition of struct VirtIOFeature from virtio-net.c to virtio.h
so other virtio devices can benefit.

Signed-off-by: Jesse Larrew <jlarrew@linux.vnet.ibm.com>
---
 hw/virtio-net.c | 12 ------------
 hw/virtio.h     | 12 ++++++++++++
 2 files changed, 12 insertions(+), 12 deletions(-)
Anthony Liguori - Feb. 19, 2013, 8:36 p.m.
Jesse Larrew <jlarrew@linux.vnet.ibm.com> writes:

> Move the definition of struct VirtIOFeature from virtio-net.c to virtio.h
> so other virtio devices can benefit.
>
> Signed-off-by: Jesse Larrew <jlarrew@linux.vnet.ibm.com>

Reviewed-by: Anthony Liguori <aliguori@us.ibm.com>

Regards,

Anthony Liguori

> ---
>  hw/virtio-net.c | 12 ------------
>  hw/virtio.h     | 12 ++++++++++++
>  2 files changed, 12 insertions(+), 12 deletions(-)
>
> diff --git a/hw/virtio-net.c b/hw/virtio-net.c
> index bdbfc18..78dc97d 100644
> --- a/hw/virtio-net.c
> +++ b/hw/virtio-net.c
> @@ -75,18 +75,6 @@ typedef struct VirtIONet
>      uint16_t curr_queues;
>  } VirtIONet;
>  
> -/*
> - * Calculate the number of bytes up to and including the given 'field' of
> - * 'container'.
> - */
> -#define endof(container, field) \
> -    (offsetof(container, field) + sizeof(((container *)0)->field))
> -
> -typedef struct VirtIOFeature {
> -    uint32_t flags;
> -    size_t end;
> -} VirtIOFeature;
> -
>  static VirtIOFeature feature_sizes[] = {
>      {.flags = 1 << VIRTIO_NET_F_MAC,
>       .end = endof(struct virtio_net_config, mac)},
> diff --git a/hw/virtio.h b/hw/virtio.h
> index 1e206b8..7755fec 100644
> --- a/hw/virtio.h
> +++ b/hw/virtio.h
> @@ -67,6 +67,18 @@
>  /* This means don't interrupt guest when buffer consumed. */
>  #define VRING_AVAIL_F_NO_INTERRUPT      1
>  
> +/*
> + * Calculate the number of bytes up to and including the given 'field' of
> + * 'container'.
> + */
> +#define endof(container, field) \
> +    (offsetof(container, field) + sizeof(((container *)0)->field))
> +
> +typedef struct VirtIOFeature {
> +    uint32_t flags;
> +    size_t end;
> +} VirtIOFeature;
> +
>  struct VirtQueue;
>  
>  static inline hwaddr vring_align(hwaddr addr,
> -- 
> 1.7.11.7

Patch

diff --git a/hw/virtio-net.c b/hw/virtio-net.c
index bdbfc18..78dc97d 100644
--- a/hw/virtio-net.c
+++ b/hw/virtio-net.c
@@ -75,18 +75,6 @@  typedef struct VirtIONet
     uint16_t curr_queues;
 } VirtIONet;
 
-/*
- * Calculate the number of bytes up to and including the given 'field' of
- * 'container'.
- */
-#define endof(container, field) \
-    (offsetof(container, field) + sizeof(((container *)0)->field))
-
-typedef struct VirtIOFeature {
-    uint32_t flags;
-    size_t end;
-} VirtIOFeature;
-
 static VirtIOFeature feature_sizes[] = {
     {.flags = 1 << VIRTIO_NET_F_MAC,
      .end = endof(struct virtio_net_config, mac)},
diff --git a/hw/virtio.h b/hw/virtio.h
index 1e206b8..7755fec 100644
--- a/hw/virtio.h
+++ b/hw/virtio.h
@@ -67,6 +67,18 @@ 
 /* This means don't interrupt guest when buffer consumed. */
 #define VRING_AVAIL_F_NO_INTERRUPT      1
 
+/*
+ * Calculate the number of bytes up to and including the given 'field' of
+ * 'container'.
+ */
+#define endof(container, field) \
+    (offsetof(container, field) + sizeof(((container *)0)->field))
+
+typedef struct VirtIOFeature {
+    uint32_t flags;
+    size_t end;
+} VirtIOFeature;
+
 struct VirtQueue;
 
 static inline hwaddr vring_align(hwaddr addr,