From nobody Thu May 16 09:14:12 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=1699879435; cv=none; d=zohomail.com; s=zohoarc; b=lfvYjc/pu38H2qEGp00z6GiC42fqnNSxbYtzKI10U9rwjYVAQh3yUoxJ5mjo6erL1wLBkY5bAECoLYWzjvlK0HN6C77l8zHVfudfg8Pt4C/yOMdjrgBErWSsYpbwEyC7/aSsu2QumiACogGog5wkjUjXIV22XzZsGZd6zYFSNgY= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1699879435; 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=QB3Q3bk7SIJemBIbBb4h+zwgDJi8hqayh+CtPWg6tiE=; b=XzaNEp/kMf4N30CMUNGUE7jpmwtGkxHFet9/UDBugxnrA66F67C8V3cdlzlN3Y9chkViRsnRb/IEi0CD0kB4AxmBrcXguerGxUjsKhA+Nd/6C41/kenPNaYLHhIIJMOGNLEH8LQzFxh4NEVujlDvBcJ4oWp3Fe6c1U0WIrh3+gc= 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 1699879435554829.3354613336112; Mon, 13 Nov 2023 04:43:55 -0800 (PST) Received: from list by lists.xenproject.org with outflank-mailman.631559.984988 (Exim 4.92) (envelope-from ) id 1r2WHg-0008Og-S8; Mon, 13 Nov 2023 12:43:20 +0000 Received: by outflank-mailman (output) from mailman id 631559.984988; Mon, 13 Nov 2023 12:43: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 1r2WHg-0008OZ-Pc; Mon, 13 Nov 2023 12:43:20 +0000 Received: by outflank-mailman (input) for mailman id 631559; Mon, 13 Nov 2023 12:43:19 +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 1r2WHf-00089i-Ig for xen-devel@lists.xenproject.org; Mon, 13 Nov 2023 12:43:19 +0000 Received: from smtp-out2.suse.de (smtp-out2.suse.de [195.135.220.29]) by se1-gles-flk1.inumbo.com (Halon) with ESMTPS id 38436a19-8222-11ee-9b0e-b553b5be7939; Mon, 13 Nov 2023 13:43:18 +0100 (CET) Received: from imap2.suse-dmz.suse.de (imap2.suse-dmz.suse.de [192.168.254.74]) (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 C32B01F7AB; Mon, 13 Nov 2023 12:43:17 +0000 (UTC) Received: from imap2.suse-dmz.suse.de (imap2.suse-dmz.suse.de [192.168.254.74]) (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 imap2.suse-dmz.suse.de (Postfix) with ESMTPS id 88CD61358C; Mon, 13 Nov 2023 12:43:17 +0000 (UTC) Received: from dovecot-director2.suse.de ([192.168.254.65]) by imap2.suse-dmz.suse.de with ESMTPSA id XFYgIOUZUmVBcQAAMHmgww (envelope-from ); Mon, 13 Nov 2023 12:43:17 +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: 38436a19-8222-11ee-9b0e-b553b5be7939 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.com; s=susede1; t=1699879397; 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=QB3Q3bk7SIJemBIbBb4h+zwgDJi8hqayh+CtPWg6tiE=; b=KtcnXZVgZu36wWLzu28Mmx1APh/eqyos7/+GdRQgihEm0ADrOENBXjx7WBCOPMyT6mjJ+X 06x4IiD4AtS/F4tD8NiZd3rRnDU+Trnqh5n15mjJuTd/QASiD6LfTUrY9l+gyivuvXJbgc vUKpfMN9qqogJVVjhzfRE0Uiy616Iwk= From: Juergen Gross To: xen-devel@lists.xenproject.org Cc: Juergen Gross , Wei Liu , Julien Grall , Anthony PERARD Subject: [PATCH 1/5] tools/xenstored: remove "-D" command line parameter Date: Mon, 13 Nov 2023 13:43:05 +0100 Message-Id: <20231113124309.10862-2-jgross@suse.com> X-Mailer: git-send-email 2.35.3 In-Reply-To: <20231113124309.10862-1-jgross@suse.com> References: <20231113124309.10862-1-jgross@suse.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @suse.com) X-ZM-MESSAGEID: 1699879437477100006 Content-Type: text/plain; charset="utf-8" Remove the "-D" command parameter, which is disabling initialization of the mandatory domain data handling. Signed-off-by: Juergen Gross Reviewed-by: Julien Grall --- tools/xenstored/core.c | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) diff --git a/tools/xenstored/core.c b/tools/xenstored/core.c index edd07711db..8bd4098cb6 100644 --- a/tools/xenstored/core.c +++ b/tools/xenstored/core.c @@ -2661,7 +2661,6 @@ static void usage(void) "\n" "where options may include:\n" "\n" -" -D, --no-domain-init to state that xenstored should not initialise d= om0,\n" " -F, --pid-file giving a file for the daemon's pid to be writte= n,\n" " -H, --help to output this message,\n" " -N, --no-fork to request that the daemon does not fork,\n" @@ -2708,7 +2707,6 @@ static void usage(void) =20 =20 static struct option options[] =3D { - { "no-domain-init", 0, NULL, 'D' }, { "entry-nb", 1, NULL, 'E' }, { "pid-file", 1, NULL, 'F' }, { "event", 1, NULL, 'e' }, @@ -2841,7 +2839,6 @@ int main(int argc, char *argv[]) int sock_pollfd_idx =3D -1; bool dofork =3D true; bool outputpid =3D false; - bool no_domain_init =3D false; bool live_update =3D false; const char *pidfile =3D NULL; int timeout; @@ -2850,12 +2847,9 @@ int main(int argc, char *argv[]) orig_argv =3D argv; =20 while ((opt =3D getopt_long(argc, argv, - "DE:F:H::KNPS:t:A:M:Q:q:T:RVW:w:U", + "E:F:H::KNPS:t:A:M:Q:q:T:RVW:w:U", options, NULL)) !=3D -1) { switch (opt) { - case 'D': - no_domain_init =3D true; - break; case 'E': hard_quotas[ACC_NODES].val =3D get_optval_uint(optarg); break; @@ -2964,7 +2958,7 @@ int main(int argc, char *argv[]) init_pipe(reopen_log_pipe); =20 /* Listen to hypervisor. */ - if (!no_domain_init && !live_update) { + if (!live_update) { domain_init(-1); dom0_init(); } --=20 2.35.3 From nobody Thu May 16 09:14:12 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=1699879433; cv=none; d=zohomail.com; s=zohoarc; b=Wsf6B0swjgfCBTArOHXruZAFusE78yCDnbGcYkMJAsUG2o7+KkKz8I4oOXLs0dflZ8DZnSXrSHytrO8he8ZrtdNgUSXurkxCOI7teyVGZ17Um2IFgoZfjo1faGD8KyiMY80bxw54iruFqrhsjs+ert3Md3HITCRMfvIO5pZ5DY0= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1699879433; 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=j5WOtX2yVjlS0aYlXkxj9AGdR0ePAmBESYfcA64cAHk=; b=m6hwFWztSUSr3ZRn2MIhlESh4VArIxoNIzbO3utTxNWEQCeMROiB5AoKzY2UW/2WMZcPI2ko1D1+An+fFc/kYZHYYcQKWN2GQWxVLNS3F3F9LXchJkDnjh1nFrgzaFePN6cabEi5YDVs4zZ5Z648Y4WfYVGjWFWC3puSbZjLDFY= 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 1699879433435673.0315364138046; Mon, 13 Nov 2023 04:43:53 -0800 (PST) Received: from list by lists.xenproject.org with outflank-mailman.631560.984998 (Exim 4.92) (envelope-from ) id 1r2WHm-0000FR-3U; Mon, 13 Nov 2023 12:43:26 +0000 Received: by outflank-mailman (output) from mailman id 631560.984998; Mon, 13 Nov 2023 12:43:26 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1r2WHm-0000FD-0r; Mon, 13 Nov 2023 12:43:26 +0000 Received: by outflank-mailman (input) for mailman id 631560; Mon, 13 Nov 2023 12:43:25 +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 1r2WHl-00089i-Db for xen-devel@lists.xenproject.org; Mon, 13 Nov 2023 12:43:25 +0000 Received: from smtp-out2.suse.de (smtp-out2.suse.de [2001:67c:2178:6::1d]) by se1-gles-flk1.inumbo.com (Halon) with ESMTPS id 3b9666bf-8222-11ee-9b0e-b553b5be7939; Mon, 13 Nov 2023 13:43:23 +0100 (CET) Received: from imap2.suse-dmz.suse.de (imap2.suse-dmz.suse.de [192.168.254.74]) (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 553261F6E6; Mon, 13 Nov 2023 12:43:23 +0000 (UTC) Received: from imap2.suse-dmz.suse.de (imap2.suse-dmz.suse.de [192.168.254.74]) (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 imap2.suse-dmz.suse.de (Postfix) with ESMTPS id 27AEE1358C; Mon, 13 Nov 2023 12:43:23 +0000 (UTC) Received: from dovecot-director2.suse.de ([192.168.254.65]) by imap2.suse-dmz.suse.de with ESMTPSA id wMJQCOsZUmVMcQAAMHmgww (envelope-from ); Mon, 13 Nov 2023 12:43:23 +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: 3b9666bf-8222-11ee-9b0e-b553b5be7939 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.com; s=susede1; t=1699879403; 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=j5WOtX2yVjlS0aYlXkxj9AGdR0ePAmBESYfcA64cAHk=; b=L2D1MztA4LpEenUM4Ef9MdvKL9EPsFbbxcCTSaSKmTMjXjIN1p3wd9hekJ1YRejm21tPCP mwz337gjr3UMmqwy3xCGz6+qtTQMjg/tJVQDnn+CvIl/Q/PTWfsDptSvxva++NzGgurZqP lKM+lxMJvWZdh6yiGfMTRWOqzXEtl7E= From: Juergen Gross To: xen-devel@lists.xenproject.org Cc: Juergen Gross , Wei Liu , Julien Grall , Anthony PERARD Subject: [PATCH 2/5] tools/xenstored: remove "-V" command line option Date: Mon, 13 Nov 2023 13:43:06 +0100 Message-Id: <20231113124309.10862-3-jgross@suse.com> X-Mailer: git-send-email 2.35.3 In-Reply-To: <20231113124309.10862-1-jgross@suse.com> References: <20231113124309.10862-1-jgross@suse.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @suse.com) X-ZM-MESSAGEID: 1699879435683100002 Content-Type: text/plain; charset="utf-8" The "-V" (verbose) command line option is nearly completely redundant with "io" tracing. Just the time of the printed data is a little bit different, while the tracing is more informative. Remove the verbose option. Signed-off-by: Juergen Gross Reviewed-by: Julien Grall --- tools/xenstored/core.c | 20 ++------------------ 1 file changed, 2 insertions(+), 18 deletions(-) diff --git a/tools/xenstored/core.c b/tools/xenstored/core.c index 8bd4098cb6..3e31e74933 100644 --- a/tools/xenstored/core.c +++ b/tools/xenstored/core.c @@ -76,7 +76,6 @@ static int sock =3D -1; int orig_argc; char **orig_argv; =20 -static bool verbose =3D false; LIST_HEAD(connections); int tracefd =3D -1; static bool recovery =3D true; @@ -329,11 +328,6 @@ static bool write_messages(struct connection *conn) return true; =20 if (out->inhdr) { - if (verbose) - xprintf("Writing msg %s (%.*s) out to %p\n", - sockmsg_string(out->hdr.msg.type), - out->hdr.msg.len, - out->buffer, conn); ret =3D conn->funcs->write(conn, out->hdr.raw + out->used, sizeof(out->hdr) - out->used); if (ret < 0) @@ -2134,11 +2128,6 @@ static bool process_delayed_message(struct delayed_r= equest *req) =20 static void consider_message(struct connection *conn) { - if (verbose) - xprintf("Got message %s len %i from %p\n", - sockmsg_string(conn->in->hdr.msg.type), - conn->in->hdr.msg.len, conn); - conn->is_stalled =3D false; /* * Currently, Live-Update is not supported if there is active @@ -2701,8 +2690,7 @@ static void usage(void) " -R, --no-recovery to request that no recovery should be attempted= when\n" " the store is corrupted (debug only),\n" " -K, --keep-orphans don't delete nodes owned by a domain when the\n" -" domain is deleted (this is a security risk!)\n" -" -V, --verbose to request verbose execution.\n"); +" domain is deleted (this is a security risk!)\n"= ); } =20 =20 @@ -2726,7 +2714,6 @@ static struct option options[] =3D { { "timeout", 1, NULL, 'w' }, { "no-recovery", 0, NULL, 'R' }, { "keep-orphans", 0, NULL, 'K' }, - { "verbose", 0, NULL, 'V' }, { "watch-nb", 1, NULL, 'W' }, #ifndef NO_LIVE_UPDATE { "live-update", 0, NULL, 'U' }, @@ -2847,7 +2834,7 @@ int main(int argc, char *argv[]) orig_argv =3D argv; =20 while ((opt =3D getopt_long(argc, argv, - "E:F:H::KNPS:t:A:M:Q:q:T:RVW:w:U", + "E:F:H::KNPS:t:A:M:Q:q:T:RW:w:U", options, NULL)) !=3D -1) { switch (opt) { case 'E': @@ -2884,9 +2871,6 @@ int main(int argc, char *argv[]) case 'K': keep_orphans =3D true; break; - case 'V': - verbose =3D true; - break; case 'W': hard_quotas[ACC_WATCH].val =3D get_optval_uint(optarg); break; --=20 2.35.3 From nobody Thu May 16 09:14:12 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=1699879436; cv=none; d=zohomail.com; s=zohoarc; b=mud+q6SJN3shyFHieWdU8fZU/g4DeQyF0e1s3HL1+qNMpkXeD5BmAJlnyL8whStZqGnwUXRIMYeQQb12KTkWGREmQILe0kfgDKWFZ2F+btKtQ+sPpvL+t9IRBmD4t+YB75JkSo39mN3fjgzW5Rl9b/elRqhSDD9Nuo2+8T8mG/k= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1699879436; 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=xRSn0Gy55koV3sSKwt+Dit5JVjBiMtzOaatQj6/2xAg=; b=Wwc1q3EnCm00Jy1bS/QkplJqzzYENg2C1IHwW354l0VGToS205t558QnMyP+ADOonXpLJBmCUonUGem1y1ldvY+cSpPf9gCMYy1V8+RHUS2N6Aw4WEoixQaG+/QW3ihLy111Xq9mJbVEMGpkR7BiMrVHX2vq06xjNG7/gAcSFcg= 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 1699879436194191.77239965350145; Mon, 13 Nov 2023 04:43:56 -0800 (PST) Received: from list by lists.xenproject.org with outflank-mailman.631561.985008 (Exim 4.92) (envelope-from ) id 1r2WHr-0000Zl-Bn; Mon, 13 Nov 2023 12:43:31 +0000 Received: by outflank-mailman (output) from mailman id 631561.985008; Mon, 13 Nov 2023 12:43: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 1r2WHr-0000Za-8n; Mon, 13 Nov 2023 12:43:31 +0000 Received: by outflank-mailman (input) for mailman id 631561; Mon, 13 Nov 2023 12:43:30 +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 1r2WHq-0000Xf-DH for xen-devel@lists.xenproject.org; Mon, 13 Nov 2023 12:43:30 +0000 Received: from smtp-out2.suse.de (smtp-out2.suse.de [195.135.220.29]) by se1-gles-sth1.inumbo.com (Halon) with ESMTPS id 3eda6225-8222-11ee-98da-6d05b1d4d9a1; Mon, 13 Nov 2023 13:43:29 +0100 (CET) Received: from imap2.suse-dmz.suse.de (imap2.suse-dmz.suse.de [192.168.254.74]) (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 0A8C01F6E6; Mon, 13 Nov 2023 12:43:29 +0000 (UTC) Received: from imap2.suse-dmz.suse.de (imap2.suse-dmz.suse.de [192.168.254.74]) (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 imap2.suse-dmz.suse.de (Postfix) with ESMTPS id C7CB31358C; Mon, 13 Nov 2023 12:43:28 +0000 (UTC) Received: from dovecot-director2.suse.de ([192.168.254.65]) by imap2.suse-dmz.suse.de with ESMTPSA id /SveLvAZUmVecQAAMHmgww (envelope-from ); Mon, 13 Nov 2023 12:43:28 +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: 3eda6225-8222-11ee-98da-6d05b1d4d9a1 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.com; s=susede1; t=1699879409; 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=xRSn0Gy55koV3sSKwt+Dit5JVjBiMtzOaatQj6/2xAg=; b=WtjyZt1bUbqDzRzKi3TNDcyZqzHxw9u3RrlgA8p60wWhpGOKSU0L0qGLWZYnQFwLPoLYQU h9pVfu6r4ys9aKoOoLiW0FPZ64AQleEjI8JRBAO/+1kO2aiLxKWWYVaVLULmhO8dKkiAQ1 Uxx7/oChtkx6c6uAWxIQJrWmd9lc7l4= From: Juergen Gross To: xen-devel@lists.xenproject.org Cc: Juergen Gross , Wei Liu , Julien Grall , Anthony PERARD Subject: [PATCH 3/5] tools/xenstored: remove the "-P" command line option Date: Mon, 13 Nov 2023 13:43:07 +0100 Message-Id: <20231113124309.10862-4-jgross@suse.com> X-Mailer: git-send-email 2.35.3 In-Reply-To: <20231113124309.10862-1-jgross@suse.com> References: <20231113124309.10862-1-jgross@suse.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @suse.com) X-ZM-MESSAGEID: 1699879437477100005 Content-Type: text/plain; charset="utf-8" The "-P" command line option just results in printing the PID of the xenstored daemon to stdout before stdout is being closed. The same information can be retrieved from the PID file via the "-F" option. Remove the redundant "-P" option. Signed-off-by: Juergen Gross Reviewed-by: Julien Grall --- tools/xenstored/core.c | 13 +------------ 1 file changed, 1 insertion(+), 12 deletions(-) diff --git a/tools/xenstored/core.c b/tools/xenstored/core.c index 3e31e74933..5a6378316a 100644 --- a/tools/xenstored/core.c +++ b/tools/xenstored/core.c @@ -2653,7 +2653,6 @@ static void usage(void) " -F, --pid-file giving a file for the daemon's pid to be writte= n,\n" " -H, --help to output this message,\n" " -N, --no-fork to request that the daemon does not fork,\n" -" -P, --output-pid to request that the pid of the daemon is output= ,\n" " -T, --trace-file giving the file for logging, and\n" " --trace-control=3D+ activate a specific \n" " --trace-control=3D- deactivate a specific \n" @@ -2702,7 +2701,6 @@ static struct option options[] =3D { { "help", 0, NULL, 'H' }, { "no-fork", 0, NULL, 'N' }, { "priv-domid", 1, NULL, 'p' }, - { "output-pid", 0, NULL, 'P' }, { "entry-size", 1, NULL, 'S' }, { "trace-file", 1, NULL, 'T' }, { "trace-control", 1, NULL, 1 }, @@ -2825,7 +2823,6 @@ int main(int argc, char *argv[]) int opt; int sock_pollfd_idx =3D -1; bool dofork =3D true; - bool outputpid =3D false; bool live_update =3D false; const char *pidfile =3D NULL; int timeout; @@ -2834,7 +2831,7 @@ int main(int argc, char *argv[]) orig_argv =3D argv; =20 while ((opt =3D getopt_long(argc, argv, - "E:F:H::KNPS:t:A:M:Q:q:T:RW:w:U", + "E:F:H::KNS:t:A:M:Q:q:T:RW:w:U", options, NULL)) !=3D -1) { switch (opt) { case 'E': @@ -2849,9 +2846,6 @@ int main(int argc, char *argv[]) case 'N': dofork =3D false; break; - case 'P': - outputpid =3D true; - break; case 'R': recovery =3D false; break; @@ -2947,11 +2941,6 @@ int main(int argc, char *argv[]) dom0_init(); } =20 - if (outputpid) { - printf("%ld\n", (long)getpid()); - fflush(stdout); - } - /* redirect to /dev/null now we're ready to accept connections */ if (dofork && !live_update) finish_daemonize(); --=20 2.35.3 From nobody Thu May 16 09:14:12 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=1699879435; cv=none; d=zohomail.com; s=zohoarc; b=KBklFZ8s4rATg0hNQEPV3HpteI7cDtg571w4Q/k/PfIhVy+Kjqsngq4IUvUxzT+A8uhuXb5Gy4720V6eUBA7aWXvMB06855Fg3bNlY5Ly3VJoY/pUpc7WwX/FMxnUWH99y92+ryjfXdleT8oKzn+AZBP6pd0TmNEGpwVKMuuoeg= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1699879435; 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=gXFEuOQILoQ662ByGndYuFK8T/I1cGHZaW2+4BFFJh0=; b=F3n1czCIXWWa/A1CHJN/kBmq6fdrzKaxlMxWfiBYui+VtPDKSI49rTsvO68SLS58no1h/91u0EncjoK4U6LHlTKi2P4unCoxKC+5bZ035l4KUpA3IXGZpJMzxFvoPv5Rx98egFBAyhidcbzqYrFtIVHDIOC4kkph3Z3R2ZYdHwE= 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 1699879435893256.6292163569922; Mon, 13 Nov 2023 04:43:55 -0800 (PST) Received: from list by lists.xenproject.org with outflank-mailman.631562.985019 (Exim 4.92) (envelope-from ) id 1r2WHw-0000vc-QN; Mon, 13 Nov 2023 12:43:36 +0000 Received: by outflank-mailman (output) from mailman id 631562.985019; Mon, 13 Nov 2023 12:43:36 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1r2WHw-0000vN-MP; Mon, 13 Nov 2023 12:43:36 +0000 Received: by outflank-mailman (input) for mailman id 631562; Mon, 13 Nov 2023 12:43:35 +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 1r2WHv-0000Xf-CD for xen-devel@lists.xenproject.org; Mon, 13 Nov 2023 12:43:35 +0000 Received: from smtp-out2.suse.de (smtp-out2.suse.de [195.135.220.29]) by se1-gles-sth1.inumbo.com (Halon) with ESMTPS id 4235acd8-8222-11ee-98da-6d05b1d4d9a1; Mon, 13 Nov 2023 13:43:34 +0100 (CET) Received: from imap2.suse-dmz.suse.de (imap2.suse-dmz.suse.de [192.168.254.74]) (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 A4D061F6E6; Mon, 13 Nov 2023 12:43:34 +0000 (UTC) Received: from imap2.suse-dmz.suse.de (imap2.suse-dmz.suse.de [192.168.254.74]) (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 imap2.suse-dmz.suse.de (Postfix) with ESMTPS id 79B9E1358C; Mon, 13 Nov 2023 12:43:34 +0000 (UTC) Received: from dovecot-director2.suse.de ([192.168.254.65]) by imap2.suse-dmz.suse.de with ESMTPSA id 49hYHPYZUmVlcQAAMHmgww (envelope-from ); Mon, 13 Nov 2023 12:43:34 +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: 4235acd8-8222-11ee-98da-6d05b1d4d9a1 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.com; s=susede1; t=1699879414; 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=gXFEuOQILoQ662ByGndYuFK8T/I1cGHZaW2+4BFFJh0=; b=dPpPJ73dgn+aVMAN0urQUULQx/TSKIU4NIB5XuDlkZa0GebmigrBe93oXM66rffQVaded0 gw/X9KX2p578k+3REdcOxjJtpUk8jSCj3CnrWDTdju4s7+An6/mwGkodHoKkfb29mXzhCP VdT7SGyZweX0ISXzNvbRA7L3264TOyY= From: Juergen Gross To: xen-devel@lists.xenproject.org Cc: Juergen Gross , Wei Liu , Julien Grall , Anthony PERARD Subject: [PATCH 4/5] tools/xenstored: remove "-N" command line option Date: Mon, 13 Nov 2023 13:43:08 +0100 Message-Id: <20231113124309.10862-5-jgross@suse.com> X-Mailer: git-send-email 2.35.3 In-Reply-To: <20231113124309.10862-1-jgross@suse.com> References: <20231113124309.10862-1-jgross@suse.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @suse.com) X-ZM-MESSAGEID: 1699879437521100007 Content-Type: text/plain; charset="utf-8" The "-N" (do not daemonize) command line option is of questionable use: its sole purpose seems to be to aid debugging of xenstored by making it easier to start xenstored under gdb, or to see any debug messages easily. Debug messages can as well be sent to syslog(), while gdb can be attached to the daemon easily. The only not covered case is an error while initializing xenstored, but this could be handled e.g. by saving a core dump, which can be analyzed later. The call of talloc_enable_leak_report_full() done only with "-N" specified is no longer needed, as the same can be achieved via "xenstore-control memreport". Signed-off-by: Juergen Gross Reviewed-by: Julien Grall --- tools/xenstored/core.c | 26 +++++++------------------- 1 file changed, 7 insertions(+), 19 deletions(-) diff --git a/tools/xenstored/core.c b/tools/xenstored/core.c index 5a6378316a..c3cfef0965 100644 --- a/tools/xenstored/core.c +++ b/tools/xenstored/core.c @@ -2652,7 +2652,6 @@ static void usage(void) "\n" " -F, --pid-file giving a file for the daemon's pid to be writte= n,\n" " -H, --help to output this message,\n" -" -N, --no-fork to request that the daemon does not fork,\n" " -T, --trace-file giving the file for logging, and\n" " --trace-control=3D+ activate a specific \n" " --trace-control=3D- deactivate a specific \n" @@ -2699,7 +2698,6 @@ static struct option options[] =3D { { "event", 1, NULL, 'e' }, { "master-domid", 1, NULL, 'm' }, { "help", 0, NULL, 'H' }, - { "no-fork", 0, NULL, 'N' }, { "priv-domid", 1, NULL, 'p' }, { "entry-size", 1, NULL, 'S' }, { "trace-file", 1, NULL, 'T' }, @@ -2822,7 +2820,6 @@ int main(int argc, char *argv[]) { int opt; int sock_pollfd_idx =3D -1; - bool dofork =3D true; bool live_update =3D false; const char *pidfile =3D NULL; int timeout; @@ -2831,7 +2828,7 @@ int main(int argc, char *argv[]) orig_argv =3D argv; =20 while ((opt =3D getopt_long(argc, argv, - "E:F:H::KNS:t:A:M:Q:q:T:RW:w:U", + "E:F:H::KS:t:A:M:Q:q:T:RW:w:U", options, NULL)) !=3D -1) { switch (opt) { case 'E': @@ -2843,9 +2840,6 @@ int main(int argc, char *argv[]) case 'H': usage(); return 0; - case 'N': - dofork =3D false; - break; case 'R': recovery =3D false; break; @@ -2911,18 +2905,13 @@ int main(int argc, char *argv[]) /* Errors ignored here, will be reported when we open files */ mkdir(xenstore_daemon_rundir(), 0755); =20 - if (dofork) { - openlog("xenstored", 0, LOG_DAEMON); - if (!live_update) - daemonize(); - } + openlog("xenstored", 0, LOG_DAEMON); + if (!live_update) + daemonize(); + if (pidfile) write_pidfile(pidfile); =20 - /* Talloc leak reports go to stderr, which is closed if we fork. */ - if (!dofork) - talloc_enable_leak_report_full(); - /* Don't kill us with SIGPIPE. */ signal(SIGPIPE, SIG_IGN); =20 @@ -2942,11 +2931,10 @@ int main(int argc, char *argv[]) } =20 /* redirect to /dev/null now we're ready to accept connections */ - if (dofork && !live_update) + if (!live_update) finish_daemonize(); #ifndef __MINIOS__ - if (dofork) - xprintf =3D trace; + xprintf =3D trace; #endif =20 signal(SIGHUP, trigger_reopen_log); --=20 2.35.3 From nobody Thu May 16 09:14:12 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=1699879443; cv=none; d=zohomail.com; s=zohoarc; b=UCwnK+ToTQfFVoEeapIe/VCkKGxtS6ttEeuKHMbn/afWUTWdLQsHSZmjAd8f+yhefG0JeOkp96fITxbqiXyygoCBhQembpXsOP544Cpv+vE8NltAhtRYhaVLHtr7Z9C8whvHr7d+2a/ktjdren7JyGWYoR9jImB7f/QjOFFH8tQ= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1699879443; 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=e446G+xhnceZo0d5puzVNgBcr2j5egvLiaV1XBFhMhk=; b=PkDg+Jh3Lmm9o9dXD94NgfVYwBx5gN3vS4F3K3Kd9ZNo3CSd6D7IOpxTjKnvnHYaIbLVZxg9phC+kaaGXXGvO6JO5EjbOazZJiTVGBaczlysmAu9mUQiob0YJHiHO7TJqAtPAlAeyh5OMOVkeyVr2tdgFm47bTiHy3T+WdNdRHU= 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 1699879443162467.13290654192485; Mon, 13 Nov 2023 04:44:03 -0800 (PST) Received: from list by lists.xenproject.org with outflank-mailman.631563.985029 (Exim 4.92) (envelope-from ) id 1r2WI4-0001OV-2M; Mon, 13 Nov 2023 12:43:44 +0000 Received: by outflank-mailman (output) from mailman id 631563.985029; Mon, 13 Nov 2023 12:43:44 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1r2WI3-0001OO-VF; Mon, 13 Nov 2023 12:43:43 +0000 Received: by outflank-mailman (input) for mailman id 631563; Mon, 13 Nov 2023 12:43:42 +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 1r2WI2-00089i-3f for xen-devel@lists.xenproject.org; Mon, 13 Nov 2023 12:43:42 +0000 Received: from smtp-out1.suse.de (smtp-out1.suse.de [195.135.220.28]) by se1-gles-flk1.inumbo.com (Halon) with ESMTPS id 45b691b4-8222-11ee-9b0e-b553b5be7939; Mon, 13 Nov 2023 13:43:40 +0100 (CET) Received: from imap2.suse-dmz.suse.de (imap2.suse-dmz.suse.de [192.168.254.74]) (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-out1.suse.de (Postfix) with ESMTPS id 5C1FC218F1; Mon, 13 Nov 2023 12:43:40 +0000 (UTC) Received: from imap2.suse-dmz.suse.de (imap2.suse-dmz.suse.de [192.168.254.74]) (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 imap2.suse-dmz.suse.de (Postfix) with ESMTPS id 2F4711358C; Mon, 13 Nov 2023 12:43:40 +0000 (UTC) Received: from dovecot-director2.suse.de ([192.168.254.65]) by imap2.suse-dmz.suse.de with ESMTPSA id foUqCvwZUmVzcQAAMHmgww (envelope-from ); Mon, 13 Nov 2023 12:43:40 +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: 45b691b4-8222-11ee-9b0e-b553b5be7939 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.com; s=susede1; t=1699879420; 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=e446G+xhnceZo0d5puzVNgBcr2j5egvLiaV1XBFhMhk=; b=KNIGDnA5bPPhkylE+AV8izI7gRoOYYwWNuwAo/JEqdt0cHSklk2yCi6qpq4/8UOS1yFFWW r69ovYsJU+7UQKkMrQzg0HlVzCYIPwpOR3S6Q/mX5Ufl2o/KBbCxJ2WcGGQzkq4VJLe1rN pGrpLlx+YrxIW5RzNN/+yJ4D3zc5Alg= From: Juergen Gross To: xen-devel@lists.xenproject.org Cc: Juergen Gross , Wei Liu , Julien Grall , Anthony PERARD Subject: [PATCH 5/5] tools/xenstored: remove the "-R" command line option Date: Mon, 13 Nov 2023 13:43:09 +0100 Message-Id: <20231113124309.10862-6-jgross@suse.com> X-Mailer: git-send-email 2.35.3 In-Reply-To: <20231113124309.10862-1-jgross@suse.com> References: <20231113124309.10862-1-jgross@suse.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @suse.com) X-ZM-MESSAGEID: 1699879443434100001 Content-Type: text/plain; charset="utf-8" The "-R" (no recovery) command line option enables to omit fixing the node store in case of detected inconsistencies. This might have been of interest in the past, when the node data base was kept in a file, but now the usability of this option is zero. Remove the "-R" option. Signed-off-by: Juergen Gross Reviewed-by: Julien Grall --- tools/xenstored/core.c | 20 ++++---------------- 1 file changed, 4 insertions(+), 16 deletions(-) diff --git a/tools/xenstored/core.c b/tools/xenstored/core.c index c3cfef0965..9d6a5684b8 100644 --- a/tools/xenstored/core.c +++ b/tools/xenstored/core.c @@ -78,7 +78,6 @@ char **orig_argv; =20 LIST_HEAD(connections); int tracefd =3D -1; -static bool recovery =3D true; bool keep_orphans =3D false; static int reopen_log_pipe[2]; static int reopen_log_pipe0_pollfd_idx =3D -1; @@ -2443,9 +2442,6 @@ int remember_string(struct hashtable *hash, const cha= r *str) * have a corresponding child node (and if so, delete them). Each valid c= hild * is then recursively checked. * - * No deleting is performed if the recovery flag is cleared (i.e. -R was - * passed on the command line). - * * As we go, we record each node in the given reachable hashtable. These * entries will be used later in clean_store. */ @@ -2462,8 +2458,7 @@ static int check_store_step(const void *ctx, struct c= onnection *conn, =20 if (hashtable_search(data->reachable, (void *)node->name)) { log("check_store: '%s' is duplicated!", node->name); - return recovery ? WALK_TREE_RM_CHILDENTRY - : WALK_TREE_SKIP_CHILDREN; + return WALK_TREE_RM_CHILDENTRY; } =20 if (remember_string(data->reachable, node->name)) @@ -2479,7 +2474,7 @@ static int check_store_enoent(const void *ctx, struct= connection *conn, { log("check_store: node '%s' not found", name); =20 - return recovery ? WALK_TREE_RM_CHILDENTRY : WALK_TREE_OK; + return WALK_TREE_RM_CHILDENTRY; } =20 =20 @@ -2504,8 +2499,7 @@ static int clean_store_(const void *key, void *val, v= oid *private) } if (!hashtable_search(reachable, name)) { log("clean_store: '%s' is orphaned!", name); - if (recovery) - db_delete(NULL, name, NULL); + db_delete(NULL, name, NULL); } =20 talloc_free(name); @@ -2685,8 +2679,6 @@ static void usage(void) " -w, --timeout =3D set the timeout in seconds for ,\n" " allowed timeout candidates are:\n" " watch-event: time a watch-event is kept pending= \n" -" -R, --no-recovery to request that no recovery should be attempted= when\n" -" the store is corrupted (debug only),\n" " -K, --keep-orphans don't delete nodes owned by a domain when the\n" " domain is deleted (this is a security risk!)\n"= ); } @@ -2708,7 +2700,6 @@ static struct option options[] =3D { { "quota", 1, NULL, 'Q' }, { "quota-soft", 1, NULL, 'q' }, { "timeout", 1, NULL, 'w' }, - { "no-recovery", 0, NULL, 'R' }, { "keep-orphans", 0, NULL, 'K' }, { "watch-nb", 1, NULL, 'W' }, #ifndef NO_LIVE_UPDATE @@ -2828,7 +2819,7 @@ int main(int argc, char *argv[]) orig_argv =3D argv; =20 while ((opt =3D getopt_long(argc, argv, - "E:F:H::KS:t:A:M:Q:q:T:RW:w:U", + "E:F:H::KS:t:A:M:Q:q:T:W:w:U", options, NULL)) !=3D -1) { switch (opt) { case 'E': @@ -2840,9 +2831,6 @@ int main(int argc, char *argv[]) case 'H': usage(); return 0; - case 'R': - recovery =3D false; - break; case 'S': hard_quotas[ACC_NODESZ].val =3D get_optval_uint(optarg); break; --=20 2.35.3