From nobody Mon Feb 9 13:37:28 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 170.10.129.124 as permitted sender) client-ip=170.10.129.124; envelope-from=libvir-list-bounces@redhat.com; helo=us-smtp-delivery-124.mimecast.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 170.10.129.124 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1657885577; cv=none; d=zohomail.com; s=zohoarc; b=Br9aMFvzYdV8HlV9xZCeOm4P7gL7s8TzjC7oh4kwlMHCI/eJWam4ns5PpVTYH5FhlcaI69nv7EJicnR4Df03xvdFzDeymZD3zdVb/s5ZiZ5a46skrzksA8tgy1uCuIjUrRNJx7To0f2tTcXO5Pk+rZPe7oHI4BDgEXjaOGcfOwg= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1657885577; h=Content-Type:Content-Transfer-Encoding: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=y/twzcCvnj3DZO27Zdcy39wDt9Vi/F7zlTgbttq63RI=; b=jIIcrC0eLZBsMYP/5FMihU5aHknX1/kFCYvJhg7a0Gz3JJXUvVAheXjj2EV3MU6hE6SsKINQXp7jDsqTtierbk4WIUfFFsHftMFhgCUe47/hjSOgpb2Gb5VccYkZUOjDHkTUurWv4GlKts/GnC1U3oW8QVbpBd26Qj9xoZ77DmY= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 170.10.129.124 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) by mx.zohomail.com with SMTPS id 1657885577215333.65499488037926; Fri, 15 Jul 2022 04:46:17 -0700 (PDT) Received: from mimecast-mx02.redhat.com (mimecast-mx02.redhat.com [66.187.233.88]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-168-RgIgVSlCNxCqyRqfdUF20Q-1; Fri, 15 Jul 2022 07:44:46 -0400 Received: from smtp.corp.redhat.com (int-mx09.intmail.prod.int.rdu2.redhat.com [10.11.54.9]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 7C6B380600E; Fri, 15 Jul 2022 11:44:44 +0000 (UTC) Received: from mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (unknown [10.30.29.100]) by smtp.corp.redhat.com (Postfix) with ESMTP id 60DFA492CA5; Fri, 15 Jul 2022 11:44:44 +0000 (UTC) Received: from mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (localhost [IPv6:::1]) by mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (Postfix) with ESMTP id 2AE331947072; Fri, 15 Jul 2022 11:44:44 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx10.intmail.prod.int.rdu2.redhat.com [10.11.54.10]) by mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (Postfix) with ESMTP id F349619466DF for ; Fri, 15 Jul 2022 11:44:42 +0000 (UTC) Received: by smtp.corp.redhat.com (Postfix) id E84D040315B; Fri, 15 Jul 2022 11:44:42 +0000 (UTC) Received: from speedmetal.lan (unknown [10.40.208.32]) by smtp.corp.redhat.com (Postfix) with ESMTP id 6E48C492C3B for ; Fri, 15 Jul 2022 11:44:42 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1657885576; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:list-id:list-help: list-unsubscribe:list-subscribe:list-post; bh=y/twzcCvnj3DZO27Zdcy39wDt9Vi/F7zlTgbttq63RI=; b=OdsVFE9UC5M2hqHXFrf+BrVjXAPXJhARwFVpwZo2BKSBFjCZoOJXhJlamfKAVFBh9u7phZ XX3LaeEja+Hvf9PL0v/dJpgT5LnrKzVDF+ZC6RdP+NbhIMu3lXgBuEkol+/4MUWWsKasrZ SxJEYhkNT3DntbjKWpHyIJx571axUZA= X-MC-Unique: RgIgVSlCNxCqyRqfdUF20Q-1 X-Original-To: libvir-list@listman.corp.redhat.com From: Peter Krempa To: libvir-list@redhat.com Subject: [PATCH 16/20] qemu: command: Drop the code for configuring audio devices via environment variables Date: Fri, 15 Jul 2022 13:44:21 +0200 Message-Id: <5f92ba8c5e39aca869da59fe21ec69bb5ae0a370.1657884290.git.pkrempa@redhat.com> In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.85 on 10.11.54.10 X-BeenThere: libvir-list@redhat.com X-Mailman-Version: 2.1.29 Precedence: list List-Id: Development discussions about the libvirt library & tools List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: libvir-list-bounces@redhat.com Sender: "libvir-list" X-Scanned-By: MIMEDefang 2.85 on 10.11.54.9 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=libvir-list-bounces@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1657885579042100015 Content-Type: text/plain; charset="utf-8" Remove the old now unused code. Signed-off-by: Peter Krempa --- src/qemu/qemu_command.c | 183 ---------------------------------------- 1 file changed, 183 deletions(-) diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c index 4d9a0eb2e1..57e8115db3 100644 --- a/src/qemu/qemu_command.c +++ b/src/qemu/qemu_command.c @@ -8030,189 +8030,6 @@ qemuBuildAudioCommandLineArgs(virCommand *cmd, return 0; } -static void -qemuBuildAudioCommonEnv(virCommand *cmd, - const char *prefix, - virDomainAudioIOCommon *def) -{ - if (def->fixedSettings) - virCommandAddEnvFormat(cmd, "%sFIXED_SETTINGS=3D%s", - prefix, - virTristateSwitchTypeToString(def->fixedSet= tings)); - - if (def->voices) - virCommandAddEnvFormat(cmd, "%sVOICES=3D%u", - prefix, def->voices); - - if (def->fixedSettings) { - if (def->frequency) - virCommandAddEnvFormat(cmd, "%sFIXED_FREQ=3D%u", - prefix, def->frequency); - if (def->channels) - virCommandAddEnvFormat(cmd, "%sFIXED_CHANNELS=3D%u", - prefix, def->channels); - if (def->format) - virCommandAddEnvFormat(cmd, "%sFIXED_FMT=3D%s", - prefix, - virDomainAudioFormatTypeToString(def->f= ormat)); - } -} - -static void -qemuBuildAudioALSAEnv(virCommand *cmd, - const char *prefix, - virDomainAudioIOALSA *def) -{ - if (def->dev) - virCommandAddEnvFormat(cmd, "%sDEV=3D%s", - prefix, def->dev); -} - -static void -qemuBuildAudioCoreAudioEnv(virCommand *cmd, - virDomainAudioDef *def) -{ - if (def->backend.coreaudio.output.bufferCount) - virCommandAddEnvFormat(cmd, "QEMU_COREAUDIO_BUFFER_COUNT=3D%u", - def->backend.coreaudio.output.bufferCount); - if (def->output.bufferLength) - virCommandAddEnvFormat(cmd, "QEMU_COREAUDIO_BUFFER_SIZE=3D%u", - def->output.bufferLength); -} - -static void -qemuBuildAudioOSSEnv(virCommand *cmd, - const char *prefix, - const char *prefix2, - virDomainAudioIOOSS *def) -{ - if (def->dev) - virCommandAddEnvFormat(cmd, "%sDEV=3D%s", - prefix, def->dev); - if (def->tryPoll) - virCommandAddEnvFormat(cmd, "%sTRY_POLL=3D%s", prefix2, - virTristateSwitchTypeToString(def->tryPoll)= ); -} - -static void -qemuBuildAudioPulseAudioEnv(virCommand *cmd, - virDomainAudioDef *def) -{ - if (def->backend.pulseaudio.input.name) - virCommandAddEnvPair(cmd, "QEMU_PA_SOURCE", - def->backend.pulseaudio.input.name); - if (def->backend.pulseaudio.output.name) - virCommandAddEnvPair(cmd, "QEMU_PA_SINK", - def->backend.pulseaudio.output.name); - - if (def->input.bufferLength) - virCommandAddEnvFormat(cmd, "QEMU_PA_SAMPLES=3D%u", - def->input.bufferLength); - - if (def->backend.pulseaudio.serverName) - virCommandAddEnvPair(cmd, "QEMU_PA_SERVER=3D%s", - def->backend.pulseaudio.serverName); -} - - -static int G_GNUC_UNUSED -qemuBuildAudioCommandLineEnv(virCommand *cmd, - virDomainDef *def) -{ - virDomainAudioDef *audio; - if (def->naudios !=3D 1) - return 0; - - audio =3D def->audios[0]; - virCommandAddEnvPair(cmd, "QEMU_AUDIO_DRV", - qemuAudioDriverTypeToString(audio->type)); - - if (audio->timerPeriod) - virCommandAddEnvFormat(cmd, "QEMU_AUDIO_TIMER_PERIOD=3D%u", - audio->timerPeriod); - - qemuBuildAudioCommonEnv(cmd, "QEMU_AUDIO_ADC_", &audio->input); - qemuBuildAudioCommonEnv(cmd, "QEMU_AUDIO_DAC_", &audio->output); - - switch (audio->type) { - case VIR_DOMAIN_AUDIO_TYPE_NONE: - break; - - case VIR_DOMAIN_AUDIO_TYPE_ALSA: - qemuBuildAudioALSAEnv(cmd, "QEMU_AUDIO_ADC_", &audio->backend.alsa= .input); - qemuBuildAudioALSAEnv(cmd, "QEMU_AUDIO_DAC_", &audio->backend.alsa= .output); - break; - - case VIR_DOMAIN_AUDIO_TYPE_COREAUDIO: - qemuBuildAudioCoreAudioEnv(cmd, audio); - break; - - case VIR_DOMAIN_AUDIO_TYPE_JACK: - break; - - case VIR_DOMAIN_AUDIO_TYPE_OSS: - qemuBuildAudioOSSEnv(cmd, "QEMU_OSS_ADC_", "QEMU_AUDIO_ADC_", - &audio->backend.oss.input); - qemuBuildAudioOSSEnv(cmd, "QEMU_OSS_DAC_", "QEMU_AUDIO_DAC_", - &audio->backend.oss.output); - - if (audio->backend.oss.input.bufferCount) - virCommandAddEnvFormat(cmd, "QEMU_OSS_NFRAGS=3D%u", - audio->backend.oss.input.bufferCount); - - if (audio->backend.oss.tryMMap) - virCommandAddEnvFormat(cmd, "QEMU_OSS_MMAP=3D%s", - virTristateSwitchTypeToString(audio->ba= ckend.oss.tryMMap)); - if (audio->backend.oss.exclusive) - virCommandAddEnvFormat(cmd, "QEMU_OSS_EXCLUSIVE=3D%s", - virTristateSwitchTypeToString(audio->ba= ckend.oss.exclusive)); - if (audio->backend.oss.dspPolicySet) - virCommandAddEnvFormat(cmd, "QEMU_OSS_POLICY=3D%d", - audio->backend.oss.dspPolicy); - break; - - case VIR_DOMAIN_AUDIO_TYPE_PULSEAUDIO: - qemuBuildAudioPulseAudioEnv(cmd, audio); - break; - - case VIR_DOMAIN_AUDIO_TYPE_SDL: - if (audio->output.bufferLength) - virCommandAddEnvFormat(cmd, "QEMU_SDL_SAMPLES=3D%u", - audio->output.bufferLength); - - if (audio->backend.sdl.driver) { - /* - * Some SDL audio driver names are different on SDL 1.2 - * vs 2.0. Given how old SDL 1.2 is, we're not going - * make any attempt to support it here as it is unlikely - * to have an real world users. We can assume libvirt - * driver name strings match SDL 2.0 names. - */ - virCommandAddEnvPair(cmd, "SDL_AUDIODRIVER", - virDomainAudioSDLDriverTypeToString( - audio->backend.sdl.driver)); - } - break; - - case VIR_DOMAIN_AUDIO_TYPE_SPICE: - break; - - case VIR_DOMAIN_AUDIO_TYPE_FILE: - if (audio->backend.file.path) - virCommandAddEnvFormat(cmd, "QEMU_WAV_PATH=3D%s", - audio->backend.file.path); - break; - - case VIR_DOMAIN_AUDIO_TYPE_DBUS: - break; - - case VIR_DOMAIN_AUDIO_TYPE_LAST: - default: - virReportEnumRangeError(virDomainAudioType, audio->type); - return -1; - } - return 0; -} static int qemuBuildAudioCommandLine(virCommand *cmd, --=20 2.36.1