From nobody Fri May 3 19:20:42 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=1629194153; cv=none; d=zohomail.com; s=zohoarc; b=MZ1lU9tHV1Dfm81wNpbftw9sdAQyOJD0nb1ysBPY7dnD5AkUJLH3dNND7fPStIHgVt/zUCL3EOprhGtl2u/ITu/OAl1KquKiX18OPFSuAOewIVkIyYfvLGfN6h9SueSggVM6VuG+faqREE3cTt/4o8R6DAvdmGWtfKliJdlGRJA= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1629194153; 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=z7e67WuvV4pKmdIXjVMDTNBcSJU1S8WTkTBIrXnVCNo=; b=bjzN7zNRwq+jhHY0rzq+b/tLbOVIP9ltgx8tx01Wiskj3UKa3yAYus2x+r0DnVJhoc8MoGURA/Wt0kCuw2MPVncB/X4dVTdWWM4gm/JkMC9eJrLLyeO6Ab9+ItzmOwukKVxbe4Ht3eMX92gCI4Sv2WdMDKijqVllLIS5YE1y2nw= 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 1629194153706965.2738169083673; Tue, 17 Aug 2021 02:55:53 -0700 (PDT) Received: from list by lists.xenproject.org with outflank-mailman.167687.306128 (Exim 4.92) (envelope-from ) id 1mFvoh-00084Y-Af; Tue, 17 Aug 2021 09:55:31 +0000 Received: by outflank-mailman (output) from mailman id 167687.306128; Tue, 17 Aug 2021 09:55:31 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1mFvoh-00084P-72; Tue, 17 Aug 2021 09:55:31 +0000 Received: by outflank-mailman (input) for mailman id 167687; Tue, 17 Aug 2021 09:55:29 +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 1mFvof-0007HZ-QJ for xen-devel@lists.xenproject.org; Tue, 17 Aug 2021 09:55:29 +0000 Received: from smtp-out2.suse.de (unknown [195.135.220.29]) by us1-amaz-eas2.inumbo.com (Halon) with ESMTPS id 370c78c1-ff41-11eb-a498-12813bfff9fa; Tue, 17 Aug 2021 09:55:13 +0000 (UTC) Received: from imap1.suse-dmz.suse.de (imap1.suse-dmz.suse.de [192.168.254.73]) (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 805191FF2A; Tue, 17 Aug 2021 09:55:12 +0000 (UTC) Received: from imap1.suse-dmz.suse.de (imap1.suse-dmz.suse.de [192.168.254.73]) (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 imap1.suse-dmz.suse.de (Postfix) with ESMTPS id 50B9113318; Tue, 17 Aug 2021 09:55:12 +0000 (UTC) Received: from dovecot-director2.suse.de ([192.168.254.65]) by imap1.suse-dmz.suse.de with ESMTPSA id cEsyEoCHG2FEDwAAGKfGzw (envelope-from ); Tue, 17 Aug 2021 09:55:12 +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: 370c78c1-ff41-11eb-a498-12813bfff9fa DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.com; s=susede1; t=1629194112; 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=z7e67WuvV4pKmdIXjVMDTNBcSJU1S8WTkTBIrXnVCNo=; b=nWFEioz4JgFpFDtLsmXwKUIjBQgufaQmMJankVSMenhEkuE0MvmQ3SQwix2GdbqoUbCPvG BjsN1jXHh5koKWK2TpcD4WOZ/eY9I4GnV2xdxFo6nrloS5kW7DbUIw3Ieja+oPmGiEvnhO eKco3UZL6Q52yL1qqn9SNy3Mf1OMCKQ= From: Juergen Gross To: minios-devel@lists.xenproject.org, xen-devel@lists.xenproject.org Cc: samuel.thibault@ens-lyon.org, wl@xen.org, Juergen Gross Subject: [PATCH 1/2] mini-os: make config handling more generic Date: Tue, 17 Aug 2021 11:54:58 +0200 Message-Id: <20210817095459.27671-2-jgross@suse.com> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20210817095459.27671-1-jgross@suse.com> References: <20210817095459.27671-1-jgross@suse.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @suse.com) X-ZM-MESSAGEID: 1629194155552100001 Content-Type: text/plain; charset="utf-8" When adding a new CONFIG_ variable this needs to be done in multiple places. Change the handling to be more generic. This at once fixes a bug with CONFIG_XC which was not defined for the C preprocessor (it seems that this never resulted in any real issues, though). Signed-off-by: Juergen Gross Reviewed-by: Samuel Thibault --- Config.mk | 66 +++++++++++++++++++++++-------------------------------- 1 file changed, 28 insertions(+), 38 deletions(-) diff --git a/Config.mk b/Config.mk index cb823c2..15311ef 100644 --- a/Config.mk +++ b/Config.mk @@ -171,49 +171,39 @@ endif # CONFIG_ variables. =20 # Configuration defaults +CONFIG-y +=3D CONFIG_START_NETWORK +CONFIG-y +=3D CONFIG_SPARSE_BSS +CONFIG-y +=3D CONFIG_BLKFRONT +CONFIG-y +=3D CONFIG_NETFRONT +CONFIG-y +=3D CONFIG_FBFRONT +CONFIG-y +=3D CONFIG_KBDFRONT +CONFIG-y +=3D CONFIG_CONSFRONT +CONFIG-y +=3D CONFIG_XENBUS +CONFIG-y +=3D CONFIG_XC +CONFIG-n +=3D CONFIG_QEMU_XS_ARGS +CONFIG-n +=3D CONFIG_TEST +CONFIG-n +=3D CONFIG_PCIFRONT +CONFIG-n +=3D CONFIG_TPMFRONT +CONFIG-n +=3D CONFIG_TPM_TIS +CONFIG-n +=3D CONFIG_TPMBACK +CONFIG-n +=3D CONFIG_BALLOON +# 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 ifeq ($(TARGET_ARCH_FAM),x86) -CONFIG_PARAVIRT ?=3D y +CONFIG-y +=3D CONFIG_PARAVIRT else -CONFIG_PARAVIRT ?=3D n +CONFIG-n +=3D CONFIG_PARAVIRT endif -CONFIG_START_NETWORK ?=3D y -CONFIG_SPARSE_BSS ?=3D y -CONFIG_QEMU_XS_ARGS ?=3D n -CONFIG_TEST ?=3D n -CONFIG_PCIFRONT ?=3D n -CONFIG_BLKFRONT ?=3D y -CONFIG_TPMFRONT ?=3D n -CONFIG_TPM_TIS ?=3D n -CONFIG_TPMBACK ?=3D n -CONFIG_NETFRONT ?=3D y -CONFIG_FBFRONT ?=3D y -CONFIG_KBDFRONT ?=3D y -CONFIG_CONSFRONT ?=3D y -CONFIG_XENBUS ?=3D y -CONFIG_XC ?=3Dy -CONFIG_LWIP ?=3D $(lwip) -CONFIG_BALLOON ?=3D n -# Setting CONFIG_USE_XEN_CONSOLE copies all print output to the Xen emerge= ncy -# console apart of standard dom0 handled console. -CONFIG_USE_XEN_CONSOLE ?=3D n +CONFIG-$(lwip) +=3D CONFIG_LWIP + +$(foreach i,$(CONFIG-y),$(eval $(i) ?=3D y)) +$(foreach i,$(CONFIG-n),$(eval $(i) ?=3D n)) + +CONFIG-all :=3D $(CONFIG-y) $(CONFIG-n) =20 # Export config items as compiler directives -DEFINES-$(CONFIG_PARAVIRT) +=3D -DCONFIG_PARAVIRT -DEFINES-$(CONFIG_START_NETWORK) +=3D -DCONFIG_START_NETWORK -DEFINES-$(CONFIG_SPARSE_BSS) +=3D -DCONFIG_SPARSE_BSS -DEFINES-$(CONFIG_QEMU_XS_ARGS) +=3D -DCONFIG_QEMU_XS_ARGS -DEFINES-$(CONFIG_PCIFRONT) +=3D -DCONFIG_PCIFRONT -DEFINES-$(CONFIG_BLKFRONT) +=3D -DCONFIG_BLKFRONT -DEFINES-$(CONFIG_TPMFRONT) +=3D -DCONFIG_TPMFRONT -DEFINES-$(CONFIG_TPM_TIS) +=3D -DCONFIG_TPM_TIS -DEFINES-$(CONFIG_TPMBACK) +=3D -DCONFIG_TPMBACK -DEFINES-$(CONFIG_NETFRONT) +=3D -DCONFIG_NETFRONT -DEFINES-$(CONFIG_KBDFRONT) +=3D -DCONFIG_KBDFRONT -DEFINES-$(CONFIG_FBFRONT) +=3D -DCONFIG_FBFRONT -DEFINES-$(CONFIG_CONSFRONT) +=3D -DCONFIG_CONSFRONT -DEFINES-$(CONFIG_XENBUS) +=3D -DCONFIG_XENBUS -DEFINES-$(CONFIG_BALLOON) +=3D -DCONFIG_BALLOON -DEFINES-$(CONFIG_USE_XEN_CONSOLE) +=3D -DCONFIG_USE_XEN_CONSOLE +$(foreach i,$(CONFIG-all),$(eval DEFINES-$($(i)) +=3D -D$(i))) =20 DEFINES-y +=3D -D__XEN_INTERFACE_VERSION__=3D$(XEN_INTERFACE_VERSION) =20 --=20 2.26.2 From nobody Fri May 3 19:20:42 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=1629194159; cv=none; d=zohomail.com; s=zohoarc; b=BKw5PqQioDhjDKTnEOWtYIPXTaXpo5E6feVfrLBgYlKuldes9PHCTJEzt8VpYVInbK0r4BxaVILpLAHwsBr13xiLYBExgHAby7UpzXT1ih6Ygm6Uk6brYR6l4Br6sqWDfw9TDu72PVIhIRwcUQuUwsa/RvO45qIjyvf/eKxOIi0= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1629194159; 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=6C/kYgeCHpbmW4aQY5wUhjgZzqJkvYkEyqUXd4wWzEM=; b=UZPpfmH+/PiRSdu9/rxnvEl8xv21jEkAB2fbbpwZT4nWbaTJJVmqxcnUjaB4ZTLOe8HrPJAcCnNWSvfnIGkBpNRnUdnNLfyj8F1YNv2Kw/Fg7MaNnuBE0LFpsqlxYxrCmUVorClztsm2nyExIE7atgsna85Pxp5F6JK8mOTuR1o= 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 1629194159732867.4530811883586; Tue, 17 Aug 2021 02:55:59 -0700 (PDT) Received: from list by lists.xenproject.org with outflank-mailman.167685.306106 (Exim 4.92) (envelope-from ) id 1mFvoX-0007Q1-0P; Tue, 17 Aug 2021 09:55:21 +0000 Received: by outflank-mailman (output) from mailman id 167685.306106; Tue, 17 Aug 2021 09:55:20 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1mFvoW-0007P1-TE; Tue, 17 Aug 2021 09:55:20 +0000 Received: by outflank-mailman (input) for mailman id 167685; Tue, 17 Aug 2021 09:55:20 +0000 Received: from us1-rack-iad1.inumbo.com ([172.99.69.81]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1mFvoV-0007Ha-Vk for xen-devel@lists.xenproject.org; Tue, 17 Aug 2021 09:55:20 +0000 Received: from smtp-out2.suse.de (unknown [195.135.220.29]) by us1-rack-iad1.inumbo.com (Halon) with ESMTPS id cc6e5109-a177-46dc-a90c-ea52122590ff; Tue, 17 Aug 2021 09:55:13 +0000 (UTC) Received: from imap1.suse-dmz.suse.de (imap1.suse-dmz.suse.de [192.168.254.73]) (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 B6B801FF2C; Tue, 17 Aug 2021 09:55:12 +0000 (UTC) Received: from imap1.suse-dmz.suse.de (imap1.suse-dmz.suse.de [192.168.254.73]) (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 imap1.suse-dmz.suse.de (Postfix) with ESMTPS id 87BC413318; Tue, 17 Aug 2021 09:55:12 +0000 (UTC) Received: from dovecot-director2.suse.de ([192.168.254.65]) by imap1.suse-dmz.suse.de with ESMTPSA id sMCmH4CHG2FEDwAAGKfGzw (envelope-from ); Tue, 17 Aug 2021 09:55:12 +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: cc6e5109-a177-46dc-a90c-ea52122590ff DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.com; s=susede1; t=1629194112; 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=6C/kYgeCHpbmW4aQY5wUhjgZzqJkvYkEyqUXd4wWzEM=; b=igvi9mJDRgK1cbndd4mDIjnvgEhYsOX4p+oW4RPNh9dShzPROZgiHXE8ZdmCU2LEu4KX+/ 9wsBiSuZUrDjQi8wk2z8j92kBhsuhkez5CwmKlbUBYouV1vTKI/Mg8MIaR0uR5G9PqnyA4 T7dqfBuXC0kNSS/L+cwCA1lU84l1Fh4= From: Juergen Gross To: minios-devel@lists.xenproject.org, xen-devel@lists.xenproject.org Cc: samuel.thibault@ens-lyon.org, wl@xen.org, Juergen Gross Subject: [PATCH 2/2] mini-os: move test functions under CONFIG_TEST Date: Tue, 17 Aug 2021 11:54:59 +0200 Message-Id: <20210817095459.27671-3-jgross@suse.com> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20210817095459.27671-1-jgross@suse.com> References: <20210817095459.27671-1-jgross@suse.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @suse.com) X-ZM-MESSAGEID: 1629194161995100001 Content-Type: text/plain; charset="utf-8" There is no need to have the xenbus test support functions always included in Mini-OS. Move them inside #ifdef CONFIG_TEST. Signed-off-by: Juergen Gross Reviewed-by: Samuel Thibault --- xenbus/xenbus.c | 32 +++++++++++++++++--------------- 1 file changed, 17 insertions(+), 15 deletions(-) diff --git a/xenbus/xenbus.c b/xenbus/xenbus.c index fdb0934..11427ba 100644 --- a/xenbus/xenbus.c +++ b/xenbus/xenbus.c @@ -573,21 +573,6 @@ static char *errmsg(struct xsd_sockmsg *rep) return res; } =20 -/* Send a debug message to xenbus. Can block. */ -static void xenbus_debug_msg(const char *msg) -{ - int len =3D strlen(msg); - struct write_req req[] =3D { - { "print", sizeof("print") }, - { msg, len }, - { "", 1 }}; - struct xsd_sockmsg *reply; - - reply =3D xenbus_msg_reply(XS_DEBUG, 0, req, ARRAY_SIZE(req)); - printk("Got a reply, type %d, id %d, len %d.\n", - reply->type, reply->req_id, reply->len); -} - /* List the contents of a directory. Returns a malloc()ed array of pointers to malloc()ed strings. The array is NULL terminated. May block. */ @@ -882,6 +867,22 @@ domid_t xenbus_get_self_id(void) return ret; } =20 +#ifdef CONFIG_TEST +/* Send a debug message to xenbus. Can block. */ +static void xenbus_debug_msg(const char *msg) +{ + int len =3D strlen(msg); + struct write_req req[] =3D { + { "print", sizeof("print") }, + { msg, len }, + { "", 1 }}; + struct xsd_sockmsg *reply; + + reply =3D xenbus_msg_reply(XS_DEBUG, 0, req, ARRAY_SIZE(req)); + printk("Got a reply, type %d, id %d, len %d.\n", + reply->type, reply->req_id, reply->len); +} + static void do_ls_test(const char *pre) { char **dirs, *msg; @@ -968,6 +969,7 @@ void test_xenbus(void) do_read_test("device/vif/0/flibble"); printk("(Should have said ENOENT)\n"); } +#endif /* CONFIG_TEST */ =20 /* * Local variables: --=20 2.26.2