From nobody Thu Nov 28 12:55:55 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=1670947539; cv=none; d=zohomail.com; s=zohoarc; b=X/jEaiFH8a2Hi7WlsaTodUidPHjPcSfUC1wh1fhkCJBQ+NiVTvhoHUvpq1oYxvTsQ+HGW17FSGHZzH0GNtSH7uuvoQooUzt10lKDuXBNGAQsI011fTV7MKhoh1HZe/QalchpWNx/lpaVTtrp2u0QR8wb8yZ/9HZqnFuG14qaCM0= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1670947539; 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=JdgZ1VuZvqNGh5getUJSQZgnrcQ2jyvptjdFRbrPjw4=; b=We7pe6euGisYmhLfcfgFJJR1XvjlkEwbhyiOdn+RKYNKUNSPESmjzoHjoGHg9TurC+ktpwh2sd11ZFNdQJzFAJZiORCIlMeet7P6e4qITDDAuWRSKakijXsxLhWtxoDXIXB+XMMifTBsqmgI9HbKOskL/wRf2yBI+ZwIph2+Ij4= 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 1670947539548643.6681477313361; Tue, 13 Dec 2022 08:05:39 -0800 (PST) Received: from list by lists.xenproject.org with outflank-mailman.460768.718797 (Exim 4.92) (envelope-from ) id 1p57mF-0006Gr-B2; Tue, 13 Dec 2022 16:05:07 +0000 Received: by outflank-mailman (output) from mailman id 460768.718797; Tue, 13 Dec 2022 16:05:07 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1p57mE-0006By-Sd; Tue, 13 Dec 2022 16:05:06 +0000 Received: by outflank-mailman (input) for mailman id 460768; Tue, 13 Dec 2022 16:05:04 +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 1p57jK-0001dt-Ud for xen-devel@lists.xenproject.org; Tue, 13 Dec 2022 16:02:06 +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 7d9edf47-7aff-11ed-91b6-6bf2151ebd3b; Tue, 13 Dec 2022 17:02:06 +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 1423A1FDAE; Tue, 13 Dec 2022 16:02:06 +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 D7809138EE; Tue, 13 Dec 2022 16:02:05 +0000 (UTC) Received: from dovecot-director2.suse.de ([192.168.254.65]) by imap2.suse-dmz.suse.de with ESMTPSA id dERXM/2hmGMfKgAAMHmgww (envelope-from ); Tue, 13 Dec 2022 16:02:05 +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: 7d9edf47-7aff-11ed-91b6-6bf2151ebd3b DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.com; s=susede1; t=1670947326; 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=JdgZ1VuZvqNGh5getUJSQZgnrcQ2jyvptjdFRbrPjw4=; b=GpEsvWQy3SoCa9waloGggwBG82cl58uECCxZ+kAUvCqZA7TFvgmltanbkVtAgW1tZibY2x CHojaVNLmxjkdNpOsbr54U+RpaffMZiBoi/GJLW1YmT3oWaqfXr4WE0UhkbWlZvcIUWVWS hckQM5B4apb/mxBF683Lu7Wz2vp1k9o= From: Juergen Gross To: xen-devel@lists.xenproject.org Cc: Juergen Gross , Wei Liu , Julien Grall , Anthony PERARD , Julien Grall Subject: [PATCH v2 14/19] tools/xenstore: let chk_domain_generation() return a bool Date: Tue, 13 Dec 2022 17:00:40 +0100 Message-Id: <20221213160045.28170-15-jgross@suse.com> X-Mailer: git-send-email 2.35.3 In-Reply-To: <20221213160045.28170-1-jgross@suse.com> References: <20221213160045.28170-1-jgross@suse.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @suse.com) X-ZM-MESSAGEID: 1670947541258100001 Content-Type: text/plain; charset="utf-8" Instead of returning 0 or 1 let chk_domain_generation() return a boolean value. Simplify the only caller by removing the ret variable. Signed-off-by: Juergen Gross Reviewed-by: Julien Grall --- tools/xenstore/xenstored_domain.c | 18 ++++++++---------- 1 file changed, 8 insertions(+), 10 deletions(-) diff --git a/tools/xenstore/xenstored_domain.c b/tools/xenstore/xenstored_d= omain.c index a3ecdb382f..65e94e3822 100644 --- a/tools/xenstore/xenstored_domain.c +++ b/tools/xenstore/xenstored_domain.c @@ -983,20 +983,20 @@ void domain_deinit(void) * count (used for testing whether a node permission is older than a domai= n). * * Return values: - * 0: domain has higher generation count (it is younger than a node with = the - * given count), or domain isn't existing any longer - * 1: domain is older than the node + * false: domain has higher generation count (it is younger than a node w= ith + * the given count), or domain isn't existing any longer + * true: domain is older than the node */ -static int chk_domain_generation(unsigned int domid, uint64_t gen) +static bool chk_domain_generation(unsigned int domid, uint64_t gen) { struct domain *d; =20 if (!xc_handle && domid =3D=3D dom0_domid) - return 1; + return true; =20 d =3D find_domain_struct(domid); =20 - return (d && d->generation <=3D gen) ? 1 : 0; + return d && d->generation <=3D gen; } =20 /* @@ -1031,14 +1031,12 @@ int domain_alloc_permrefs(struct node_perms *perms) int domain_adjust_node_perms(struct node *node) { unsigned int i; - int ret; =20 for (i =3D 1; i < node->perms.num; i++) { if (node->perms.p[i].perms & XS_PERM_IGNORE) continue; - ret =3D chk_domain_generation(node->perms.p[i].id, - node->generation); - if (!ret) + if (!chk_domain_generation(node->perms.p[i].id, + node->generation)) node->perms.p[i].perms |=3D XS_PERM_IGNORE; } =20 --=20 2.35.3