From: "Philippe Mathieu-Daudé" <f4bug@amsat.org>
To: Jiri Pirko <jiri@resnulli.us>, Jason Wang <jasowang@redhat.com>,
Dmitry Fleytman <dmitry@daynix.com>, Stefan Weil <sw@weilnetz.de>
Cc: "Philippe Mathieu-Daudé" <f4bug@amsat.org>,
qemu-devel@nongnu.org, "Eric Blake" <eblake@redhat.com>
Subject: [Qemu-devel] [PATCH 4/7] net/rocker: move struct rocker_desc to C file
Date: Mon, 8 Jan 2018 15:02:28 -0300 [thread overview]
Message-ID: <20180108180231.21122-5-f4bug@amsat.org> (raw)
In-Reply-To: <20180108180231.21122-1-f4bug@amsat.org>
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(-)
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;
--
2.15.1
next prev parent reply other threads:[~2018-01-08 18:02 UTC|newest]
Thread overview: 16+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-01-08 18:02 [Qemu-devel] [PATCH 0/7] use QEMU_PACKED and QEMU_ALIGNED macros Philippe Mathieu-Daudé
2018-01-08 18:02 ` [Qemu-devel] [PATCH 1/7] net: struct MACAddr can use the QEMU_PACKED macro Philippe Mathieu-Daudé
2018-01-09 16:26 ` Richard Henderson
2018-01-08 18:02 ` [Qemu-devel] [PATCH 2/7] net/eth: " Philippe Mathieu-Daudé
2018-01-08 18:02 ` [Qemu-devel] [PATCH 3/7] net/rocker: use QEMU_PACKED and QEMU_ALIGNED() macros Philippe Mathieu-Daudé
2018-01-09 16:27 ` Richard Henderson
2018-01-08 18:02 ` Philippe Mathieu-Daudé [this message]
2018-01-09 16:27 ` [Qemu-devel] [PATCH 4/7] net/rocker: move struct rocker_desc to C file Richard Henderson
2018-01-08 18:02 ` [Qemu-devel] [PATCH 5/7] net/eepro100: use QEMU_ALIGNED() macro Philippe Mathieu-Daudé
2018-01-09 16:27 ` Richard Henderson
2018-01-08 18:02 ` [Qemu-devel] [RFC PATCH 6/7] net/eepro100: reduce alignment to DWORD (32bit) Philippe Mathieu-Daudé
2018-01-08 18:10 ` Paolo Bonzini
2018-01-08 18:28 ` Philippe Mathieu-Daudé
2018-01-08 18:02 ` [Qemu-devel] [PATCH 7/7] i386/pc: use the QEMU_ALIGNED() macro Philippe Mathieu-Daudé
2018-01-08 18:53 ` Marcel Apfelbaum
2018-01-09 16:28 ` Richard Henderson
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20180108180231.21122-5-f4bug@amsat.org \
--to=f4bug@amsat.org \
--cc=dmitry@daynix.com \
--cc=eblake@redhat.com \
--cc=jasowang@redhat.com \
--cc=jiri@resnulli.us \
--cc=qemu-devel@nongnu.org \
--cc=sw@weilnetz.de \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).