From nobody Fri Oct 31 04:01:20 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; 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=1752586258; cv=none; d=zohomail.com; s=zohoarc; b=fhvyPwmg7NgK06LOvry+olF8H7v0TxdqV5IyG60+8/ZJGgrtSUNv6CYhWA9HISMFMPdHxERf3KcsHIaXlK/nqasa8ekQ6D6fBnWzXwegJLbmeZinc6O8m0svmYCTubv2EUB97jvF1K4KjMdhwxTW9Wm1U013xfZjr4yv0ofvkzE= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1752586258; h=Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=BDdRGnWTd5zwdCL0TVOinfUW7FrCL8NCA12iHuDre8E=; b=TnPsx9V1bu6SejHaOIhPrcMItuZSovVu3gIO5x7AZ/ZwG4mhPv6tb9EvUC1r/Vt7yl7P2rccQJdk/Kt95kztQGbaxd2vlAp5SOzLOmDy+Nfsdx79RYieAe0zhsuB1qDPCBP0Qpf1HzOo+55SCoBPAF1ZSETwpTS+s02S4rm9iJI= 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 1752586258606241.46312642124826; Tue, 15 Jul 2025 06:30:58 -0700 (PDT) Received: from list by lists.xenproject.org with outflank-mailman.1044166.1414281 (Exim 4.92) (envelope-from ) id 1ubfk5-0004g7-Eq; Tue, 15 Jul 2025 13:30:45 +0000 Received: by outflank-mailman (output) from mailman id 1044166.1414281; Tue, 15 Jul 2025 13:30:45 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1ubfk5-0004ff-9P; Tue, 15 Jul 2025 13:30:45 +0000 Received: by outflank-mailman (input) for mailman id 1044166; Tue, 15 Jul 2025 13:30:44 +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 1ubfjv-0000p6-1I for xen-devel@lists.xenproject.org; Tue, 15 Jul 2025 13:30:35 +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 e247bf86-617f-11f0-b894-0df219b8e170; Tue, 15 Jul 2025 15:30:33 +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 1663421232; Tue, 15 Jul 2025 13:30:33 +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 DAE2C13A68; Tue, 15 Jul 2025 13:30:32 +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 5crsM/hXdmh1NwAAD6G6ig (envelope-from ); Tue, 15 Jul 2025 13:30:32 +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: e247bf86-617f-11f0-b894-0df219b8e170 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.com; s=susede1; t=1752586233; 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=BDdRGnWTd5zwdCL0TVOinfUW7FrCL8NCA12iHuDre8E=; b=nYNcCmldwPuW2gGg9URjLy87kYhJtYKeUWCY8VaL/SJCLJ4ny3UkbrGbI+r9yxTSUIDX3P isr/+bd8i2zZyd8n0mSwr4V5+5tsPY447T52puZEHLEhrYZkBmiQnNBvRkNptxGbcOYtb/ uNaKVmMpHnjYivtcpItwBfu2CmYW9VA= Authentication-Results: smtp-out1.suse.de; dkim=pass header.d=suse.com header.s=susede1 header.b=nYNcCmld DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.com; s=susede1; t=1752586233; 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=BDdRGnWTd5zwdCL0TVOinfUW7FrCL8NCA12iHuDre8E=; b=nYNcCmldwPuW2gGg9URjLy87kYhJtYKeUWCY8VaL/SJCLJ4ny3UkbrGbI+r9yxTSUIDX3P isr/+bd8i2zZyd8n0mSwr4V5+5tsPY447T52puZEHLEhrYZkBmiQnNBvRkNptxGbcOYtb/ uNaKVmMpHnjYivtcpItwBfu2CmYW9VA= From: Juergen Gross To: minios-devel@lists.xenproject.org, xen-devel@lists.xenproject.org Cc: samuel.thibault@ens-lyon.org, Juergen Gross , Jason Andryuk Subject: [MINI-OS PATCH v2 09/14] 9pfs: store bepath in struct struct dev_9pfs Date: Tue, 15 Jul 2025 15:29:31 +0200 Message-ID: <20250715132936.2798-10-jgross@suse.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20250715132936.2798-1-jgross@suse.com> References: <20250715132936.2798-1-jgross@suse.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Spam-Level: X-Spam-Flag: NO X-Rspamd-Queue-Id: 1663421232 X-Rspamd-Action: no action X-Rspamd-Server: rspamd1.dmz-prg2.suse.org X-Spamd-Result: default: False [-3.01 / 50.00]; BAYES_HAM(-3.00)[99.99%]; MID_CONTAINS_FROM(1.00)[]; NEURAL_HAM_LONG(-1.00)[-1.000]; R_MISSING_CHARSET(0.50)[]; R_DKIM_ALLOW(-0.20)[suse.com:s=susede1]; NEURAL_HAM_SHORT(-0.20)[-1.000]; MIME_GOOD(-0.10)[text/plain]; MX_GOOD(-0.01)[]; MIME_TRACE(0.00)[0:+]; FUZZY_RATELIMITED(0.00)[rspamd.com]; DKIM_SIGNED(0.00)[suse.com:s=susede1]; TO_DN_SOME(0.00)[]; RBL_SPAMHAUS_BLOCKED_OPENRESOLVER(0.00)[2a07:de40:b281:104:10:150:64:97:from]; SPAMHAUS_XBL(0.00)[2a07:de40:b281:104:10:150:64:97:from]; ARC_NA(0.00)[]; RCVD_COUNT_TWO(0.00)[2]; TO_MATCH_ENVRCPT_ALL(0.00)[]; FROM_HAS_DN(0.00)[]; RECEIVED_SPAMHAUS_BLOCKED_OPENRESOLVER(0.00)[2a07:de40:b281:106:10:150:64:167:received]; DNSWL_BLOCKED(0.00)[2a07:de40:b281:104:10:150:64:97:from]; FROM_EQ_ENVFROM(0.00)[]; RCVD_VIA_SMTP_AUTH(0.00)[]; RCVD_TLS_ALL(0.00)[]; DKIM_TRACE(0.00)[suse.com:+]; RCPT_COUNT_FIVE(0.00)[5]; DBL_BLOCKED_OPENRESOLVER(0.00)[amd.com:email,imap1.dmz-prg2.suse.org:rdns,imap1.dmz-prg2.suse.org:helo,suse.com:dkim,suse.com:mid,suse.com:email] X-Spam-Score: -3.01 X-ZohoMail-DKIM: pass (identity @suse.com) X-ZM-MESSAGEID: 1752586261026116600 Content-Type: text/plain; charset="utf-8" Use struct dev_9pfs for storing the backend path of the device state in order to avoid code duplication in init_9pfront() and shutdown_9pfront(). Signed-off-by: Juergen Gross Reviewed-by: Jason Andryuk --- 9pfront.c | 23 ++++++++++------------- 1 file changed, 10 insertions(+), 13 deletions(-) diff --git a/9pfront.c b/9pfront.c index 895426d1..2bfc49b1 100644 --- a/9pfront.c +++ b/9pfront.c @@ -25,6 +25,7 @@ struct dev_9pfs { char nodename[20]; unsigned int dom; char *backend; + char bepath[64]; =20 char *tag; const char *mnt; @@ -1103,7 +1104,6 @@ void *init_9pfront(unsigned int id, const char *mnt) char *reason =3D ""; xenbus_transaction_t xbt; int retry =3D 1; - char bepath[64] =3D { 0 }; XenbusState state; unsigned int i; void *addr; @@ -1137,11 +1137,12 @@ void *init_9pfront(unsigned int id, const char *mnt) if ( msg ) goto err; =20 - snprintf(bepath, sizeof(bepath), "%s/state", dev->backend); - free(xenbus_watch_path_token(XBT_NIL, bepath, bepath, &dev->events)); - state =3D xenbus_read_integer(bepath); + snprintf(dev->bepath, sizeof(dev->bepath), "%s/state", dev->backend); + free(xenbus_watch_path_token(XBT_NIL, dev->bepath, dev->bepath, + &dev->events)); + state =3D xenbus_read_integer(dev->bepath); while ( msg =3D=3D NULL && state < XenbusStateInitWait ) - msg =3D xenbus_wait_for_state_change(bepath, &state, &dev->events); + msg =3D xenbus_wait_for_state_change(dev->bepath, &state, &dev->ev= ents); if ( msg || state !=3D XenbusStateInitWait ) { reason =3D "illegal backend state"; @@ -1228,9 +1229,9 @@ void *init_9pfront(unsigned int id, const char *mnt) free(xenbus_transaction_end(xbt, 0, &retry)); } =20 - state =3D xenbus_read_integer(bepath); + state =3D xenbus_read_integer(dev->bepath); while ( msg =3D=3D NULL && state < XenbusStateConnected ) - msg =3D xenbus_wait_for_state_change(bepath, &state, &dev->events); + msg =3D xenbus_wait_for_state_change(dev->bepath, &state, &dev->ev= ents); if ( msg || state !=3D XenbusStateConnected ) { reason =3D "illegal backend state"; @@ -1263,8 +1264,6 @@ void *init_9pfront(unsigned int id, const char *mnt) free(xenbus_transaction_end(xbt, 1, &retry)); =20 err: - if ( bepath[0] ) - free(xenbus_unwatch_path_token(XBT_NIL, bepath, bepath)); if ( msg ) printk("9pfsfront add %u failed, error %s accessing Xenstore\n", id, msg); @@ -1279,22 +1278,20 @@ EXPORT_SYMBOL(init_9pfront); void shutdown_9pfront(void *dev) { struct dev_9pfs *dev9p =3D dev; - char bepath[64]; XenbusState state; char *msg; char *reason =3D ""; =20 umount(dev9p->mnt); - snprintf(bepath, sizeof(bepath), "%s/state", dev9p->backend); =20 msg =3D xenbus_printf(XBT_NIL, dev9p->nodename, "state", "%u", XenbusStateClosing); if ( msg ) goto err; =20 - state =3D xenbus_read_integer(bepath); + state =3D xenbus_read_integer(dev9p->bepath); while ( msg =3D=3D NULL && state < XenbusStateClosing) - msg =3D xenbus_wait_for_state_change(bepath, &state, &dev9p->event= s); + msg =3D xenbus_wait_for_state_change(dev9p->bepath, &state, &dev9p= ->events); if ( msg || state !=3D XenbusStateClosing ) { reason =3D "illegal backend state"; --=20 2.43.0