From patchwork Tue Feb 5 16:58:58 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Samuel Thibault X-Patchwork-Id: 157485 Delivered-To: patch@linaro.org Received: by 2002:a02:48:0:0:0:0:0 with SMTP id 69csp5410366jaa; Tue, 5 Feb 2019 09:10:33 -0800 (PST) X-Google-Smtp-Source: AHgI3IbsibnApTeQG4XPIGSMsQ93za7dnhVAww7k+othlxgbKmrH26oRLnlmOBf8s+yrZ3MY1WN5 X-Received: by 2002:a25:ac2:: with SMTP id 185mr4812252ybk.349.1549386633468; Tue, 05 Feb 2019 09:10:33 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1549386633; cv=none; d=google.com; s=arc-20160816; b=yo9a8aj+QzLILy5xyZ15RJxCRD+uODMpw8ggya7kt35XQ6VFpXoeVEEV0DS67DkTIJ s1Ow6pw6A6lSeJMg0wfiTXh3ZSH7FnjfEYcgeDKZpxTABkq6/XXovw4s5pvDvqGJI8fw teCUSNQqJMf/n28RkqtbkogNznfbZBiGjh2wgXZprwrT1Sk5cB+1ars1j/X8MmnBkEGC uAskqVn36m5vXo7NUDCOJk75JRV+PkZTXbA1SnRIvGzpvgzaZAkVFsV4nCNde37DdDL7 UKkEvs0moLlRhc5IePhVqq088/yFaQNHTlNcJC8mBYeD4HJlLeVU9pJLq6tjn7paPR8t YCww== 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=arltjQDaoRZJlIcmRCzhqa/LXrkbvlbuuI+oG5Mphl/sfobrjI3EfxwnziqlBoJS5x QZb3bIK+DgmoToizx49aKydmntb0i2TjCg28A/6DkVWvcQi0gbhbP+0ROJfPGgeOzOso PhWHxDs18sNQIHyziyqbAam9SAPytHHTjiaqpfE3wcqwWfaemqEmG7004EmwMfA5R0QY fd25lMzSDQ4c9zSTe2/MDHxTl0WoYWRrb/0n9PA+HIvdMwarO0u6Jb61jEennrDXA1ZX /D1YJdj9rRPfoRHGpCYfIfQH8r47O6wlWDUTNooZpGS0ZOv2CZqKTRbqbaCWDBXBkv7K 8K2g== 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 y129si2341490ywe.387.2019.02.05.09.10.33 for (version=TLS1 cipher=AES128-SHA bits=128/128); Tue, 05 Feb 2019 09:10:33 -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]:35069 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gr4Ey-0004Sr-Pk for patch@linaro.org; Tue, 05 Feb 2019 12:10:32 -0500 Received: from eggs.gnu.org ([209.51.188.92]:33070) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gr44d-0005eh-4U for qemu-devel@nongnu.org; Tue, 05 Feb 2019 11:59:52 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1gr44b-0005t6-8r for qemu-devel@nongnu.org; Tue, 05 Feb 2019 11:59:50 -0500 Received: from hera.aquilenet.fr ([2a0c:e300::1]:40356) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1gr44X-0005ll-Oz for qemu-devel@nongnu.org; Tue, 05 Feb 2019 11:59:47 -0500 Received: from localhost (localhost [127.0.0.1]) by hera.aquilenet.fr (Postfix) with ESMTP id 2B7B4C030; Tue, 5 Feb 2019 17:59:35 +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 afrMC9UE7CAC; Tue, 5 Feb 2019 17:59:34 +0100 (CET) Received: from function (unknown [188.164.201.34]) by hera.aquilenet.fr (Postfix) with ESMTPSA id 42E1EC032; Tue, 5 Feb 2019 17:59:31 +0100 (CET) Received: from samy by function with local (Exim 4.92-RC4) (envelope-from ) id 1gr44G-0006xL-GB; Tue, 05 Feb 2019 17:59:28 +0100 From: Samuel Thibault To: qemu-devel@nongnu.org, peter.maydell@linaro.org Date: Tue, 5 Feb 2019 18:58:58 +0200 Message-Id: <20190205165927.26599-4-samuel.thibault@ens-lyon.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190205165927.26599-1-samuel.thibault@ens-lyon.org> References: <20190205165927.26599-1-samuel.thibault@ens-lyon.org> MIME-Version: 1.0 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a0c:e300::1 Subject: [Qemu-devel] [PULLv2 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