From nobody Mon Mar 23 21:24:36 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of lists.xenproject.org designates 192.237.175.120 as permitted sender) client-ip=192.237.175.120; envelope-from=xen-devel-bounces@lists.xenproject.org; helo=lists.xenproject.org; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of lists.xenproject.org designates 192.237.175.120 as permitted sender) smtp.mailfrom=xen-devel-bounces@lists.xenproject.org; dmarc=pass(p=none dis=none) header.from=gmail.com ARC-Seal: i=1; a=rsa-sha256; t=1774283468; cv=none; d=zohomail.com; s=zohoarc; b=LXxu0n+iFVM94F+vEeKP+Nof//tAhdRtEVKXG1WUpxQaydWS+mvYeXkpF40SsGTFpLwpItejHyBxjJyMCuEpwEgnGbG26PMQ09ayTFVnpFzDy0DEH9lSzqRiy2+8YroL5tiwnU0NjGHLYyKOBJYp6a+dImxZVHpyvKQ56jr7HVs= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1774283468; h=Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=WFYQihohLvdN+/ExvCQUaHnRoG/WzCRUsmGA2ZwH768=; b=Tjke/yfpPQgHvkfTwpmMoom9FQglAm+IFrQ8kQQESPIZWg0zPaHENodGyS36QLAbqOYSIEFwh7exnRULANU72eXeJfwaYEHvn/zeSyzJiAYZ06ZlkIJkIIge8HTcYRJbnAhZfFmu9fN9QaDecAcb8VYZuAZ5wdSNBHkjPvZl1l8= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of lists.xenproject.org designates 192.237.175.120 as permitted sender) smtp.mailfrom=xen-devel-bounces@lists.xenproject.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.xenproject.org (lists.xenproject.org [192.237.175.120]) by mx.zohomail.com with SMTPS id 1774283468522448.9401918539728; Mon, 23 Mar 2026 09:31:08 -0700 (PDT) Received: from list by lists.xenproject.org with outflank-mailman.1259452.1552771 (Exim 4.92) (envelope-from ) id 1w4iB8-0006F3-A4; Mon, 23 Mar 2026 16:30:58 +0000 Received: by outflank-mailman (output) from mailman id 1259452.1552771; Mon, 23 Mar 2026 16:30:58 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1w4iB8-0006Ew-5t; Mon, 23 Mar 2026 16:30:58 +0000 Received: by outflank-mailman (input) for mailman id 1259452; Mon, 23 Mar 2026 16:30:56 +0000 Received: from mx.expurgate.net ([195.190.135.10]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1w4iB6-0006Dc-HE for xen-devel@lists.xenproject.org; Mon, 23 Mar 2026 16:30:56 +0000 Received: from mx.expurgate.net (helo=localhost) by mx.expurgate.net with esmtp id 1w4iB5-007jD4-TT for xen-devel@lists.xenproject.org; Mon, 23 Mar 2026 17:30:55 +0100 Received: from [10.42.69.3] (helo=localhost) by localhost with ESMTP (eXpurgate MTA 0.9.1) (envelope-from ) id 69c16a97-bab6-0a2a0a5309dd-0a2a4503b4ec-44 for ; Mon, 23 Mar 2026 17:30:55 +0100 Received: from [209.85.208.49] (helo=mail-ed1-f49.google.com) by tlsNG-33051d.mxtls.expurgate.net with ESMTPS (eXpurgate 4.55.2) (envelope-from ) id 69c16abf-1947-0a2a45030019-d155d031c542-3 for ; Mon, 23 Mar 2026 17:30:55 +0100 Received: by mail-ed1-f49.google.com with SMTP id 4fb4d7f45d1cf-668d70fabc4so918391a12.1 for ; Mon, 23 Mar 2026 09:30:55 -0700 (PDT) Received: from fedora (user-109-243-69-121.play-internet.pl. [109.243.69.121]) by smtp.gmail.com with ESMTPSA id a640c23a62f3a-b9832f8be14sm536248166b.17.2026.03.23.09.30.42 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 23 Mar 2026 09:30:45 -0700 (PDT) X-Outflank-Mailman: Message body and most headers restored to incoming version X-BeenThere: xen-devel@lists.xenproject.org List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-devel-bounces@lists.xenproject.org Precedence: list Sender: "Xen-devel" Authentication-Results: eu.smtp.expurgate.cloud; dkim=pass header.s=20230601 header.d=gmail.com header.i="@gmail.com" header.h="Content-Transfer-Encoding:MIME-Version:References:In-Reply-To:Message-ID:Date:Subject:Cc:To:From" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1774283455; x=1774888255; darn=lists.xenproject.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=WFYQihohLvdN+/ExvCQUaHnRoG/WzCRUsmGA2ZwH768=; b=BygPlh7JyaB2oqV1Hw5pK5nqh+z3d2fFq/BfAmHqSaQxb55iWBvP5JrKi9JlsfR035 DBFumNI0vVYr8ylPJXfEK/QCMrGIlLGbms1VVnntq91ciHT/q8v9zkbPfRPOglML9fjd EkZ7KTMtXyPr9YRbDDCn6wC5Raf4CDkZO5fWpDGbqrGVQ40c/b3fxXuZljNoFk6mJt76 G4oVasqOURMGSOuw+3GrynBhtIE4jvQfO+fdK2q+JGC51qfFH3uUC1WIGNX1Dpfrk7Go vF4igWtIo7OvwOGwf+pWVOQyGUKKOP7INkYS/g4wk59P9uE8H1ZpLWF+D4jUP6fGWWgQ TpWQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1774283455; x=1774888255; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-gg:x-gm-message-state:from :to:cc:subject:date:message-id:reply-to; bh=WFYQihohLvdN+/ExvCQUaHnRoG/WzCRUsmGA2ZwH768=; b=Gtv2zOWG5bfqsNTlNwUKVtEG974cUpMck18pNgIGdxybz6x4BIsPfpe5a1HcW5DHre DiF2L31WQ6HFbXs9AxvHWhNpHZ6Zeg5sOqXvXZ0/FuXnBJ7Ps3IBaBG66PTNFe4g2ETb UdAREwpja5uuJPVlpofh3kIRSFJzMw9Yo9+PqQOVn75Cyi8C2HZbmHSRHRGxyAL8ZApU npGHxehtq9QJX4XwzQRDLtXTz0r3C5dkntbI1G0B+PQ3tJWZ/olps7gXNHWOa9tk+iwR KFwdOq/g3OPouE038TVFW/zeOQJTMoMzF9hih3Qt+exLWnF4L8hpRbTsxteS5FmD89CB Io6g== X-Gm-Message-State: AOJu0YzdSnPNfyrw4iqQpRGdP1C6ugL3F1w5XI6jv19rs8rQWb1O3tfi OZUR66KsO5dD5NtNeMkk3aEkj2uptHpVyfjPCx8xQkOVCKSiOuMF6QC+LGFxtA== X-Gm-Gg: ATEYQzxUrCEKriWaeZCFeGGJNoE69PlHZtEZDZx8tyXpI0oH+s/5aZ936JHcfLTZDIG hln0cBlXiVsvA3ZfdIRuX+gc/IUb/Lk37LZvWPBS2Hwvc3d6ra7KQE3D/F0UGv2BxSzPD6iNgrf QXs8rus8M1HhwoAuNJx74fZVcnYs1feBR7gxmfKmZdSokF4vWD00g1gxj40vKN6wZWkztOFrFB9 pssaB9YYWeQTgAZEqOSrk7FKdsNdn2auYpYGjsGNQ2htx7Bj+UgqmDOCw2M7zrUykYoN5/J6Kym APmeHonTfVNnTmi16ZSGuZKjzl6ug9lAEndn04EdtMyFDoY9jqvXiGSJd+aeqbsTA2DpmvIe+mt BFb45maQ7Z1KM8o+BM6x+5LjdooC8uF/bmHBPTNm5rC6bIxCIitIJV8vUXisBisBHrUgC9Fsumq 4ItzwPESx48GqQKA/VHKK20aluqxx6caTZXfmKZHXpF0VBF7tE0ZhlM9MfddTIG+t0pw== X-Received: by 2002:a17:906:5985:b0:b98:5b2:77fe with SMTP id a640c23a62f3a-b982f21d401mr575939166b.3.1774283454732; Mon, 23 Mar 2026 09:30:54 -0700 (PDT) From: Oleksii Kurochko To: xen-devel@lists.xenproject.org Cc: Romain Caritey , Oleksii Kurochko , Stefano Stabellini , Julien Grall , Bertrand Marquis , Michal Orzel , Volodymyr Babchuk , Andrew Cooper , Anthony PERARD , Jan Beulich , =?UTF-8?q?Roger=20Pau=20Monn=C3=A9?= Subject: [PATCH v2 04/11] xen/dom0less: rename kernel_zimage_probe() to kernel_image_probe() Date: Mon, 23 Mar 2026 17:29:45 +0100 Message-ID: <0fc8039cce1d8bcce1539e7c9ced71f2d1e85b6c.1774281309.git.oleksii.kurochko@gmail.com> X-Mailer: git-send-email 2.53.0 In-Reply-To: References: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-purgate-ID: tlsNG-33051d/1774283455-4905472C-809ABE1F/0/0 X-purgate-type: clean X-purgate-size: 7643 X-ZohoMail-DKIM: pass (identity @gmail.com) X-ZM-MESSAGEID: 1774283469860158500 Content-Type: text/plain; charset="utf-8" The helper kernel_zimage_probe() is referenced from common code (xen/common/device-tree/kernel.c), but its name is tied to the zImage format which is specific to Arm (from architectures supported by Xen). Other architectures supported by Xen, such as RISC-V, do not use the zImage format and instead rely on other kernel image types (e.g. Image or compressed Image variants: Image.gz, etc). Using "zimage" in the name is therefore misleading in architecture-independent code. Rename kernel_zimage_probe() to kernel_image_probe() and update the associated structure field from "zimage" to "image" to reflect that the code handles generic kernel images rather than the zImage format specifically. No functional change intended. Reported-by: Jan Beulich Signed-off-by: Oleksii Kurochko --- Changes in v2: - new patch. --- xen/arch/arm/kernel.c | 48 ++++++++++++++++----------------- xen/common/device-tree/kernel.c | 2 +- xen/include/xen/fdt-kernel.h | 4 +-- 3 files changed, 27 insertions(+), 27 deletions(-) diff --git a/xen/arch/arm/kernel.c b/xen/arch/arm/kernel.c index 7544fd50a20f..3c613cdb233f 100644 --- a/xen/arch/arm/kernel.c +++ b/xen/arch/arm/kernel.c @@ -101,8 +101,8 @@ static paddr_t __init kernel_zimage_place(struct kernel= _info *info) paddr_t load_addr; =20 #ifdef CONFIG_ARM_64 - if ( (info->arch.type =3D=3D DOMAIN_64BIT) && (info->zimage.start =3D= =3D 0) ) - return mem->bank[0].start + info->zimage.text_offset; + if ( (info->arch.type =3D=3D DOMAIN_64BIT) && (info->image.start =3D= =3D 0) ) + return mem->bank[0].start + info->image.text_offset; #endif =20 /* @@ -111,19 +111,19 @@ static paddr_t __init kernel_zimage_place(struct kern= el_info *info) * and above 32MiB. Load it as high as possible within these * constraints, while also avoiding the DTB. */ - if ( info->zimage.start =3D=3D 0 ) + if ( info->image.start =3D=3D 0 ) { paddr_t load_end; =20 load_end =3D mem->bank[0].start + mem->bank[0].size; load_end =3D MIN(mem->bank[0].start + MB(128), load_end); =20 - load_addr =3D load_end - info->zimage.len; + load_addr =3D load_end - info->image.len; /* Align to 2MB */ load_addr &=3D ~((2 << 20) - 1); } else - load_addr =3D info->zimage.start; + load_addr =3D info->image.start; =20 return load_addr; } @@ -131,8 +131,8 @@ static paddr_t __init kernel_zimage_place(struct kernel= _info *info) static void __init kernel_zimage_load(struct kernel_info *info) { paddr_t load_addr =3D kernel_zimage_place(info); - paddr_t paddr =3D info->zimage.kernel_addr; - paddr_t len =3D info->zimage.len; + paddr_t paddr =3D info->image.kernel_addr; + paddr_t len =3D info->image.len; void *kernel; int rc; =20 @@ -215,7 +215,7 @@ int __init kernel_uimage_probe(struct kernel_info *info, return -EOPNOTSUPP; } =20 - info->zimage.start =3D be32_to_cpu(uimage.load); + info->image.start =3D be32_to_cpu(uimage.load); info->entry =3D be32_to_cpu(uimage.ep); =20 /* @@ -224,20 +224,20 @@ int __init kernel_uimage_probe(struct kernel_info *in= fo, * independent image. That means Xen is free to load such an image at * any valid address. */ - if ( info->zimage.start =3D=3D 0 ) + if ( info->image.start =3D=3D 0 ) printk(XENLOG_INFO "No load address provided. Xen will decide where to load it= .\n"); else printk(XENLOG_INFO "Provided load address: %"PRIpaddr" and entry address: %"PR= Ipaddr"\n", - info->zimage.start, info->entry); + info->image.start, info->entry); =20 /* * If the image supports position independent execution, then user can= not * provide an entry point as Xen will load such an image at any approp= riate * memory address. Thus, we need to return error. */ - if ( (info->zimage.start =3D=3D 0) && (info->entry !=3D 0) ) + if ( (info->image.start =3D=3D 0) && (info->entry !=3D 0) ) { printk(XENLOG_ERR "Entry point cannot be non zero for PIE image.\n"); @@ -257,13 +257,13 @@ int __init kernel_uimage_probe(struct kernel_info *in= fo, if ( rc ) return rc; =20 - info->zimage.kernel_addr =3D mod->start; - info->zimage.len =3D mod->size; + info->image.kernel_addr =3D mod->start; + info->image.len =3D mod->size; } else { - info->zimage.kernel_addr =3D addr + sizeof(uimage); - info->zimage.len =3D len; + info->image.kernel_addr =3D addr + sizeof(uimage); + info->image.len =3D len; } =20 info->load =3D kernel_zimage_load; @@ -289,7 +289,7 @@ int __init kernel_uimage_probe(struct kernel_info *info, * Thus, Xen uses uimage.load attribute to determine the load address = and * zimage.text_offset is ignored. */ - info->zimage.text_offset =3D 0; + info->image.text_offset =3D 0; #endif =20 return 0; @@ -338,10 +338,10 @@ static int __init kernel_zimage64_probe(struct kernel= _info *info, if ( (end - start) > size ) return -EINVAL; =20 - info->zimage.kernel_addr =3D addr; - info->zimage.len =3D end - start; - info->zimage.text_offset =3D zimage.text_offset; - info->zimage.start =3D 0; + info->image.kernel_addr =3D addr; + info->image.len =3D end - start; + info->image.text_offset =3D zimage.text_offset; + info->image.start =3D 0; =20 info->load =3D kernel_zimage_load; =20 @@ -389,10 +389,10 @@ static int __init kernel_zimage32_probe(struct kernel= _info *info, } } =20 - info->zimage.kernel_addr =3D addr; + info->image.kernel_addr =3D addr; =20 - info->zimage.start =3D start; - info->zimage.len =3D end - start; + info->image.start =3D start; + info->image.len =3D end - start; =20 info->load =3D kernel_zimage_load; =20 @@ -403,7 +403,7 @@ static int __init kernel_zimage32_probe(struct kernel_i= nfo *info, return 0; } =20 -int __init kernel_zimage_probe(struct kernel_info *info, paddr_t addr, +int __init kernel_image_probe(struct kernel_info *info, paddr_t addr, paddr_t size) { int rc; diff --git a/xen/common/device-tree/kernel.c b/xen/common/device-tree/kerne= l.c index 28096121a52d..cfa27464f0fc 100644 --- a/xen/common/device-tree/kernel.c +++ b/xen/common/device-tree/kernel.c @@ -235,7 +235,7 @@ int __init kernel_probe(struct kernel_info *info, if ( rc && rc !=3D -EINVAL ) return rc; =20 - rc =3D kernel_zimage_probe(info, mod->start, mod->size); + rc =3D kernel_image_probe(info, mod->start, mod->size); =20 return rc; } diff --git a/xen/include/xen/fdt-kernel.h b/xen/include/xen/fdt-kernel.h index 33a60597bb4d..2af3bd5f0722 100644 --- a/xen/include/xen/fdt-kernel.h +++ b/xen/include/xen/fdt-kernel.h @@ -56,7 +56,7 @@ struct kernel_info { paddr_t text_offset; /* 64-bit Image only */ #endif paddr_t start; /* Must be 0 for 64-bit Image */ - } zimage; + } image; }; =20 #if __has_include() @@ -122,7 +122,7 @@ void kernel_load(struct kernel_info *info); =20 int kernel_decompress(struct boot_module *mod, uint32_t offset); =20 -int kernel_zimage_probe(struct kernel_info *info, paddr_t addr, paddr_t si= ze); +int kernel_image_probe(struct kernel_info *info, paddr_t addr, paddr_t siz= e); =20 /* * uImage isn't really used nowadays thereby leave kernel_uimage_probe() --=20 2.53.0