From patchwork Thu Feb 7 14:02:47 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Samuel Thibault X-Patchwork-Id: 157759 Delivered-To: patch@linaro.org Received: by 2002:ac9:7558:0:0:0:0:0 with SMTP id r24csp670281oct; Thu, 7 Feb 2019 06:07:10 -0800 (PST) X-Google-Smtp-Source: AHgI3IaWqAywWLwp+NZDJeG9sDcEpJcgjdgR0mAfmFQ8udbMxHmbt1VVdQapRg2FmF9M2Ez4Dkr3 X-Received: by 2002:adf:8b83:: with SMTP id o3mr12878261wra.81.1549548429964; Thu, 07 Feb 2019 06:07:09 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1549548429; cv=none; d=google.com; s=arc-20160816; b=GTRsGJbUjnfefDtaoLNfD4OBLwlovB+iqn4+8BFJ2dhbEjGdezK+QaXYpI+Puhotb/ gqPEP4Dsx6N+LD4Dtz6u1Q5a3XarW2mPviD4VSz04Mb/MRNlvKf0AR7bosV4z8g/3ZNU spCrxfBnC3yfmZh+3pouUvHBKG2morlgLUvARcW4hULIcw8f0PCPd/9aaeQGZScdmbWh p05e0ls0N2momcQBy1xWJfoYi6SKmBTMK4vGJ9ZgtuqUY9OyCvRq6J+qX1DgHX6qyXZI S9OjczA3fYDIgE4Z8ERY67um28E5YQH65mcxOfK7jGhF2LnbrqB6dTd5S7Urk5rz8X2m TJPg== 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=L2+rd/l7S9XVG19cVZ+EFQPs84d63OuDlN2y5CzEZeRFIMXz6aQI9je3gRBFGslZ71 0fJ8YjtmAxpF3B7nYlWysJpcLyJvUvUTo8Cmn6TRL2YDe5vIACQGN64e0+4C1GJzpmtq NT6Npe0jPlbPcSL8MpD/BuHK3meV2LhNFB9KxvGy7q+stn1Ruyc4xrNkRYlELUXVOzRK OAaRFRWuCmQdhh5YFAYCkWwKQHV4rgzNiHL+1rK8jI68JaMYMGO2uN1hgPF0d0iBi4ug hCL2GteU2QB+ntHtC4hUQiIoJJ6HUVbpcGmKWxRn5YNUOCQtaduHic9Bzb49nLIKFkGw Q1Hw== 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 v15si1035344wmc.165.2019.02.07.06.07.09 for (version=TLS1 cipher=AES128-SHA bits=128/128); Thu, 07 Feb 2019 06:07:09 -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]:40621 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1grkKa-0003Si-Sx for patch@linaro.org; Thu, 07 Feb 2019 09:07:08 -0500 Received: from eggs.gnu.org ([209.51.188.92]:57258) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1grkHJ-0001wr-V9 for qemu-devel@nongnu.org; Thu, 07 Feb 2019 09:03:53 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1grkHC-0000qa-7h for qemu-devel@nongnu.org; Thu, 07 Feb 2019 09:03:43 -0500 Received: from hera.aquilenet.fr ([185.233.100.1]:41586) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1grkGy-0000m0-Es for qemu-devel@nongnu.org; Thu, 07 Feb 2019 09:03:27 -0500 Received: from localhost (localhost [127.0.0.1]) by hera.aquilenet.fr (Postfix) with ESMTP id 825E9CC15; Thu, 7 Feb 2019 15:03:22 +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 8tCbRXnn4VTf; Thu, 7 Feb 2019 15:03:19 +0100 (CET) Received: from function (unknown [160.40.205.85]) by hera.aquilenet.fr (Postfix) with ESMTPSA id 8AED0CD1C; Thu, 7 Feb 2019 15:03:18 +0100 (CET) Received: from samy by function with local (Exim 4.92-RC4) (envelope-from ) id 1grkGq-0004D4-Ro; Thu, 07 Feb 2019 15:03:16 +0100 From: Samuel Thibault To: qemu-devel@nongnu.org, peter.maydell@linaro.org Date: Thu, 7 Feb 2019 16:02:47 +0200 Message-Id: <20190207140316.16103-4-samuel.thibault@ens-lyon.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190207140316.16103-1-samuel.thibault@ens-lyon.org> References: <20190207140316.16103-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] [PULLv4 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