From mboxrd@z Thu Jan 1 00:00:00 1970 From: Matthew Daley Subject: [PATCH 28/29] xentrace: don't try to close null libxc handle in disable_tbufs Date: Wed, 30 Oct 2013 20:52:04 +1300 Message-ID: <1383119525-26033-29-git-send-email-mattjd@gmail.com> References: <1383119525-26033-1-git-send-email-mattjd@gmail.com> Mime-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Return-path: In-Reply-To: <1383119525-26033-1-git-send-email-mattjd@gmail.com> List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org To: xen-devel@lists.xen.org Cc: George Dunlap , Matthew Daley , Ian Jackson , Ian Campbell , Stefano Stabellini List-Id: xen-devel@lists.xenproject.org While at it, simplify the function. Coverity-ID: 1055316 Signed-off-by: Matthew Daley --- tools/xentrace/xentrace.c | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/tools/xentrace/xentrace.c b/tools/xentrace/xentrace.c index 622bac8..504763d 100644 --- a/tools/xentrace/xentrace.c +++ b/tools/xentrace/xentrace.c @@ -425,22 +425,18 @@ fail: static void disable_tbufs(void) { xc_interface *xc_handle = xc_interface_open(0,0,0); - int ret; if ( !xc_handle ) { perror("Couldn't open xc handle to disable tbufs."); - goto out; + return; } - ret = xc_tbuf_disable(xc_handle); - - if ( ret != 0 ) + if ( xc_tbuf_disable(xc_handle) != 0 ) { perror("Couldn't disable trace buffers"); } -out: xc_interface_close(xc_handle); } -- 1.7.10.4