From mboxrd@z Thu Jan  1 00:00:00 1970
From: Ian Campbell <ian.campbell@citrix.com>
Subject: Re: [PATCH] oxenstored: fix del_watches and
	del_transactions
Date: Thu, 18 Jun 2015 09:53:52 +0100
Message-ID: <1434617632.28264.24.camel@citrix.com>
References: <1434569989-5774-1-git-send-email-wei.liu2@citrix.com>
	<745A59CD-7FD7-4DFA-A33D-032974BD7B71@citrix.com>
Mime-Version: 1.0
Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: 7bit
Return-path: <xen-devel-bounces@lists.xen.org>
Received: from mail6.bemta3.messagelabs.com ([195.245.230.39])
	by lists.xen.org with esmtp (Exim 4.72)
	(envelope-from <prvs=604cfbd4c=Ian.Campbell@citrix.com>)
	id 1Z5VaB-0004do-7B
	for xen-devel@lists.xenproject.org; Thu, 18 Jun 2015 08:53:59 +0000
In-Reply-To: <745A59CD-7FD7-4DFA-A33D-032974BD7B71@citrix.com>
List-Unsubscribe: <http://lists.xen.org/cgi-bin/mailman/options/xen-devel>,
	<mailto:xen-devel-request@lists.xen.org?subject=unsubscribe>
List-Post: <mailto:xen-devel@lists.xen.org>
List-Help: <mailto:xen-devel-request@lists.xen.org?subject=help>
List-Subscribe: <http://lists.xen.org/cgi-bin/mailman/listinfo/xen-devel>,
	<mailto:xen-devel-request@lists.xen.org?subject=subscribe>
Sender: xen-devel-bounces@lists.xen.org
Errors-To: xen-devel-bounces@lists.xen.org
To: Dave Scott <Dave.Scott@citrix.com>
Cc: Xen-devel <xen-devel@lists.xenproject.org>, Wei Liu <wei.liu2@citrix.com>
List-Id: xen-devel@lists.xenproject.org

On Wed, 2015-06-17 at 20:44 +0100, Dave Scott wrote:
> > On 17 Jun 2015, at 20:39, Wei Liu <wei.liu2@citrix.com> wrote:
> > 
> > The statement to reset nb_watches should be in del_watches, not
> > del_transactions.
> > 
> > Signed-off-by: Wei Liu <wei.liu2@citrix.com>
> > Cc: David Scott <dave.scott@citrix.com>
> > ---
> > It was only until Ian applied previous patch that I discovered this
> > copy-n-paste  error. Sorry about this.
> 
> Oh yes I see what you mean.
> 
> Acked-by: David Scott <dave.scott@citrix.com>

Alas:
        File "connection.ml", line 191, characters 17-19:
        Error: Syntax error

If I just need to append a ; to the moved line I can do that on commit,
if it needs e.g. wrapping in a begin/end or something then I'd best have
another patch.

Ian.


diff --git a/tools/ocaml/xenstored/connection.ml b/tools/ocaml/xenstore
index 9de4978..935939a 100644
--- a/tools/ocaml/xenstored/connection.ml
+++ b/tools/ocaml/xenstored/connection.ml
@@ -188,10 +188,10 @@ let del_watch con path token =
 
 let del_watches con =
   Hashtbl.clear con.watches
+  con.nb_watches <- 0
 
 let del_transactions con =
   Hashtbl.clear con.transactions;
-  con.nb_watches <- 0
 
 let list_watches con =
        let ll = Hashtbl.fold