From patchwork Fri Feb 17 15:45:55 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jan Kiszka X-Patchwork-Id: 141856 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [140.186.70.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id 7E188B6FA4 for ; Sat, 18 Feb 2012 02:46:24 +1100 (EST) Received: from localhost ([::1]:35689 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1RyQ0s-000365-FR for incoming@patchwork.ozlabs.org; Fri, 17 Feb 2012 10:46:22 -0500 Received: from eggs.gnu.org ([140.186.70.92]:35547) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1RyQ0h-000357-9U for qemu-devel@nongnu.org; Fri, 17 Feb 2012 10:46:17 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1RyQ0g-0007tm-0U for qemu-devel@nongnu.org; Fri, 17 Feb 2012 10:46:11 -0500 Received: from thoth.sbs.de ([192.35.17.2]:16785) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1RyQ0f-0007tE-OA for qemu-devel@nongnu.org; Fri, 17 Feb 2012 10:46:09 -0500 Received: from mail1.siemens.de (localhost [127.0.0.1]) by thoth.sbs.de (8.13.6/8.13.6) with ESMTP id q1HFk1C6028244; Fri, 17 Feb 2012 16:46:01 +0100 Received: from mchn199C.mchp.siemens.de ([139.25.109.49]) by mail1.siemens.de (8.13.6/8.13.6) with ESMTP id q1HFjwxQ001419; Fri, 17 Feb 2012 16:46:01 +0100 From: Jan Kiszka To: qemu-devel@nongnu.org Date: Fri, 17 Feb 2012 16:45:55 +0100 Message-Id: <47b0708190d9ee86edfd7f975e436422b2243258.1329493546.git.jan.kiszka@siemens.com> X-Mailer: git-send-email 1.7.3.4 In-Reply-To: References: In-Reply-To: References: X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6, seldom 2.4 (older, 4) X-Received-From: 192.35.17.2 Cc: Zhi Yong Wu , "Michael S. Tsirkin" Subject: [Qemu-devel] [PATCH 1/3] slirp: Clean up ifs_init X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Remove duplicate ifs_init macros, reimplement the logic as static inline in mbuf.h. CC: Zhi Yong Wu CC: Michael S. Tsirkin 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