From patchwork Fri Jun 17 15:59:47 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stefan Hajnoczi X-Patchwork-Id: 9184599 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id EAF17608A2 for ; Fri, 17 Jun 2016 16:44:10 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id D61F428386 for ; Fri, 17 Jun 2016 16:44:10 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id CAE5A28390; Fri, 17 Jun 2016 16:44:10 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.9 required=2.0 tests=BAYES_00,RCVD_IN_DNSWL_HI autolearn=ham version=3.3.1 Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 657C528386 for ; Fri, 17 Jun 2016 16:44:10 +0000 (UTC) Received: from localhost ([::1]:59009 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bDwsL-0008NN-2K for patchwork-qemu-devel@patchwork.kernel.org; Fri, 17 Jun 2016 12:44:09 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:55427) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bDwD2-00053p-E1 for qemu-devel@nongnu.org; Fri, 17 Jun 2016 12:01:29 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1bDwD0-0002yq-9o for qemu-devel@nongnu.org; Fri, 17 Jun 2016 12:01:27 -0400 Received: from mx1.redhat.com ([209.132.183.28]:37984) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bDwD0-0002ye-20 for qemu-devel@nongnu.org; Fri, 17 Jun 2016 12:01:26 -0400 Received: from int-mx13.intmail.prod.int.phx2.redhat.com (int-mx13.intmail.prod.int.phx2.redhat.com [10.5.11.26]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 8F1227D0C4; Fri, 17 Jun 2016 16:01:25 +0000 (UTC) Received: from localhost (ovpn-112-65.ams2.redhat.com [10.36.112.65]) by int-mx13.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id u5HG1OZA011036; Fri, 17 Jun 2016 12:01:25 -0400 From: Stefan Hajnoczi To: Date: Fri, 17 Jun 2016 16:59:47 +0100 Message-Id: <1466179193-11232-37-git-send-email-stefanha@redhat.com> In-Reply-To: <1466179193-11232-1-git-send-email-stefanha@redhat.com> References: <1466179193-11232-1-git-send-email-stefanha@redhat.com> X-Scanned-By: MIMEDefang 2.68 on 10.5.11.26 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.27]); Fri, 17 Jun 2016 16:01:25 +0000 (UTC) X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 209.132.183.28 Subject: [Qemu-devel] [PULL 36/42] trace: split out trace events for audio/ directory X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Peter Maydell , Stefan Hajnoczi Errors-To: qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Sender: "Qemu-devel" X-Virus-Scanned: ClamAV using ClamSMTP From: "Daniel P. Berrange" Move all trace-events for files in the audio/ directory to their own file. Signed-off-by: Daniel P. Berrange Message-id: 1466066426-16657-35-git-send-email-berrange@redhat.com Signed-off-by: Stefan Hajnoczi --- Makefile.objs | 1 + audio/trace-events | 17 +++++++++++++++++ trace-events | 16 ---------------- 3 files changed, 18 insertions(+), 16 deletions(-) create mode 100644 audio/trace-events diff --git a/Makefile.objs b/Makefile.objs index 32b5265..562acfa 100644 --- a/Makefile.objs +++ b/Makefile.objs @@ -151,3 +151,4 @@ trace-events-y += hw/acpi/trace-events trace-events-y += hw/arm/trace-events trace-events-y += hw/alpha/trace-events trace-events-y += ui/trace-events +trace-events-y += audio/trace-events diff --git a/audio/trace-events b/audio/trace-events new file mode 100644 index 0000000..5638ea1 --- /dev/null +++ b/audio/trace-events @@ -0,0 +1,17 @@ +# See docs/trace-events.txt for syntax documentation. + +# audio/alsaaudio.c +alsa_revents(int revents) "revents = %d" +alsa_pollout(int i, int fd) "i = %d fd = %d" +alsa_set_handler(int events, int index, int fd, int err) "events=%#x index=%d fd=%d err=%d" +alsa_wrote_zero(int len) "Failed to write %d frames (wrote zero)" +alsa_read_zero(long len) "Failed to read %ld frames (read zero)" +alsa_xrun_out(void) "Recovering from playback xrun" +alsa_xrun_in(void) "Recovering from capture xrun" +alsa_resume_out(void) "Resuming suspended output stream" +alsa_resume_in(void) "Resuming suspended input stream" +alsa_no_frames(int state) "No frames available and ALSA state is %d" + +# audio/ossaudio.c +oss_version(int version) "OSS version = %#x" +oss_invalid_available_size(int size, int bufsize) "Invalid available size, size=%d bufsize=%d" diff --git a/trace-events b/trace-events index 1ddf7a7..1a6bf2f 100644 --- a/trace-events +++ b/trace-events @@ -192,22 +192,6 @@ cpu_set_state(int cpu_index, uint8_t state) "setting cpu %d state to %" PRIu8 cpu_halt(int cpu_index) "halting cpu %d" cpu_unhalt(int cpu_index) "unhalting cpu %d" -# audio/alsaaudio.c -alsa_revents(int revents) "revents = %d" -alsa_pollout(int i, int fd) "i = %d fd = %d" -alsa_set_handler(int events, int index, int fd, int err) "events=%#x index=%d fd=%d err=%d" -alsa_wrote_zero(int len) "Failed to write %d frames (wrote zero)" -alsa_read_zero(long len) "Failed to read %ld frames (read zero)" -alsa_xrun_out(void) "Recovering from playback xrun" -alsa_xrun_in(void) "Recovering from capture xrun" -alsa_resume_out(void) "Resuming suspended output stream" -alsa_resume_in(void) "Resuming suspended input stream" -alsa_no_frames(int state) "No frames available and ALSA state is %d" - -# audio/ossaudio.c -oss_version(int version) "OSS version = %#x" -oss_invalid_available_size(int size, int bufsize) "Invalid available size, size=%d bufsize=%d" - # net/vhost-user.c vhost_user_event(const char *chr, int event) "chr: %s got event: %d"