From nobody Fri Apr 19 23:17:05 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=1631253346; cv=none; d=zohomail.com; s=zohoarc; b=NuvK0TmWqsM5JaqtcVnNXc5jV+G7dSsNlxdYnNlOpAKoeC3gCD5nrIzVR9MnX2TVY87ySpi875YYxQ8osK3Lahrj/QzV9ejnOhCBAykR43iHO2Jvywv1vnNLGoqi5AuH4RgWM2tVVLkFZONQpcL1pSqRdPwvu2dYzXEmEZRh+ec= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1631253346; 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=xV8rdwiG4q9toCr/6b+aaGACeRQj1/7eJo0Ol2OKeRo=; b=X1kqFL8pNz9ME6/sFWXMMC79jNEcyfzlhwGr21qwvZHbf70MNZ7Quu9SSf8Hr7uM/lavJblp8DY9x114wZOsyktX2r0x8pdr+pK/HzbHkAZZKLr+fg5Y4oUIvu9jubJwxL/4jfXdmquvBVs2hEu9wjZec9RBnkMpzj0/oj6SSho= 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 1631253346053462.9194820837058; Thu, 9 Sep 2021 22:55:46 -0700 (PDT) Received: from list by lists.xenproject.org with outflank-mailman.184032.332538 (Exim 4.92) (envelope-from ) id 1mOZVV-0002mz-Oe; Fri, 10 Sep 2021 05:55:25 +0000 Received: by outflank-mailman (output) from mailman id 184032.332538; Fri, 10 Sep 2021 05:55:25 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1mOZVV-0002ms-LZ; Fri, 10 Sep 2021 05:55:25 +0000 Received: by outflank-mailman (input) for mailman id 184032; Fri, 10 Sep 2021 05:55:24 +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 1mOZVU-0002mm-ET for xen-devel@lists.xenproject.org; Fri, 10 Sep 2021 05:55:24 +0000 Received: from smtp-out1.suse.de (unknown [195.135.220.28]) by us1-amaz-eas2.inumbo.com (Halon) with ESMTPS id afb5fd60-11fb-11ec-b210-12813bfff9fa; Fri, 10 Sep 2021 05:55:23 +0000 (UTC) Received: from imap2.suse-dmz.suse.de (imap2.suse-dmz.suse.de [192.168.254.74]) (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 2BC1A223F2; Fri, 10 Sep 2021 05:55:22 +0000 (UTC) Received: from imap2.suse-dmz.suse.de (imap2.suse-dmz.suse.de [192.168.254.74]) (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 imap2.suse-dmz.suse.de (Postfix) with ESMTPS id CC9BB13D0C; Fri, 10 Sep 2021 05:55:21 +0000 (UTC) Received: from dovecot-director2.suse.de ([192.168.254.65]) by imap2.suse-dmz.suse.de with ESMTPSA id cJiAMEnzOmEDEAAAMHmgww (envelope-from ); Fri, 10 Sep 2021 05:55:21 +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: afb5fd60-11fb-11ec-b210-12813bfff9fa DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.com; s=susede1; t=1631253322; 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=xV8rdwiG4q9toCr/6b+aaGACeRQj1/7eJo0Ol2OKeRo=; b=YqZjTZsf0xfHXnshigWUy37ia2m5fkNKqan+OsRvi2PlL3ZNh03lWky1a6Rou/oVVVijsv EZ9GAkSwOOHDZIaAZctSYWUJNv3WmIzjkv0Lcv48lTO2ZqFuL2yoMn0U/sD+6sSQFJpeiL a9BR0OCfw5byHfSLdAWpwizGi9yjYPA= 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 v3 1/3] stubdom: fix build with disabled pv-grub Date: Fri, 10 Sep 2021 07:55:16 +0200 Message-Id: <20210910055518.562-2-jgross@suse.com> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20210910055518.562-1-jgross@suse.com> References: <20210910055518.562-1-jgross@suse.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @suse.com) X-ZM-MESSAGEID: 1631253347777100001 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-grub-if-enabled target in stubdom/Makefile taking care of this situation. Signed-off-by: Juergen Gross Reviewed-by: Samuel Thibault -- V3: - rename pv-grub32 target (Ian Jackson) Reviewed-by: Ian Jackson --- Makefile | 4 ++-- stubdom/Makefile | 13 +++++++++++++ 2 files changed, 15 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index 96d32cfd50..346d73a0dc 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-grub-if-enabled 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-grub-if-enabled endif =20 .PHONY: tools/firmware/seabios-dir-force-update diff --git a/stubdom/Makefile b/stubdom/Makefile index 06aa69d8bc..ccfcf5b75f 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-grub-if-enabled +ifneq ($(filter grub,$(STUBDOM_TARGETS)),) +pv-grub-if-enabled: pv-grub +else +pv-grub-if-enabled: +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-grub-if-enabled: install-grub +else +install-grub-if-enabled: +endif + install-c: c-stubdom =20 install-caml: caml-stubdom --=20 2.26.2 From nobody Fri Apr 19 23:17:05 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=1631253348; cv=none; d=zohomail.com; s=zohoarc; b=YZTER35YDvAKC/Le18q5LHGJ6RyEgzjgTPbPoM7sBNqR9wzal8xj++N3cgbQENmlyiLRNfnWFHYp2cLhOx5g2SFgcr5hmUj6ntMCHcEuM5xVbhOv6xuYzxvazH61HslkBcYbFwo7xsbMiBBt1dDcrgioGhVRbJVMCHNYPTsXGss= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1631253348; 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=YgngfMEyR4Vr8reqmxkBKjSYP0wtCAuyapjE7LwlNwk=; b=lDCnIIIyQFfAbqclSVLDKmzUW3vHJ92CdGUjwoaLUtthfpLf8XWAXGC+rGVI9XXPI5kKxrjsJpYf6DdIfTv4Ze4JrmvNjHZVC9riMXSZPXNS6gjU+rbBCXnKWVuLo8aag8EmpF1ZEiSwmnvUtlqMC0yjU4a8PC405lARmqR+k2E= 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 1631253348842353.3567805396366; Thu, 9 Sep 2021 22:55:48 -0700 (PDT) Received: from list by lists.xenproject.org with outflank-mailman.184035.332561 (Exim 4.92) (envelope-from ) id 1mOZVg-0003Rg-AQ; Fri, 10 Sep 2021 05:55:36 +0000 Received: by outflank-mailman (output) from mailman id 184035.332561; Fri, 10 Sep 2021 05:55:36 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1mOZVg-0003RV-78; Fri, 10 Sep 2021 05:55:36 +0000 Received: by outflank-mailman (input) for mailman id 184035; Fri, 10 Sep 2021 05:55:34 +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 1mOZVe-0002mm-CH for xen-devel@lists.xenproject.org; Fri, 10 Sep 2021 05:55:34 +0000 Received: from smtp-out2.suse.de (unknown [195.135.220.29]) by us1-amaz-eas2.inumbo.com (Halon) with ESMTPS id afd42b3c-11fb-11ec-b210-12813bfff9fa; Fri, 10 Sep 2021 05:55:23 +0000 (UTC) Received: from imap2.suse-dmz.suse.de (imap2.suse-dmz.suse.de [192.168.254.74]) (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-out2.suse.de (Postfix) with ESMTPS id 6B22B1FE45; Fri, 10 Sep 2021 05:55:22 +0000 (UTC) Received: from imap2.suse-dmz.suse.de (imap2.suse-dmz.suse.de [192.168.254.74]) (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 imap2.suse-dmz.suse.de (Postfix) with ESMTPS id 3015D13D02; Fri, 10 Sep 2021 05:55:22 +0000 (UTC) Received: from dovecot-director2.suse.de ([192.168.254.65]) by imap2.suse-dmz.suse.de with ESMTPSA id kAP+CUrzOmEDEAAAMHmgww (envelope-from ); Fri, 10 Sep 2021 05:55:22 +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: afd42b3c-11fb-11ec-b210-12813bfff9fa DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.com; s=susede1; t=1631253322; 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=YgngfMEyR4Vr8reqmxkBKjSYP0wtCAuyapjE7LwlNwk=; b=TaC/0oyaSn5bktgqEl+S15Rrq+YIlbrsvlGxljMRhwIbFci4Si1HyHHdTXcafK0UTKVicb SHNhbgfvGN0hMff6oCzagAb+eIzPk3dyw0Gxtd2OSmKnmcczRutVbK8ZB/9LAP/PgSH3BJ lCT/cxzHmgenA7zauRAF4UrzudIQfe0= From: Juergen Gross To: xen-devel@lists.xenproject.org Cc: Juergen Gross , Ian Jackson , Community Manager , Samuel Thibault , Wei Liu Subject: [PATCH v3 2/3] stubdom: disable building pv-grub Date: Fri, 10 Sep 2021 07:55:17 +0200 Message-Id: <20210910055518.562-3-jgross@suse.com> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20210910055518.562-1-jgross@suse.com> References: <20210910055518.562-1-jgross@suse.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @suse.com) X-ZM-MESSAGEID: 1631253349682100004 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 Acked-by: Ian Jackson --- V2: - add CHANGELOG.md entry (Jan Beulich) --- CHANGELOG.md | 2 ++ stubdom/configure | 8 ++------ stubdom/configure.ac | 2 +- 3 files changed, 5 insertions(+), 7 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 22cfdb4298..e7107ac3de 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -16,6 +16,8 @@ The format is based on [Keep a Changelog](https://keepach= angelog.com/en/1.0.0/) appearing in 4.12.2 and 4.11.4). Prior (4.13...4.15-like) behavior can = be arranged for either by enabling the IOMMU_QUARANTINE_SCRATCH_PAGE setting at build (= configuration) time or by passing "iommu=3Dquarantine=3Dscratch-page" on the hypervisor com= mand line. + - pv-grub stubdoms will no longer be built per default. In order to be ab= le to use pv-grub + configure needs to be called with "--enable-pv-grub" as parameter. =20 ## [4.15.0 UNRELEASED](https://xenbits.xen.org/gitweb/?p=3Dxen.git;a=3Dsho= rtlog;h=3DRELEASE-4.15.0) - TBD =20 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 From nobody Fri Apr 19 23:17:05 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=1631253357; cv=none; d=zohomail.com; s=zohoarc; b=UiF5hzW35uHQICx2FFpnNgkAzyC066C/5nv9aEs4xN46oLw3uxdN/Ulh9DQyB+8sFrOkDCVhD091hqOnPf8HkL+2egQfd7a/osvC2YjtQQT9GBzJwCtvqV/2HtIr3QmtowFF7TQVaLL1av2R38v9cUhI1OVLxciF+g9JoU9Pb9A= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1631253357; 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=aRM6wu2g4hDT9jEA3EflR4Cj2R9f8xFsffqAuZHwTXA=; b=c+E5RYG59Dlxg8k2idQHT/ggQct3o2H8RXCV8TqVUpvzC50KP93YWOuRW/3wbCez6ynv8e5win30V9j7fO0iGtvltBVTacSSRwm2LKvDhUQcqknf/oit4M2fQBWmhRRRNHdeTe71oFN//KaUBs5AxQwcJDQn5dwD0VXd1XBarKQ= 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 1631253357693376.80663359913774; Thu, 9 Sep 2021 22:55:57 -0700 (PDT) Received: from list by lists.xenproject.org with outflank-mailman.184037.332571 (Exim 4.92) (envelope-from ) id 1mOZVk-0003ti-QR; Fri, 10 Sep 2021 05:55:40 +0000 Received: by outflank-mailman (output) from mailman id 184037.332571; Fri, 10 Sep 2021 05:55:40 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1mOZVk-0003tZ-N8; Fri, 10 Sep 2021 05:55:40 +0000 Received: by outflank-mailman (input) for mailman id 184037; Fri, 10 Sep 2021 05:55:39 +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 1mOZVj-0002mm-CV for xen-devel@lists.xenproject.org; Fri, 10 Sep 2021 05:55:39 +0000 Received: from smtp-out2.suse.de (unknown [195.135.220.29]) by us1-amaz-eas2.inumbo.com (Halon) with ESMTPS id af7f13f5-11fb-11ec-b210-12813bfff9fa; Fri, 10 Sep 2021 05:55:23 +0000 (UTC) Received: from imap2.suse-dmz.suse.de (imap2.suse-dmz.suse.de [192.168.254.74]) (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-out2.suse.de (Postfix) with ESMTPS id AB71E201FF; Fri, 10 Sep 2021 05:55:22 +0000 (UTC) Received: from imap2.suse-dmz.suse.de (imap2.suse-dmz.suse.de [192.168.254.74]) (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 imap2.suse-dmz.suse.de (Postfix) with ESMTPS id 7069F13D0C; Fri, 10 Sep 2021 05:55:22 +0000 (UTC) Received: from dovecot-director2.suse.de ([192.168.254.65]) by imap2.suse-dmz.suse.de with ESMTPSA id cOz8GUrzOmEDEAAAMHmgww (envelope-from ); Fri, 10 Sep 2021 05:55:22 +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: af7f13f5-11fb-11ec-b210-12813bfff9fa DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.com; s=susede1; t=1631253322; 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=aRM6wu2g4hDT9jEA3EflR4Cj2R9f8xFsffqAuZHwTXA=; b=AQ5PV++cXFuCWJJXpXhn+xk7e4+cMySIj4n6enI7lyYU0f50v4P2XSFX7McEG1OeENHNGF TZszTzWX0AonwDPN5Lo+cHdC/fQggZODSu87xhHCTa5+aDgky2Ys1t0uL6Qp3GBp3J6N1B Hw1gdVc+4U8WbliZgqbr4q441rTejHs= From: Juergen Gross To: xen-devel@lists.xenproject.org Cc: Juergen Gross , Ian Jackson , Community Manager , Samuel Thibault , Wei Liu Subject: [PATCH v3 3/3] tools: disable building qemu-trad per default Date: Fri, 10 Sep 2021 07:55:18 +0200 Message-Id: <20210910055518.562-4-jgross@suse.com> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20210910055518.562-1-jgross@suse.com> References: <20210910055518.562-1-jgross@suse.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @suse.com) X-ZM-MESSAGEID: 1631253358590100001 Content-Type: text/plain; charset="utf-8" Using qemu-traditional as device model is deprecated for some time now. So change the default for building it to "disable". This will affect ioemu-stubdom, too, as there is a direct dependency between the two. Today it is possible to use a PVH/HVM Linux-based stubdom as device model. Additionally using ioemu-stubdom isn't really helping for security, as it requires to run a very old and potentially buggy qemu version in a PV domain. This is adding probably more security problems than it is removing by using a stubdom. Signed-off-by: Juergen Gross Reviewed-by: Samuel Thibault Acked-by: Ian Jackson --- V2: - new patch --- CHANGELOG.md | 3 +++ stubdom/configure | 8 -------- stubdom/configure.ac | 8 +------- tools/configure | 17 ++--------------- tools/configure.ac | 13 +------------ 5 files changed, 7 insertions(+), 42 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index e7107ac3de..e5ab49e779 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -18,6 +18,9 @@ The format is based on [Keep a Changelog](https://keepach= angelog.com/en/1.0.0/) or by passing "iommu=3Dquarantine=3Dscratch-page" on the hypervisor com= mand line. - pv-grub stubdoms will no longer be built per default. In order to be ab= le to use pv-grub configure needs to be called with "--enable-pv-grub" as parameter. + - qemu-traditional based device models (both, qemu-traditional and ioemu-= stubdom) will + no longer be built per default. In order to be able to use those, confi= gure needs to + be called with "--enable-qemu-traditional" as parameter. =20 ## [4.15.0 UNRELEASED](https://xenbits.xen.org/gitweb/?p=3Dxen.git;a=3Dsho= rtlog;h=3DRELEASE-4.15.0) - TBD =20 diff --git a/stubdom/configure b/stubdom/configure index df31532abb..07b709f998 100755 --- a/stubdom/configure +++ b/stubdom/configure @@ -2286,14 +2286,6 @@ fi # Check whether --enable-qemu-traditional was given. if test "${enable_qemu_traditional+set}" =3D set; then : enableval=3D$enable_qemu_traditional; -else - - case "$host_cpu" in - i[3456]86|x86_64) - enable_qemu_traditional=3D"yes";; - *) enable_qemu_traditional=3D"no";; - esac - fi =20 if test "x$enable_qemu_traditional" =3D "xyes"; then : diff --git a/stubdom/configure.ac b/stubdom/configure.ac index a07a1edae5..e20d99edac 100644 --- a/stubdom/configure.ac +++ b/stubdom/configure.ac @@ -27,13 +27,7 @@ AX_STUBDOM_DEFAULT_ENABLE([xenstorepvh-stubdom], [xensto= repvh]) AX_STUBDOM_CONDITIONAL([vtpm-stubdom], [vtpm]) AX_STUBDOM_CONDITIONAL([vtpmmgr-stubdom], [vtpmmgr]) =20 -AC_ARG_ENABLE([qemu-traditional],,,[ - case "$host_cpu" in - i[[3456]]86|x86_64) - enable_qemu_traditional=3D"yes";; - *) enable_qemu_traditional=3D"no";; - esac -]) +AC_ARG_ENABLE([qemu-traditional]) AS_IF([test "x$enable_qemu_traditional" =3D "xyes"], [ qemu_traditional=3Dy],[ qemu_traditional=3Dn diff --git a/tools/configure b/tools/configure index 33814b24b3..8bf8fe75b8 100755 --- a/tools/configure +++ b/tools/configure @@ -1502,8 +1502,8 @@ Optional Features: --disable-seabios Disable SeaBIOS (default is ENABLED) --disable-golang Disable Go tools (default is ENABLED) --enable-qemu-traditional - Enable qemu traditional device model, (DEFAULT i= s on - for Linux or NetBSD x86, otherwise off) + Enable qemu traditional device model, (DEFAULT is + off) --enable-rombios Enable ROMBIOS, (DEFAULT is on if qemu-tradition= al is enabled, otherwise off) --disable-ipxe Enable in-tree IPXE, (DEFAULT is on if rombios is @@ -4287,19 +4287,6 @@ LINUX_BACKEND_MODULES=3D"`eval echo $LINUX_BACKEND_M= ODULES`" # Check whether --enable-qemu-traditional was given. if test "${enable_qemu_traditional+set}" =3D set; then : enableval=3D$enable_qemu_traditional; -else - - case "$host_cpu" in - i[3456]86|x86_64) - enable_qemu_traditional=3D"yes";; - *) enable_qemu_traditional=3D"no";; - esac - case "$host_os" in - freebsd*) - enable_qemu_traditional=3D"no";; - esac - - fi =20 if test "x$enable_qemu_traditional" =3D "xyes"; then : diff --git a/tools/configure.ac b/tools/configure.ac index 6414fcbb44..a713fd34d6 100644 --- a/tools/configure.ac +++ b/tools/configure.ac @@ -120,18 +120,7 @@ AC_SUBST(LINUX_BACKEND_MODULES) =20 AC_ARG_ENABLE([qemu-traditional], AS_HELP_STRING([--enable-qemu-traditional], - [Enable qemu traditional device model, (DEFAULT is on f= or Linux or NetBSD x86, otherwise off)]),,[ - case "$host_cpu" in - i[[3456]]86|x86_64) - enable_qemu_traditional=3D"yes";; - *) enable_qemu_traditional=3D"no";; - esac - case "$host_os" in - freebsd*) - enable_qemu_traditional=3D"no";; - esac - -]) + [Enable qemu traditional device model, (DEFAULT is off)= ])) AS_IF([test "x$enable_qemu_traditional" =3D "xyes"], [ AC_DEFINE([HAVE_QEMU_TRADITIONAL], [1], [Qemu traditional enabled]) qemu_traditional=3Dy],[ --=20 2.26.2