From nobody Fri May 10 08:37:49 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=reject dis=none) header.from=citrix.com ARC-Seal: i=1; a=rsa-sha256; t=1708944544; cv=none; d=zohomail.com; s=zohoarc; b=KkiYK+P4WB1EjjiuyGkF5UmrZuD8j5PA7E5Sp0YZ4JvmyVFAXcNRoqUqSmcDzNRLBUKzXFQmNWcF5UACM04Fj2dPoCpaFFwDV0Uw85ga9dACGv0NjQ5I/TAYMTlmn/uc+I5iPdNfhLUDFM1APUT+iwbgbPrRQbxoaAskb71wfHk= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1708944544; h=Content-Type:Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:List-Subscribe:List-Post:List-Id:List-Help:List-Unsubscribe:MIME-Version:Message-ID:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=Q8zVpDwchDEJOfDQ6FiF4/+UrPVWrsLuWj02A8p+uBQ=; b=SE1VTDjxu7a/lu7arhlzWITGZnwiTIyZ3RYWxHVk/ZR3tzfrHoBIky6X1oYGecXuyLOBnepoExp8V6jtRAuC1M828/+QmaDghKDFUqiouOTy/E5T2iPuJRgdQbIrST5+Se1+L14dFYDve2OVM/iPu6R6xljb3TySgAW9A43Eif8= 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=reject dis=none) Return-Path: Received: from lists.xenproject.org (lists.xenproject.org [192.237.175.120]) by mx.zohomail.com with SMTPS id 1708944544108591.1626100317175; Mon, 26 Feb 2024 02:49:04 -0800 (PST) Received: from list by lists.xenproject.org with outflank-mailman.685438.1066153 (Exim 4.92) (envelope-from ) id 1reYXD-0004Jv-AZ; Mon, 26 Feb 2024 10:48:35 +0000 Received: by outflank-mailman (output) from mailman id 685438.1066153; Mon, 26 Feb 2024 10:48:35 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1reYXD-0004Jo-6l; Mon, 26 Feb 2024 10:48:35 +0000 Received: by outflank-mailman (input) for mailman id 685438; Mon, 26 Feb 2024 10:48:34 +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 1reYXB-0004Ji-Uq for xen-devel@lists.xenproject.org; Mon, 26 Feb 2024 10:48:33 +0000 Received: from mail-ej1-x62b.google.com (mail-ej1-x62b.google.com [2a00:1450:4864:20::62b]) by se1-gles-flk1.inumbo.com (Halon) with ESMTPS id 94f8aea2-d494-11ee-98f5-efadbce2ee36; Mon, 26 Feb 2024 11:48:31 +0100 (CET) Received: by mail-ej1-x62b.google.com with SMTP id a640c23a62f3a-a3ddc13bbb3so425934466b.0 for ; Mon, 26 Feb 2024 02:48:31 -0800 (PST) Received: from andrewcoop.citrite.net (default-46-102-197-194.interdsl.co.uk. [46.102.197.194]) by smtp.gmail.com with ESMTPSA id m16-20020a1709061ed000b00a3d99415705sm2294599ejj.73.2024.02.26.02.48.31 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 26 Feb 2024 02:48:31 -0800 (PST) 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: 94f8aea2-d494-11ee-98f5-efadbce2ee36 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=citrix.com; s=google; t=1708944511; x=1709549311; darn=lists.xenproject.org; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:from:to:cc:subject:date:message-id:reply-to; bh=Q8zVpDwchDEJOfDQ6FiF4/+UrPVWrsLuWj02A8p+uBQ=; b=Ejnf7BEZWFZ0eOLgrkikIDr8D0ceQ1+LwPKrNmic0Kp0JoQJL58s3QUl9J/Ry9V5XS hCzPhG3+rGyz1XUwt166RXTHcQMsFe4Lmfi4tAGcMWLYMEesdqc+Aw+fzTvSx0MbGbo9 DLqTnEUMsuezY7BvBAXCPgZMf4+kuLezMo9kw= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1708944511; x=1709549311; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=Q8zVpDwchDEJOfDQ6FiF4/+UrPVWrsLuWj02A8p+uBQ=; b=VedqTQKZ4DHSeByDmwCPqgZqToEwqSkk92ncOrjzRYcFX5DuyYnDBHhIQwQTPXVwBx RHvdfGBX8guWXbJLd81giUa2cdc85+fXc+hIeo3tttoAnMc7RWuetREuVWU9wEgkTx79 FgAlZqkR/gTVzJI6fhHKJF1c0RLeBzsgYoo8/Rqb/o9tXiuFjvrbxWPiB94HbIcyqEjs 5Hrgvkrsx83WXkSqZIXE+2F0JY0U6QgjA5UnUSuj4LGVuN4jRibYdMOOHxsjIlna0UT7 34cUA4pUnJI8K6U0i0P8XX9PrY10K7HLI2HnSuNxtxsjXa+/Zktt/BBc+gIGOZOXkYHF YkWg== X-Gm-Message-State: AOJu0YwXXRR2fG2EZk+zMW1L3L/oQ0EZ9AZdAwEMh39SmsrUDO5azXv+ WMsBfaU0kGaMG7KFV1bZ//Y5fovMrSZQqsXRR/Ar20NubRIyiyE/hvUMw2rXoKgYZAfdESBd0CS H X-Google-Smtp-Source: AGHT+IE0dfRmVXZQ1UyuFMvRkiWjqXqO1MUL/BEfX2Ra1lI8bXduWYRqnPBjMC6mdzYFg9S38B5W1w== X-Received: by 2002:a17:906:bc54:b0:a3f:c736:526d with SMTP id s20-20020a170906bc5400b00a3fc736526dmr5285610ejv.31.1708944511338; Mon, 26 Feb 2024 02:48:31 -0800 (PST) From: Andrew Cooper To: Xen-devel Cc: Andrew Cooper , Christian Lindig , =?UTF-8?q?Edwin=20T=C3=B6r=C3=B6k?= , Rob Hoes Subject: [PATCH] tools/oxenstored: Re-format Date: Mon, 26 Feb 2024 10:48:29 +0000 Message-Id: <20240226104829.1044479-1-andrew.cooper3@citrix.com> X-Mailer: git-send-email 2.30.2 MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @citrix.com) X-ZM-MESSAGEID: 1708944545962100001 Rerun make format. Signed-off-by: Andrew Cooper Reviewed-by: Edwin T=C3=B6r=C3=B6k --- CC: Christian Lindig CC: Edwin T=C3=B6r=C3=B6k CC: Rob Hoes --- tools/ocaml/xenstored/quota.ml | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/tools/ocaml/xenstored/quota.ml b/tools/ocaml/xenstored/quota.ml index 1f652040d898..082cd25f26fc 100644 --- a/tools/ocaml/xenstored/quota.ml +++ b/tools/ocaml/xenstored/quota.ml @@ -55,13 +55,13 @@ let _check quota id size =3D raise Data_too_big ); if id > 0 then - try - let entry =3D DomidMap.find id quota.cur in - if entry >=3D quota.maxent then ( - warn "domain %u cannot create entry: quota reached" id; - raise Limit_reached - ) - with Not_found -> () + try + let entry =3D DomidMap.find id quota.cur in + if entry >=3D quota.maxent then ( + warn "domain %u cannot create entry: quota reached" id; + raise Limit_reached + ) + with Not_found -> () =20 let check quota id size =3D if !activate then @@ -88,4 +88,4 @@ let merge orig_quota mod_quota dest_quota =3D | diff -> update_entry dest id diff (* update with [x=3Dx+diff] *) in {dest_quota with cur =3D DomidMap.fold fold_merge mod_quota.cur dest_quo= ta.cur} - (* dest_quota =3D dest_quota + (mod_quota - orig_quota) *) +(* dest_quota =3D dest_quota + (mod_quota - orig_quota) *) base-commit: 8de3afc0b402bc17f65093a53e5870862707a8c7 --=20 2.30.2