From nobody Fri Apr 26 19:47:26 2024 Delivered-To: importer@patchew.org Received-SPF: none (zoho.com: 192.237.175.120 is neither permitted nor denied by domain of lists.xenproject.org) client-ip=192.237.175.120; envelope-from=xen-devel-bounces@lists.xenproject.org; helo=lists.xenproject.org; Authentication-Results: mx.zohomail.com; spf=none (zoho.com: 192.237.175.120 is neither permitted nor denied by domain of lists.xenproject.org) smtp.mailfrom=xen-devel-bounces@lists.xenproject.org ARC-Seal: i=1; a=rsa-sha256; t=1557842483; cv=none; d=zoho.com; s=zohoarc; b=hqPgdFy8qDg4/x1cTR3JT/JDtz7UhHrfiKBm5jHT5HqCyQ2nTkchWG2pXaDpHYSLHnG8aJrfgcMCLnOsoxqRn/SjWAuQZF9Y9HjzGZDeYOY8tmdeDNXlXciEMw4oi677yzp8Ktw+SHPvF84rAbdzseNXmlp6IXSwFdXm+nHISWw= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1557842483; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:List-Subscribe:List-Post:List-Id:List-Help:List-Unsubscribe:MIME-Version:Message-ID:Sender:Subject:To:ARC-Authentication-Results; bh=A1MqHRJHzkx8w/W7U4+8HSF/gbEVHIBcY+XX7JNqGQM=; b=bkp5o+UxMhhNooPtIYgkYwEL/5wJQz6LD0v/iHDwZwOyHPzHBan6XZ3lbQ30Tb/9DAtFJ9Ql9NWF/9ox3a6SCjPEhcn0e7o5Lwa/ow//xTqbfdTAbUn0nbSFllsiSk0MCwm7syIeJd1uhqaI3QQOoA2UGlJfnH+h4vHGt2I83lc= ARC-Authentication-Results: i=1; mx.zoho.com; spf=none (zoho.com: 192.237.175.120 is neither permitted nor denied by domain of lists.xenproject.org) smtp.mailfrom=xen-devel-bounces@lists.xenproject.org Return-Path: Received: from lists.xenproject.org (lists.xenproject.org [192.237.175.120]) by mx.zohomail.com with SMTPS id 1557842483226451.153496648496; Tue, 14 May 2019 07:01:23 -0700 (PDT) Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.89) (envelope-from ) id 1hQXyL-0005UO-Er; Tue, 14 May 2019 14:00:01 +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.89) (envelope-from ) id 1hQXyK-0005UG-8q for xen-devel@lists.xenproject.org; Tue, 14 May 2019 14:00:00 +0000 Received: from SMTP03.CITRIX.COM (unknown [162.221.156.55]) by us1-amaz-eas2.inumbo.com (Halon) with ESMTPS id 8b7ceb1e-7650-11e9-af36-071cca6c920d; Tue, 14 May 2019 13:59:53 +0000 (UTC) X-Inumbo-ID: 8b7ceb1e-7650-11e9-af36-071cca6c920d X-IronPort-AV: E=Sophos;i="5.60,468,1549929600"; d="scan'208";a="85440072" From: Roger Pau Monne To: Date: Tue, 14 May 2019 15:59:22 +0200 Message-ID: <20190514135922.57629-1-roger.pau@citrix.com> X-Mailer: git-send-email 2.17.2 (Apple Git-113) MIME-Version: 1.0 Subject: [Xen-devel] [PATCH v2] pvshim: make PV shim build selectable from configure X-BeenThere: xen-devel@lists.xenproject.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Cc: Wei Liu , Ian Jackson , Roger Pau Monne Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Errors-To: xen-devel-bounces@lists.xenproject.org Sender: "Xen-devel" So a user can decide whether to compile a PV shim as part of the tools build. Note that the default behavior is preserved, which is to build a PV shim when the target or host (if target is unset) architecture is 64bit x86. Requested-by: Olaf Hering Signed-off-by: Roger Pau Monn=C3=A9 Acked-by: Wei Liu --- NOTE: run autogen.sh after applying. --- Cc: Ian Jackson Cc: Wei Liu --- Changes since v1: - Only enable by default on x86_64, like the previous behavior. - Fallback to use host_cpu if target_cpu is empty. --- config/Tools.mk.in | 2 ++ tools/configure.ac | 13 +++++++++++++ tools/firmware/Makefile | 4 ---- 3 files changed, 15 insertions(+), 4 deletions(-) diff --git a/config/Tools.mk.in b/config/Tools.mk.in index 98245f63c9..84ddb1a542 100644 --- a/config/Tools.mk.in +++ b/config/Tools.mk.in @@ -75,3 +75,5 @@ TINFO_LIBS :=3D @TINFO_LIBS@ ARGP_LDFLAGS :=3D @argp_ldflags@ =20 FILE_OFFSET_BITS :=3D @FILE_OFFSET_BITS@ + +CONFIG_PV_SHIM :=3D @pvshim@ diff --git a/tools/configure.ac b/tools/configure.ac index c9fd69ddfa..fcf282e74e 100644 --- a/tools/configure.ac +++ b/tools/configure.ac @@ -492,4 +492,17 @@ AC_ARG_ENABLE([9pfs], =20 AC_SUBST(ninepfs) =20 +AC_ARG_ENABLE([pvshim], + AS_HELP_STRING([--disable-pvshim], + [Disable pvshim build (enabled by default on 64bit x86)= ]), + [AS_IF([test "x$enable_pvshim" =3D "xno"], [pvshim=3Dn], [pvshim=3Dy])= ], [ + cpu=3D`test -z "$target_cpu" && echo "$host_cpu" || echo "$target_cpu"` + case "$cpu" in + x86_64) + pvshim=3D"y";; + *) pvshim=3D"n";; + esac +]) +AC_SUBST(pvshim) + AC_OUTPUT() diff --git a/tools/firmware/Makefile b/tools/firmware/Makefile index cf304fc578..809a5fd025 100644 --- a/tools/firmware/Makefile +++ b/tools/firmware/Makefile @@ -1,10 +1,6 @@ XEN_ROOT =3D $(CURDIR)/../.. include $(XEN_ROOT)/tools/Rules.mk =20 -ifneq ($(XEN_TARGET_ARCH),x86_32) -CONFIG_PV_SHIM :=3D y -endif - # hvmloader is a 32-bit protected mode binary. TARGET :=3D hvmloader/hvmloader INST_DIR :=3D $(DESTDIR)$(XENFIRMWAREDIR) --=20 2.17.2 (Apple Git-113) _______________________________________________ Xen-devel mailing list Xen-devel@lists.xenproject.org https://lists.xenproject.org/mailman/listinfo/xen-devel