From nobody Fri Jan 3 03:33:08 2025 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; 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=fail(p=quarantine dis=quarantine) header.from=suse.com Return-Path: Received: from lists.xenproject.org (lists.xenproject.org [192.237.175.120]) by mx.zohomail.com with SMTPS id 1728297328238993.9305041215912; Mon, 7 Oct 2024 03:35:28 -0700 (PDT) Received: from list by lists.xenproject.org with outflank-mailman.811868.1224563 (Exim 4.92) (envelope-from ) id 1sxl53-0003M6-4T; Mon, 07 Oct 2024 10:35:09 +0000 Received: by outflank-mailman (output) from mailman id 811868.1224563; Mon, 07 Oct 2024 10:35:09 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1sxl53-0003Lz-1D; Mon, 07 Oct 2024 10:35:09 +0000 Received: by outflank-mailman (input) for mailman id 811868; Mon, 07 Oct 2024 10:35:07 +0000 Received: from se1-gles-sth1-in.inumbo.com ([159.253.27.254] helo=se1-gles-sth1.inumbo.com) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1sxl51-0003GC-Ho for xen-devel@lists.xenproject.org; Mon, 07 Oct 2024 10:35:07 +0000 Received: from smtp-out2.suse.de (smtp-out2.suse.de [195.135.223.131]) by se1-gles-sth1.inumbo.com (Halon) with ESMTPS id d0e0400a-8497-11ef-a0bb-8be0dac302b0; Mon, 07 Oct 2024 12:35:06 +0200 (CEST) Received: from imap1.dmz-prg2.suse.org (imap1.dmz-prg2.suse.org [IPv6:2a07:de40:b281:104:10:150:64:97]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by smtp-out2.suse.de (Postfix) with ESMTPS id E20621FD38; Mon, 7 Oct 2024 10:35:04 +0000 (UTC) Received: from imap1.dmz-prg2.suse.org (localhost [127.0.0.1]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by imap1.dmz-prg2.suse.org (Postfix) with ESMTPS id B731C13786; Mon, 7 Oct 2024 10:35:04 +0000 (UTC) Received: from dovecot-director2.suse.de ([2a07:de40:b281:106:10:150:64:167]) by imap1.dmz-prg2.suse.org with ESMTPSA id O4kvK1i5A2d0KgAAD6G6ig (envelope-from ); Mon, 07 Oct 2024 10:35:04 +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: d0e0400a-8497-11ef-a0bb-8be0dac302b0 Authentication-Results: smtp-out2.suse.de; none From: Juergen Gross To: minios-devel@lists.xenproject.org, xen-devel@lists.xenproject.org Cc: samuel.thibault@ens-lyon.org, Juergen Gross Subject: [MINI-OS PATCH 1/2] add config support for each Xen library Date: Mon, 7 Oct 2024 12:34:55 +0200 Message-ID: <20241007103456.14946-2-jgross@suse.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20241007103456.14946-1-jgross@suse.com> References: <20241007103456.14946-1-jgross@suse.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Rspamd-Pre-Result: action=no action; module=replies; Message is reply to one we originated X-Spam-Level: X-Spamd-Result: default: False [-4.00 / 50.00]; REPLY(-4.00)[] X-Spam-Score: -4.00 X-Spam-Flag: NO X-Rspamd-Queue-Id: E20621FD38 X-Rspamd-Pre-Result: action=no action; module=replies; Message is reply to one we originated X-Rspamd-Action: no action X-Rspamd-Server: rspamd2.dmz-prg2.suse.org X-ZM-MESSAGEID: 1728297329032116600 Content-Type: text/plain; charset="utf-8" Instead of adding all or no Xen library (controlled by CONFIG_XC), support a dedicated config option for each library instead. In order to support older Xen stubdom build versions, let CONFIG_XC enable all CONFIG_LIBXEN options. Signed-off-by: Juergen Gross --- Config.mk | 19 +++++++++++++++++++ Makefile | 18 +++++++++++++++++- 2 files changed, 36 insertions(+), 1 deletion(-) diff --git a/Config.mk b/Config.mk index f2d1f0ae..d0fbacac 100644 --- a/Config.mk +++ b/Config.mk @@ -212,6 +212,25 @@ $(foreach i,$(CONFIG-n),$(eval $(i) ?=3D n)) CONFIG-x +=3D CONFIG_LIBXS CONFIG_LIBXS ?=3D $(CONFIG_XENBUS) =20 +CONFIG-x +=3D CONFIG_LIBXENCALL +CONFIG-x +=3D CONFIG_LIBXENCTRL +CONFIG-x +=3D CONFIG_LIBXENDEVICEMODEL +CONFIG-x +=3D CONFIG_LIBXENEVTCHN +CONFIG-x +=3D CONFIG_LIBXENFOREIGNMEMORY +CONFIG-x +=3D CONFIG_LIBXENGNTTAB +CONFIG-x +=3D CONFIG_LIBXENGUEST +CONFIG-x +=3D CONFIG_LIBXENTOOLCORE +CONFIG-x +=3D CONFIG_LIBXENTOOLLOG +CONFIG_LIBXENCALL ?=3D $(CONFIG_XC) +CONFIG_LIBXENCTRL ?=3D $(CONFIG_XC) +CONFIG_LIBXENDEVICEMODEL ?=3D $(CONFIG_XC) +CONFIG_LIBXENEVTCHN ?=3D $(CONFIG_XC) +CONFIG_LIBXENFOREIGNMEMORY ?=3D $(CONFIG_XC) +CONFIG_LIBXENGNTTAB ?=3D $(CONFIG_XC) +CONFIG_LIBXENGUEST ?=3D $(CONFIG_XC) +CONFIG_LIBXENTOOLCORE ?=3D $(CONFIG_XC) +CONFIG_LIBXENTOOLLOG ?=3D $(CONFIG_XC) + CONFIG-all :=3D $(CONFIG-y) $(CONFIG-n) $(CONFIG-x) =20 # Export config items as compiler directives diff --git a/Makefile b/Makefile index 6c8df8b5..ffa8d1a8 100644 --- a/Makefile +++ b/Makefile @@ -123,23 +123,39 @@ endif OBJS :=3D $(filter-out $(OBJ_DIR)/lwip%.o $(LWO), $(OBJS)) =20 ifeq ($(libc),y) -ifeq ($(CONFIG_XC),y) +ifeq ($(CONFIG_LIBXENTOOLCORE),y) APP_LDLIBS +=3D -L$(TOOLCORE_PATH) -whole-archive -lxentoolcore -no-whole-= archive LIBS +=3D $(TOOLCORE_PATH)/libxentoolcore.a +endif +ifeq ($(CONFIG_LIBXENTOOLLOG),y) APP_LDLIBS +=3D -L$(TOOLLOG_PATH) -whole-archive -lxentoollog -no-whole-ar= chive LIBS +=3D $(TOOLLOG_PATH)/libxentoollog.a +endif +ifeq ($(CONFIG_LIBXENEVTCHN),y) APP_LDLIBS +=3D -L$(EVTCHN_PATH) -whole-archive -lxenevtchn -no-whole-arch= ive LIBS +=3D $(EVTCHN_PATH)/libxenevtchn.a +endif +ifeq ($(CONFIG_LIBXENGNTTAB),y) APP_LDLIBS +=3D -L$(GNTTAB_PATH) -whole-archive -lxengnttab -no-whole-arch= ive LIBS +=3D $(GNTTAB_PATH)/libxengnttab.a +endif +ifeq ($(CONFIG_LIBXENCALL),y) APP_LDLIBS +=3D -L$(CALL_PATH) -whole-archive -lxencall -no-whole-archive LIBS +=3D $(CALL_PATH)/libxencall.a +endif +ifeq ($(CONFIG_LIBXENFOREIGNMEMORY),y) APP_LDLIBS +=3D -L$(FOREIGNMEMORY_PATH) -whole-archive -lxenforeignmemory = -no-whole-archive LIBS +=3D $(FOREIGNMEMORY_PATH)/libxenforeignmemory.a +endif +ifeq ($(CONFIG_LIBXENDEVICEMODEL),y) APP_LDLIBS +=3D -L$(DEVICEMODEL_PATH) -whole-archive -lxendevicemodel -no-= whole-archive LIBS +=3D $(DEVICEMODEL_PATH)/libxendevicemodel.a +endif +ifeq ($(CONFIG_LIBXENGUEST),y) APP_LDLIBS +=3D -L$(GUEST_PATH) -whole-archive -lxenguest -no-whole-archive LIBS +=3D $(GUEST_PATH)/libxenguest.a +endif +ifeq ($(CONFIG_LIBXENCTRL),y) APP_LDLIBS +=3D -L$(CTRL_PATH) -whole-archive -lxenctrl -no-whole-archive LIBS +=3D $(CTRL_PATH)/libxenctrl.a endif --=20 2.43.0 From nobody Fri Jan 3 03:33:08 2025 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; 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=fail(p=quarantine dis=quarantine) header.from=suse.com Return-Path: Received: from lists.xenproject.org (lists.xenproject.org [192.237.175.120]) by mx.zohomail.com with SMTPS id 1728297332610300.2023690702662; Mon, 7 Oct 2024 03:35:32 -0700 (PDT) Received: from list by lists.xenproject.org with outflank-mailman.811871.1224581 (Exim 4.92) (envelope-from ) id 1sxl58-0003jB-D9; Mon, 07 Oct 2024 10:35:14 +0000 Received: by outflank-mailman (output) from mailman id 811871.1224581; Mon, 07 Oct 2024 10:35:14 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1sxl58-0003j3-AB; Mon, 07 Oct 2024 10:35:14 +0000 Received: by outflank-mailman (input) for mailman id 811871; Mon, 07 Oct 2024 10:35:12 +0000 Received: from se1-gles-sth1-in.inumbo.com ([159.253.27.254] helo=se1-gles-sth1.inumbo.com) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1sxl56-0003GC-Gi for xen-devel@lists.xenproject.org; Mon, 07 Oct 2024 10:35:12 +0000 Received: from smtp-out1.suse.de (smtp-out1.suse.de [2a07:de40:b251:101:10:150:64:1]) by se1-gles-sth1.inumbo.com (Halon) with ESMTPS id d42bf279-8497-11ef-a0bb-8be0dac302b0; Mon, 07 Oct 2024 12:35:10 +0200 (CEST) Received: from imap1.dmz-prg2.suse.org (imap1.dmz-prg2.suse.org [IPv6:2a07:de40:b281:104:10:150:64:97]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by smtp-out1.suse.de (Postfix) with ESMTPS id 89CA121BF8; Mon, 7 Oct 2024 10:35:10 +0000 (UTC) Received: from imap1.dmz-prg2.suse.org (localhost [127.0.0.1]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by imap1.dmz-prg2.suse.org (Postfix) with ESMTPS id 596C313786; Mon, 7 Oct 2024 10:35:10 +0000 (UTC) Received: from dovecot-director2.suse.de ([2a07:de40:b281:106:10:150:64:167]) by imap1.dmz-prg2.suse.org with ESMTPSA id 1lMhFF65A2eFKgAAD6G6ig (envelope-from ); Mon, 07 Oct 2024 10:35:10 +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: d42bf279-8497-11ef-a0bb-8be0dac302b0 Authentication-Results: smtp-out1.suse.de; none From: Juergen Gross To: minios-devel@lists.xenproject.org, xen-devel@lists.xenproject.org Cc: samuel.thibault@ens-lyon.org, Juergen Gross Subject: [MINI-OS PATCH 2/2] drop CONFIG_XC support Date: Mon, 7 Oct 2024 12:34:56 +0200 Message-ID: <20241007103456.14946-3-jgross@suse.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20241007103456.14946-1-jgross@suse.com> References: <20241007103456.14946-1-jgross@suse.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Rspamd-Pre-Result: action=no action; module=replies; Message is reply to one we originated X-Spam-Level: X-Spamd-Result: default: False [-4.00 / 50.00]; REPLY(-4.00)[] X-Spam-Score: -4.00 X-Spam-Flag: NO X-Rspamd-Queue-Id: 89CA121BF8 X-Rspamd-Pre-Result: action=no action; module=replies; Message is reply to one we originated X-Rspamd-Action: no action X-Rspamd-Server: rspamd2.dmz-prg2.suse.org X-ZM-MESSAGEID: 1728297333172116600 Content-Type: text/plain; charset="utf-8" CONFIG_XC is no longer needed with individual CONFIG_LIBXEN support. Remove it, while disabling the CONFIG_LIBXEN items by default. Signed-off-by: Juergen Gross --- Config.mk | 30 +++++++++--------------------- 1 file changed, 9 insertions(+), 21 deletions(-) diff --git a/Config.mk b/Config.mk index d0fbacac..f59a0cf4 100644 --- a/Config.mk +++ b/Config.mk @@ -193,6 +193,15 @@ CONFIG-n +=3D CONFIG_9PFRONT CONFIG-n +=3D CONFIG_TPM_TIS CONFIG-n +=3D CONFIG_TPMBACK CONFIG-n +=3D CONFIG_BALLOON +CONFIG-n +=3D CONFIG_LIBXENCALL +CONFIG-n +=3D CONFIG_LIBXENCTRL +CONFIG-n +=3D CONFIG_LIBXENDEVICEMODEL +CONFIG-n +=3D CONFIG_LIBXENEVTCHN +CONFIG-n +=3D CONFIG_LIBXENFOREIGNMEMORY +CONFIG-n +=3D CONFIG_LIBXENGNTTAB +CONFIG-n +=3D CONFIG_LIBXENGUEST +CONFIG-n +=3D CONFIG_LIBXENTOOLCORE +CONFIG-n +=3D CONFIG_LIBXENTOOLLOG # Setting CONFIG_USE_XEN_CONSOLE copies all print output to the Xen emerge= ncy # console apart of standard dom0 handled console. CONFIG-n +=3D CONFIG_USE_XEN_CONSOLE @@ -201,8 +210,6 @@ CONFIG-y +=3D CONFIG_PARAVIRT else CONFIG-n +=3D CONFIG_PARAVIRT endif -# Support legacy CONFIG_XC value -CONFIG_XC ?=3D $(libc) =20 CONFIG-$(lwip) +=3D CONFIG_LWIP =20 @@ -212,25 +219,6 @@ $(foreach i,$(CONFIG-n),$(eval $(i) ?=3D n)) CONFIG-x +=3D CONFIG_LIBXS CONFIG_LIBXS ?=3D $(CONFIG_XENBUS) =20 -CONFIG-x +=3D CONFIG_LIBXENCALL -CONFIG-x +=3D CONFIG_LIBXENCTRL -CONFIG-x +=3D CONFIG_LIBXENDEVICEMODEL -CONFIG-x +=3D CONFIG_LIBXENEVTCHN -CONFIG-x +=3D CONFIG_LIBXENFOREIGNMEMORY -CONFIG-x +=3D CONFIG_LIBXENGNTTAB -CONFIG-x +=3D CONFIG_LIBXENGUEST -CONFIG-x +=3D CONFIG_LIBXENTOOLCORE -CONFIG-x +=3D CONFIG_LIBXENTOOLLOG -CONFIG_LIBXENCALL ?=3D $(CONFIG_XC) -CONFIG_LIBXENCTRL ?=3D $(CONFIG_XC) -CONFIG_LIBXENDEVICEMODEL ?=3D $(CONFIG_XC) -CONFIG_LIBXENEVTCHN ?=3D $(CONFIG_XC) -CONFIG_LIBXENFOREIGNMEMORY ?=3D $(CONFIG_XC) -CONFIG_LIBXENGNTTAB ?=3D $(CONFIG_XC) -CONFIG_LIBXENGUEST ?=3D $(CONFIG_XC) -CONFIG_LIBXENTOOLCORE ?=3D $(CONFIG_XC) -CONFIG_LIBXENTOOLLOG ?=3D $(CONFIG_XC) - CONFIG-all :=3D $(CONFIG-y) $(CONFIG-n) $(CONFIG-x) =20 # Export config items as compiler directives --=20 2.43.0