From patchwork Mon Feb 27 14:02:08 2023 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: 657104 Delivered-To: patch@linaro.org Received: by 2002:adf:a3c6:0:0:0:0:0 with SMTP id m6csp2386311wrb; Mon, 27 Feb 2023 06:38:44 -0800 (PST) X-Google-Smtp-Source: AK7set/rJzZJLxFuHoqB8VzMhL20iPU1qk6577V5vIED4AFpcA5E0I3GEp4QTwhKcn4hAElNsgtC X-Received: by 2002:a05:622a:104d:b0:3bf:d1b3:2be2 with SMTP id f13-20020a05622a104d00b003bfd1b32be2mr9131549qte.63.1677508724392; Mon, 27 Feb 2023 06:38:44 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1677508724; cv=none; d=google.com; s=arc-20160816; b=Mu0Yb0AJdWM43PURN5hPjGly0QlcEMsWfQ+kUHrIVYTnioyZax4QkeYl2bOacDUmLg R6U0f6Fq8kPPOIXHwgP0rXH8zhjJAJFkogjQW43AlnhS23mq0BHls8Ha3MxFvKsly9zf CurKmdutSm5ez4KfKuBpOwHs207g3j/kz/kWv3m4J/COOmHwQ7kNzkMlVECagMVPrfQO V8+OXyQuU9CyfwfLIA3+jnsb2wK0j2malpwqZL3dkwhFPOq1PRA82DDH4OSDL6ap8xcV kHKSqIgEjX61jaZLGNUr4vWf7U7C8m2vpPz9vmVHJeQlWwfb79WavAWwpob5wDs14nrM F5Cg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:content-transfer-encoding :mime-version:references:in-reply-to:message-id:date:subject:to:from :dkim-signature; bh=0Wm8wUq0a5iz19694eHb2ATNFE27FYGPtcFCbACRkdY=; b=lvPZYe0cDJbiKzQ7ZZI82hzAtqdpXAP0nLRTavLiT5kmGS76fZsCYJ+G56vqblaUxP 1Y2c3YoQPQYCYltWtEk2WR7grEiMfzpzvY6pB7lKkKYWBMQKSO6F3w4Q42E6/GLwZfMD 4Y2Q9Xe460ZSRfSVK4IjNqGc9mw2TTEcO5yGeJVf1cfR6i628qj7xyyhqx4WoGgixC7t Vw/W7ew+HytK6ncPQJxU1MEtzkTYLYFgMOLnWxzqfnqZvy8ggBNM+GIdUd/rWRlXRWZb YoC0PDlQ61bgV59PWW3sY1Eu6NpAPnIKJ9l+k2hR5A9RZUFBdBoCM3xHebLcVfJPyuZ0 uq4A== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b="oJ4GoZV/"; 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"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id y14-20020a05622a004e00b003b9c4961c87si6766840qtw.228.2023.02.27.06.38.44 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Mon, 27 Feb 2023 06:38:44 -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; dkim=pass header.i=@linaro.org header.s=google header.b="oJ4GoZV/"; 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"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pWeFW-0003Oo-Op; Mon, 27 Feb 2023 09:13:06 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1pWeF3-0000Yv-6Z for qemu-devel@nongnu.org; Mon, 27 Feb 2023 09:12:37 -0500 Received: from mail-wr1-x42f.google.com ([2a00:1450:4864:20::42f]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1pWeEp-0001JX-2H for qemu-devel@nongnu.org; Mon, 27 Feb 2023 09:12:24 -0500 Received: by mail-wr1-x42f.google.com with SMTP id bv17so6379787wrb.5 for ; Mon, 27 Feb 2023 06:12:22 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:from:to:cc:subject:date:message-id :reply-to; bh=0Wm8wUq0a5iz19694eHb2ATNFE27FYGPtcFCbACRkdY=; b=oJ4GoZV/VB2o9JuVoACwtxpeWStDtuE5eN8Jjai8aJwBA5cYEl3f/oqNtZqZBC5GK9 SPeS8u2sOsSdLGAB8WD2NoLFPyUUZg2WxEa+yChtTy+hZXrCh9yiqb4259O/2PF8WET9 +4W6x/IfEUTcvJGpBRRs+S1w1KXTI9fvFLPx9D248AUxOWJ2JmtPtxNft3ZgYEzmhuNU lqF5qNUdg2QgLmCdLir3YMMhDwvQksHP3GD+me7B2NGCE8CMp+DCqQO1O2prRQSROiGm rUki6YD4Jm31wKQxmX0MOz7e7YneGZ6mZL18uEST3XqZoLr3snboX+uWE6PTI+yR0wQt iDAg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=0Wm8wUq0a5iz19694eHb2ATNFE27FYGPtcFCbACRkdY=; b=q64Jqoa1b/Ygeg1cNgK3Uj/KciHiJ3D1VHLGZX5t1htT7TrtSv17mhOLsHV9C4m2Hv 2PAyeoVpxnD5eaYfWmFfCLNKV9rQnq6WF5KfDMBvhsp2L5KA4hHrsJ/Qt/tH40/72xrt vRkL8ondHeqlSegp8eqevEBCc16rYrr5U7fX9ZXcBpnRUN7X+YJthfsnUAaB3I8/09Zt MfGagzoGqNDdJmOSqziR5J7y2CjjshZ3QbukWXllzfXUDevCdI/W88zfcMKEqKuO7/bD IsFMiSLxFrjvWQmiP79Y9P4CJ71eRvx2Dr5PfVTctG0TZGfknHcRYDW7M7CJF8CDsbRt oBGA== X-Gm-Message-State: AO0yUKUH6ej9fZgjsDEliEQ4FveP3t8GDQwZhX8PK8h/KDQ83YcGDzMH iSHb1mlsF03MyxUGxZcdt0kKPaT1sRDKhMgp X-Received: by 2002:a5d:6a03:0:b0:2c7:84e:1cfa with SMTP id m3-20020a5d6a03000000b002c7084e1cfamr16964008wru.40.1677507141024; Mon, 27 Feb 2023 06:12:21 -0800 (PST) Received: from localhost.localdomain ([81.0.6.76]) by smtp.gmail.com with ESMTPSA id i12-20020adfefcc000000b002c54f4d0f71sm7140915wrp.38.2023.02.27.06.12.20 for (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Mon, 27 Feb 2023 06:12:20 -0800 (PST) From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Subject: [PULL 121/126] dump: Replace tswapN() -> cpu_to_dumpN() Date: Mon, 27 Feb 2023 15:02:08 +0100 Message-Id: <20230227140213.35084-112-philmd@linaro.org> X-Mailer: git-send-email 2.38.1 In-Reply-To: <20230227140213.35084-1-philmd@linaro.org> References: <20230227140213.35084-1-philmd@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::42f; envelope-from=philmd@linaro.org; helo=mail-wr1-x42f.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: qemu-devel-bounces+patch=linaro.org@nongnu.org All uses of tswap in that file are wrong, and should be using cpu_to_dumpN, which correctly tests the endianness of the output. Reported-by: Richard Henderson Suggested-by: Richard Henderson Signed-off-by: Philippe Mathieu-Daudé Reviewed-by: Richard Henderson Reviewed-by: Thomas Huth Reviewed-by: Marc-André Lureau Message-Id: <20230225094903.53167-2-philmd@linaro.org> --- dump/dump.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/dump/dump.c b/dump/dump.c index 1362810991..0ab229e5e9 100644 --- a/dump/dump.c +++ b/dump/dump.c @@ -907,13 +907,13 @@ static void get_note_sizes(DumpState *s, const void *note, if (dump_is_64bit(s)) { const Elf64_Nhdr *hdr = note; note_head_sz = sizeof(Elf64_Nhdr); - name_sz = tswap64(hdr->n_namesz); - desc_sz = tswap64(hdr->n_descsz); + name_sz = cpu_to_dump64(s, hdr->n_namesz); + desc_sz = cpu_to_dump64(s, hdr->n_descsz); } else { const Elf32_Nhdr *hdr = note; note_head_sz = sizeof(Elf32_Nhdr); - name_sz = tswap32(hdr->n_namesz); - desc_sz = tswap32(hdr->n_descsz); + name_sz = cpu_to_dump32(s, hdr->n_namesz); + desc_sz = cpu_to_dump32(s, hdr->n_descsz); } if (note_head_size) {