From mboxrd@z Thu Jan 1 00:00:00 1970 From: Eduardo Habkost Subject: [PATCH 1/2] Extract disable_trace() from cleanup_trace() Date: Wed, 22 Oct 2008 15:35:27 -0200 Message-ID: <1224696928-22187-2-git-send-email-ehabkost@redhat.com> References: <1224696928-22187-1-git-send-email-ehabkost@redhat.com> Cc: kvm@vger.kernel.org, Eduardo Habkost To: Avi Kivity Return-path: Received: from mx2.redhat.com ([66.187.237.31]:37193 "EHLO mx2.redhat.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1757880AbYJVRfq (ORCPT ); Wed, 22 Oct 2008 13:35:46 -0400 Received: from int-mx2.corp.redhat.com (int-mx2.corp.redhat.com [172.16.27.26]) by mx2.redhat.com (8.13.8/8.13.8) with ESMTP id m9MHZkRC025024 for ; Wed, 22 Oct 2008 13:35:46 -0400 In-Reply-To: <1224696928-22187-1-git-send-email-ehabkost@redhat.com> Sender: kvm-owner@vger.kernel.org List-ID: Extract the KVM_TRACE_DISABLE ioctl() call from cleanup_trace(), as other parts of the code will use it. Signed-off-by: Eduardo Habkost --- user/kvmtrace.c | 9 +++++++-- 1 files changed, 7 insertions(+), 2 deletions(-) diff --git a/user/kvmtrace.c b/user/kvmtrace.c index de3c189..5d154c1 100644 --- a/user/kvmtrace.c +++ b/user/kvmtrace.c @@ -460,6 +460,12 @@ static void stop_threads() } } +static void disable_trace(void) +{ + if (ioctl(trace_information.fd, KVM_TRACE_DISABLE) < 0) + perror("KVM_TRACE_DISABLE"); +} + static int start_trace(void) { int fd; @@ -494,8 +500,7 @@ static void cleanup_trace(void) if (trace_information.trace_started) { trace_information.trace_started = 0; - if (ioctl(trace_information.fd, KVM_TRACE_DISABLE) < 0) - perror("KVM_TRACE_DISABLE"); + disable_trace(); } close(trace_information.fd); -- 1.5.6.rc3.11.g5f54d