From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from list by lists.gnu.org with archive (Exim 4.71) id 1gEYah-0003nV-JI for mharc-grub-devel@gnu.org; Mon, 22 Oct 2018 07:41:47 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:51357) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gEYaf-0003nP-80 for grub-devel@gnu.org; Mon, 22 Oct 2018 07:41:46 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1gEYaa-0006tc-3e for grub-devel@gnu.org; Mon, 22 Oct 2018 07:41:45 -0400 Received: from aserp2120.oracle.com ([141.146.126.78]:46676) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1gEYaX-0006mD-QL for grub-devel@gnu.org; Mon, 22 Oct 2018 07:41:38 -0400 Received: from pps.filterd (aserp2120.oracle.com [127.0.0.1]) by aserp2120.oracle.com (8.16.0.22/8.16.0.22) with SMTP id w9MBcl27159018; Mon, 22 Oct 2018 11:41:26 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=+s6YrUFfnIS3rRp5xviCkNXyDlru4GHusa1VOBs1uU8=; b=n9UQyZvWYTFb0rjDaB5w9jlgISvS9WT2H3yKoDJ+IdmJvJmrvG2DtU17WzA3M+l0THeG vapZOdC14JB66sAmMwqDePXsSbdNVBJWFvR2kiFFjp0sCK9SbU99zPsHGa5WoCizchK5 amxDXavYuPrzxRCv5RgmdgnLo8JVwDTD2GEeGEfJyQkMHTvOB5FSVlZjeH+02eymheaW 6QhvJWo6ogaE97zkySmWbkpmjgk8v/+KDmX2pnoNcLiGarBF8Fhha5+33SRThurSNQV9 5B22xrT1RYq83XBCqXiG227ooTvIpQ4a/gtOY4CueQZ3TGrYFpk7rFR2VC5m0bwpMah8 Hg== Received: from aserv0022.oracle.com (aserv0022.oracle.com [141.146.126.234]) by aserp2120.oracle.com with ESMTP id 2n7vapnvff-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Mon, 22 Oct 2018 11:41:26 +0000 Received: from userv0121.oracle.com (userv0121.oracle.com [156.151.31.72]) by aserv0022.oracle.com (8.14.4/8.14.4) with ESMTP id w9MBfP3Z013558 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Mon, 22 Oct 2018 11:41:26 GMT Received: from abhmp0017.oracle.com (abhmp0017.oracle.com [141.146.116.23]) by userv0121.oracle.com (8.14.4/8.13.8) with ESMTP id w9MBfOVM009191; Mon, 22 Oct 2018 11:41:24 GMT Received: from olila.i.net-space.pl (/10.175.186.189) by default (Oracle Beehive Gateway v4.0) with ESMTP ; Mon, 22 Oct 2018 04:41:24 -0700 Date: Mon, 22 Oct 2018 13:41:20 +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 14/18] xenpvh: add build runes for grub-core Message-ID: <20181022114120.GD4548@olila.i.net-space.pl> References: <20181009110317.6022-1-jgross@suse.com> <20181009110317.6022-15-jgross@suse.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20181009110317.6022-15-jgross@suse.com> User-Agent: Mutt/1.5.21 (2010-09-15) X-Proofpoint-Virus-Version: vendor=nai engine=5900 definitions=9053 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=999 adultscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.0.1-1807170000 definitions=main-1810220102 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x [generic] X-Received-From: 141.146.126.78 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: Mon, 22 Oct 2018 11:41:46 -0000 On Tue, Oct 09, 2018 at 01:03:13PM +0200, Juergen Gross wrote: > Add the modifications to the build system needed to build a xenpvh > grub. > > Signed-off-by: Juergen Gross > Reviewed-by: Daniel Kiper > --- > gentpl.py | 4 ++-- > grub-core/Makefile.am | 12 ++++++++++++ > grub-core/Makefile.core.def | 35 +++++++++++++++++++++++++++++++++++ > 3 files changed, 49 insertions(+), 2 deletions(-) > > diff --git a/gentpl.py b/gentpl.py > index da67965a4..9732b4aee 100644 > --- a/gentpl.py > +++ b/gentpl.py > @@ -28,7 +28,7 @@ import re > > GRUB_PLATFORMS = [ "emu", "i386_pc", "i386_efi", "i386_qemu", "i386_coreboot", > "i386_multiboot", "i386_ieee1275", "x86_64_efi", > - "i386_xen", "x86_64_xen", > + "i386_xen", "x86_64_xen", "i386_xenpvh", s/i386_xenpvh/i386_xen_pvh/ here and below please... > "mips_loongson", "sparc64_ieee1275", > "powerpc_ieee1275", "mips_arc", "ia64_efi", > "mips_qemu_mips", "arm_uboot", "arm_efi", "arm64_efi", > @@ -71,7 +71,7 @@ GROUPS["videomodules"] = GRUB_PLATFORMS[:]; > for i in GROUPS["videoinkernel"]: GROUPS["videomodules"].remove(i) > > # Similar for terminfo > -GROUPS["terminfoinkernel"] = [ "emu", "mips_loongson", "mips_arc", "mips_qemu_mips" ] + GROUPS["xen"] + GROUPS["ieee1275"] + GROUPS["uboot"]; > +GROUPS["terminfoinkernel"] = [ "emu", "mips_loongson", "mips_arc", "mips_qemu_mips", "i386_xenpvh" ] + GROUPS["xen"] + GROUPS["ieee1275"] + GROUPS["uboot"]; > GROUPS["terminfomodule"] = GRUB_PLATFORMS[:]; > for i in GROUPS["terminfoinkernel"]: GROUPS["terminfomodule"].remove(i) > > diff --git a/grub-core/Makefile.am b/grub-core/Makefile.am > index f4ff62b76..d4417e2c4 100644 > --- a/grub-core/Makefile.am > +++ b/grub-core/Makefile.am > @@ -101,6 +101,18 @@ KERNEL_HEADER_FILES += $(top_builddir)/include/grub/machine/int.h > KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/i386/tsc.h > endif > > +if COND_i386_xenpvh > +KERNEL_HEADER_FILES += $(top_builddir)/include/grub/machine/kernel.h > +KERNEL_HEADER_FILES += $(top_builddir)/include/grub/machine/int.h > +KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/i386/tsc.h > +KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/terminfo.h > +KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/extcmd.h > +KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/loader.h > +KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/lib/arg.h > +KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/xen.h > +KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/i386/xen/hypercall.h > +endif > + > if COND_i386_efi > KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/efi/efi.h > KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/efi/disk.h > diff --git a/grub-core/Makefile.core.def b/grub-core/Makefile.core.def > index 9590e87d9..c42cebc38 100644 > --- a/grub-core/Makefile.core.def > +++ b/grub-core/Makefile.core.def > @@ -79,6 +79,8 @@ kernel = { > i386_xen_ldflags = '$(TARGET_IMG_BASE_LDOPT),0'; > x86_64_xen_ldflags = '$(TARGET_IMG_LDFLAGS)'; > x86_64_xen_ldflags = '$(TARGET_IMG_BASE_LDOPT),0'; > + i386_xenpvh_ldflags = '$(TARGET_IMG_LDFLAGS)'; > + i386_xenpvh_ldflags = '$(TARGET_IMG_BASE_LDOPT),0x100000'; > > mips_loongson_ldflags = '-Wl,-Ttext,0x80200000'; > powerpc_ieee1275_ldflags = '-Wl,-Ttext,0x200000'; > @@ -100,6 +102,7 @@ kernel = { > x86_64_efi_startup = kern/x86_64/efi/startup.S; > i386_xen_startup = kern/i386/xen/startup.S; > x86_64_xen_startup = kern/x86_64/xen/startup.S; > + i386_xenpvh_startup = kern/i386/xen/startup_pvh.S; > i386_qemu_startup = kern/i386/qemu/startup.S; > i386_ieee1275_startup = kern/i386/ieee1275/startup.S; > i386_coreboot_startup = kern/i386/coreboot/startup.S; > @@ -177,6 +180,7 @@ kernel = { > > i386 = kern/i386/dl.c; > i386_xen = kern/i386/dl.c; > + i386_xenpvh = kern/i386/dl.c; > > i386_coreboot = kern/i386/coreboot/init.c; > i386_multiboot = kern/i386/coreboot/init.c; > @@ -222,6 +226,14 @@ kernel = { > xen = disk/xen/xendisk.c; > xen = commands/boot.c; > > + i386_xenpvh = kern/i386/tsc.c; > + i386_xenpvh = kern/i386/xen/tsc.c; > + i386_xenpvh = commands/boot.c; > + i386_xenpvh = kern/xen/init.c; > + i386_xenpvh = kern/i386/xen/pvh.c; > + i386_xenpvh = term/xen/console.c; > + i386_xenpvh = disk/xen/xendisk.c; I would sort all file names here. Daniel