From nobody Tue Feb 10 01:31:55 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=1698832488; cv=none; d=zohomail.com; s=zohoarc; b=Xp5p2ZuMY1H6WvwAYdzxRAPFV9ajA53MH3mSrtqn7+68Rf/t/cUnH0qlbOecESuUuiMGtMhtogqvp0GuYZYzZhYF5y6op00AdFMvNkQKr8rk/cF/N06ARFulQ9spilh1ed09PawnnPS7sem2tfno2vbOgPTj9oU+efk/6aFj+PM= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1698832488; 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=nYvyegEExGxpVyVevuNtSzRpcmdIFE44ODgb8U4L3Mw=; b=kNUO4JPDSD//xzkmw3PIK+76m9rFeAA6ruk/et3CIKPnWu+lKFhNrCWsCSrwFcKnL5keXpsE43cisYic7HmuSMRUn8kEZQ+ylvyWBKYWtXUiwDV3d7ZFoBFY6PJeTnqknWvAL7n6zzICj4X1mxEI3B13kidQUTrytTsiCJDLrhA= 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 1698832488229504.7933572734189; Wed, 1 Nov 2023 02:54:48 -0700 (PDT) Received: from list by lists.xenproject.org with outflank-mailman.626351.976584 (Exim 4.92) (envelope-from ) id 1qy7vg-00012N-R8; Wed, 01 Nov 2023 09:54:28 +0000 Received: by outflank-mailman (output) from mailman id 626351.976584; Wed, 01 Nov 2023 09:54:28 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1qy7vg-00010a-Kq; Wed, 01 Nov 2023 09:54:28 +0000 Received: by outflank-mailman (input) for mailman id 626351; Wed, 01 Nov 2023 09:54:27 +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 1qy7e0-0005sN-Bj for xen-devel@lists.xenproject.org; Wed, 01 Nov 2023 09:36:12 +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 17487220-789a-11ee-9b0e-b553b5be7939; Wed, 01 Nov 2023 10:36:10 +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 822601F750; Wed, 1 Nov 2023 09:36:10 +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 4D36F13460; Wed, 1 Nov 2023 09:36:10 +0000 (UTC) Received: from dovecot-director2.suse.de ([192.168.254.65]) by imap2.suse-dmz.suse.de with ESMTPSA id UXV4EQocQmXRCQAAMHmgww (envelope-from ); Wed, 01 Nov 2023 09:36:10 +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: 17487220-789a-11ee-9b0e-b553b5be7939 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.com; s=susede1; t=1698831370; 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=nYvyegEExGxpVyVevuNtSzRpcmdIFE44ODgb8U4L3Mw=; b=IvRzd0LiiImU0mfBCuFuNDX9S6iSYQ2NjakQUD61tGb8Oll4NzPwXb9+5PrhXvZv4jUY2u fAIKcDR6kxhpyU2dRg8nZwHhasA0+yUeqapcA+JCOX340TRuu4i3saqa1vLs2jQkGC6G6p lZUHlnUEvT1nXLjBJZcC6uMdg5bEkSI= From: Juergen Gross To: xen-devel@lists.xenproject.org Cc: Juergen Gross , Wei Liu , Julien Grall , Anthony PERARD Subject: [PATCH 29/29] tools/xenstored: have a single do_control_memreport() Date: Wed, 1 Nov 2023 10:33:25 +0100 Message-Id: <20231101093325.30302-30-jgross@suse.com> X-Mailer: git-send-email 2.35.3 In-Reply-To: <20231101093325.30302-1-jgross@suse.com> References: <20231101093325.30302-1-jgross@suse.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @suse.com) X-ZM-MESSAGEID: 1698832490509100001 Content-Type: text/plain; charset="utf-8" With 9pfs now available in Xenstore-stubdom, there is no reason to have distinct do_control_memreport() variants for the daemon and the stubdom implementations. Signed-off-by: Juergen Gross Reviewed-by: Jason Andryuk --- tools/xenstored/control.c | 27 +++++++-------------------- 1 file changed, 7 insertions(+), 20 deletions(-) diff --git a/tools/xenstored/control.c b/tools/xenstored/control.c index dae23a5ac0..7db2c4703b 100644 --- a/tools/xenstored/control.c +++ b/tools/xenstored/control.c @@ -216,23 +216,11 @@ static int do_control_logfile(const void *ctx, struct= connection *conn, return 0; } =20 -#ifdef __MINIOS__ -static int do_control_memreport(const void *ctx, struct connection *conn, - const char **vec, int num) -{ - if (num) - return EINVAL; - - talloc_report_full(NULL, stdout); - - send_ack(conn, XS_CONTROL); - return 0; -} -#else static int do_control_memreport(const void *ctx, struct connection *conn, const char **vec, int num) { FILE *fp; + char *filename; int fd; =20 if (num > 1) @@ -255,8 +243,12 @@ static int do_control_memreport(const void *ctx, struc= t connection *conn, if (!fp) close(fd); } - } else - fp =3D fopen(vec[0], "a"); + } else { + filename =3D absolute_filename(ctx, vec[0]); + if (!filename) + return ENOMEM; + fp =3D fopen(filename, "a"); + } =20 if (!fp) return EBADF; @@ -267,7 +259,6 @@ static int do_control_memreport(const void *ctx, struct= connection *conn, send_ack(conn, XS_CONTROL); return 0; } -#endif =20 static int do_control_print(const void *ctx, struct connection *conn, const char **vec, int num) @@ -310,11 +301,7 @@ static struct cmd_s cmds[] =3D { " Default timeout is 60 seconds.", 5 }, #endif { "logfile", do_control_logfile, "" }, -#ifdef __MINIOS__ - { "memreport", do_control_memreport, "" }, -#else { "memreport", do_control_memreport, "[]" }, -#endif { "print", do_control_print, "" }, { "quota", do_control_quota, "[set ||max [-r]]" }, --=20 2.35.3