From nobody Wed May 15 20:20:19 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org ARC-Seal: i=1; a=rsa-sha256; t=1621281294; cv=none; d=zohomail.com; s=zohoarc; b=AUeVZBROXS1iZ8qyrkkAHvwPDQZQ/BFKkCpQZKLQT/oikIdfNMkz8RqPIhGdv3zN7BWrkb9ahb2pVWeSDN9LRzjHiKADEusg+wXt0AHZmwqZHpA/ucHF5cwi9jKvMhvRYTwSVX2I42doWKgFYJ5dBuuOWfEgXcbX8GCLzZA5bZA= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1621281294; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=gFTr412t6i7g+lJzWG/hnSboeO/MBJ70oO1XqZquEb8=; b=ZvkrtiL39H/8d55vvbFNvHR5+h4tq/R3YAAYvd8Embrx+ijMhG6+ZnuWg44LI6joIRaIQm8uofU3STEi1frjL3E41rSG/sIdkqtQisuBzehm8x7TJb+fbpBdayiipp4tqKfEFt31K+9QlZfQYtlVJm8Rcc5rl/Yk8qn+fJfD56g= ARC-Authentication-Results: i=1; mx.zohomail.com; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 16212812942131013.579500818365; Mon, 17 May 2021 12:54:54 -0700 (PDT) Received: from localhost ([::1]:48560 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lijKH-0001WY-9e for importer@patchew.org; Mon, 17 May 2021 15:54:53 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:58796) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lijBr-0005Uv-1Z for qemu-devel@nongnu.org; Mon, 17 May 2021 15:46:11 -0400 Received: from mailout02.t-online.de ([194.25.134.17]:47152) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lijBp-0000LO-As for qemu-devel@nongnu.org; Mon, 17 May 2021 15:46:10 -0400 Received: from fwd09.aul.t-online.de (fwd09.aul.t-online.de [172.20.27.151]) by mailout02.t-online.de (Postfix) with SMTP id F20BBF164; Mon, 17 May 2021 21:46:04 +0200 (CEST) Received: from linpower.localnet (bpmarGZXohy3MCWnQZRS-xfvn6rsNBbFXGDDjCkg8w7aMmqaqfJNI1CCK1l-3sRQjX@[79.208.18.63]) by fwd09.t-online.de with (TLSv1.2:ECDHE-RSA-AES256-GCM-SHA384 encrypted) esmtp id 1lijBk-1mA0lE0; Mon, 17 May 2021 21:46:04 +0200 Received: by linpower.localnet (Postfix, from userid 1000) id 5A57E2000A0; Mon, 17 May 2021 21:46:04 +0200 (CEST) From: =?UTF-8?q?Volker=20R=C3=BCmelin?= To: Gerd Hoffmann Subject: [PATCH 1/4] alsaaudio: remove #ifdef DEBUG to avoid bit rot Date: Mon, 17 May 2021 21:46:01 +0200 Message-Id: <20210517194604.2545-1-vr_qemu@t-online.de> X-Mailer: git-send-email 2.26.2 In-Reply-To: References: MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-ID: bpmarGZXohy3MCWnQZRS-xfvn6rsNBbFXGDDjCkg8w7aMmqaqfJNI1CCK1l-3sRQjX X-TOI-EXPURGATEID: 150726::1621280764-00002D5B-B3131B7A/0/0 CLEAN NORMAL X-TOI-MSGID: 36fe0ee8-93e8-4fcd-ae6c-7e298ed45b94 Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: none client-ip=194.25.134.17; envelope-from=volker.ruemelin@t-online.de; helo=mailout02.t-online.de X-Spam_score_int: -18 X-Spam_score: -1.9 X-Spam_bar: - X-Spam_report: (-1.9 / 5.0 requ) BAYES_00=-1.9, FREEMAIL_FROM=0.001, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H3=0.001, RCVD_IN_MSPIKE_WL=0.001, SPF_HELO_NONE=0.001, SPF_NONE=0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: qemu-devel@nongnu.org Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" Merge the #ifdef DEBUG code with the if statement a few lines above to avoid bit rot. Suggested-by: Gerd Hoffmann Signed-off-by: Volker R=C3=BCmelin --- audio/alsaaudio.c | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/audio/alsaaudio.c b/audio/alsaaudio.c index fcc2f62864..2b9789e647 100644 --- a/audio/alsaaudio.c +++ b/audio/alsaaudio.c @@ -34,6 +34,8 @@ #define AUDIO_CAP "alsa" #include "audio_int.h" =20 +#define DEBUG_ALSA 0 + struct pollhlp { snd_pcm_t *handle; struct pollfd *pfds; @@ -587,16 +589,12 @@ static int alsa_open(bool in, struct alsa_params_req = *req, =20 *handlep =3D handle; =20 - if (obtfmt !=3D req->fmt || - obt->nchannels !=3D req->nchannels || - obt->freq !=3D req->freq) { + if (DEBUG_ALSA || obtfmt !=3D req->fmt || + obt->nchannels !=3D req->nchannels || obt->freq !=3D req->freq) { dolog ("Audio parameters for %s\n", typ); alsa_dump_info(req, obt, obtfmt, apdo); } =20 -#ifdef DEBUG - alsa_dump_info(req, obt, obtfmt, apdo); -#endif return 0; =20 err: --=20 2.26.2 From nobody Wed May 15 20:20:19 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org ARC-Seal: i=1; a=rsa-sha256; t=1621281366; cv=none; d=zohomail.com; s=zohoarc; b=Gz5vkpzW9aV/KK2WZhKysm76k1axk9Sgk7vXK+tSCiDMS86/JqcJUIHqbd8pcw0qjipuMmNFij4qmeB85KTefiorjh//3+XjC6CkAhIEpGJ4GA5aNrnIkxQw26IV9IchDw9bD09XzoQIfTSvcI/MVrNDyu0a1uzvhnExbokN7Gk= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1621281366; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=c4i6GZLjBDX/7bRPWUO0OEsO8e/W3iyTr5Cig07cSeA=; b=SExfl2vplLtE74MvNzxK4euhqyH90HCevhP4dal2Fr+Az4IDvo4e8y1iXq+sjTtvd71WCVc6jof8gVjGKmSLwBynSSHpOIhPGWmysN7mkL2abJ93fGmjHDPRww+zQUaYnahT1jgdTO+hxJeBrrh2uQEEfOXA7zyWUbUFz0vycqM= ARC-Authentication-Results: i=1; mx.zohomail.com; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1621281366956272.64630852215555; Mon, 17 May 2021 12:56:06 -0700 (PDT) Received: from localhost ([::1]:50878 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lijLR-0003Ba-Vr for importer@patchew.org; Mon, 17 May 2021 15:56:06 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:58804) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lijBr-0005WT-Uq for qemu-devel@nongnu.org; Mon, 17 May 2021 15:46:11 -0400 Received: from mailout01.t-online.de ([194.25.134.80]:33098) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lijBq-0000ND-94 for qemu-devel@nongnu.org; Mon, 17 May 2021 15:46:11 -0400 Received: from fwd08.aul.t-online.de (fwd08.aul.t-online.de [172.20.26.151]) by mailout01.t-online.de (Postfix) with SMTP id 9945129D8F; Mon, 17 May 2021 21:46:07 +0200 (CEST) Received: from linpower.localnet (bHj86QZOYh0WhC4qUwlnwFlOORTfOEsAmAHd0b5EHVHeqzdEjAnhlcHpiCfvj-6Zr9@[79.208.18.63]) by fwd08.t-online.de with (TLSv1.2:ECDHE-RSA-AES256-GCM-SHA384 encrypted) esmtp id 1lijBn-0qPBtA0; Mon, 17 May 2021 21:46:07 +0200 Received: by linpower.localnet (Postfix, from userid 1000) id 5C2F92000C5; Mon, 17 May 2021 21:46:04 +0200 (CEST) From: =?UTF-8?q?Volker=20R=C3=BCmelin?= To: Gerd Hoffmann Subject: [PATCH 2/4] paaudio: remove unused stream flags Date: Mon, 17 May 2021 21:46:02 +0200 Message-Id: <20210517194604.2545-2-vr_qemu@t-online.de> X-Mailer: git-send-email 2.26.2 In-Reply-To: References: MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-ID: bHj86QZOYh0WhC4qUwlnwFlOORTfOEsAmAHd0b5EHVHeqzdEjAnhlcHpiCfvj-6Zr9 X-TOI-EXPURGATEID: 150726::1621280767-0000AFFF-2A0807A4/0/0 CLEAN NORMAL X-TOI-MSGID: dee59d10-18ac-42b0-ac7a-774c925ec266 Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: none client-ip=194.25.134.80; envelope-from=volker.ruemelin@t-online.de; helo=mailout01.t-online.de X-Spam_score_int: -18 X-Spam_score: -1.9 X-Spam_bar: - X-Spam_report: (-1.9 / 5.0 requ) BAYES_00=-1.9, FREEMAIL_FROM=0.001, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H2=-0.001, SPF_HELO_NONE=0.001, SPF_NONE=0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: qemu-devel@nongnu.org Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" In current code there are no calls to pa_stream_get_latency() or pa_stream_get_time() to receive latency or time information. Remove the flags PA_STREAM_INTERPOLATE_TIMING and PA_STREAM_AUTO_TIMING_UPDATE which instruct PulseAudio to calculate this information in regular intervals. Signed-off-by: Volker R=C3=BCmelin --- audio/paaudio.c | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/audio/paaudio.c b/audio/paaudio.c index c97b22e970..14b4269c55 100644 --- a/audio/paaudio.c +++ b/audio/paaudio.c @@ -463,10 +463,7 @@ static pa_stream *qpa_simple_new ( =20 pa_stream_set_state_callback(stream, stream_state_cb, c); =20 - flags =3D - PA_STREAM_INTERPOLATE_TIMING - | PA_STREAM_AUTO_TIMING_UPDATE - | PA_STREAM_EARLY_REQUESTS; + flags =3D PA_STREAM_EARLY_REQUESTS; =20 if (dev) { /* don't move the stream if the user specified a sink/source */ --=20 2.26.2 From nobody Wed May 15 20:20:19 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org ARC-Seal: i=1; a=rsa-sha256; t=1621280827; cv=none; d=zohomail.com; s=zohoarc; b=KNaFIhqGGHa9he4bXtFPRdfV9qO2U7r8z8uZ4cCnOXh1yptfesRkLKf74uuXH+QLoxFj3qBkrIMvYEL5qAFrBLzTGIa13ES9O5ESytgKCSzTtuLa2yli/3lcVLrctle+amJUuZ/+9QcWXaah1bUKYIpqZUhGOqtA28W71V3x9n8= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1621280827; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=uEugO1dPJfP8H2lGPv7nyGRGgr3VIWsD1A1+fsi5oUU=; b=TJUgrOd7Ep4aCXjeH1qeAnjxox5/pwIo3UmFD9KyuQndDKb611XYyt2rD4qFyFjy7BsrFiw8LFvWW7ANLstAUzW3JW2yaWXlPyOY2Em8KUYS1livbrEh4mvYpx+5t2IfVXBqAoiFg1xW16DpknbMmFrSGLsU2VF/Nmx4n6yvWS8= ARC-Authentication-Results: i=1; mx.zohomail.com; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1621280827700145.71826212653605; Mon, 17 May 2021 12:47:07 -0700 (PDT) Received: from localhost ([::1]:60640 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lijCk-00071p-HH for importer@patchew.org; Mon, 17 May 2021 15:47:06 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:58820) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lijBw-0005dk-IN for qemu-devel@nongnu.org; Mon, 17 May 2021 15:46:16 -0400 Received: from mailout01.t-online.de ([194.25.134.80]:33158) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lijBu-0000R9-Vu for qemu-devel@nongnu.org; Mon, 17 May 2021 15:46:16 -0400 Received: from fwd00.aul.t-online.de (fwd00.aul.t-online.de [172.20.26.147]) by mailout01.t-online.de (Postfix) with SMTP id 787D929D8E; Mon, 17 May 2021 21:46:13 +0200 (CEST) Received: from linpower.localnet (G-BMLoZFwh47Nue+7DAiTkKlxL94tTukj70Jt8LbkoYwKE7ivX-pkOIRVsoSwnYwoQ@[79.208.18.63]) by fwd00.t-online.de with (TLSv1.2:ECDHE-RSA-AES256-GCM-SHA384 encrypted) esmtp id 1lijBq-3mPuwy0; Mon, 17 May 2021 21:46:10 +0200 Received: by linpower.localnet (Postfix, from userid 1000) id 5D563200620; Mon, 17 May 2021 21:46:04 +0200 (CEST) From: =?UTF-8?q?Volker=20R=C3=BCmelin?= To: Gerd Hoffmann Subject: [PATCH 3/4] audio: move code to audio/audio.c Date: Mon, 17 May 2021 21:46:03 +0200 Message-Id: <20210517194604.2545-3-vr_qemu@t-online.de> X-Mailer: git-send-email 2.26.2 In-Reply-To: References: MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-ID: G-BMLoZFwh47Nue+7DAiTkKlxL94tTukj70Jt8LbkoYwKE7ivX-pkOIRVsoSwnYwoQ X-TOI-EXPURGATEID: 150726::1621280770-00010D54-ABA2A352/0/0 CLEAN NORMAL X-TOI-MSGID: a4dc22bb-2caa-4fbb-874b-4d432636a08a Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: none client-ip=194.25.134.80; envelope-from=volker.ruemelin@t-online.de; helo=mailout01.t-online.de X-Spam_score_int: -18 X-Spam_score: -1.9 X-Spam_bar: - X-Spam_report: (-1.9 / 5.0 requ) BAYES_00=-1.9, FREEMAIL_FROM=0.001, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H2=-0.001, SPF_HELO_NONE=0.001, SPF_NONE=0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: qemu-devel@nongnu.org Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" Move the code to generate the pa_context_new() application name argument to a function in audio/audio.c. The new function audio_application_name() will also be used in the jackaudio backend. Signed-off-by: Volker R=C3=BCmelin --- audio/audio.c | 9 +++++++++ audio/audio_int.h | 2 ++ audio/paaudio.c | 5 +---- 3 files changed, 12 insertions(+), 4 deletions(-) diff --git a/audio/audio.c b/audio/audio.c index 534278edfe..052ca6cb78 100644 --- a/audio/audio.c +++ b/audio/audio.c @@ -32,6 +32,7 @@ #include "qapi/qapi-visit-audio.h" #include "qemu/cutils.h" #include "qemu/module.h" +#include "qemu-common.h" #include "sysemu/replay.h" #include "sysemu/runstate.h" #include "ui/qemu-spice.h" @@ -2172,6 +2173,14 @@ const char *audio_get_id(QEMUSoundCard *card) } } =20 +const char *audio_application_name(void) +{ + const char *vm_name; + + vm_name =3D qemu_get_vm_name(); + return vm_name ? vm_name : "qemu"; +} + void audio_rate_start(RateCtl *rate) { memset(rate, 0, sizeof(RateCtl)); diff --git a/audio/audio_int.h b/audio/audio_int.h index 06f0913835..6d685e24a3 100644 --- a/audio/audio_int.h +++ b/audio/audio_int.h @@ -243,6 +243,8 @@ void *audio_calloc (const char *funcname, int nmemb, si= ze_t size); =20 void audio_run(AudioState *s, const char *msg); =20 +const char *audio_application_name(void); + typedef struct RateCtl { int64_t start_ticks; int64_t bytes_sent; diff --git a/audio/paaudio.c b/audio/paaudio.c index 14b4269c55..75401d5391 100644 --- a/audio/paaudio.c +++ b/audio/paaudio.c @@ -2,7 +2,6 @@ =20 #include "qemu/osdep.h" #include "qemu/module.h" -#include "qemu-common.h" #include "audio.h" #include "qapi/opts-visitor.h" =20 @@ -753,7 +752,6 @@ static int qpa_validate_per_direction_opts(Audiodev *de= v, /* common */ static void *qpa_conn_init(const char *server) { - const char *vm_name; PAConnection *c =3D g_malloc0(sizeof(PAConnection)); QTAILQ_INSERT_TAIL(&pa_conns, c, list); =20 @@ -762,9 +760,8 @@ static void *qpa_conn_init(const char *server) goto fail; } =20 - vm_name =3D qemu_get_vm_name(); c->context =3D pa_context_new(pa_threaded_mainloop_get_api(c->mainloop= ), - vm_name ? vm_name : "qemu"); + audio_application_name()); if (!c->context) { goto fail; } --=20 2.26.2 From nobody Wed May 15 20:20:19 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org ARC-Seal: i=1; a=rsa-sha256; t=1621280966; cv=none; d=zohomail.com; s=zohoarc; b=Sz3mrDMkhVddFw8kE/74nc7hxqCU3f8qBDdXhUjpyr8mPGN5vUoLiHG8Gw2qxIJbMy0QZjOSaLhZOoyhOZpUZ7+FPOTHaVGkKKXNCVNEzi1F47J1nfZ3mULliSO7JQTNEdNCd2Lc3VhFDjNPm0VpbGVkiRNJhWlfGpdUO16cvVk= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1621280966; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=hsaiDxbqpwYWGsX+2+E/1txUmGlGieMY5ZjD//JBUS8=; b=GaGk8TaQVaZxITOapvI2WBTnIHrmEcfGeqAlK0SWjGNwAkRj3vR61USQVtwThZg5lw4xtd3tj0NJON+pD5lZq8MzYVQymp7dFG2q6UwZqOqfiRHdT9D6KoyaXhWQ0xSSOLnTtGfAPOS7CZ/ZZg0vnahagRWwQveNGRqRpwSu734= ARC-Authentication-Results: i=1; mx.zohomail.com; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1621280966631286.8730861455698; Mon, 17 May 2021 12:49:26 -0700 (PDT) Received: from localhost ([::1]:37534 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lijEz-0002EL-Iz for importer@patchew.org; Mon, 17 May 2021 15:49:25 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:59358) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lijDZ-0000kh-VL for qemu-devel@nongnu.org; Mon, 17 May 2021 15:47:57 -0400 Received: from mailout08.t-online.de ([194.25.134.20]:48610) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lijDY-0001W0-A1 for qemu-devel@nongnu.org; Mon, 17 May 2021 15:47:57 -0400 Received: from fwd07.aul.t-online.de (fwd07.aul.t-online.de [172.20.27.150]) by mailout08.t-online.de (Postfix) with SMTP id 104F924256; Mon, 17 May 2021 21:46:13 +0200 (CEST) Received: from linpower.localnet (V+dS4GZCrhCyGj3kZKOEFqwg2BtgW3IPe5z3NTs9uYCmlsbdFqslvMs6-VLxXvvZcd@[79.208.18.63]) by fwd07.t-online.de with (TLSv1.2:ECDHE-RSA-AES256-GCM-SHA384 encrypted) esmtp id 1lijBs-1JKtua0; Mon, 17 May 2021 21:46:12 +0200 Received: by linpower.localnet (Postfix, from userid 1000) id 5F868200624; Mon, 17 May 2021 21:46:04 +0200 (CEST) From: =?UTF-8?q?Volker=20R=C3=BCmelin?= To: Gerd Hoffmann Subject: [PATCH 4/4] jackaudio: avoid that the client name contains the word (NULL) Date: Mon, 17 May 2021 21:46:04 +0200 Message-Id: <20210517194604.2545-4-vr_qemu@t-online.de> X-Mailer: git-send-email 2.26.2 In-Reply-To: References: MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-ID: V+dS4GZCrhCyGj3kZKOEFqwg2BtgW3IPe5z3NTs9uYCmlsbdFqslvMs6-VLxXvvZcd X-TOI-EXPURGATEID: 150726::1621280772-00011901-9D786454/0/0 CLEAN NORMAL X-TOI-MSGID: 45367512-1a9c-469f-97ae-238f1e15d73f Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: none client-ip=194.25.134.20; envelope-from=volker.ruemelin@t-online.de; helo=mailout08.t-online.de X-Spam_score_int: -18 X-Spam_score: -1.9 X-Spam_bar: - X-Spam_report: (-1.9 / 5.0 requ) BAYES_00=-1.9, FREEMAIL_FROM=0.001, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H3=0.001, RCVD_IN_MSPIKE_WL=0.001, SPF_HELO_NONE=0.001, SPF_NONE=0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: qemu-devel@nongnu.org Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" Currently with jackaudio client name and qemu guest name unset, the JACK client names are out-(NULL) and in-(NULL). These names are user visible in the patch bay. Replace the function call to qemu_get_vm_name() with a call to audio_application_name() which replaces NULL with "qemu" to have more descriptive names. Signed-off-by: Volker R=C3=BCmelin --- audio/jackaudio.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/audio/jackaudio.c b/audio/jackaudio.c index 3031c4e29b..e7de6d5433 100644 --- a/audio/jackaudio.c +++ b/audio/jackaudio.c @@ -26,7 +26,6 @@ #include "qemu/module.h" #include "qemu/atomic.h" #include "qemu/main-loop.h" -#include "qemu-common.h" #include "audio.h" =20 #define AUDIO_CAP "jack" @@ -412,7 +411,7 @@ static int qjack_client_init(QJackClient *c) =20 snprintf(client_name, sizeof(client_name), "%s-%s", c->out ? "out" : "in", - c->opt->client_name ? c->opt->client_name : qemu_get_vm_name()); + c->opt->client_name ? c->opt->client_name : audio_application_name= ()); =20 if (c->opt->exact_name) { options |=3D JackUseExactName; --=20 2.26.2