From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([140.186.70.92]:53533) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1RyO6d-0002Md-Eo for qemu-devel@nongnu.org; Fri, 17 Feb 2012 08:44:12 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1RyO6X-0000Yi-H9 for qemu-devel@nongnu.org; Fri, 17 Feb 2012 08:44:11 -0500 Received: from thoth.sbs.de ([192.35.17.2]:18069) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1RyO6X-0000YP-1Q for qemu-devel@nongnu.org; Fri, 17 Feb 2012 08:44:05 -0500 Message-ID: <4F3E599B.3090004@siemens.com> Date: Fri, 17 Feb 2012 14:43:55 +0100 From: Jan Kiszka MIME-Version: 1.0 References: <1329293521-16197-1-git-send-email-zwu.kernel@gmail.com> <4F3B6D1F.9010607@web.de> In-Reply-To: <4F3B6D1F.9010607@web.de> Content-Type: text/plain; charset=ISO-8859-15 Content-Transfer-Encoding: 7bit Subject: Re: [Qemu-devel] [PATCH 1/2] slirp: remove duplicate definition List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: zwu.kernel@gmail.com, mst@redhat.com Cc: Zhi Yong Wu , qemu-devel@nongnu.org, stefanha@linux.vnet.ibm.com On 2012-02-15 09:30, Jan Kiszka wrote: > On 2012-02-15 09:12, zwu.kernel@gmail.com wrote: >> From: Zhi Yong Wu >> >> Signed-off-by: Zhi Yong Wu >> --- >> slirp/if.c | 2 -- >> 1 files changed, 0 insertions(+), 2 deletions(-) >> >> diff --git a/slirp/if.c b/slirp/if.c >> index 2852396..8e0cac2 100644 >> --- a/slirp/if.c >> +++ b/slirp/if.c >> @@ -8,8 +8,6 @@ >> #include >> #include "qemu-timer.h" >> >> -#define ifs_init(ifm) ((ifm)->ifs_next = (ifm)->ifs_prev = (ifm)) >> - >> static void >> ifs_insque(struct mbuf *ifm, struct mbuf *ifmhead) >> { > > Let's grab the chance and move ifs_init to mbuf.h. I've pushed the following into queues/slirp now. Michael, please use it as base for your renaming. -----8<----- slirp: Clean up ifs_init Remove duplicate ifs_init macros, reimplement the logic as static inline in mbuf.h. Signed-off-by: Jan Kiszka --- slirp/if.c | 2 -- slirp/if.h | 2 -- slirp/mbuf.h | 5 +++++ 3 files changed, 5 insertions(+), 4 deletions(-) diff --git a/slirp/if.c b/slirp/if.c index 2852396..8e0cac2 100644 --- a/slirp/if.c +++ b/slirp/if.c @@ -8,8 +8,6 @@ #include #include "qemu-timer.h" -#define ifs_init(ifm) ((ifm)->ifs_next = (ifm)->ifs_prev = (ifm)) - static void ifs_insque(struct mbuf *ifm, struct mbuf *ifmhead) { diff --git a/slirp/if.h b/slirp/if.h index 2dac1c7..3327023 100644 --- a/slirp/if.h +++ b/slirp/if.h @@ -20,6 +20,4 @@ /* 2 for alignment, 14 for ethernet, 40 for TCP/IP */ #define IF_MAXLINKHDR (2 + 14 + 40) -#define ifs_init(ifm) ((ifm)->ifs_next = (ifm)->ifs_prev = (ifm)) - #endif diff --git a/slirp/mbuf.h b/slirp/mbuf.h index 0708840..8d7951f 100644 --- a/slirp/mbuf.h +++ b/slirp/mbuf.h @@ -124,4 +124,9 @@ void m_adj(struct mbuf *, int); int m_copy(struct mbuf *, struct mbuf *, int, int); struct mbuf * dtom(Slirp *, void *); +static inline void ifs_init(struct mbuf *ifm) +{ + ifm->ifs_next = ifm->ifs_prev = ifm; +} + #endif