From patchwork Tue Feb 5 17:05:05 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Peter Maydell X-Patchwork-Id: 157501 Delivered-To: patch@linaro.org Received: by 2002:a02:48:0:0:0:0:0 with SMTP id 69csp5443493jaa; Tue, 5 Feb 2019 09:42:01 -0800 (PST) X-Google-Smtp-Source: AHgI3IYxBTWKEGZL0VK9vcpsMvMAHHgq0PJEY+j3c6GmjHxxu2DkvOMTnOV2ASP1r02AmY6GmfzB X-Received: by 2002:a81:9ad8:: with SMTP id r207mr4949705ywg.72.1549388520961; Tue, 05 Feb 2019 09:42:00 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1549388520; cv=none; d=google.com; s=arc-20160816; b=ToJuzSgxBsg1MqnpahpqN1zEKbhOpelu8gaPROnyQ8gew/o5lpITfuEjQfb2A67TbA v3JkdxvtVeQZimwS1L2QwjbrxxzUu4aIQtgFa7dhkgmC9UTlbXj7mjdmel0dBJszwhHo SK0VZDdlrJ9TZ1WCGaYsr5bEshTq4tjAF0k2u2KpMPbpHkVS063WYlCf20+yICvF/V0F jT+/mzITp9K6ruiKdDRDO35MrKV/Sh6DtW9E2uSY+fwn7BLiff2PTsq6LMjbZaO53g6h pJUFobsuMua+3TxWYNa/TZ99v5v8qWWNrEEKa4qPlVyDv1Z/iCK/VpVNVivRpYKLyaI+ 6wVg== 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:subject :content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:to:from:dkim-signature; bh=K5npKx6n/vRln5RFgvocN/O1CXk1/9HDCQe/KYXo6m0=; b=UPNK2xfvSvmPIdSKhfEywhb6QVgyaHlCAjrDTX9jEkqFitS1WV0G+QEiVfBYYBzLPW z5QRjjbtge8qnMwNgUjzo/+FRha7OnCByul2gVgP75tdb5J5QvGbDrV+xjdXaDqzdfJQ cy41xlyvsb0WzA6NTb4OD5HlSTtZ+o2kL0Jt9JSuKmo3ALHC+T8fxoI9pF/vkO5J7xza xm4ZxiTqqyJpRTVaskcPZ2GO4flOXqyi+8VpcxjA7RuSZ2KylJ/ma5Vr2rrp6VxGn0Hb RyW0d5AAJBxlw4ZJYI6SEajHZn3AeZKoi6rCl/ozy8k9arB1Sym5PYtQavrb2BjsX99p O6sQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=olnvcZyh; 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=fail (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 u124si402990ybb.326.2019.02.05.09.42.00 for (version=TLS1 cipher=AES128-SHA bits=128/128); Tue, 05 Feb 2019 09:42:00 -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=fail header.i=@linaro.org header.s=google header.b=olnvcZyh; 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=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([127.0.0.1]:35764 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gr4jQ-0006j4-A4 for patch@linaro.org; Tue, 05 Feb 2019 12:42:00 -0500 Received: from eggs.gnu.org ([209.51.188.92]:36064) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gr4AV-0001vW-Db for qemu-devel@nongnu.org; Tue, 05 Feb 2019 12:06:03 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1gr4AR-0000Z7-Ke for qemu-devel@nongnu.org; Tue, 05 Feb 2019 12:05:55 -0500 Received: from mail-wr1-x442.google.com ([2a00:1450:4864:20::442]:37705) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1gr4AR-0000Rt-C0 for qemu-devel@nongnu.org; Tue, 05 Feb 2019 12:05:51 -0500 Received: by mail-wr1-x442.google.com with SMTP id s12so4473707wrt.4 for ; Tue, 05 Feb 2019 09:05:40 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:subject:date:message-id:in-reply-to:references:mime-version :content-transfer-encoding; bh=K5npKx6n/vRln5RFgvocN/O1CXk1/9HDCQe/KYXo6m0=; b=olnvcZyhNKBcbIWeczt/tugNhc+GnAhGcUMkpEwouAsnBS9WT3g3/Kfu9ZscYe/Dk5 CI4AWoKMWabFO88igHyHckY3HfA5PEOcSnHrzVkmLaW/exe1UFCZogV3xhkL9b3VQfNx f7I7tNDRD+FNgCvlujcTm9EGFk0njOSRhy/Nez9VDg1z/uELrKiMLSke+Jh8MOF+E/Tu ePsX4zpVpqCVhaC9zQRUaJS+E5HLJGUrrqHT088n4sS7fm5sjDRBIM6a72MmY07DiFeD tt9VFJAI8fUVx8rwU0y/tWZgT79VHEbrSZ/X/IPaW3oR3mKQ3C/aQ+xHbQaibdjXpIN3 Vjhg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=K5npKx6n/vRln5RFgvocN/O1CXk1/9HDCQe/KYXo6m0=; b=gZzNYqHsKYVys3Wr4Z4Hv4pJMwpaalbG8RKvVTqDHAZv4XkzbP9XT7qGl4kGd5AeGl jt6PjqyZpMiUNAIljD8DqyID7m56bkYIh84hMTehPAveAV4hbLbV1y9CpxE5yLtPV97G GffDQYb/Ub972e5kKoM3S8SJpiDlh/3wiV9UO0RwpsCbLpb1MUmf8k1luaTQ1t/80rew 682C6Xzgl5oSeD20hricsFTf4QmdqrwIDWHmagylORweWnJcqfmubOvdkR7xY4Kl3kW/ WHX9Y1TydXx90YMKprFnszCunFSgazsD+vNddpNFZHiju5LRWU9KDVBKHFoYN5bhf8yP crAg== X-Gm-Message-State: AHQUAuY8BV92mVQhpBnbBdhCgZZGEz3DatEUSnY7prvD2oWQILlvFexe oC0dJGLj9bPajo9iVSSiBfTAJQhdvpVERg== X-Received: by 2002:adf:9226:: with SMTP id 35mr4437291wrj.61.1549386338425; Tue, 05 Feb 2019 09:05:38 -0800 (PST) Received: from orth.archaic.org.uk (orth.archaic.org.uk. [81.2.115.148]) by smtp.gmail.com with ESMTPSA id w13sm5583164wmf.5.2019.02.05.09.05.37 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 05 Feb 2019 09:05:37 -0800 (PST) From: Peter Maydell To: qemu-devel@nongnu.org Date: Tue, 5 Feb 2019 17:05:05 +0000 Message-Id: <20190205170510.21984-18-peter.maydell@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190205170510.21984-1-peter.maydell@linaro.org> References: <20190205170510.21984-1-peter.maydell@linaro.org> MIME-Version: 1.0 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:4864:20::442 Subject: [Qemu-devel] [PULL 17/22] hw/arm/boot: Fix block comment style in arm_load_kernel() 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: , Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" Fix the block comment style in arm_load_kernel() to QEMU's current style preferences. This will allow us to do some refactoring of this function without checkpatch complaining about the code-motion patches. Signed-off-by: Peter Maydell Reviewed-by: Richard Henderson Reviewed-by: Igor Mammedov Message-id: 20190131112240.8395-2-peter.maydell@linaro.org --- hw/arm/boot.c | 30 ++++++++++++++++++++---------- 1 file changed, 20 insertions(+), 10 deletions(-) -- 2.20.1 diff --git a/hw/arm/boot.c b/hw/arm/boot.c index 05762d0fc1b..dcb93fdbe2c 100644 --- a/hw/arm/boot.c +++ b/hw/arm/boot.c @@ -961,7 +961,8 @@ void arm_load_kernel(ARMCPU *cpu, struct arm_boot_info *info) static const ARMInsnFixup *primary_loader; AddressSpace *as = arm_boot_address_space(cpu, info); - /* CPU objects (unlike devices) are not automatically reset on system + /* + * CPU objects (unlike devices) are not automatically reset on system * reset, so we must always register a handler to do so. If we're * actually loading a kernel, the handler is also responsible for * arranging that we start it correctly. @@ -970,7 +971,8 @@ void arm_load_kernel(ARMCPU *cpu, struct arm_boot_info *info) qemu_register_reset(do_cpu_reset, ARM_CPU(cs)); } - /* The board code is not supposed to set secure_board_setup unless + /* + * The board code is not supposed to set secure_board_setup unless * running its code in secure mode is actually possible, and KVM * doesn't support secure. */ @@ -983,7 +985,8 @@ void arm_load_kernel(ARMCPU *cpu, struct arm_boot_info *info) if (!info->kernel_filename || info->firmware_loaded) { if (have_dtb(info)) { - /* If we have a device tree blob, but no kernel to supply it to (or + /* + * If we have a device tree blob, but no kernel to supply it to (or * the kernel is supposed to be loaded by the bootloader), copy the * DTB to the base of RAM for the bootloader to pick up. */ @@ -998,7 +1001,8 @@ void arm_load_kernel(ARMCPU *cpu, struct arm_boot_info *info) try_decompressing_kernel = arm_feature(&cpu->env, ARM_FEATURE_AARCH64); - /* Expose the kernel, the command line, and the initrd in fw_cfg. + /* + * Expose the kernel, the command line, and the initrd in fw_cfg. * We don't process them here at all, it's all left to the * firmware. */ @@ -1018,7 +1022,8 @@ void arm_load_kernel(ARMCPU *cpu, struct arm_boot_info *info) } } - /* We will start from address 0 (typically a boot ROM image) in the + /* + * We will start from address 0 (typically a boot ROM image) in the * same way as hardware. */ return; @@ -1045,7 +1050,8 @@ void arm_load_kernel(ARMCPU *cpu, struct arm_boot_info *info) if (info->nb_cpus == 0) info->nb_cpus = 1; - /* We want to put the initrd far enough into RAM that when the + /* + * We want to put the initrd far enough into RAM that when the * kernel is uncompressed it will not clobber the initrd. However * on boards without much RAM we must ensure that we still leave * enough room for a decent sized initrd, and on boards with large @@ -1062,12 +1068,14 @@ void arm_load_kernel(ARMCPU *cpu, struct arm_boot_info *info) kernel_size = arm_load_elf(info, &elf_entry, &elf_low_addr, &elf_high_addr, elf_machine, as); if (kernel_size > 0 && have_dtb(info)) { - /* If there is still some room left at the base of RAM, try and put + /* + * If there is still some room left at the base of RAM, try and put * the DTB there like we do for images loaded with -bios or -pflash. */ if (elf_low_addr > info->loader_start || elf_high_addr < info->loader_start) { - /* Set elf_low_addr as address limit for arm_load_dtb if it may be + /* + * Set elf_low_addr as address limit for arm_load_dtb if it may be * pointing into RAM, otherwise pass '0' (no limit) */ if (elf_low_addr < info->loader_start) { @@ -1128,7 +1136,8 @@ void arm_load_kernel(ARMCPU *cpu, struct arm_boot_info *info) fixupcontext[FIXUP_BOARDID] = info->board_id; fixupcontext[FIXUP_BOARD_SETUP] = info->board_setup_addr; - /* for device tree boot, we pass the DTB directly in r2. Otherwise + /* + * for device tree boot, we pass the DTB directly in r2. Otherwise * we point to the kernel args. */ if (have_dtb(info)) { @@ -1181,7 +1190,8 @@ void arm_load_kernel(ARMCPU *cpu, struct arm_boot_info *info) info->write_board_setup(cpu, info); } - /* Notify devices which need to fake up firmware initialization + /* + * Notify devices which need to fake up firmware initialization * that we're doing a direct kernel boot. */ object_child_foreach_recursive(object_get_root(),