From patchwork Sat Oct 5 15:15:45 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Juergen Gross X-Patchwork-Id: 13823309 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from lists.xenproject.org (lists.xenproject.org [192.237.175.120]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id E68D9CF887E for ; Sat, 5 Oct 2024 15:16:16 +0000 (UTC) Received: from list by lists.xenproject.org with outflank-mailman.810957.1223641 (Exim 4.92) (envelope-from ) id 1sx6Vn-0006Tq-5t; Sat, 05 Oct 2024 15:16:03 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 810957.1223641; Sat, 05 Oct 2024 15:16:03 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1sx6Vn-0006Tj-37; Sat, 05 Oct 2024 15:16:03 +0000 Received: by outflank-mailman (input) for mailman id 810957; Sat, 05 Oct 2024 15:16:01 +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 1sx6Vl-0006TD-OK for xen-devel@lists.xenproject.org; Sat, 05 Oct 2024 15:16:01 +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 b98a526f-832c-11ef-a0bb-8be0dac302b0; Sat, 05 Oct 2024 17:16:00 +0200 (CEST) Received: from imap1.dmz-prg2.suse.org (unknown [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 6E2631FE1A; Sat, 5 Oct 2024 15:15:58 +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 2CA8013A8F; Sat, 5 Oct 2024 15:15:58 +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 BB5HCS5YAWfwCAAAD6G6ig (envelope-from ); Sat, 05 Oct 2024 15:15:58 +0000 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: b98a526f-832c-11ef-a0bb-8be0dac302b0 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.com; s=susede1; t=1728141358; 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=HPdwuqGA7z8EJBMd2vQxym4phrJ0tE0TYVW2NGLkHuk=; b=qepeY9qR5p+HPhmRmFhWAtQ7M+O/H0QaCpy47X7zbanVFeyk5+BMqqZVfLjyzQyBk76iQq 3NDb5cVo6UVLwTXNuhS5qNdxnp2cdoIrgG5txXQhuo1YAsVcWShfGjDfldCD1X+o3LslPQ H0TNPJk9wjKp9DKJC/Artk2x5iNCsmU= Authentication-Results: smtp-out2.suse.de; none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.com; s=susede1; t=1728141358; 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=HPdwuqGA7z8EJBMd2vQxym4phrJ0tE0TYVW2NGLkHuk=; b=qepeY9qR5p+HPhmRmFhWAtQ7M+O/H0QaCpy47X7zbanVFeyk5+BMqqZVfLjyzQyBk76iQq 3NDb5cVo6UVLwTXNuhS5qNdxnp2cdoIrgG5txXQhuo1YAsVcWShfGjDfldCD1X+o3LslPQ H0TNPJk9wjKp9DKJC/Artk2x5iNCsmU= From: Juergen Gross To: xen-devel@lists.xenproject.org Cc: Juergen Gross , Andrew Cooper , Jan Beulich , Julien Grall , Stefano Stabellini , Samuel Thibault Subject: [PATCH 1/4] stubdom: add local .gitignore file Date: Sat, 5 Oct 2024 17:15:45 +0200 Message-ID: <20241005151548.29184-2-jgross@suse.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20241005151548.29184-1-jgross@suse.com> References: <20241005151548.29184-1-jgross@suse.com> MIME-Version: 1.0 X-Spamd-Result: default: False [-6.78 / 50.00]; REPLY(-4.00)[]; BAYES_HAM(-3.00)[99.99%]; MID_CONTAINS_FROM(1.00)[]; NEURAL_HAM_LONG(-1.00)[-1.000]; R_MISSING_CHARSET(0.50)[]; NEURAL_HAM_SHORT(-0.18)[-0.886]; MIME_GOOD(-0.10)[text/plain]; RCVD_COUNT_TWO(0.00)[2]; ARC_NA(0.00)[]; RCVD_VIA_SMTP_AUTH(0.00)[]; FROM_HAS_DN(0.00)[]; MIME_TRACE(0.00)[0:+]; TO_MATCH_ENVRCPT_ALL(0.00)[]; FROM_EQ_ENVFROM(0.00)[]; RCPT_COUNT_SEVEN(0.00)[7]; DBL_BLOCKED_OPENRESOLVER(0.00)[suse.com:mid,suse.com:email]; DKIM_SIGNED(0.00)[suse.com:s=susede1]; TO_DN_SOME(0.00)[]; RCVD_TLS_ALL(0.00)[] Add a stubdom specfic .gitignore file. Signed-off-by: Juergen Gross --- .gitignore | 37 +------------------------------------ stubdom/.gitignore | 36 ++++++++++++++++++++++++++++++++++++ 2 files changed, 37 insertions(+), 36 deletions(-) create mode 100644 stubdom/.gitignore diff --git a/.gitignore b/.gitignore index d88be80b28..5c13fb5878 100644 --- a/.gitignore +++ b/.gitignore @@ -39,7 +39,6 @@ cscope.po.out .vscode dist -stubdom/*.tar.gz autom4te.cache/ automation/build/yocto/*.dockerfile @@ -66,41 +65,7 @@ docs/pdf/ docs/txt/ extras/ install/* -stubdom/*-minios-config.mk -stubdom/autom4te.cache/ -stubdom/binutils-* -stubdom/config.cache -stubdom/config.log -stubdom/config.status -stubdom/cross-root-* -stubdom/gcc-* -stubdom/gmp-* -stubdom/grub-* -stubdom/include -stubdom/ioemu -stubdom/ioemu/ -stubdom/libs-* -stubdom/libxencall-* -stubdom/libxenevtchn-* -stubdom/libxenforeignmemory-* -stubdom/libxengnttab-* -stubdom/libxentoolcore-* -stubdom/libxentoollog-* -stubdom/lwip-* -stubdom/lwip/ -stubdom/mini-os-* -stubdom/mk-headers-* -stubdom/newlib-1.* -stubdom/newlib-x86* -stubdom/pciutils-* -stubdom/pkg-config/* -stubdom/polarssl-* -stubdom/stubdompath.sh -stubdom/tpm_emulator-* -stubdom/vtpm/vtpm_manager.h -stubdom/xenstore -stubdom/xenstorepvh -stubdom/zlib-* + tools/*/build/lib*/*.py tools/autom4te.cache/ tools/config.h diff --git a/stubdom/.gitignore b/stubdom/.gitignore new file mode 100644 index 0000000000..10e2547a22 --- /dev/null +++ b/stubdom/.gitignore @@ -0,0 +1,36 @@ +/*.tar.gz +/*-minios-config.mk +/autom4te.cache/ +/binutils-* +/config.cache +/config.log +/config.status +/cross-root-* +/gcc-* +/gmp-* +/grub-* +/include +/ioemu +/ioemu/ +/libs-* +/libxencall-* +/libxenevtchn-* +/libxenforeignmemory-* +/libxengnttab-* +/libxentoolcore-* +/libxentoollog-* +/lwip-* +/lwip/ +/mini-os-* +/mk-headers-* +/newlib-1.* +/newlib-x86* +/pciutils-* +/pkg-config/* +/polarssl-* +/stubdompath.sh +/tpm_emulator-* +/vtpm/vtpm_manager.h +/xenstore +/xenstorepvh +/zlib-* From patchwork Sat Oct 5 15:15:46 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Juergen Gross X-Patchwork-Id: 13823310 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from lists.xenproject.org (lists.xenproject.org [192.237.175.120]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 2B523CF34C4 for ; Sat, 5 Oct 2024 15:16:18 +0000 (UTC) Received: from list by lists.xenproject.org with outflank-mailman.810958.1223651 (Exim 4.92) (envelope-from ) id 1sx6Vq-0006kV-Cx; Sat, 05 Oct 2024 15:16:06 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 810958.1223651; Sat, 05 Oct 2024 15:16:06 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1sx6Vq-0006kO-9j; Sat, 05 Oct 2024 15:16:06 +0000 Received: by outflank-mailman (input) for mailman id 810958; Sat, 05 Oct 2024 15:16:05 +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 1sx6Vp-0006TD-3r for xen-devel@lists.xenproject.org; Sat, 05 Oct 2024 15:16:05 +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 bcdfd6bc-832c-11ef-a0bb-8be0dac302b0; Sat, 05 Oct 2024 17:16:04 +0200 (CEST) Received: from imap1.dmz-prg2.suse.org (unknown [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 0F20B1FDBD; Sat, 5 Oct 2024 15:16: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 D131E13A8F; Sat, 5 Oct 2024 15:16:03 +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 3XJtMTNYAWf1CAAAD6G6ig (envelope-from ); Sat, 05 Oct 2024 15:16:03 +0000 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: bcdfd6bc-832c-11ef-a0bb-8be0dac302b0 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.com; s=susede1; t=1728141364; 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=gqQWygSSK4ytl3fKX2xJfCRM7bub9g07ORkZhe7KAkQ=; b=G/GENQ8FHHuThLUbP6nX92T+t5BxBIGtZ7/Ii0BO/IrfOjzKCljvJdjgADziygNVySe9Bk R0sXlh3rKRkp7lLILgz8VKGuRd26SFut/3L0SDKLsExjYqAhD8x/jdfUSKkcqoADjX+n/u PjwXdCDIus0gT7UVpM1BSo6wnLc3qEM= Authentication-Results: smtp-out2.suse.de; none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.com; s=susede1; t=1728141364; 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=gqQWygSSK4ytl3fKX2xJfCRM7bub9g07ORkZhe7KAkQ=; b=G/GENQ8FHHuThLUbP6nX92T+t5BxBIGtZ7/Ii0BO/IrfOjzKCljvJdjgADziygNVySe9Bk R0sXlh3rKRkp7lLILgz8VKGuRd26SFut/3L0SDKLsExjYqAhD8x/jdfUSKkcqoADjX+n/u PjwXdCDIus0gT7UVpM1BSo6wnLc3qEM= From: Juergen Gross To: xen-devel@lists.xenproject.org Cc: Juergen Gross , Samuel Thibault , Daniel De Graaf , Quan Xu Subject: [PATCH 2/4] stubdom: explcitly add libc and lwip Mini-OS config options Date: Sat, 5 Oct 2024 17:15:46 +0200 Message-ID: <20241005151548.29184-3-jgross@suse.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20241005151548.29184-1-jgross@suse.com> References: <20241005151548.29184-1-jgross@suse.com> MIME-Version: 1.0 X-Spamd-Result: default: False [-5.30 / 50.00]; REPLY(-4.00)[]; BAYES_HAM(-3.00)[99.99%]; SUSPICIOUS_RECIPS(1.50)[]; MID_CONTAINS_FROM(1.00)[]; NEURAL_HAM_LONG(-1.00)[-1.000]; R_MISSING_CHARSET(0.50)[]; NEURAL_HAM_SHORT(-0.20)[-1.000]; MIME_GOOD(-0.10)[text/plain]; ARC_NA(0.00)[]; RCVD_VIA_SMTP_AUTH(0.00)[]; TAGGED_RCPT(0.00)[]; TO_MATCH_ENVRCPT_ALL(0.00)[]; TO_DN_SOME(0.00)[]; MIME_TRACE(0.00)[0:+]; FROM_EQ_ENVFROM(0.00)[]; FREEMAIL_CC(0.00)[suse.com,ens-lyon.org,tycho.nsa.gov,gmail.com]; FROM_HAS_DN(0.00)[]; RCVD_COUNT_TWO(0.00)[2]; RCVD_TLS_ALL(0.00)[]; DBL_BLOCKED_OPENRESOLVER(0.00)[suse.com:mid,suse.com:email]; RCPT_COUNT_FIVE(0.00)[5]; DKIM_SIGNED(0.00)[suse.com:s=susede1]; FREEMAIL_ENVRCPT(0.00)[gmail.com] Today the Mini-OS build systems derives libc and lwip config options from the stubdom and LWIPDIR make variables supplied by the Xen build system. In order to prepare those being explicit Mini-OS config options, add them to the related stubdom Mini-OS config files. While at it remove the CONFIG_START_NETWORK setting from config files disabling lwip, as CONFIG_START_NETWORK requires lwip for becoming effective. Signed-off-by: Juergen Gross --- stubdom/c/minios.cfg | 2 ++ stubdom/grub/minios.cfg | 3 ++- stubdom/ioemu-minios.cfg | 2 ++ stubdom/vtpm/minios.cfg | 3 ++- stubdom/vtpmmgr/minios.cfg | 3 ++- stubdom/xenstore-minios.cfg | 1 + stubdom/xenstorepvh-minios.cfg | 1 + 7 files changed, 12 insertions(+), 3 deletions(-) diff --git a/stubdom/c/minios.cfg b/stubdom/c/minios.cfg index e69de29bb2..56d65510cd 100644 --- a/stubdom/c/minios.cfg +++ b/stubdom/c/minios.cfg @@ -0,0 +1,2 @@ +CONFIG_LIBC=y +CONFIG_LWIP=y diff --git a/stubdom/grub/minios.cfg b/stubdom/grub/minios.cfg index 8df49092cd..5145b357e0 100644 --- a/stubdom/grub/minios.cfg +++ b/stubdom/grub/minios.cfg @@ -1,3 +1,4 @@ -CONFIG_START_NETWORK=n +CONFIG_LIBC=y +CONFIG_LWIP=n CONFIG_SPARSE_BSS=n CONFIG_TPMFRONT=y diff --git a/stubdom/ioemu-minios.cfg b/stubdom/ioemu-minios.cfg index a65baa3765..6153ae05f8 100644 --- a/stubdom/ioemu-minios.cfg +++ b/stubdom/ioemu-minios.cfg @@ -1,3 +1,5 @@ +CONFIG_LIBC=y +CONFIG_LWIP=y CONFIG_START_NETWORK=n CONFIG_QEMU_XS_ARGS=y CONFIG_PCIFRONT=y diff --git a/stubdom/vtpm/minios.cfg b/stubdom/vtpm/minios.cfg index 31652ee4f2..22f66f1351 100644 --- a/stubdom/vtpm/minios.cfg +++ b/stubdom/vtpm/minios.cfg @@ -1,7 +1,8 @@ +CONFIG_LIBC=y +CONFIG_LWIP=n CONFIG_TPMFRONT=y CONFIG_TPM_TIS=n CONFIG_TPMBACK=y -CONFIG_START_NETWORK=n CONFIG_TEST=n CONFIG_PCIFRONT=n CONFIG_BLKFRONT=y diff --git a/stubdom/vtpmmgr/minios.cfg b/stubdom/vtpmmgr/minios.cfg index 3fb383d30f..a9f13a2fd2 100644 --- a/stubdom/vtpmmgr/minios.cfg +++ b/stubdom/vtpmmgr/minios.cfg @@ -1,7 +1,8 @@ +CONFIG_LIBC=y +CONFIG_LWIP=n CONFIG_TPMFRONT=y CONFIG_TPM_TIS=y CONFIG_TPMBACK=y -CONFIG_START_NETWORK=n CONFIG_TEST=n CONFIG_PCIFRONT=n CONFIG_BLKFRONT=y diff --git a/stubdom/xenstore-minios.cfg b/stubdom/xenstore-minios.cfg index 239da519b9..0252b59432 100644 --- a/stubdom/xenstore-minios.cfg +++ b/stubdom/xenstore-minios.cfg @@ -1,3 +1,4 @@ +CONFIG_LIBC=y CONFIG_BLKFRONT=n CONFIG_NETFRONT=n CONFIG_FBFRONT=n diff --git a/stubdom/xenstorepvh-minios.cfg b/stubdom/xenstorepvh-minios.cfg index 752b90d7d3..62a228f33d 100644 --- a/stubdom/xenstorepvh-minios.cfg +++ b/stubdom/xenstorepvh-minios.cfg @@ -1,3 +1,4 @@ +CONFIG_LIBC=y CONFIG_PARAVIRT=n CONFIG_BLKFRONT=n CONFIG_NETFRONT=n From patchwork Sat Oct 5 15:15:47 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Juergen Gross X-Patchwork-Id: 13823312 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from lists.xenproject.org (lists.xenproject.org [192.237.175.120]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id A0DE1CF887E for ; Sat, 5 Oct 2024 15:16:26 +0000 (UTC) Received: from list by lists.xenproject.org with outflank-mailman.810959.1223661 (Exim 4.92) (envelope-from ) id 1sx6Vw-00076M-JS; Sat, 05 Oct 2024 15:16:12 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 810959.1223661; Sat, 05 Oct 2024 15:16:12 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1sx6Vw-00076B-Gb; Sat, 05 Oct 2024 15:16:12 +0000 Received: by outflank-mailman (input) for mailman id 810959; Sat, 05 Oct 2024 15:16:11 +0000 Received: from se1-gles-flk1-in.inumbo.com ([94.247.172.50] helo=se1-gles-flk1.inumbo.com) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1sx6Vv-0006E7-Ie for xen-devel@lists.xenproject.org; Sat, 05 Oct 2024 15:16:11 +0000 Received: from smtp-out1.suse.de (smtp-out1.suse.de [195.135.223.130]) by se1-gles-flk1.inumbo.com (Halon) with ESMTPS id c03215f7-832c-11ef-99a2-01e77a169b0f; Sat, 05 Oct 2024 17:16:10 +0200 (CEST) Received: from imap1.dmz-prg2.suse.org (unknown [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 9C05021E1D; Sat, 5 Oct 2024 15:16:09 +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 7746513A8F; Sat, 5 Oct 2024 15:16:09 +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 7ZSkGzlYAWf+CAAAD6G6ig (envelope-from ); Sat, 05 Oct 2024 15:16:09 +0000 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: c03215f7-832c-11ef-99a2-01e77a169b0f DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.com; s=susede1; t=1728141369; 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=Qa1gW4DnBfzxqPMf4tD8MwJ65mRwo8BvZFHY8vU0Kx8=; b=N8rRKyv8Cg3c26WTDtn0+GMJ3bJl/tXLKuGUO+2oDMZUdO2P/ky7iwCSdwAcViNl0NunHB CD677e2i8jKUzAwq44uasGIYYD2svFLaPbpK23Y17ALfGhe7JYV+LIWgs+j8qk/OcY8OfB imPJ/GYgEHS/8QPNgEpSP1xhJwJ4tAM= Authentication-Results: smtp-out1.suse.de; none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.com; s=susede1; t=1728141369; 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=Qa1gW4DnBfzxqPMf4tD8MwJ65mRwo8BvZFHY8vU0Kx8=; b=N8rRKyv8Cg3c26WTDtn0+GMJ3bJl/tXLKuGUO+2oDMZUdO2P/ky7iwCSdwAcViNl0NunHB CD677e2i8jKUzAwq44uasGIYYD2svFLaPbpK23Y17ALfGhe7JYV+LIWgs+j8qk/OcY8OfB imPJ/GYgEHS/8QPNgEpSP1xhJwJ4tAM= From: Juergen Gross To: xen-devel@lists.xenproject.org Cc: Juergen Gross , Anthony PERARD Subject: [PATCH 3/4] build: move xenlibs-dependencies make definition to uselibs.mk Date: Sat, 5 Oct 2024 17:15:47 +0200 Message-ID: <20241005151548.29184-4-jgross@suse.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20241005151548.29184-1-jgross@suse.com> References: <20241005151548.29184-1-jgross@suse.com> MIME-Version: 1.0 X-Spamd-Result: default: False [-6.77 / 50.00]; REPLY(-4.00)[]; BAYES_HAM(-3.00)[99.99%]; MID_CONTAINS_FROM(1.00)[]; NEURAL_HAM_LONG(-1.00)[-1.000]; R_MISSING_CHARSET(0.50)[]; NEURAL_HAM_SHORT(-0.17)[-0.833]; MIME_GOOD(-0.10)[text/plain]; RCVD_COUNT_TWO(0.00)[2]; FROM_HAS_DN(0.00)[]; ARC_NA(0.00)[]; MIME_TRACE(0.00)[0:+]; TO_DN_SOME(0.00)[]; TO_MATCH_ENVRCPT_ALL(0.00)[]; RCVD_VIA_SMTP_AUTH(0.00)[]; DBL_BLOCKED_OPENRESOLVER(0.00)[suse.com:email,suse.com:mid]; FROM_EQ_ENVFROM(0.00)[]; DKIM_SIGNED(0.00)[suse.com:s=susede1]; RCPT_COUNT_THREE(0.00)[3]; RCVD_TLS_ALL(0.00)[] In order to be able to use the xenlibs-dependencies macro from stubdom build, move it to tools/libs/uselibs.mk, which is included from current users and stubdom/Makefile. No functional change intended. Signed-off-by: Juergen Gross --- tools/Rules.mk | 7 ------- tools/libs/uselibs.mk | 7 +++++++ 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/tools/Rules.mk b/tools/Rules.mk index e2289c25b4..6bd636709f 100644 --- a/tools/Rules.mk +++ b/tools/Rules.mk @@ -81,13 +81,6 @@ endif # include any CFLAGS or LDLIBS relating to libbar or libbaz unless # they use those libraries directly (not via libfoo) too. -# Give the list of Xen library that the libraries in $(1) are linked against, -# directly or indirectly. -define xenlibs-dependencies - $(sort $(foreach lib,$(1), \ - $(USELIBS_$(lib)) $(call xenlibs-dependencies,$(USELIBS_$(lib))))) -endef - # Flags for linking recursive dependencies of Xen libraries in $(1) define xenlibs-rpath $(addprefix -Wl$(comma)-rpath-link=$(XEN_ROOT)/tools/libs/,$(call xenlibs-dependencies,$(1))) diff --git a/tools/libs/uselibs.mk b/tools/libs/uselibs.mk index efd7a475ba..7aa8d83e06 100644 --- a/tools/libs/uselibs.mk +++ b/tools/libs/uselibs.mk @@ -31,3 +31,10 @@ USELIBS_light := toollog evtchn toolcore ctrl store hypfs guest LIBS_LIBS += util USELIBS_util := light FILENAME_util := xlutil + +# Give the list of Xen library that the libraries in $(1) are linked against, +# directly or indirectly. +define xenlibs-dependencies + $(sort $(foreach lib,$(1), \ + $(USELIBS_$(lib)) $(call xenlibs-dependencies,$(USELIBS_$(lib))))) +endef From patchwork Sat Oct 5 15:15:48 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Juergen Gross X-Patchwork-Id: 13823313 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from lists.xenproject.org (lists.xenproject.org [192.237.175.120]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 19714CF887E for ; Sat, 5 Oct 2024 15:16:32 +0000 (UTC) Received: from list by lists.xenproject.org with outflank-mailman.810960.1223671 (Exim 4.92) (envelope-from ) id 1sx6W1-0007Y5-VH; Sat, 05 Oct 2024 15:16:17 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 810960.1223671; Sat, 05 Oct 2024 15:16:17 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1sx6W1-0007Xy-Ra; Sat, 05 Oct 2024 15:16:17 +0000 Received: by outflank-mailman (input) for mailman id 810960; Sat, 05 Oct 2024 15:16:16 +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 1sx6W0-0006TD-8a for xen-devel@lists.xenproject.org; Sat, 05 Oct 2024 15:16:16 +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 c384f09e-832c-11ef-a0bb-8be0dac302b0; Sat, 05 Oct 2024 17:16:15 +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 382CC1FDDA; Sat, 5 Oct 2024 15:16:15 +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 0DAB313A8F; Sat, 5 Oct 2024 15:16:15 +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 k/3hAT9YAWcBCQAAD6G6ig (envelope-from ); Sat, 05 Oct 2024 15:16:15 +0000 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: c384f09e-832c-11ef-a0bb-8be0dac302b0 Authentication-Results: smtp-out2.suse.de; none From: Juergen Gross To: xen-devel@lists.xenproject.org Cc: Juergen Gross , Samuel Thibault , Anthony PERARD Subject: [PATCH 4/4] stubdom: add fine grained library config items to Mini-OS configs Date: Sat, 5 Oct 2024 17:15:48 +0200 Message-ID: <20241005151548.29184-5-jgross@suse.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20241005151548.29184-1-jgross@suse.com> References: <20241005151548.29184-1-jgross@suse.com> MIME-Version: 1.0 X-Rspamd-Pre-Result: action=no action; module=replies; Message is reply to one we originated X-Spamd-Result: default: False [-4.00 / 50.00]; REPLY(-4.00)[] X-Rspamd-Queue-Id: 382CC1FDDA 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 Today Mini-OS can only be configured to use all or none Xen library. In order to prepare a more fine grained configuration scheme, add per library config items to the Mini-OS config files. As some libraries pull in others, the config files need to be extended at build time to reflect those indirect library uses. Signed-off-by: Juergen Gross --- stubdom/.gitignore | 1 + stubdom/Makefile | 49 ++++++++++++++++++++++++++++++++++------------ 2 files changed, 38 insertions(+), 12 deletions(-) diff --git a/stubdom/.gitignore b/stubdom/.gitignore index 10e2547a22..c6a88467ae 100644 --- a/stubdom/.gitignore +++ b/stubdom/.gitignore @@ -1,3 +1,4 @@ +*.out.cfg /*.tar.gz /*-minios-config.mk /autom4te.cache/ diff --git a/stubdom/Makefile b/stubdom/Makefile index 8c503c2bf8..3b501a0710 100644 --- a/stubdom/Makefile +++ b/stubdom/Makefile @@ -340,6 +340,14 @@ endef $(foreach lib,$(STUB_LIBS),$(eval $(call BUILD_lib,$(lib)))) +define BUILD_config + cp $< $@ + for i in $(sort $(APP_LIBS) $(call xenlibs-dependencies,$(APP_LIBS))); do \ + u=`echo $$i | tr a-z A-Z`; \ + echo "CONFIG_LIBXEN$$u=y"; \ + done >> $@ +endef + xenstore/stamp: $(XEN_ROOT)/tools/xenstored/Makefile.common $(do_links) @@ -373,8 +381,12 @@ $(TARGETS_MINIOS): mini-os-%: # ioemu ####### -ioemu-minios-config.mk: $(CURDIR)/ioemu-minios.cfg - MINIOS_CONFIG="$<" CONFIG_FILE="$(CURDIR)/$@" $(MAKE) DESTDIR= -C $(MINI_OS) config +ioemu-minios.out.cfg: APP_LIBS = evtchn gnttab ctrl guest +ioemu-minios.out.cfg: $(CURDIR)/ioemu-minios.cfg Makefile + $(BUILD_config) + +ioemu-minios-config.mk: ioemu-minios.out.cfg + MINIOS_CONFIG="$(CURDIR)/$<" CONFIG_FILE="$(CURDIR)/$@" $(MAKE) DESTDIR= -C $(MINI_OS) config .PHONY: ioemu ioemu: cross-zlib cross-libpci libxenguest ioemu-minios-config.mk @@ -435,8 +447,12 @@ grub-upstream: grub-$(GRUB_VERSION).tar.gz patch -d $@ -p1 < $$i || exit 1; \ done -grub-$(XEN_TARGET_ARCH)-minios-config.mk: $(CURDIR)/grub/minios.cfg - MINIOS_CONFIG="$<" CONFIG_FILE="$(CURDIR)/$@" $(MAKE) DESTDIR= -C $(MINI_OS) config +grub/minios.out.cfg: APP_LIBS = guest ctrl toollog +grub/minios.out.cfg: $(CURDIR)/grub/minios.cfg Makefile + $(BUILD_config) + +grub-$(XEN_TARGET_ARCH)-minios-config.mk: grub/minios.out.cfg + MINIOS_CONFIG="$(CURDIR)/$<" CONFIG_FILE="$(CURDIR)/$@" $(MAKE) DESTDIR= -C $(MINI_OS) config .PHONY: grub grub: cross-polarssl grub-upstream $(CROSS_ROOT) grub-$(XEN_TARGET_ARCH)-minios-config.mk @@ -447,8 +463,12 @@ grub: cross-polarssl grub-upstream $(CROSS_ROOT) grub-$(XEN_TARGET_ARCH)-minios- # xenstore ########## -xenstore-minios-config.mk: $(CURDIR)/xenstore-minios.cfg - MINIOS_CONFIG="$<" CONFIG_FILE="$(CURDIR)/$@" $(MAKE) DESTDIR= -C $(MINI_OS) config +xenstore-minios.out.cfg: APP_LIBS = gnttab evtchn toollog ctrl +xenstore-minios.out.cfg: $(CURDIR)/xenstore-minios.cfg Makefile + $(BUILD_config) + +xenstore-minios-config.mk: xenstore-minios.out.cfg + MINIOS_CONFIG="$(CURDIR)/$<" CONFIG_FILE="$(CURDIR)/$@" $(MAKE) DESTDIR= -C $(MINI_OS) config .PHONY: xenstore xenstore: $(CROSS_ROOT) xenstore-minios-config.mk @@ -458,8 +478,12 @@ xenstore: $(CROSS_ROOT) xenstore-minios-config.mk # xenstorepvh ############# -xenstorepvh-minios-config.mk: $(CURDIR)/xenstorepvh-minios.cfg - MINIOS_CONFIG="$<" CONFIG_FILE="$(CURDIR)/$@" $(MAKE) DESTDIR= -C $(MINI_OS) config +xenstorepvh-minios.out.cfg: APP_LIBS = gnttab evtchn toollog ctrl +xenstorepvh-minios.out.cfg: $(CURDIR)/xenstorepvh-minios.cfg Makefile + $(BUILD_config) + +xenstorepvh-minios-config.mk: xenstorepvh-minios.out.cfg + MINIOS_CONFIG="$(CURDIR)/$<" CONFIG_FILE="$(CURDIR)/$@" $(MAKE) DESTDIR= -C $(MINI_OS) config .PHONY: xenstorepvh xenstorepvh: $(CROSS_ROOT) xenstorepvh-minios-config.mk @@ -472,7 +496,7 @@ xenstorepvh: $(CROSS_ROOT) xenstorepvh-minios-config.mk .PHONY: ioemu-stubdom ioemu-stubdom: APP_OBJS=$(CURDIR)/ioemu/i386-stubdom/qemu.a $(CURDIR)/ioemu/i386-stubdom/libqemu.a $(CURDIR)/ioemu/libqemu_common.a ioemu-stubdom: mini-os-$(XEN_TARGET_ARCH)-ioemu lwip-$(XEN_TARGET_ARCH) libxenguest ioemu - DEF_CPPFLAGS="$(TARGET_CPPFLAGS)" DEF_CFLAGS="$(TARGET_CFLAGS)" DEF_LDFLAGS="$(TARGET_LDFLAGS)" MINIOS_CONFIG="$(CURDIR)/ioemu-minios.cfg" $(MAKE) DESTDIR= -C $(MINI_OS) OBJ_DIR=$(CURDIR)/$< LWIPDIR=$(CURDIR)/lwip-$(XEN_TARGET_ARCH) APP_OBJS="$(APP_OBJS)" + DEF_CPPFLAGS="$(TARGET_CPPFLAGS)" DEF_CFLAGS="$(TARGET_CFLAGS)" DEF_LDFLAGS="$(TARGET_LDFLAGS)" MINIOS_CONFIG="$(CURDIR)/ioemu-minios.out.cfg" $(MAKE) DESTDIR= -C $(MINI_OS) OBJ_DIR=$(CURDIR)/$< LWIPDIR=$(CURDIR)/lwip-$(XEN_TARGET_ARCH) APP_OBJS="$(APP_OBJS)" .PHONY: c-stubdom c-stubdom: mini-os-$(XEN_TARGET_ARCH)-c lwip-$(XEN_TARGET_ARCH) libxenguest c @@ -488,7 +512,7 @@ vtpmmgr-stubdom: mini-os-$(XEN_TARGET_ARCH)-vtpmmgr vtpmmgr .PHONY: pv-grub pv-grub: mini-os-$(XEN_TARGET_ARCH)-grub libxenguest grub - DEF_CPPFLAGS="$(TARGET_CPPFLAGS)" DEF_CFLAGS="$(TARGET_CFLAGS)" DEF_LDFLAGS="$(TARGET_LDFLAGS)" MINIOS_CONFIG="$(CURDIR)/grub/minios.cfg" $(MAKE) DESTDIR= -C $(MINI_OS) OBJ_DIR=$(CURDIR)/$< APP_OBJS=$(CURDIR)/grub-$(XEN_TARGET_ARCH)/main.a + DEF_CPPFLAGS="$(TARGET_CPPFLAGS)" DEF_CFLAGS="$(TARGET_CFLAGS)" DEF_LDFLAGS="$(TARGET_LDFLAGS)" MINIOS_CONFIG="$(CURDIR)/grub/minios.out.cfg" $(MAKE) DESTDIR= -C $(MINI_OS) OBJ_DIR=$(CURDIR)/$< APP_OBJS=$(CURDIR)/grub-$(XEN_TARGET_ARCH)/main.a .PHONY: pv-grub-if-enabled ifneq ($(filter grub,$(STUBDOM_TARGETS)),) @@ -499,11 +523,11 @@ endif .PHONY: xenstore-stubdom xenstore-stubdom: mini-os-$(XEN_TARGET_ARCH)-xenstore libxenguest xenstore - DEF_CPPFLAGS="$(TARGET_CPPFLAGS)" DEF_CFLAGS="$(TARGET_CFLAGS)" DEF_LDFLAGS="$(TARGET_LDFLAGS)" MINIOS_CONFIG="$(CURDIR)/xenstore-minios.cfg" $(MAKE) DESTDIR= -C $(MINI_OS) OBJ_DIR=$(CURDIR)/$< APP_OBJS=$(CURDIR)/xenstore/xenstored.a + DEF_CPPFLAGS="$(TARGET_CPPFLAGS)" DEF_CFLAGS="$(TARGET_CFLAGS)" DEF_LDFLAGS="$(TARGET_LDFLAGS)" MINIOS_CONFIG="$(CURDIR)/xenstore-minios.out.cfg" $(MAKE) DESTDIR= -C $(MINI_OS) OBJ_DIR=$(CURDIR)/$< APP_OBJS=$(CURDIR)/xenstore/xenstored.a .PHONY: xenstorepvh-stubdom xenstorepvh-stubdom: mini-os-$(XEN_TARGET_ARCH)-xenstorepvh libxenguest xenstorepvh - DEF_CPPFLAGS="$(TARGET_CPPFLAGS)" DEF_CFLAGS="$(TARGET_CFLAGS)" DEF_LDFLAGS="$(TARGET_LDFLAGS)" MINIOS_CONFIG="$(CURDIR)/xenstorepvh-minios.cfg" $(MAKE) DESTDIR= -C $(MINI_OS) OBJ_DIR=$(CURDIR)/$< APP_OBJS=$(CURDIR)/xenstorepvh/xenstored.a + DEF_CPPFLAGS="$(TARGET_CPPFLAGS)" DEF_CFLAGS="$(TARGET_CFLAGS)" DEF_LDFLAGS="$(TARGET_LDFLAGS)" MINIOS_CONFIG="$(CURDIR)/xenstorepvh-minios.out.cfg" $(MAKE) DESTDIR= -C $(MINI_OS) OBJ_DIR=$(CURDIR)/$< APP_OBJS=$(CURDIR)/xenstorepvh/xenstored.a ######### # install @@ -605,6 +629,7 @@ clean: rm -fr grub-$(XEN_TARGET_ARCH) rm -f $(STUBDOMPATH) rm -f *-minios-config.mk + rm -f *.out.cfg rm -fr pkg-config -[ ! -d ioemu ] || $(MAKE) DESTDIR= -C ioemu clean -[ ! -d xenstore ] || $(MAKE) -f $(CURDIR)/xenlibs.mk -C xenstore clean