From nobody Fri Apr 19 01:54:58 2024 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=quarantine dis=none) header.from=suse.com ARC-Seal: i=1; a=rsa-sha256; t=1631176056; cv=none; d=zohomail.com; s=zohoarc; b=ZrBmmjjl35gAog2hkAd05/SgQkjNTu2qY83bmLYMPx5GN3kHV6e+ageBUqFLyyRYaKUdCpiDIqFA9cDiov285oeKiRU0giuoA6w8Gpbhxa+Gk3fGim35aGeRZC9kZLIng3poOOqCHmW/GVeXUPAQbgODOxOzW6y2LFqDALincuI= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1631176056; h=Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=EGsf4GAR2GL00EaPTSPTi/UURLGcI6rfW30asCxzTy0=; b=JKbaZy+8TJvSCEdUmoKleCoXY4+SuAQmBYRpPVhDKviy7ZidecJdtun1FW1IJ8/+T0QQDtABqd9X0J4Xmxm7oXAlH60hxWbsM0e5kDx+DDvqRfkVTOGUdO3WbYvU7Tbimb4NT9C3hNirOIh8IcfPoCM+gTlaqSe0i+xB5ucT1M4= 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=quarantine dis=none) Return-Path: Received: from lists.xenproject.org (lists.xenproject.org [192.237.175.120]) by mx.zohomail.com with SMTPS id 163117605641175.47771266569202; Thu, 9 Sep 2021 01:27:36 -0700 (PDT) Received: from list by lists.xenproject.org with outflank-mailman.182753.330521 (Exim 4.92) (envelope-from ) id 1mOFP1-0000vV-Qs; Thu, 09 Sep 2021 08:27:23 +0000 Received: by outflank-mailman (output) from mailman id 182753.330521; Thu, 09 Sep 2021 08:27:23 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1mOFP1-0000vI-Mt; Thu, 09 Sep 2021 08:27:23 +0000 Received: by outflank-mailman (input) for mailman id 182753; Thu, 09 Sep 2021 08:27:22 +0000 Received: from us1-rack-iad1.inumbo.com ([172.99.69.81]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1mOFP0-0000r2-Ra for xen-devel@lists.xenproject.org; Thu, 09 Sep 2021 08:27:22 +0000 Received: from smtp-out1.suse.de (unknown [195.135.220.28]) by us1-rack-iad1.inumbo.com (Halon) with ESMTPS id 777175a9-2056-4fba-8ab6-2f31ab8818d8; Thu, 09 Sep 2021 08:27:22 +0000 (UTC) Received: from imap1.suse-dmz.suse.de (imap1.suse-dmz.suse.de [192.168.254.73]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-521) server-digest SHA512) (No client certificate requested) by smtp-out1.suse.de (Postfix) with ESMTPS id 3E2D722326; Thu, 9 Sep 2021 08:27:18 +0000 (UTC) Received: from imap1.suse-dmz.suse.de (imap1.suse-dmz.suse.de [192.168.254.73]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-521) server-digest SHA512) (No client certificate requested) by imap1.suse-dmz.suse.de (Postfix) with ESMTPS id E1D861365E; Thu, 9 Sep 2021 08:27:13 +0000 (UTC) Received: from dovecot-director2.suse.de ([192.168.254.65]) by imap1.suse-dmz.suse.de with ESMTPSA id kMS7NWHFOWHPEAAAGKfGzw (envelope-from ); Thu, 09 Sep 2021 08:27:13 +0000 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" X-Inumbo-ID: 777175a9-2056-4fba-8ab6-2f31ab8818d8 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.com; s=susede1; t=1631176038; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc:cc: mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=EGsf4GAR2GL00EaPTSPTi/UURLGcI6rfW30asCxzTy0=; b=sLdwAApthP3myFJPzarWHeUIkkgefvZlSErS1ox+2gBFb9+P04jJ7THt5EXeJz85zbnXIi Y4KhhfrrDr88FPeY1mmCcWFz2gW7kshFC+e2qTXpRzrQVxxm/OXl8QFs33jbpu/SyhNXVs FT/Q0HaHFW9/pxEKtEaWQnoz7yVy7Yc= From: Juergen Gross To: xen-devel@lists.xenproject.org Cc: Juergen Gross , Andrew Cooper , George Dunlap , Ian Jackson , Jan Beulich , Julien Grall , Stefano Stabellini , Wei Liu , Samuel Thibault Subject: [PATCH 1/2] stubdom: fix build with disabled pv-grub Date: Thu, 9 Sep 2021 10:27:04 +0200 Message-Id: <20210909082705.9434-2-jgross@suse.com> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20210909082705.9434-1-jgross@suse.com> References: <20210909082705.9434-1-jgross@suse.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @suse.com) X-ZM-MESSAGEID: 1631176057573100004 Content-Type: text/plain; charset="utf-8" Today the build will fail if --disable-pv-grub as a parameter of configure, as the main Makefile will unconditionally try to build a 32-bit pv-grub stubdom. Fix that by introducing a pv-grub32 target in stubdom/Makefile taking care of this situation. Signed-off-by: Juergen Gross Reviewed-by: Samuel Thibault --- Makefile | 4 ++-- stubdom/Makefile | 13 +++++++++++++ 2 files changed, 15 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index 96d32cfd50..5b5cef3e49 100644 --- a/Makefile +++ b/Makefile @@ -72,7 +72,7 @@ build-tools-oxenstored: build-tools-public-headers build-stubdom: mini-os-dir build-tools-public-headers $(MAKE) -C stubdom build ifeq (x86_64,$(XEN_TARGET_ARCH)) - XEN_TARGET_ARCH=3Dx86_32 $(MAKE) -C stubdom pv-grub + XEN_TARGET_ARCH=3Dx86_32 $(MAKE) -C stubdom pv-grub32 endif =20 .PHONY: build-docs @@ -143,7 +143,7 @@ install-tools: install-tools-public-headers install-stubdom: mini-os-dir install-tools $(MAKE) -C stubdom install ifeq (x86_64,$(XEN_TARGET_ARCH)) - XEN_TARGET_ARCH=3Dx86_32 $(MAKE) -C stubdom install-grub + XEN_TARGET_ARCH=3Dx86_32 $(MAKE) -C stubdom install-grub32 endif =20 .PHONY: tools/firmware/seabios-dir-force-update diff --git a/stubdom/Makefile b/stubdom/Makefile index 06aa69d8bc..b339ae701c 100644 --- a/stubdom/Makefile +++ b/stubdom/Makefile @@ -531,6 +531,13 @@ vtpmmgr-stubdom: mini-os-$(XEN_TARGET_ARCH)-vtpmmgr vt= pmmgr pv-grub: mini-os-$(XEN_TARGET_ARCH)-grub libxenguest grub DEF_CPPFLAGS=3D"$(TARGET_CPPFLAGS)" DEF_CFLAGS=3D"$(TARGET_CFLAGS)" DEF_L= DFLAGS=3D"$(TARGET_LDFLAGS)" MINIOS_CONFIG=3D"$(CURDIR)/grub/minios.cfg" $(= MAKE) DESTDIR=3D -C $(MINI_OS) OBJ_DIR=3D$(CURDIR)/$< APP_OBJS=3D$(CURDIR)/= grub-$(XEN_TARGET_ARCH)/main.a =20 +.PHONY: pv-grub32 +ifneq ($(filter grub,$(STUBDOM_TARGETS)),) +pv-grub32: pv-grub +else +pv-grub32: +endif + .PHONY: xenstore-stubdom xenstore-stubdom: mini-os-$(XEN_TARGET_ARCH)-xenstore libxenguest xenstore DEF_CPPFLAGS=3D"$(TARGET_CPPFLAGS)" DEF_CFLAGS=3D"$(TARGET_CFLAGS)" DEF_L= DFLAGS=3D"$(TARGET_LDFLAGS)" MINIOS_CONFIG=3D"$(CURDIR)/xenstore-minios.cfg= " $(MAKE) DESTDIR=3D -C $(MINI_OS) OBJ_DIR=3D$(CURDIR)/$< APP_OBJS=3D$(CURD= IR)/xenstore/xenstored.a @@ -560,6 +567,12 @@ install-grub: pv-grub $(INSTALL_DIR) "$(DESTDIR)$(XENFIRMWAREDIR)" $(INSTALL_DATA) mini-os-$(XEN_TARGET_ARCH)-grub/mini-os.gz "$(DESTDIR)$(X= ENFIRMWAREDIR)/pv-grub-$(XEN_TARGET_ARCH).gz" =20 +ifneq ($(filter grub,$(STUBDOM_TARGETS)),) +install-grub32: install-grub +else +install-grub32: +endif + install-c: c-stubdom =20 install-caml: caml-stubdom --=20 2.26.2 From nobody Fri Apr 19 01:54:58 2024 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=quarantine dis=none) header.from=suse.com ARC-Seal: i=1; a=rsa-sha256; t=1631176054; cv=none; d=zohomail.com; s=zohoarc; b=WYrKSySecMS3cJ9l4uOwC3wKfeQGMP7/15WzCtUOI1dh7qYo47tg1BzvbLXPeKaQdPFTppRWxm2GzoT6Eq8qRLf+BaLJvBmRmA/uArmIsL0MqiI3WczsOXoyZbuHgPKYMo8nnhab5i4Nn5EC6oyLY/j4UI86Ajzkep7eE2wz8MU= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1631176054; h=Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=hKgds8sS3qW4uVOZtuYU/xKRL4VfjAB9MmtS4lgtd1s=; b=DrQ2jdKtrKmEu7v3LfiyuBbgaYmy/RYnLyXsiluAtSDNJjL7mca4Jb91or1jlxLzSlnJEqll6WECEiuR0ycgP5uTORNOyNo/igPNThOCCYWCTPDqCwBNrg+/dPXTdj6EIdZLlFLl7WE1uLR4O4FeQi2wxwiBoUlqBSGsaEdt7Aw= 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=quarantine dis=none) Return-Path: Received: from lists.xenproject.org (lists.xenproject.org [192.237.175.120]) by mx.zohomail.com with SMTPS id 1631176054694604.7414370856644; Thu, 9 Sep 2021 01:27:34 -0700 (PDT) Received: from list by lists.xenproject.org with outflank-mailman.182752.330504 (Exim 4.92) (envelope-from ) id 1mOFOz-0000Lx-Jt; Thu, 09 Sep 2021 08:27:21 +0000 Received: by outflank-mailman (output) from mailman id 182752.330504; Thu, 09 Sep 2021 08:27:21 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1mOFOz-0000LA-CO; Thu, 09 Sep 2021 08:27:21 +0000 Received: by outflank-mailman (input) for mailman id 182752; Thu, 09 Sep 2021 08:27:19 +0000 Received: from all-amaz-eas1.inumbo.com ([34.197.232.57] helo=us1-amaz-eas2.inumbo.com) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1mOFOx-0000Fc-TD for xen-devel@lists.xenproject.org; Thu, 09 Sep 2021 08:27:19 +0000 Received: from smtp-out1.suse.de (unknown [195.135.220.28]) by us1-amaz-eas2.inumbo.com (Halon) with ESMTPS id bd7e9ceb-1147-11ec-b1a7-12813bfff9fa; Thu, 09 Sep 2021 08:27:17 +0000 (UTC) Received: from imap1.suse-dmz.suse.de (imap1.suse-dmz.suse.de [192.168.254.73]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-521) server-digest SHA512) (No client certificate requested) by smtp-out1.suse.de (Postfix) with ESMTPS id 7AE3722323; Thu, 9 Sep 2021 08:27:15 +0000 (UTC) Received: from imap1.suse-dmz.suse.de (imap1.suse-dmz.suse.de [192.168.254.73]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-521) server-digest SHA512) (No client certificate requested) by imap1.suse-dmz.suse.de (Postfix) with ESMTPS id 44BED13AB4; Thu, 9 Sep 2021 08:27:14 +0000 (UTC) Received: from dovecot-director2.suse.de ([192.168.254.65]) by imap1.suse-dmz.suse.de with ESMTPSA id SGNPD2LFOWHPEAAAGKfGzw (envelope-from ); Thu, 09 Sep 2021 08:27:14 +0000 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" X-Inumbo-ID: bd7e9ceb-1147-11ec-b1a7-12813bfff9fa DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.com; s=susede1; t=1631176035; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc:cc: mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=hKgds8sS3qW4uVOZtuYU/xKRL4VfjAB9MmtS4lgtd1s=; b=pBaQHqm4l76QobGJBt0AG1Bqj3JJHypVnlW2cOHLAXSLKwOQvbFoxR7mxYiZkfIxZA1tpg 2j7VmjQgJKONoDWVziTvopkWYNOitkSyqmxZi9OlPTtwxOQ6tR5MhrrFN5zrFuo+h/aT0d KWYOka5qw6xRuPV7CVLOxT/s2AGynqw= From: Juergen Gross To: xen-devel@lists.xenproject.org Cc: Juergen Gross , Samuel Thibault , Ian Jackson , Wei Liu Subject: [PATCH 2/2] stubdom: disable building pv-grub Date: Thu, 9 Sep 2021 10:27:05 +0200 Message-Id: <20210909082705.9434-3-jgross@suse.com> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20210909082705.9434-1-jgross@suse.com> References: <20210909082705.9434-1-jgross@suse.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @suse.com) X-ZM-MESSAGEID: 1631176057100100001 Content-Type: text/plain; charset="utf-8" The stubdom based pv-grub is using a very outdated version of grub (0.97) and should not be used any longer. Mainline grub has support for PV guests for a long time now, so that should be used as a boot loader of a PV domain. So disable building pv-grub per default. In case someone really wants to continue using it he/she can still use a pv-grub binary from an older Xen version or manually enable building it via: configure --enable-pv-grub Signed-off-by: Juergen Gross Reviewed-by: Samuel Thibault --- stubdom/configure | 8 ++------ stubdom/configure.ac | 2 +- 2 files changed, 3 insertions(+), 7 deletions(-) diff --git a/stubdom/configure b/stubdom/configure index aa48df986d..df31532abb 100755 --- a/stubdom/configure +++ b/stubdom/configure @@ -1342,7 +1342,7 @@ Optional Features: --enable-ioemu-stubdom Build and install ioemu-stubdom --enable-c-stubdom Build and install c-stubdom (default is DISABLED) --enable-caml-stubdom Build and install caml-stubdom (default is DISAB= LED) - --disable-pv-grub Build and install pv-grub (default is ENABLED) + --enable-pv-grub Build and install pv-grub (default is DISABLED) --disable-xenstore-stubdom Build and install xenstore-stubdom (default is ENABLED) @@ -2129,11 +2129,7 @@ fi else =20 =20 -grub=3Dy -STUBDOM_TARGETS=3D"$STUBDOM_TARGETS grub" -STUBDOM_BUILD=3D"$STUBDOM_BUILD pv-grub" -STUBDOM_INSTALL=3D"$STUBDOM_INSTALL install-grub" -STUBDOM_UNINSTALL=3D"$STUBDOM_UNINSTALL install-grub" +grub=3Dn =20 =20 fi diff --git a/stubdom/configure.ac b/stubdom/configure.ac index bd6f765929..a07a1edae5 100644 --- a/stubdom/configure.ac +++ b/stubdom/configure.ac @@ -21,7 +21,7 @@ m4_include([../m4/fetcher.m4]) AX_STUBDOM_CONDITIONAL([ioemu-stubdom], [ioemu]) AX_STUBDOM_DEFAULT_DISABLE([c-stubdom], [c]) AX_STUBDOM_DEFAULT_DISABLE([caml-stubdom], [caml]) -AX_STUBDOM_DEFAULT_ENABLE([pv-grub], [grub]) +AX_STUBDOM_DEFAULT_DISABLE([pv-grub], [grub]) AX_STUBDOM_DEFAULT_ENABLE([xenstore-stubdom], [xenstore]) AX_STUBDOM_DEFAULT_ENABLE([xenstorepvh-stubdom], [xenstorepvh]) AX_STUBDOM_CONDITIONAL([vtpm-stubdom], [vtpm]) --=20 2.26.2