From patchwork Thu Feb 14 10:47:14 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Laurent Vivier X-Patchwork-Id: 1042008 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=nongnu.org (client-ip=209.51.188.17; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=vivier.eu Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 440YM40Gl1z9sMp for ; Thu, 14 Feb 2019 22:00:00 +1100 (AEDT) Received: from localhost ([127.0.0.1]:46222 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1guEkI-0002kk-0S for incoming@patchwork.ozlabs.org; Thu, 14 Feb 2019 05:59:58 -0500 Received: from eggs.gnu.org ([209.51.188.92]:50595) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1guEYy-0002S6-QS for qemu-devel@nongnu.org; Thu, 14 Feb 2019 05:48:18 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1guEYu-0002yO-3O for qemu-devel@nongnu.org; Thu, 14 Feb 2019 05:48:16 -0500 Received: from mout.kundenserver.de ([212.227.126.133]:42293) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1guEYj-0002VK-C4; Thu, 14 Feb 2019 05:48:01 -0500 Received: from localhost.localdomain ([78.238.229.36]) by mrelayeu.kundenserver.de (mreue010 [212.227.15.167]) with ESMTPSA (Nemesis) id 1MX00X-1ga9NL2AtF-00XKox; Thu, 14 Feb 2019 11:47:46 +0100 From: Laurent Vivier To: qemu-devel@nongnu.org Date: Thu, 14 Feb 2019 11:47:14 +0100 Message-Id: <20190214104717.3543-12-laurent@vivier.eu> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190214104717.3543-1-laurent@vivier.eu> References: <20190214104717.3543-1-laurent@vivier.eu> MIME-Version: 1.0 X-Provags-ID: V03:K1:d+kNLakKyr+Vr+dBEmmNfauzVYZSbZwhd6bUBwfm1SgYlljxwXL pM5b0w26z+dQtOJSwbYI12ZZ04mhHq6xJODKScFzr7iZsJQrzNDGfHiEcFmIIozvBROjVqb 95eGF0NzTt17p6pwp4VIAsFPgj5h2wa9xF18vMwwim/g4p0W3dGYGVYk4SUez110h4WSuHL pm8JqutBZOs/qPrt+TKOQ== X-UI-Out-Filterresults: notjunk:1; V03:K0:iwLeW2vOwPc=:z6DP5FR9UkIL0fAHw2nB0I HqbrjeSyTWv5QvEV8uXDEhuNrE8Vy4F4O9cqehk5C+5HIbAbV8LZZlD/DdaARKQzTu1y0bga0 PXz0Yek7M86qLBqltRFvX8AXxsienT0lyVEH/5lJ2S5PVDhHfTiH1VSM6b3Gu8qTN718pYeBX wjmnFdg8f6xxL/pJGSIZrsw2Mn5dFyZQwSANW5obsmlZJRuTKfGJ+vmq+F9ETEilUBnx99sZ8 R4+XfrxAMVyiw58M/V2z50WEkyYJ4yqUIxuD5MhVW1ztkTkb9dVJaLsG3vQznmRiswY5iMi9Q EKZYQv+W+0nbX6XWHNfW89V5gyyqzaGCIit4sQVxIJl0QX1uKVr4KikNhxi12DFMF2JivOkL5 LznJ0goERbvgTRGrpxnw8EmK+mUxtbGc7gFGv70wTDPXyhViu7qtUxXSF4qCBfwzEuJS5gZOI CJc6VBCyiET11Ou6pebSNvwBwgSpvnVd8qWUS7krTiRGdJejPn1T2WGGxo+dDuIPcRWLq+41t E8+YMAgb/sXCJXRnG1fP3sKU1txSGq/j9d/FhxW6C/fPmJB8fzxj8QgIINHMdt6sOscEhFkfv 0RIuJWhUUoQCzRrsDmgbKPZeIQ0EI1HwkvMtPEZadN2EoKMz5IVyeDGjN6g1dSgp6Aljc32bQ 2nnYldVcuR46JTRAGlLvIo+49vAEI4L7NASTLP/D+hGFrOktEh1hm02hF9N2uDHpkBGK17F79 tdrjOzdBKGQ+g6sbsk1IZlECx7d3rSHfEQICkw== X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 212.227.126.133 Subject: [Qemu-devel] [PULL 11/14] wavcapture: Convert to error_report 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: Gerd Hoffmann , kvm@vger.kernel.org, "Michael S. Tsirkin" , libvir-list@redhat.com, Mark Cave-Ayland , Michael Tokarev , Laurent Vivier , Markus Armbruster , qemu-trivial@nongnu.org, Kamil Rytarowski , Gerd Hoffmann , Paolo Bonzini , "Dr. David Alan Gilbert" , Artyom Tarasenko Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" From: "Dr. David Alan Gilbert" Kill off a pile of monitor_printf's and cur_mon usage. The only one left in wavcapture.c is the info case. Signed-off-by: Dr. David Alan Gilbert Reviewed-by: Gerd Hoffmann Reviewed-by: Michael S. Tsirkin Message-Id: <20170320173840.3626-3-dgilbert@redhat.com> Signed-off-by: Laurent Vivier --- audio/wavcapture.c | 39 +++++++++++++++++---------------------- 1 file changed, 17 insertions(+), 22 deletions(-) diff --git a/audio/wavcapture.c b/audio/wavcapture.c index cf31ed652c2b..cd24570aa70c 100644 --- a/audio/wavcapture.c +++ b/audio/wavcapture.c @@ -38,30 +38,29 @@ static void wav_destroy (void *opaque) uint8_t dlen[4]; uint32_t datalen = wav->bytes; uint32_t rifflen = datalen + 36; - Monitor *mon = cur_mon; if (wav->f) { le_store (rlen, rifflen, 4); le_store (dlen, datalen, 4); if (fseek (wav->f, 4, SEEK_SET)) { - monitor_printf (mon, "wav_destroy: rlen fseek failed\nReason: %s\n", - strerror (errno)); + error_report("wav_destroy: rlen fseek failed: %s", + strerror(errno)); goto doclose; } if (fwrite (rlen, 4, 1, wav->f) != 1) { - monitor_printf (mon, "wav_destroy: rlen fwrite failed\nReason %s\n", - strerror (errno)); + error_report("wav_destroy: rlen fwrite failed: %s", + strerror(errno)); goto doclose; } if (fseek (wav->f, 32, SEEK_CUR)) { - monitor_printf (mon, "wav_destroy: dlen fseek failed\nReason %s\n", - strerror (errno)); + error_report("wav_destroy: dlen fseek failed: %s", + strerror(errno)); goto doclose; } if (fwrite (dlen, 1, 4, wav->f) != 4) { - monitor_printf (mon, "wav_destroy: dlen fwrite failed\nReason %s\n", - strerror (errno)); + error_report("wav_destroy: dlen fwrite failed: %s", + strerror(errno)); goto doclose; } doclose: @@ -78,8 +77,7 @@ static void wav_capture (void *opaque, void *buf, int size) WAVState *wav = opaque; if (fwrite (buf, size, 1, wav->f) != 1) { - monitor_printf (cur_mon, "wav_capture: fwrite error\nReason: %s", - strerror (errno)); + error_report("wav_capture: fwrite error: %s", strerror(errno)); } wav->bytes += size; } @@ -110,7 +108,6 @@ static struct capture_ops wav_capture_ops = { int wav_start_capture (CaptureState *s, const char *path, int freq, int bits, int nchannels) { - Monitor *mon = cur_mon; WAVState *wav; uint8_t hdr[] = { 0x52, 0x49, 0x46, 0x46, 0x00, 0x00, 0x00, 0x00, 0x57, 0x41, 0x56, @@ -124,13 +121,13 @@ int wav_start_capture (CaptureState *s, const char *path, int freq, CaptureVoiceOut *cap; if (bits != 8 && bits != 16) { - monitor_printf (mon, "incorrect bit count %d, must be 8 or 16\n", bits); + error_report("incorrect bit count %d, must be 8 or 16", bits); return -1; } if (nchannels != 1 && nchannels != 2) { - monitor_printf (mon, "incorrect channel count %d, must be 1 or 2\n", - nchannels); + error_report("incorrect channel count %d, must be 1 or 2", + nchannels); return -1; } @@ -158,8 +155,8 @@ int wav_start_capture (CaptureState *s, const char *path, int freq, wav->f = fopen (path, "wb"); if (!wav->f) { - monitor_printf (mon, "Failed to open wave file `%s'\nReason: %s\n", - path, strerror (errno)); + error_report("Failed to open wave file `%s': %s", + path, strerror(errno)); g_free (wav); return -1; } @@ -170,14 +167,13 @@ int wav_start_capture (CaptureState *s, const char *path, int freq, wav->freq = freq; if (fwrite (hdr, sizeof (hdr), 1, wav->f) != 1) { - monitor_printf (mon, "Failed to write header\nReason: %s\n", - strerror (errno)); + error_report("Failed to write header: %s", strerror(errno)); goto error_free; } cap = AUD_add_capture (&as, &ops, wav); if (!cap) { - monitor_printf (mon, "Failed to add audio capture\n"); + error_report("Failed to add audio capture"); goto error_free; } @@ -189,8 +185,7 @@ int wav_start_capture (CaptureState *s, const char *path, int freq, error_free: g_free (wav->path); if (fclose (wav->f)) { - monitor_printf (mon, "Failed to close wave file\nReason: %s\n", - strerror (errno)); + error_report("Failed to close wave file: %s", strerror(errno)); } g_free (wav); return -1;