From nobody Mon Feb 9 14:38:11 2026 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=none dis=none) header.from=suse.com ARC-Seal: i=1; a=rsa-sha256; t=1600843583; cv=none; d=zohomail.com; s=zohoarc; b=APsUAE+eF2LEO2RQlSeLHgGugbs+iEu9Rk1uKxlduFqCnkiIKI+CRNgG/ATXSzP2YxknKK3+yjCKZB7bnZTDgnSr+fPf6XlzDtCU67JfskSsRvRvOyF6+VUTE/BizMm5KXJljOExjsJK/1ub6S7v0ZMjR3KUbnxTlKTsqjEiYC8= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1600843583; 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=hiEmrxVeJNQLnM0Fx5gFjQdQxTv/21+Ys/Zu5SejwOo=; b=QN9QUIYgeAkZGkkcwQ8iNNUplnV5ssuRI52M4ITrX/eyVxmcIFUcg6MEhpk+vjC/8ls4UvH2gvlrgGIdfmttRyWkiYgFo+kdseZbYLX8PDz6Q7iq4BkBfm4IGaiofvR6PYMDTSHwLHWoJibmSkZCQSbG0isawqZ/TeAruyUPtbw= 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=none dis=none) header.from= Return-Path: Received: from lists.xenproject.org (lists.xenproject.org [192.237.175.120]) by mx.zohomail.com with SMTPS id 1600843583392440.2931308822398; Tue, 22 Sep 2020 23:46:23 -0700 (PDT) Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1kKyXJ-0001X0-Ue; Wed, 23 Sep 2020 06:45:53 +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 1kKyXJ-0001WR-5f for xen-devel@lists.xenproject.org; Wed, 23 Sep 2020 06:45:53 +0000 Received: from mx2.suse.de (unknown [195.135.220.15]) by us1-amaz-eas2.inumbo.com (Halon) with ESMTPS id 784aa80b-0714-4865-aceb-1fe4615a96d3; Wed, 23 Sep 2020 06:45:46 +0000 (UTC) Received: from relay2.suse.de (unknown [195.135.221.27]) by mx2.suse.de (Postfix) with ESMTP id D081AAB0E; Wed, 23 Sep 2020 06:46:22 +0000 (UTC) X-Inumbo-ID: 784aa80b-0714-4865-aceb-1fe4615a96d3 X-Virus-Scanned: by amavisd-new at test-mx.suse.de DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.com; s=susede1; t=1600843545; h=from:from:reply-to:subject:subject: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=hiEmrxVeJNQLnM0Fx5gFjQdQxTv/21+Ys/Zu5SejwOo=; b=ZReoZv5iIoD7ohX2yyennswB0e6fwltaIJaT4A37u9T3gJMwpzMIfqKOi9WLFR/+OazHh4 +HPsBSHC6+aNK5/3MpXe1NCZfmt3cakndaEe6CAqJNkRJlQOwNU9OkKg9upKdjq8U+mdjM 6E5jlR3PEhBgzVyLv2ItaNJZ2xC7IUE= 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 3/3] stubdom: add xenstore pvh stubdom Date: Wed, 23 Sep 2020 08:45:41 +0200 Message-Id: <20200923064541.19546-4-jgross@suse.com> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20200923064541.19546-1-jgross@suse.com> References: <20200923064541.19546-1-jgross@suse.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-BeenThere: xen-devel@lists.xenproject.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-devel-bounces@lists.xenproject.org Sender: "Xen-devel" X-ZohoMail-DKIM: pass (identity @suse.com) Content-Type: text/plain; charset="utf-8" Add a PVH xenstore stubdom in order to support a Xenstore stubdom on a hypervisor built without PV-support. Signed-off-by: Juergen Gross Acked-by: Wei Liu Reviewed-by: Samuel Thibault --- .gitignore | 1 + stubdom/Makefile | 31 ++++++++++++++++++++-- stubdom/configure | 47 ++++++++++++++++++++++++++++++++++ stubdom/configure.ac | 1 + stubdom/xenstorepvh-minios.cfg | 10 ++++++++ 5 files changed, 88 insertions(+), 2 deletions(-) create mode 100644 stubdom/xenstorepvh-minios.cfg diff --git a/.gitignore b/.gitignore index 5e8c47e2db..e7b388e31b 100644 --- a/.gitignore +++ b/.gitignore @@ -91,6 +91,7 @@ stubdom/stubdompath.sh stubdom/tpm_emulator-* stubdom/vtpm/vtpm_manager.h stubdom/xenstore +stubdom/xenstorepvh stubdom/zlib-* tools/*/build/lib*/*.py tools/autom4te.cache/ diff --git a/stubdom/Makefile b/stubdom/Makefile index fb9617fa14..90d9ffcd9f 100644 --- a/stubdom/Makefile +++ b/stubdom/Makefile @@ -367,7 +367,10 @@ $(foreach lib,$(STUB_LIBS),$(eval $(call BUILD_lib,$(l= ib)))) xenstore/stamp: $(XEN_ROOT)/tools/xenstore/Makefile $(do_links) =20 -LINK_DIRS :=3D xenstore $(foreach dir,$(STUB_LIBS),libs-$(XEN_TARGET_ARCH)= /$(dir)) +xenstorepvh/stamp: $(XEN_ROOT)/tools/xenstore/Makefile + $(do_links) + +LINK_DIRS :=3D xenstore xenstorepvh $(foreach dir,$(STUB_LIBS),libs-$(XEN_= TARGET_ARCH)/$(dir)) LINK_STAMPS :=3D $(foreach dir,$(LINK_DIRS),$(dir)/stamp) =20 mk-headers-$(XEN_TARGET_ARCH): $(IOEMU_LINKFARM_TARGET) $(LINK_STAMPS) @@ -486,6 +489,17 @@ xenstore-minios-config.mk: $(CURDIR)/xenstore-minios.c= fg xenstore: $(CROSS_ROOT) xenstore-minios-config.mk CPPFLAGS=3D"$(TARGET_CPPFLAGS) $(shell cat xenstore-minios-config.mk)" CF= LAGS=3D"$(TARGET_CFLAGS)" $(MAKE) DESTDIR=3D -C $@ xenstored.a CONFIG_STUBD= OM=3Dy =20 +############# +# xenstorepvh +############# + +xenstorepvh-minios-config.mk: $(CURDIR)/xenstorepvh-minios.cfg + MINIOS_CONFIG=3D"$<" CONFIG_FILE=3D"$(CURDIR)/$@" $(MAKE) DESTDIR=3D -C $= (MINI_OS) config + +.PHONY: xenstorepvh +xenstorepvh: $(CROSS_ROOT) xenstorepvh-minios-config.mk + CPPFLAGS=3D"$(TARGET_CPPFLAGS) $(shell cat xenstorepvh-minios-config.mk)"= CFLAGS=3D"$(TARGET_CFLAGS)" $(MAKE) DESTDIR=3D -C $@ xenstored.a CONFIG_ST= UBDOM=3Dy + ######## # minios ######## @@ -519,6 +533,10 @@ pv-grub: mini-os-$(XEN_TARGET_ARCH)-grub libxenguest g= rub 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 =20 +.PHONY: xenstorepvh-stubdom +xenstorepvh-stubdom: mini-os-$(XEN_TARGET_ARCH)-xenstorepvh libxenguest xe= nstorepvh + DEF_CPPFLAGS=3D"$(TARGET_CPPFLAGS)" DEF_CFLAGS=3D"$(TARGET_CFLAGS)" DEF_L= DFLAGS=3D"$(TARGET_LDFLAGS)" MINIOS_CONFIG=3D"$(CURDIR)/xenstorepvh-minios.= cfg" $(MAKE) DESTDIR=3D -C $(MINI_OS) OBJ_DIR=3D$(CURDIR)/$< APP_OBJS=3D$(C= URDIR)/xenstorepvh/xenstored.a + ######### # install ######### @@ -548,6 +566,10 @@ install-xenstore: xenstore-stubdom $(INSTALL_DIR) "$(DESTDIR)$(XENFIRMWAREDIR)" $(INSTALL_DATA) mini-os-$(XEN_TARGET_ARCH)-xenstore/mini-os.gz "$(DESTDIR= )$(XENFIRMWAREDIR)/xenstore-stubdom.gz" =20 +install-xenstorepvh: xenstorepvh-stubdom + $(INSTALL_DIR) "$(DESTDIR)$(XENFIRMWAREDIR)" + $(INSTALL_DATA) mini-os-$(XEN_TARGET_ARCH)-xenstorepvh/mini-os.gz "$(DEST= DIR)$(XENFIRMWAREDIR)/xenstorepvh-stubdom.gz" + install-vtpm: vtpm-stubdom $(INSTALL_DIR) "$(DESTDIR)$(XENFIRMWAREDIR)" $(INSTALL_DATA) mini-os-$(XEN_TARGET_ARCH)-vtpm/mini-os.gz "$(DESTDIR)$(X= ENFIRMWAREDIR)/vtpm-stubdom.gz" @@ -581,6 +603,9 @@ uninstall-grub: uninstall-xenstore: rm -f $(DESTDIR)$(XENFIRMWAREDIR)/xenstore-stubdom.gz =20 +uninstall-xenstorepvh: + rm -f $(DESTDIR)$(XENFIRMWAREDIR)/xenstorepvh-stubdom.gz + uninstall-vtpm: rm -f $(DESTDIR)$(XENFIRMWAREDIR)/vtpm-stubdom.gz =20 @@ -600,6 +625,7 @@ clean: rm -fr mini-os-$(XEN_TARGET_ARCH)-caml rm -fr mini-os-$(XEN_TARGET_ARCH)-grub rm -fr mini-os-$(XEN_TARGET_ARCH)-xenstore + rm -fr mini-os-$(XEN_TARGET_ARCH)-xenstorepvh rm -fr mini-os-$(XEN_TARGET_ARCH)-vtpm rm -fr mini-os-$(XEN_TARGET_ARCH)-vtpmmgr $(MAKE) DESTDIR=3D -C caml clean @@ -612,6 +638,7 @@ clean: rm -fr pkg-config -[ ! -d ioemu ] || $(MAKE) DESTDIR=3D -C ioemu clean -[ ! -d xenstore ] || $(MAKE) DESTDIR=3D -C xenstore clean + -[ ! -d xenstorepvh ] || $(MAKE) DESTDIR=3D -C xenstorepvh clean =20 # clean the cross-compilation result .PHONY: crossclean @@ -620,7 +647,7 @@ crossclean: clean rm -fr newlib-$(XEN_TARGET_ARCH) rm -fr zlib-$(XEN_TARGET_ARCH) pciutils-$(XEN_TARGET_ARCH) rm -fr libs-$(XEN_TARGET_ARCH) - rm -fr ioemu xenstore + rm -fr ioemu xenstore xenstorepvh rm -fr gmp-$(XEN_TARGET_ARCH) rm -fr polarssl-$(XEN_TARGET_ARCH) rm -fr openssl-$(XEN_TARGET_ARCH) diff --git a/stubdom/configure b/stubdom/configure index 3668203db8..903414589b 100755 --- a/stubdom/configure +++ b/stubdom/configure @@ -630,6 +630,7 @@ WGET CMAKE extfiles debug +xenstorepvh xenstore grub caml @@ -689,6 +690,7 @@ enable_c_stubdom enable_caml_stubdom enable_pv_grub enable_xenstore_stubdom +enable_xenstore_pvh_stubdom enable_vtpm_stubdom enable_vtpmmgr_stubdom enable_qemu_traditional @@ -1344,6 +1346,9 @@ Optional Features: --disable-xenstore-stubdom Build and install xenstore-stubdom (default is ENABLED) + --disable-xenstorepvh-stubdom + Build and install xenstorepvh-stubdom (default is + ENABLED) --enable-vtpm-stubdom Build and install vtpm-stubdom --enable-vtpmmgr-stubdom Build and install vtpmmgr-stubdom @@ -2178,6 +2183,48 @@ fi =20 =20 =20 +# Check whether --enable-xenstorepvh-stubdom was given. +if test "${enable_xenstore_pvh_stubdom+set}" =3D set; then : + enableval=3D$enable_xenstore_pvh_stubdom; + +if test "x$enableval" =3D "xyes"; then : + + +xenstorepvh=3Dy +STUBDOM_TARGETS=3D"$STUBDOM_TARGETS xenstorepvh" +STUBDOM_BUILD=3D"$STUBDOM_BUILD xenstorepvh-stubdom" +STUBDOM_INSTALL=3D"$STUBDOM_INSTALL install-xenstorepvh" +STUBDOM_UNINSTALL=3D"$STUBDOM_UNINSTALL install-xenstorepvh" + + +else + +if test "x$enableval" =3D "xno"; then : + + +xenstorepvh=3Dn + + +fi + +fi + + +else + + +xenstorepvh=3Dy +STUBDOM_TARGETS=3D"$STUBDOM_TARGETS xenstorepvh" +STUBDOM_BUILD=3D"$STUBDOM_BUILD xenstorepvh-stubdom" +STUBDOM_INSTALL=3D"$STUBDOM_INSTALL install-xenstorepvh" +STUBDOM_UNINSTALL=3D"$STUBDOM_UNINSTALL install-xenstorepvh" + + +fi + + + + # Check whether --enable-vtpm-stubdom was given. if test "${enable_vtpm_stubdom+set}" =3D set; then : enableval=3D$enable_vtpm_stubdom; diff --git a/stubdom/configure.ac b/stubdom/configure.ac index a2d514c021..bd6f765929 100644 --- a/stubdom/configure.ac +++ b/stubdom/configure.ac @@ -23,6 +23,7 @@ AX_STUBDOM_DEFAULT_DISABLE([c-stubdom], [c]) AX_STUBDOM_DEFAULT_DISABLE([caml-stubdom], [caml]) AX_STUBDOM_DEFAULT_ENABLE([pv-grub], [grub]) AX_STUBDOM_DEFAULT_ENABLE([xenstore-stubdom], [xenstore]) +AX_STUBDOM_DEFAULT_ENABLE([xenstorepvh-stubdom], [xenstorepvh]) AX_STUBDOM_CONDITIONAL([vtpm-stubdom], [vtpm]) AX_STUBDOM_CONDITIONAL([vtpmmgr-stubdom], [vtpmmgr]) =20 diff --git a/stubdom/xenstorepvh-minios.cfg b/stubdom/xenstorepvh-minios.cfg new file mode 100644 index 0000000000..6af51f5753 --- /dev/null +++ b/stubdom/xenstorepvh-minios.cfg @@ -0,0 +1,10 @@ +CONFIG_PARAVIRT=3Dn +CONFIG_BLKFRONT=3Dn +CONFIG_NETFRONT=3Dn +CONFIG_FBFRONT=3Dn +CONFIG_KBDFRONT=3Dn +CONFIG_CONSFRONT=3Dn +CONFIG_XENBUS=3Dn +CONFIG_LWIP=3Dn +CONFIG_BALLOON=3Dy +XEN_INTERFACE_VERSION=3D__XEN_LATEST_INTERFACE_VERSION__ --=20 2.26.2