From nobody Mon Mar 23 21:44:38 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=quarantine dis=none) header.from=suse.com ARC-Seal: i=1; a=rsa-sha256; t=1773932824; cv=none; d=zohomail.com; s=zohoarc; b=QEcZ4H4AhJcAi2ffcyID6x7hGMupMtn4cJZtV0iKEXymNQPyz8E7OpVBcBu2CnCL6lgImA4XDmivZ6sTq/8dIoc4H3WxjprEUt1yVPpIhp/aLVxIZ7heF6of7DgMdJmioq+TJYvWiXUVU0Jlz7RY2Sgp152ZrEnhDxWCFT0NJ4I= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1773932824; 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=igSCQ4R7W3BM61Lrna0U8D/RNVuugNOT+EHqmQFTBoc=; b=FiyABR4xuREzi+2XzgS9WAhvoGwerXLrSgliP94p2WkDFfJ21CjvNn7CZq/pKfXtvHQXJMpC2rG3hy5afQD/eaDWYMDIz2aSn+7HaIFer0VMmDv6FWWqQ3pd/UPoOH/oxWMcUA9fBjsZ9NcejsNFLVOXuNbPeu23/s77aYQCA1g= 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 1773932824178664.4275122440715; Thu, 19 Mar 2026 08:07:04 -0700 (PDT) Received: from list by lists.xenproject.org with outflank-mailman.1257292.1551711 (Exim 4.92) (envelope-from ) id 1w3ExL-0003IJ-R9; Thu, 19 Mar 2026 15:06:39 +0000 Received: by outflank-mailman (output) from mailman id 1257292.1551711; Thu, 19 Mar 2026 15:06:39 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1w3ExL-0003IC-OG; Thu, 19 Mar 2026 15:06:39 +0000 Received: by outflank-mailman (input) for mailman id 1257292; Thu, 19 Mar 2026 15:06:39 +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 1w3ExK-0003I6-Tk for xen-devel@lists.xenproject.org; Thu, 19 Mar 2026 15:06:39 +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 3a0b8fbe-23a5-11f1-b164-2bf370ae4941; Thu, 19 Mar 2026 16:06:37 +0100 (CET) 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 0C7295BDB7; Thu, 19 Mar 2026 15:06:37 +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 E0E124273B; Thu, 19 Mar 2026 15:06:36 +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 n6+sNfwQvGlTIAAAD6G6ig (envelope-from ); Thu, 19 Mar 2026 15:06:36 +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: 3a0b8fbe-23a5-11f1-b164-2bf370ae4941 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.com; s=susede1; t=1773932797; 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=igSCQ4R7W3BM61Lrna0U8D/RNVuugNOT+EHqmQFTBoc=; b=sYrczV8iG+iM9wjce9AeFVYPvSIjtxxk8A1Hezmi2ituXo0aQYRQYqk2juKLknJXI2zHxX 9gbH7iCCYotK7y+Mnoy5u8btnat0WsZf/D/6zjcRh4YVi6ks8OsFh0JcS3BSLbSKcas1PD cVWoCLzH+QzA7DH7H8GNjMnhjKQEVVA= Authentication-Results: smtp-out2.suse.de; dkim=pass header.d=suse.com header.s=susede1 header.b=sYrczV8i DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.com; s=susede1; t=1773932797; 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=igSCQ4R7W3BM61Lrna0U8D/RNVuugNOT+EHqmQFTBoc=; b=sYrczV8iG+iM9wjce9AeFVYPvSIjtxxk8A1Hezmi2ituXo0aQYRQYqk2juKLknJXI2zHxX 9gbH7iCCYotK7y+Mnoy5u8btnat0WsZf/D/6zjcRh4YVi6ks8OsFh0JcS3BSLbSKcas1PD cVWoCLzH+QzA7DH7H8GNjMnhjKQEVVA= From: Juergen Gross To: xen-devel@lists.xenproject.org Cc: Juergen Gross , Julien Grall , Anthony PERARD Subject: [PATCH 9/8] tools/xs-clients: support depth with xenstore-watch Date: Thu, 19 Mar 2026 16:06:23 +0100 Message-ID: <20260319150626.436719-1-jgross@suse.com> X-Mailer: git-send-email 2.53.0 In-Reply-To: <20260313074751.2904215-1-jgross@suse.com> References: <20260313074751.2904215-1-jgross@suse.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Rspamd-Action: no action X-Rspamd-Server: rspamd2.dmz-prg2.suse.org X-Spamd-Result: default: False [-3.01 / 50.00]; BAYES_HAM(-3.00)[99.99%]; NEURAL_HAM_LONG(-1.00)[-1.000]; MID_CONTAINS_FROM(1.00)[]; 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)[]; ARC_NA(0.00)[]; FUZZY_RATELIMITED(0.00)[rspamd.com]; RCVD_COUNT_TWO(0.00)[2]; MIME_TRACE(0.00)[0:+]; RCVD_VIA_SMTP_AUTH(0.00)[]; SPAMHAUS_XBL(0.00)[2a07:de40:b281:104:10:150:64:97:from]; TO_DN_SOME(0.00)[]; RBL_SPAMHAUS_BLOCKED_OPENRESOLVER(0.00)[2a07:de40:b281:104:10:150:64:97:from]; RECEIVED_SPAMHAUS_BLOCKED_OPENRESOLVER(0.00)[2a07:de40:b281:106:10:150:64:167:received]; FROM_HAS_DN(0.00)[]; TO_MATCH_ENVRCPT_ALL(0.00)[]; DBL_BLOCKED_OPENRESOLVER(0.00)[suse.com:dkim,suse.com:mid,suse.com:email,imap1.dmz-prg2.suse.org:helo,imap1.dmz-prg2.suse.org:rdns]; RCVD_TLS_ALL(0.00)[]; FROM_EQ_ENVFROM(0.00)[]; RCPT_COUNT_THREE(0.00)[4]; DKIM_SIGNED(0.00)[suse.com:s=susede1]; DKIM_TRACE(0.00)[suse.com:+] X-Rspamd-Queue-Id: 0C7295BDB7 X-Spam-Flag: NO X-Spam-Score: -3.01 X-Spam-Level: X-ZohoMail-DKIM: pass (identity @suse.com) X-ZM-MESSAGEID: 1773932826177158500 Content-Type: text/plain; charset="utf-8" Add a "-d " parameter to xenstore-watch, allowing to specify the depth parameter of the XS_WATCH command. Using "-d" without support of depth by xenstored will refuse to set the watch(es). Signed-off-by: Juergen Gross --- tools/xs-clients/xenstore_client.c | 19 +++++++++++++++---- 1 file changed, 15 insertions(+), 4 deletions(-) diff --git a/tools/xs-clients/xenstore_client.c b/tools/xs-clients/xenstore= _client.c index 9a25704b91..4a14cb334f 100644 --- a/tools/xs-clients/xenstore_client.c +++ b/tools/xs-clients/xenstore_client.c @@ -445,7 +445,7 @@ do_watch(struct xs_handle *xsh, int max_events) static int perform(enum mode mode, int optind, int argc, char **argv, struct xs_handl= e *xsh, xs_transaction_t xth, int prefix, int tidy, int upto, int recurse,= int nr_watches, - int raw) + int raw, int depth) { switch (mode) { case MODE_ls: @@ -627,8 +627,11 @@ perform(enum mode mode, int optind, int argc, char **a= rgv, struct xs_handle *xsh for (; argv[optind]; optind++) { const char *w =3D argv[optind]; =20 - if (!xs_watch(xsh, w, w)) + if (depth < 0 && !xs_watch(xsh, w, w)) errx(1, "Unable to add watch on %s\n", w); + if (depth >=3D 0 && !xs_watch_depth(xsh, w, w, depth)) + errx(1, "Unable to add watch on %s with depth %d\n", w, + depth); } do_watch(xsh, nr_watches); } @@ -676,6 +679,7 @@ main(int argc, char **argv) int nr_watches =3D -1; int transaction; int raw =3D 0; + int depth =3D -1; struct winsize ws; enum mode mode; =20 @@ -709,10 +713,11 @@ main(int argc, char **argv) {"recurse", 0, 0, 'r'}, /* MODE_chmod */ {"number", 1, 0, 'n'}, /* MODE_watch */ {"raw", 0, 0, 'R'}, /* MODE_read || MODE_write */ + {"depth", 1, 0, 'd'}, /* MODE_watch */ {0, 0, 0, 0} }; =20 - c =3D getopt_long(argc - switch_argv, argv + switch_argv, "hfspturn:R", + c =3D getopt_long(argc - switch_argv, argv + switch_argv, "hfspturn:Rd:", long_options, &index); if (c =3D=3D -1) break; @@ -766,6 +771,12 @@ main(int argc, char **argv) else usage(1, mode, switch_argv, argv[0]); break; + case 'd': + if ( mode =3D=3D MODE_watch ) + depth =3D atoi(optarg); + else + usage(1, mode, switch_argv, argv[0]); + break; } } =20 @@ -819,7 +830,7 @@ again: errx(1, "couldn't start transaction"); } =20 - ret =3D perform(mode, optind, argc - switch_argv, argv + switch_argv, = xsh, xth, prefix, tidy, upto, recurse, nr_watches, raw); + ret =3D perform(mode, optind, argc - switch_argv, argv + switch_argv, = xsh, xth, prefix, tidy, upto, recurse, nr_watches, raw, depth); =20 if (transaction && !xs_transaction_end(xsh, xth, ret)) { if (ret =3D=3D 0 && errno =3D=3D EAGAIN) { --=20 2.53.0