From patchwork Thu Feb 1 18:18:53 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Leif Lindholm X-Patchwork-Id: 126572 Delivered-To: patch@linaro.org Received: by 10.46.124.24 with SMTP id x24csp1952893ljc; Thu, 1 Feb 2018 10:23:02 -0800 (PST) X-Google-Smtp-Source: AH8x225JHyob6KDBUwI6I1+yfTnmL5HxsDvTAw7zWk4wVzOFf8ShUhBmjcS+K4a+DTWwGcnG5SJx X-Received: by 10.37.93.18 with SMTP id r18mr20377794ybb.424.1517509382879; Thu, 01 Feb 2018 10:23:02 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1517509382; cv=none; d=google.com; s=arc-20160816; b=Rzr++vwE9Knon2OnPs2BoqLaGiz4XB9067bzeegzFwqD0WOY572RdJnifFpgYtyXlR fB2pdCQnOLP3qDfysUQtKSUT+EvKfre/y1/WC4OBzQOljdW5xhLstopHZfqA1yJ7AvOF 9ZDHdPPEcdupPyg52MU11Mbii9TIRPdRatB8Up+ngjLTizZWP0P2uO58keylUipd8dtL DNv6e9R/T+yr+KTFSGarzLHKECsG8KTIHC5t6JtjIscs4d0S4LtKnyk5OzF1hdSHg3+X vUGBGpKso6TriOcy3mcDch76xeoBN8G9Jd96H6/fV0fofjqzrc2Sq47YJvi/e2tppQNC Oscw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:mime-version:cc:reply-to :list-subscribe:list-help:list-post:list-archive:list-unsubscribe :list-id:precedence:references:in-reply-to:message-id:date:subject :to:from:dkim-signature:arc-authentication-results; bh=xlzSDROY8ga/kCzaHKjj28vGIEC/WBzbbluJuEdhIV0=; b=Vz1mDIORD6htEZ8jvuK07JnSpzNfsw+rJ41JQXrCJ7wz63KwMR0WcKmTUZ7/IneePu 33iIRDm8xYl6iL9uUGoQM9luWOPCeEZYwk5K6S29gsY5Oh3k8prwPQfYbhQcFDIYc8Tb hLuPseLTg3zXBxxeyZRCTH3P/yAQ3MLoMKbsBM/BOD1AvkntBcfh/1fRhPDlVquDtQS1 H5Xq73RyFobVgPCu9Z33o/ekITxO6C4UVZnyv1L9Dc4QlcXJMQHQwvdW4liVramvzS0c AJZxN5mKkRvHgit8YTDhJnQVDmTlHRu9kiPYUhwBaiYOzPSxjbsKfuhAyQmGt/2cm8hR xYqw== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@linaro.org header.s=google header.b=guNZOGpw; spf=pass (google.com: domain of grub-devel-bounces+patch=linaro.org@gnu.org designates 2001:4830:134:3::11 as permitted sender) smtp.mailfrom=grub-devel-bounces+patch=linaro.org@gnu.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [2001:4830:134:3::11]) by mx.google.com with ESMTPS id k127si38216ywg.165.2018.02.01.10.23.02 for (version=TLS1 cipher=AES128-SHA bits=128/128); Thu, 01 Feb 2018 10:23:02 -0800 (PST) Received-SPF: pass (google.com: domain of grub-devel-bounces+patch=linaro.org@gnu.org designates 2001:4830:134:3::11 as permitted sender) client-ip=2001:4830:134:3::11; Authentication-Results: mx.google.com; dkim=neutral (body hash did not verify) header.i=@linaro.org header.s=google header.b=guNZOGpw; spf=pass (google.com: domain of grub-devel-bounces+patch=linaro.org@gnu.org designates 2001:4830:134:3::11 as permitted sender) smtp.mailfrom=grub-devel-bounces+patch=linaro.org@gnu.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([::1]:52842 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ehJVm-0006Zz-92 for patch@linaro.org; Thu, 01 Feb 2018 13:23:02 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:55443) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ehJS4-0003oH-Sl for grub-devel@gnu.org; Thu, 01 Feb 2018 13:19:17 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ehJS2-0003U8-4w for grub-devel@gnu.org; Thu, 01 Feb 2018 13:19:11 -0500 Received: from mail-wm0-x243.google.com ([2a00:1450:400c:c09::243]:38229) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1ehJS1-0003Rv-UI for grub-devel@gnu.org; Thu, 01 Feb 2018 13:19:10 -0500 Received: by mail-wm0-x243.google.com with SMTP id 141so7503009wme.3 for ; Thu, 01 Feb 2018 10:19:09 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=73RGxGH1VSixfDeTKR0WjMQMucL+rbQbn9gNFopgUZI=; b=guNZOGpwobJC29Z3v/FOWzjA9HCO3Z1tOVf0E8FzNJZZzDauf0IahthXCp+48uh9cP owKglwYdFlyrKjwXn5SU4fxPWQ1NvFkmHZzpVk/JYLeFtqWoimSnTDtkvwAFCgtUWn+b Q/RjwYDS0nHuELD5qzRR9WrjVjHCrZCgiBZN0= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=73RGxGH1VSixfDeTKR0WjMQMucL+rbQbn9gNFopgUZI=; b=CBp5sVLaShSNFEyiWrdEleqnQaODu1oviTrM6/WPQ+nKzNdkJ3SiOZU4i3PK9Bn8WF 8H4a1aSVQ9ipdqgPdEpqHnD8XSvol86gYenZiCE7BNl6V4FxFv8EpkZm2c7u55zyyalC 5H0rKi4DUS0xKVZOa0xEIpyfKryzlLIzFd89N8MZrRltr/v8g8Q5Bxnv8WvqLbytWAZi dkhQJjgbBNuBWE1j69dbJn1JwS6g/zKIYNvzCu41VnsCj2O+yj2a5jHWsZQjB3Btt8eJ iF8ml/YZZkVi5hT3F4E1ucVpSV+F7/ab4139WZKdNzprEQ9zBXvrr9q1uxBy4Dc/1GiX WheQ== X-Gm-Message-State: AKwxytdMF0r+Pd4XrU2oko+oexE+vsAyQhNOb9DIi4RENljOg8ZNBe/Q fpn/z4qni+rPdqxTkhUh/QAVp6pLWkw= X-Received: by 10.28.29.81 with SMTP id d78mr29617562wmd.65.1517509148703; Thu, 01 Feb 2018 10:19:08 -0800 (PST) Received: from vanye.hemma.eciton.net (cpc92316-cmbg19-2-0-cust118.5-4.cable.virginm.net. [82.12.0.119]) by smtp.gmail.com with ESMTPSA id b11sm163911wrf.23.2018.02.01.10.19.07 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 01 Feb 2018 10:19:07 -0800 (PST) From: Leif Lindholm To: grub-devel@gnu.org Subject: [PATCH 05/10] arm64: align linux kernel header struct naming with i386 Date: Thu, 1 Feb 2018 18:18:53 +0000 Message-Id: <20180201181858.1472-6-leif.lindholm@linaro.org> X-Mailer: git-send-email 2.11.0 In-Reply-To: <20180201181858.1472-1-leif.lindholm@linaro.org> References: <20180201181858.1472-1-leif.lindholm@linaro.org> X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:400c:c09::243 X-BeenThere: grub-devel@gnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: The development of GNU GRUB List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-To: The development of GNU GRUB Cc: Daniel Kiper MIME-Version: 1.0 Errors-To: grub-devel-bounces+patch=linaro.org@gnu.org Sender: "Grub-devel" Rename struct grub_arm64_linux_kernel_header -> linux_arm64_kernel_header. Signed-off-by: Leif Lindholm --- grub-core/loader/arm64/linux.c | 4 ++-- grub-core/loader/arm64/xen_boot.c | 4 ++-- include/grub/arm64/linux.h | 5 ++--- 3 files changed, 6 insertions(+), 7 deletions(-) -- 2.11.0 _______________________________________________ Grub-devel mailing list Grub-devel@gnu.org https://lists.gnu.org/mailman/listinfo/grub-devel Reviewed-by: Daniel Kiper diff --git a/grub-core/loader/arm64/linux.c b/grub-core/loader/arm64/linux.c index ca01a2349..79f25a711 100644 --- a/grub-core/loader/arm64/linux.c +++ b/grub-core/loader/arm64/linux.c @@ -48,7 +48,7 @@ static grub_addr_t initrd_start; static grub_addr_t initrd_end; grub_err_t -grub_arm64_uefi_check_image (struct grub_arm64_linux_kernel_header * lh) +grub_arm64_uefi_check_image (struct linux_arm64_kernel_header * lh) { if (lh->magic != GRUB_ARM64_LINUX_MAGIC) return grub_error(GRUB_ERR_BAD_OS, "invalid magic number"); @@ -249,7 +249,7 @@ grub_cmd_linux (grub_command_t cmd __attribute__ ((unused)), int argc, char *argv[]) { grub_file_t file = 0; - struct grub_arm64_linux_kernel_header lh; + struct linux_arm64_kernel_header lh; grub_dl_ref (my_mod); diff --git a/grub-core/loader/arm64/xen_boot.c b/grub-core/loader/arm64/xen_boot.c index 0a40e16be..258264c79 100644 --- a/grub-core/loader/arm64/xen_boot.c +++ b/grub-core/loader/arm64/xen_boot.c @@ -67,7 +67,7 @@ typedef enum module_type module_type_t; struct xen_hypervisor_header { - struct grub_arm64_linux_kernel_header efi_head; + struct linux_arm64_kernel_header efi_head; /* This is always PE\0\0. */ grub_uint8_t signature[GRUB_PE32_SIGNATURE_SIZE]; @@ -469,7 +469,7 @@ grub_cmd_xen_hypervisor (grub_command_t cmd __attribute__ ((unused)), if (grub_file_read (file, &sh, sizeof (sh)) != (long) sizeof (sh)) goto fail; if (grub_arm64_uefi_check_image - ((struct grub_arm64_linux_kernel_header *) &sh) != GRUB_ERR_NONE) + ((struct linux_arm64_kernel_header *) &sh) != GRUB_ERR_NONE) goto fail; grub_file_seek (file, 0); diff --git a/include/grub/arm64/linux.h b/include/grub/arm64/linux.h index a8edf50dc..abe7e9cc3 100644 --- a/include/grub/arm64/linux.h +++ b/include/grub/arm64/linux.h @@ -24,7 +24,7 @@ #define GRUB_ARM64_LINUX_MAGIC 0x644d5241 /* 'ARM\x64' */ /* From linux/Documentation/arm64/booting.txt */ -struct grub_arm64_linux_kernel_header +struct linux_arm64_kernel_header { grub_uint32_t code0; /* Executable code */ grub_uint32_t code1; /* Executable code */ @@ -38,8 +38,7 @@ struct grub_arm64_linux_kernel_header grub_uint32_t hdr_offset; /* Offset of PE/COFF header */ }; -grub_err_t grub_arm64_uefi_check_image (struct grub_arm64_linux_kernel_header - *lh); +grub_err_t grub_arm64_uefi_check_image (struct linux_arm64_kernel_header *lh); grub_err_t grub_arm64_uefi_boot_image (grub_addr_t addr, grub_size_t size, char *args);