From patchwork Mon Jan 8 17:28:54 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= X-Patchwork-Id: 856946 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=nongnu.org (client-ip=2001:4830:134:3::11; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=) Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="tR0l6DaB"; dkim-atps=neutral Received: from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 3zFj322Y3Vz9s4s for ; Tue, 9 Jan 2018 04:30:22 +1100 (AEDT) Received: from localhost ([::1]:46969 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1eYbFc-0008GB-CW for incoming@patchwork.ozlabs.org; Mon, 08 Jan 2018 12:30:20 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:33621) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1eYbEd-00083N-1c for qemu-devel@nongnu.org; Mon, 08 Jan 2018 12:29:20 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1eYbEc-0008Pm-7r for qemu-devel@nongnu.org; Mon, 08 Jan 2018 12:29:19 -0500 Received: from mail-qk0-x241.google.com ([2607:f8b0:400d:c09::241]:46339) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1eYbEc-0008PE-3j for qemu-devel@nongnu.org; Mon, 08 Jan 2018 12:29:18 -0500 Received: by mail-qk0-x241.google.com with SMTP id l12so14750630qke.13 for ; Mon, 08 Jan 2018 09:29:18 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=TthngJ5DDtkitAo4wCaBEdaKUWAUgMKak36jYhOPZLA=; b=tR0l6DaBxpD5XPuN4kw5W8QkweTLT83gspRnirP/b0mzobumUEtsi1rASIzEljMd3j kB508gAd8WfbU0fkf/uJzmM27J/S+QmDa8dOkFPTUVgmQRuwE1r0PJEp5Fs4R6d6AN1S 6MSAcNuOZ83ePhLtdokg0k1TZM1s0N9I4FApbiscNhiCl9/2Jr5cfjFX2ZB75DStVdFk NiIiB2pqupV3Owu1nAbkrLGz6E3ijm7KIHYV8HgCFmn4mgW6KS35VRVh9ORJxN5AM3Rs nvcW1OKLBmnpaDP7g8aPPCkIF2FgPnJB1w7rlCdF3hsGxswTUjUOcvE7LvZfpZ1Y3FTx 1gVw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=TthngJ5DDtkitAo4wCaBEdaKUWAUgMKak36jYhOPZLA=; b=eWs+VufNSONVbHsQhT2EHlDCcxhmRlVBUO8PLbyRaoPBO4j3q7c7yFXVNGlf1DlGML C57p/bxpr3Zj1JB1unlqQ6mojKgFkN399ouSfZrRqv3K9WHf4MBCEmE/oLm0tgsSIbsZ kyO4N48Wy0b0DBxZyLcj09CQJeoQ2zs80JyC5GGTc+jhcTkJjRKy1JLTuyPmVfwNyeUH SIGh4Sh/xKOhcsDKcHhwxrNkW72eamVCL7+N4n9rXzQbRiezjvtFl0Z5uKmX9AT2WNTL cT1PW/qXqqCvBnvlrQiqAi6B0wVP/wui0UFTHnrAqvWnucpiVuSa7x+in7BRRSI5h4X6 i9tg== X-Gm-Message-State: AKwxytdAL7rHqrGS/7ecaDd3/E+Jyrm22GkkUdeYoXkD8Ol/Vg1r4ekV noMZiAsu8zyKNQbAl1bI2Xw= X-Google-Smtp-Source: ACJfBov4gO6fGiLkzv6Mlyyk40pL79xueTgSCZ/PFWHp1P6afttEOBfYj0M3V+ZCDZb0qBDeXevBmA== X-Received: by 10.55.76.193 with SMTP id z184mr17061419qka.318.1515432557576; Mon, 08 Jan 2018 09:29:17 -0800 (PST) Received: from x1.local ([138.117.48.219]) by smtp.gmail.com with ESMTPSA id j127sm787922qkd.88.2018.01.08.09.29.14 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 08 Jan 2018 09:29:16 -0800 (PST) From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= To: Samuel Thibault , Jan Kiszka , "Michael S . Tsirkin" , Paolo Bonzini , Eric Blake , Thomas Huth Date: Mon, 8 Jan 2018 14:28:54 -0300 Message-Id: <20180108172904.8772-3-f4bug@amsat.org> X-Mailer: git-send-email 2.15.1 In-Reply-To: <20180108172904.8772-1-f4bug@amsat.org> References: <20180108172904.8772-1-f4bug@amsat.org> MIME-Version: 1.0 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2607:f8b0:400d:c09::241 Subject: [Qemu-devel] [PATCH 02/12] slirp: struct icmp/ethhdr ARE 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: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , qemu-devel@nongnu.org Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" Signed-off-by: Philippe Mathieu-Daudé --- slirp/ip6_icmp.h | 6 +++--- slirp/ip_icmp.h | 2 +- slirp/slirp.h | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/slirp/ip6_icmp.h b/slirp/ip6_icmp.h index b3378b17b5..a4ccc69974 100644 --- a/slirp/ip6_icmp.h +++ b/slirp/ip6_icmp.h @@ -17,20 +17,20 @@ struct icmp6_echo { /* Echo Messages */ uint16_t id; uint16_t seq_num; -}; +} QEMU_PACKED; union icmp6_error_body { uint32_t unused; uint32_t pointer; uint32_t mtu; -}; +} QEMU_PACKED; /* * NDP Messages */ struct ndp_rs { /* Router Solicitation Message */ uint32_t reserved; -}; +} QEMU_PACKED; struct ndp_ra { /* Router Advertisement Message */ uint8_t chl; /* Cur Hop Limit */ diff --git a/slirp/ip_icmp.h b/slirp/ip_icmp.h index d88ab34c1b..e53242bdd8 100644 --- a/slirp/ip_icmp.h +++ b/slirp/ip_icmp.h @@ -88,7 +88,7 @@ struct icmp { #define icmp_ip icmp_dun.id_ip.idi_ip #define icmp_mask icmp_dun.id_mask #define icmp_data icmp_dun.id_data -}; +} QEMU_PACKED; /* * Lower bounds on packet lengths for various types. diff --git a/slirp/slirp.h b/slirp/slirp.h index 9f29b52610..9a7287e7cc 100644 --- a/slirp/slirp.h +++ b/slirp/slirp.h @@ -103,7 +103,7 @@ struct ethhdr { unsigned char h_dest[ETH_ALEN]; /* destination eth addr */ unsigned char h_source[ETH_ALEN]; /* source ether addr */ unsigned short h_proto; /* packet type ID field */ -}; +} QEMU_PACKED; struct slirp_arphdr { unsigned short ar_hrd; /* format of hardware address */