From nobody Fri Nov 7 15:35:29 2025 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1548182616466639.3289349550904; Tue, 22 Jan 2019 10:43:36 -0800 (PST) Received: from localhost ([127.0.0.1]:47055 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gm11L-0000iE-BH for importer@patchew.org; Tue, 22 Jan 2019 13:43:35 -0500 Received: from eggs.gnu.org ([209.51.188.92]:40453) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gm0zS-0007xU-D8 for qemu-devel@nongnu.org; Tue, 22 Jan 2019 13:41:39 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1gm0zO-0001hT-GQ for qemu-devel@nongnu.org; Tue, 22 Jan 2019 13:41:36 -0500 Received: from mail-wr1-x444.google.com ([2a00:1450:4864:20::444]:40150) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1gm0z9-0000sS-3w for qemu-devel@nongnu.org; Tue, 22 Jan 2019 13:41:24 -0500 Received: by mail-wr1-x444.google.com with SMTP id p4so28576619wrt.7 for ; Tue, 22 Jan 2019 10:39:31 -0800 (PST) Received: from orth.archaic.org.uk (orth.archaic.org.uk. [81.2.115.148]) by smtp.gmail.com with ESMTPSA id o4sm94588594wrq.66.2019.01.22.10.18.26 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Tue, 22 Jan 2019 10:18:26 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=nHl7eywGziHShEgliBUBA6fYWaXKXPyf6GkhBJ6XSZs=; b=WcqN9n58XCWWPVs1ta+7jPeo+0/HbxM7skTw/vf3yTsi1BjyJ72eIGahwOnTSEa009 luL1LJGfu/UEDZKYjRzpRHFVbafkfsNt1RSlQyS08IK+RDOi4glPmdazpUUlxhwJOnQX 6fYOFa1w9UXyeoiE+u4m9O2V3p6D/aNuLUsGk= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=nHl7eywGziHShEgliBUBA6fYWaXKXPyf6GkhBJ6XSZs=; b=fh3m7I2O1BFvRK0TWxgQZPq8WAZjVD73Fv89jGGc3EaicEFIcqD72xxG6kTfCYWmem 5Z5+8IBIU1WjvJwKl8PQ6dArVeFLlWuAu3SxKivD0Zn+iV5nVGlzp+5cYCuROOk5rCKR Y0zQu78Z/g4gHUpXfFqYHrCGh1TnGzX86QN8vLlF9a8E5lpbp7pjIXyNs0Kq9kDR1Uh7 bfnQUjkJIQAFmfVNX60MSZlSwtH5ZODElI79hl3OHYB6C7ugAPFvncnigXaF+NYlTAYR cNyk63qX5IBliPWFA/s6uYECdzGNcc3SBJSQ7GNKa+FVJ5uHtDnUtAqAf1opxZui9wH8 wMhQ== X-Gm-Message-State: AJcUukcAspDWeFaS1jsvfoi6Psvd7+50BwIPak33a0rOyXw2qvHvGX/h FFF4eiYDICXfincMV0mXsrDuBv2LwIjvJA== X-Google-Smtp-Source: ALg8bN5wW7qXA9CK2ChrGyYS5j0gk94aUfknKc4uQBzgnF+5KpaR32R7dNjiMZ5D1GXjiKO+1oyuMg== X-Received: by 2002:adf:cc91:: with SMTP id p17mr34640049wrj.118.1548181107424; Tue, 22 Jan 2019 10:18:27 -0800 (PST) From: Peter Maydell To: qemu-devel@nongnu.org Date: Tue, 22 Jan 2019 18:18:22 +0000 Message-Id: <20190122181822.1505-3-peter.maydell@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190122181822.1505-1-peter.maydell@linaro.org> References: <20190122181822.1505-1-peter.maydell@linaro.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: 2a00:1450:4864:20::444 Subject: [Qemu-devel] [PATCH 2/2] slirp: Don't mark struct ipq or struct ipasfrag as packed 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: Samuel Thibault , Jan Kiszka , =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= , patches@linaro.org Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) Content-Type: text/plain; charset="utf-8" There is no reason to mark the struct ipq and struct ipasfrag as packed: they are naturally aligned anyway, and are not representing any on-the-wire packet format. Indeed they vary in size depending on the size of pointers on the host system, because the 'struct qlink' members include 'void *' fields. Dropping the 'packed' annotation fixes clang -Waddress-of-packed-member warnings and probably lets the compiler generate better code too. The only thing we do care about in the layout of the struct is that the frag_link matches up with the ipf_link of the struct ipasfrag, as documented in the comment on that struct; assert at build time that this is the case. Signed-off-by: Peter Maydell Reviewed-by: Eric Blake --- slirp/ip.h | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/slirp/ip.h b/slirp/ip.h index 243b6c8b249..20614f3b53e 100644 --- a/slirp/ip.h +++ b/slirp/ip.h @@ -217,7 +217,7 @@ struct ipq { uint8_t ipq_p; /* protocol of this fragment */ uint16_t ipq_id; /* sequence id for reassembly */ struct in_addr ipq_src,ipq_dst; -} QEMU_PACKED; +}; =20 /* * Ip header, when holding a fragment. @@ -227,7 +227,10 @@ struct ipq { struct ipasfrag { struct qlink ipf_link; struct ip ipf_ip; -} QEMU_PACKED; +}; + +QEMU_BUILD_BUG_ON(offsetof(struct ipq, frag_link) !=3D + offsetof(struct ipasfrag, ipf_link)); =20 #define ipf_off ipf_ip.ip_off #define ipf_tos ipf_ip.ip_tos --=20 2.20.1