From patchwork Tue Feb 5 18:28:19 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Samuel Thibault X-Patchwork-Id: 157522 Delivered-To: patch@linaro.org Received: by 2002:a02:48:0:0:0:0:0 with SMTP id 69csp5546931jaa; Tue, 5 Feb 2019 11:24:47 -0800 (PST) X-Google-Smtp-Source: AHgI3Ib6a1PkOa6mPcAL8MJekg9DI+6RLB3Dd+EnLRMMvNTJgyoRAIniZMEE2I87Rjas7+uYIhDi X-Received: by 2002:a0d:c484:: with SMTP id g126mr5374299ywd.151.1549394687444; Tue, 05 Feb 2019 11:24:47 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1549394687; cv=none; d=google.com; s=arc-20160816; b=hqvRnNfnLzfgdkx8vFSVu1jhzix8yj2tX3kNKZG/N777s7QVgIYa/wHxssT0xmF3ZE 4dZOi3lW62EM+4C88DmdvlZ2RhDyoA7KuaeAHWQ5sQ6vvSfaH35TA0w3TcrabFfFkjLS 2xMQLfCuL9roSVNV/BIBaQ9CY1N1h2C3VfNaFeh7TpM53MkWKH3El+FyRbX1JpTcjni2 P6+oGBU6E4GWuOEYKFmXrPic9KN3GWcFqumUtdcTurUiFoFqWdfC2A6vJsmIagDHOsCR YPJOheIwQbRrvfip9y3qINU6e06lsvpqtWvCxnqAeDSXTTiYqRZQM9yUYEVUpKSjnrLX KsAQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:cc:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:subject :content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:to:from; bh=c37Oo6eLvoOcn14oMVc6NjO4Og2IlcGPMnzcEwlvs00=; b=UlX8lGe5rUsGfXESKnfB0V9rdIXWuP8lc/Cd99fcPfrfK1Trb/hu8WuuNSMkcuLhpR CKAeVtUfKKqZXbsV7WdHBfKAI3NLJLJMLV7CBVLKkfWCVgYLMtQaHcnUSSgamjUOMiYc AHgYsrbuIgIlFtrKpp58JnA3vbcOPi+7jURKIbxsqKqcACz2rge7N49SBajQekXzFBNV 1Aq5+UE5vjRS0Jp0JHKjsRn33PWrkbd97WuU10LRb8ilhjgA6jc7wkikmtKbOpFB0Yw3 hPzp0B8CYsJer03RR9RyAktH0kNj5abVkG5HnDNuGVfmbvvPQUM7wQOvgXWK4WzhKaPZ MPgg== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org" Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id 1si143177ywm.10.2019.02.05.11.24.47 for (version=TLS1 cipher=AES128-SHA bits=128/128); Tue, 05 Feb 2019 11:24:47 -0800 (PST) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org" Received: from localhost ([127.0.0.1]:38546 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gr6Ks-0008Jv-UF for patch@linaro.org; Tue, 05 Feb 2019 14:24:46 -0500 Received: from eggs.gnu.org ([209.51.188.92]:42104) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gr5Sv-0004nB-2F for qemu-devel@nongnu.org; Tue, 05 Feb 2019 13:29:02 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1gr5St-0005Iy-Rx for qemu-devel@nongnu.org; Tue, 05 Feb 2019 13:29:00 -0500 Received: from hera.aquilenet.fr ([185.233.100.1]:34632) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1gr5St-0005Fz-Gj for qemu-devel@nongnu.org; Tue, 05 Feb 2019 13:28:59 -0500 Received: from localhost (localhost [127.0.0.1]) by hera.aquilenet.fr (Postfix) with ESMTP id B3EEAC10F; Tue, 5 Feb 2019 19:28:57 +0100 (CET) X-Virus-Scanned: Debian amavisd-new at aquilenet.fr 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 PGdeSh55UkOH; Tue, 5 Feb 2019 19:28:57 +0100 (CET) Received: from function (unknown [188.164.201.34]) by hera.aquilenet.fr (Postfix) with ESMTPSA id 197D2C112; Tue, 5 Feb 2019 19:28:53 +0100 (CET) Received: from samy by function with local (Exim 4.92-RC4) (envelope-from ) id 1gr5Sj-0007nM-5D; Tue, 05 Feb 2019 19:28:49 +0100 From: Samuel Thibault To: qemu-devel@nongnu.org, peter.maydell@linaro.org Date: Tue, 5 Feb 2019 20:28:19 +0200 Message-Id: <20190205182848.29887-4-samuel.thibault@ens-lyon.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190205182848.29887-1-samuel.thibault@ens-lyon.org> References: <20190205182848.29887-1-samuel.thibault@ens-lyon.org> MIME-Version: 1.0 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 185.233.100.1 Subject: [Qemu-devel] [PULLv3 03/32] 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: jan.kiszka@siemens.com, stefanha@redhat.com, Samuel Thibault Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" From: Peter Maydell 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 Signed-off-by: Samuel Thibault --- slirp/ip.h | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) -- 2.20.1 diff --git a/slirp/ip.h b/slirp/ip.h index 243b6c8b24..20614f3b53 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; +}; /* * 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) != + offsetof(struct ipasfrag, ipf_link)); #define ipf_off ipf_ip.ip_off #define ipf_tos ipf_ip.ip_tos