diff mbox series

[4/7] net/rocker: move struct rocker_desc to C file

Message ID 20180108180231.21122-5-f4bug@amsat.org
State New
Headers show
Series use QEMU_PACKED and QEMU_ALIGNED macros | expand

Commit Message

Philippe Mathieu-Daudé Jan. 8, 2018, 6:02 p.m. UTC 
this is the only user.

Signed-off-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
---
 hw/net/rocker/rocker_hw.h   | 13 -------------
 hw/net/rocker/rocker_desc.c | 13 +++++++++++++
 2 files changed, 13 insertions(+), 13 deletions(-)

Comments

Richard Henderson Jan. 9, 2018, 4:27 p.m. UTC | #1 
On 01/08/2018 10:02 AM, Philippe Mathieu-Daudé wrote:
> this is the only user.
> 
> Signed-off-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
> ---
>  hw/net/rocker/rocker_hw.h   | 13 -------------
>  hw/net/rocker/rocker_desc.c | 13 +++++++++++++
>  2 files changed, 13 insertions(+), 13 deletions(-)

Reviewed-by: Richard Henderson <richard.henderson@linaro.org>


r~
diff mbox series

Patch

diff --git a/hw/net/rocker/rocker_hw.h b/hw/net/rocker/rocker_hw.h
index 8b4ce250d5..daaaf4080f 100644
--- a/hw/net/rocker/rocker_hw.h
+++ b/hw/net/rocker/rocker_hw.h
@@ -119,19 +119,6 @@  enum {
  */
 #define ROCKER_RING_INDEX(reg) ((reg >> 5) & 0x7F)
 
-/*
- * Rocker DMA Descriptor
- */
-
-typedef struct rocker_desc {
-    __le64 buf_addr;
-    uint64_t cookie;
-    __le16 buf_size;
-    __le16 tlv_size;
-    __le16 rsvd[5];   /* pad to 32 bytes */
-    __le16 comp_err;
-} QEMU_PACKED QEMU_ALIGNED(8) RockerDesc;
-
 /*
  * Rocker TLV type fields
  */
diff --git a/hw/net/rocker/rocker_desc.c b/hw/net/rocker/rocker_desc.c
index b009da4f89..2f2de837f8 100644
--- a/hw/net/rocker/rocker_desc.c
+++ b/hw/net/rocker/rocker_desc.c
@@ -23,6 +23,19 @@ 
 #include "rocker_hw.h"
 #include "rocker_desc.h"
 
+/*
+ * Rocker DMA Descriptor
+ */
+
+typedef struct rocker_desc {
+    __le64 buf_addr;
+    uint64_t cookie;
+    __le16 buf_size;
+    __le16 tlv_size;
+    __le16 rsvd[5];   /* pad to 32 bytes */
+    __le16 comp_err;
+} QEMU_PACKED QEMU_ALIGNED(8) RockerDesc;
+
 struct desc_ring {
     hwaddr base_addr;
     uint32_t size;