From nobody Fri Nov 7 13:04:08 2025 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) client-ip=208.118.235.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; spf=pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org Return-Path: Received: from lists.gnu.org (208.118.235.17 [208.118.235.17]) by mx.zohomail.com with SMTPS id 1538935625375952.768936935435; Sun, 7 Oct 2018 11:07:05 -0700 (PDT) Received: from localhost ([::1]:43137 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1g9DSD-0000nB-B0 for importer@patchew.org; Sun, 07 Oct 2018 14:06:57 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:54581) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1g9DQn-0008VG-MN for qemu-devel@nongnu.org; Sun, 07 Oct 2018 14:05:30 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1g9DQk-000116-OW for qemu-devel@nongnu.org; Sun, 07 Oct 2018 14:05:29 -0400 Received: from hera.aquilenet.fr ([2a0c:e300::1]:54630) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1g9DQi-0000vJ-3U for qemu-devel@nongnu.org; Sun, 07 Oct 2018 14:05:24 -0400 Received: from localhost (localhost [127.0.0.1]) by hera.aquilenet.fr (Postfix) with ESMTP id 54315297; Sun, 7 Oct 2018 20:05:20 +0200 (CEST) Received: from hera.aquilenet.fr ([127.0.0.1]) by localhost (hera.aquilenet.fr [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id j5GJEnLToivr; Sun, 7 Oct 2018 20:05:19 +0200 (CEST) Received: from var.youpi.perso.aquilenet.fr (unknown [IPv6:2a01:cb19:181:c200:3602:86ff:fe2c:6a19]) by hera.aquilenet.fr (Postfix) with ESMTPSA id 3ECB34A4; Sun, 7 Oct 2018 20:05:19 +0200 (CEST) Received: from samy by var.youpi.perso.aquilenet.fr with local (Exim 4.91) (envelope-from ) id 1g9DQc-0001Mq-BY; Sun, 07 Oct 2018 20:05:18 +0200 X-Virus-Scanned: Debian amavisd-new at aquilenet.fr From: Samuel Thibault To: qemu-devel@nongnu.org, peter.maydell@linaro.org Date: Sun, 7 Oct 2018 20:05:16 +0200 Message-Id: <20181007180518.5212-2-samuel.thibault@ens-lyon.org> X-Mailer: git-send-email 2.19.0 In-Reply-To: <20181007180518.5212-1-samuel.thibault@ens-lyon.org> References: <20181007180518.5212-1-samuel.thibault@ens-lyon.org> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a0c:e300::1 Subject: [Qemu-devel] [PULL 1/3] slirp: document mbuf pointers and sizes X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: jan.kiszka@siemens.com, stefanha@redhat.com, Samuel Thibault Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail: RSF_0 Z_629925259 SPT_0 Content-Type: text/plain; charset="utf-8" From: Peter Maydell and fix confusing datasize name into gapsize in m_inc. Signed-off-by: Peter Maydell Signed-off-by: Samuel Thibault --- slirp/mbuf.c | 14 +++++++------- slirp/mbuf.h | 13 +++++++++++++ 2 files changed, 20 insertions(+), 7 deletions(-) diff --git a/slirp/mbuf.c b/slirp/mbuf.c index 1b7868355a..aa1f28afb1 100644 --- a/slirp/mbuf.c +++ b/slirp/mbuf.c @@ -151,7 +151,7 @@ m_cat(struct mbuf *m, struct mbuf *n) void m_inc(struct mbuf *m, int size) { - int datasize; + int gapsize; =20 /* some compilers throw up on gotos. This one we can fake. */ if (M_ROOM(m) > size) { @@ -159,17 +159,17 @@ m_inc(struct mbuf *m, int size) } =20 if (m->m_flags & M_EXT) { - datasize =3D m->m_data - m->m_ext; - m->m_ext =3D g_realloc(m->m_ext, size + datasize); + gapsize =3D m->m_data - m->m_ext; + m->m_ext =3D g_realloc(m->m_ext, size + gapsize); } else { - datasize =3D m->m_data - m->m_dat; - m->m_ext =3D g_malloc(size + datasize); + gapsize =3D m->m_data - m->m_dat; + m->m_ext =3D g_malloc(size + gapsize); memcpy(m->m_ext, m->m_dat, m->m_size); m->m_flags |=3D M_EXT; } =20 - m->m_data =3D m->m_ext + datasize; - m->m_size =3D size + datasize; + m->m_data =3D m->m_ext + gapsize; + m->m_size =3D size + gapsize; } =20 =20 diff --git a/slirp/mbuf.h b/slirp/mbuf.h index 33b84485d6..bfdf8c4577 100644 --- a/slirp/mbuf.h +++ b/slirp/mbuf.h @@ -47,6 +47,19 @@ * free the m_ext. This is inefficient memory-wise, but who cares. */ =20 +/* + * mbufs allow to have a gap between the start of the allocated buffer (m_= ext if + * M_EXT is set, m_dat otherwise) and the in-use data: + * + * |--gapsize----->|---m_len-------> + * |----------m_size------------------------------> + * |----M_ROOM--------------------> + * |-M_FREEROOM--> + * + * ^ ^ ^ + * m_dat/m_ext m_data end of buffer + */ + /* * How much room is in the mbuf, from m_data to the end of the mbuf */ --=20 2.19.0