From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from list by lists.gnu.org with archive (Exim 4.71) id 1gDTMd-0001bH-7e for mharc-grub-devel@gnu.org; Fri, 19 Oct 2018 07:54:47 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:53326) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gDTMZ-0001Zs-Hh for grub-devel@gnu.org; Fri, 19 Oct 2018 07:54:45 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1gDTMU-0000iA-7Y for grub-devel@gnu.org; Fri, 19 Oct 2018 07:54:43 -0400 Received: from userp2120.oracle.com ([156.151.31.85]:42816) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1gDTMT-0000A2-31 for grub-devel@gnu.org; Fri, 19 Oct 2018 07:54:37 -0400 Received: from pps.filterd (userp2120.oracle.com [127.0.0.1]) by userp2120.oracle.com (8.16.0.22/8.16.0.22) with SMTP id w9JBiID7047158; Fri, 19 Oct 2018 11:54:19 GMT DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=oracle.com; h=date : from : to : cc : subject : message-id : references : mime-version : content-type : in-reply-to; s=corp-2018-07-02; bh=WFMFMKTk60x8LW2t8/BCYCHXniWvizZr823AuXjJ/I0=; b=43dmHJrHeSvv/B7JAhnTbbdSOOaXjWTMCE6zR62ZZoRuZEQGXhGHViS0fRMulqjPTMNp CAdFg7FyOJspQkpTvSszvfYJDFVxhnV8D+nCKqRYYXES8nkg0o3WcIvs7ZKf9d33l3pI rfhcRComnX3NPXYfM15GO38xc+m25+ZLrjV6B1+sBKrl3LdF5c+p5uqWFo/BKQHen/zR wDxnIJq0hG2rAMCVFnH/LSfY/5c2oAtYrOYY757rbcX/Kv/LmJEPZGgxCUXlV7FSJQQ5 XRPdKqi7iu20lQi20DU76tZQFa8gfi8Eic3ugmhL1Eb0ZPtv35MTfX5QSXHUZQZtYKC0 cw== Received: from aserv0021.oracle.com (aserv0021.oracle.com [141.146.126.233]) by userp2120.oracle.com with ESMTP id 2n39brufdw-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Fri, 19 Oct 2018 11:54:19 +0000 Received: from userv0122.oracle.com (userv0122.oracle.com [156.151.31.75]) by aserv0021.oracle.com (8.14.4/8.14.4) with ESMTP id w9JBsH0x028308 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Fri, 19 Oct 2018 11:54:17 GMT Received: from abhmp0004.oracle.com (abhmp0004.oracle.com [141.146.116.10]) by userv0122.oracle.com (8.14.4/8.14.4) with ESMTP id w9JBsGLA003863; Fri, 19 Oct 2018 11:54:16 GMT Received: from olila.i.net-space.pl (/10.175.180.66) by default (Oracle Beehive Gateway v4.0) with ESMTP ; Fri, 19 Oct 2018 04:54:15 -0700 Date: Fri, 19 Oct 2018 13:54:11 +0200 From: Daniel Kiper To: Juergen Gross Cc: grub-devel@gnu.org, xen-devel@lists.xen.org, phcoder@gmail.com, hans@knorrie.org Subject: Re: [PATCH v2 07/18] xen: add PVH specific defines to offset.h Message-ID: <20181019115411.GD4422@olila.i.net-space.pl> References: <20181009110317.6022-1-jgross@suse.com> <20181009110317.6022-8-jgross@suse.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20181009110317.6022-8-jgross@suse.com> User-Agent: Mutt/1.5.21 (2010-09-15) X-Proofpoint-Virus-Version: vendor=nai engine=5900 definitions=9050 signatures=668683 X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 suspectscore=0 malwarescore=0 phishscore=0 bulkscore=0 spamscore=0 mlxscore=0 mlxlogscore=848 adultscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.0.1-1807170000 definitions=main-1810190107 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x [generic] X-Received-From: 156.151.31.85 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: , X-List-Received-Date: Fri, 19 Oct 2018 11:54:45 -0000 On Tue, Oct 09, 2018 at 01:03:06PM +0200, Juergen Gross wrote: > include/grub/offsets.h needs some defines for Xen PVH mode. > > Add them. While at it line up the values in the surrounding lines to > start at the same column. > > Signed-off-by: Juergen Gross > --- > include/grub/offsets.h | 21 ++++++++++++--------- > 1 file changed, 12 insertions(+), 9 deletions(-) > > diff --git a/include/grub/offsets.h b/include/grub/offsets.h > index 330e4c707..b16353163 100644 > --- a/include/grub/offsets.h > +++ b/include/grub/offsets.h > @@ -36,9 +36,10 @@ > #define GRUB_DECOMPRESSOR_I386_PC_MAX_DECOMPRESSOR_SIZE (0x9000-0x8200) > > /* The segment where the kernel is loaded. */ > -#define GRUB_BOOT_I386_PC_KERNEL_SEG 0x800 > +#define GRUB_BOOT_I386_PC_KERNEL_SEG 0x800 > > -#define GRUB_KERNEL_I386_PC_LINK_ADDR 0x9000 > +#define GRUB_KERNEL_I386_PC_LINK_ADDR 0x9000 > +#define GRUB_KERNEL_I386_XENPVH_LINK_ADDR 0x100000 s/XENPVH/XEN_PVH/ In general I prefer XEN_PVH instead of XENPVH. So, please update them all where possible. Not only in this patch. > /* The upper memory area (starting at 640 kiB). */ > #define GRUB_MEMORY_I386_PC_UPPER 0xa0000 > @@ -101,15 +102,17 @@ > #define GRUB_KERNEL_I386_MULTIBOOT_MOD_ALIGN GRUB_KERNEL_I386_COREBOOT_MOD_ALIGN > > #define GRUB_KERNEL_X86_64_XEN_MOD_ALIGN 0x8 > -#define GRUB_KERNEL_I386_XEN_MOD_ALIGN 0x8 > +#define GRUB_KERNEL_I386_XEN_MOD_ALIGN 0x8 > +#define GRUB_KERNEL_I386_XENPVH_MOD_ALIGN 0x8 Ditto. > /* Non-zero value is only needed for PowerMacs. */ > -#define GRUB_KERNEL_X86_64_XEN_MOD_GAP 0x0 > -#define GRUB_KERNEL_I386_XEN_MOD_GAP 0x0 > -#define GRUB_KERNEL_I386_IEEE1275_MOD_GAP 0x0 > -#define GRUB_KERNEL_I386_COREBOOT_MOD_GAP 0x0 > -#define GRUB_KERNEL_SPARC64_IEEE1275_MOD_GAP 0x0 > -#define GRUB_KERNEL_ARM_UBOOT_MOD_GAP 0x0 > +#define GRUB_KERNEL_X86_64_XEN_MOD_GAP 0x0 > +#define GRUB_KERNEL_I386_XEN_MOD_GAP 0x0 > +#define GRUB_KERNEL_I386_XENPVH_MOD_GAP 0x0 Ditto. Daniel