From nobody Wed Nov 12 07:05:22 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 ARC-Seal: i=1; a=rsa-sha256; t=1568584051; cv=none; d=zoho.com; s=zohoarc; b=MehoO/ePhGZ17U0ADX79HhqkaiyBkfs3QORiMxAj2P8odOAmeez9q4AAc1oSM8UYvgXK1zTS+Ep5mBnY9QvyDkrAJT04bKnnOeRKujHfMqtwXQmDJ60Lc5dpBLGVomZkQdP1xYjChtATfdCTpJCaDxtEYPfimdms2vjdZVdQz8Q= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1568584051; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To:ARC-Authentication-Results; bh=U+YdfCWqylTf26ufhufmjwqtzAn/BfWEQAlWL2QBKqY=; b=XIKXVWMrvphVw2iQacTRMkP4FKcZ/25ajSVr3JQsO/rwszibX+3GdooGw24zthZ+57q5kiakH4q0GmxuIhY1bqMPztsn27w+Ln55JDzkNomvaR7Z63yPNSzMazToVGlYyqcRccmoz3WLFL/iiIIFmLNfG3skw/jCvqlrkQo6eSg= ARC-Authentication-Results: i=1; mx.zoho.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 Return-Path: Received: from lists.gnu.org (209.51.188.17 [209.51.188.17]) by mx.zohomail.com with SMTPS id 1568584051338286.0370742796672; Sun, 15 Sep 2019 14:47:31 -0700 (PDT) Received: from localhost ([::1]:57384 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1i9cMW-0001uL-Jn for importer@patchew.org; Sun, 15 Sep 2019 17:47:16 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:53349) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1i9cFB-00043b-8s for qemu-devel@nongnu.org; Sun, 15 Sep 2019 17:39:42 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1i9cFA-0002BA-5w for qemu-devel@nongnu.org; Sun, 15 Sep 2019 17:39:41 -0400 Received: from mail-wr1-x441.google.com ([2a00:1450:4864:20::441]:44034) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1i9cFA-0002Av-0R for qemu-devel@nongnu.org; Sun, 15 Sep 2019 17:39:40 -0400 Received: by mail-wr1-x441.google.com with SMTP id i18so6187941wru.11 for ; Sun, 15 Sep 2019 14:39:39 -0700 (PDT) Received: from localhost.localdomain (240.red-88-21-68.staticip.rima-tde.net. [88.21.68.240]) by smtp.gmail.com with ESMTPSA id z1sm68738999wre.40.2019.09.15.14.39.37 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 15 Sep 2019 14:39:38 -0700 (PDT) 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=U+YdfCWqylTf26ufhufmjwqtzAn/BfWEQAlWL2QBKqY=; b=gyzmS+NQiMFGh0VRdcQBRM4FqhDVWAvMkc7nacFYCWvCI+oP2ZgWf9Hrsnj02LlpBp Qb5YQqLJ9EsWfoTQJLEjFPHLKwPMSyAwK5ymZrCA60bs0raNIq73g96VpxzYpeY7BMwl iomVTUgmhnU4LdhtfTPQCtM0cCRKbv7jMz//Z0p2PpZR09Cq2/DQvehxzdYbfI/xfjAv plnv9M5oe3sfIEhcsXadexk7n+RS6gzzY85KHNOPdVLybyJNXKHzghFHIpxmew+wP0we rjg+N4XdOLUhPGnE0MqnhMngRBtwR0FxEJpQF9IG2Y6IUn5xYE8PFPkGjggTuLZvCrSq b79g== 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=U+YdfCWqylTf26ufhufmjwqtzAn/BfWEQAlWL2QBKqY=; b=orMbbHM6ptnRCU8oKTNwEmwDICi2BMiLGvgkpeFIdhHPsxtvqG+m/NXOE7s/LFdQQI KvqOJQl6v+9KW8Gc05NE90x6B0FdEReDD+NLJ0X7Uha8tycn0m8wF3/1GTbzEKQ4FWyY +KDlh/YnbgKChpmn1im+QOyOgtu6CK+SrQ882TaFRIHzE84/vMxVHyXkKxkS2Kn4EcEU NT5BXe5dygScqZfcCLyXU6L4l58fimecL9xeKqRAIo4veQb93hSmWgWK71ZvvzfaOBt2 buLRBMCXJvzo/yiFGdzR289xVFFLGI+P9Yytd0nPuEZeQubpHZyCW0zCG9MRVG2K+Gq6 t6Ig== X-Gm-Message-State: APjAAAWaKl9Y6YyP9h2xby6hEFoINrsiVZaY/IYqV4iMJNfegIV3MVbV WD/Qh2/MNpqqEuHgS6YqCWMOL5SB X-Google-Smtp-Source: APXvYqz82u/VP6g34kEKaG15A6qmwoiaCPswQGvFKQ23cFSXLzz4yGE0lwBkNgtkfq9vn3O8P70hMw== X-Received: by 2002:a5d:4491:: with SMTP id j17mr17754346wrq.257.1568583578908; Sun, 15 Sep 2019 14:39:38 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Date: Sun, 15 Sep 2019 23:39:24 +0200 Message-Id: <20190915213924.22223-10-f4bug@amsat.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190915213924.22223-1-f4bug@amsat.org> References: <20190915213924.22223-1-f4bug@amsat.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Type: text/plain; charset="utf-8" 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::441 Subject: [Qemu-devel] [RFC PATCH v7 9/9] linux-user/syscall: Align target_sockaddr fields using ABI types X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Riku Voipio , Laurent Vivier , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) Target architectures align types differently for instance m68k aligns on 16bit whereas others on 32bit). Use ABI types to keep alignments good. Suggested-by: Laurent Vivier Signed-off-by: Philippe Mathieu-Daud=C3=A9 --- RFC: Is target_sockaddr_ll.sll_ifindex of type abi_int? linux-user/syscall_defs.h | 34 +++++++++++++++++----------------- 1 file changed, 17 insertions(+), 17 deletions(-) diff --git a/linux-user/syscall_defs.h b/linux-user/syscall_defs.h index 7694d72446..852d4498e0 100644 --- a/linux-user/syscall_defs.h +++ b/linux-user/syscall_defs.h @@ -134,22 +134,22 @@ #define TARGET_IOWRU(type,nr) TARGET_IOC(TARGET_IOC_READ|TARGET_IOC_WRITE,= (type),(nr),TARGET_IOC_SIZEMASK) =20 struct target_sockaddr { - uint16_t sa_family; + abi_ushort sa_family; uint8_t sa_data[14]; }; =20 struct target_sockaddr_ll { - uint16_t sll_family; /* Always AF_PACKET */ - uint16_t sll_protocol; /* Physical layer protocol */ - int sll_ifindex; /* Interface number */ - uint16_t sll_hatype; /* ARP hardware type */ - uint8_t sll_pkttype; /* Packet type */ - uint8_t sll_halen; /* Length of address */ - uint8_t sll_addr[8]; /* Physical layer address */ + abi_ushort sll_family; /* Always AF_PACKET */ + abi_ushort sll_protocol; /* Physical layer protocol */ + int sll_ifindex; /* Interface number */ + abi_ushort sll_hatype; /* ARP hardware type */ + uint8_t sll_pkttype; /* Packet type */ + uint8_t sll_halen; /* Length of address */ + uint8_t sll_addr[8]; /* Physical layer address */ }; =20 struct target_sockaddr_un { - uint16_t su_family; + abi_ushort su_family; uint8_t sun_path[108]; }; =20 @@ -161,24 +161,24 @@ struct target_sockaddr_nl { }; =20 struct target_in_addr { - uint32_t s_addr; /* big endian */ + abi_uint s_addr; /* big endian */ }; =20 struct target_sockaddr_in { - uint16_t sin_family; - int16_t sin_port; /* big endian */ + abi_ushort sin_family; + abi_short sin_port; /* big endian */ struct target_in_addr sin_addr; uint8_t __pad[sizeof(struct target_sockaddr) - - sizeof(uint16_t) - sizeof(int16_t) - + sizeof(abi_ushort) - sizeof(abi_short) - sizeof(struct target_in_addr)]; }; =20 struct target_sockaddr_in6 { - uint16_t sin6_family; - uint16_t sin6_port; /* big endian */ - uint32_t sin6_flowinfo; /* big endian */ + abi_ushort sin6_family; + abi_ushort sin6_port; /* big endian */ + abi_uint sin6_flowinfo; /* big endian */ struct in6_addr sin6_addr; /* IPv6 address, big endian */ - uint32_t sin6_scope_id; + abi_uint sin6_scope_id; }; =20 struct target_sock_filter { --=20 2.20.1