From nobody Sun Apr 12 06:06:44 2026 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; 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; dmarc=pass(p=none dis=none) header.from=yandex-team.com ARC-Seal: i=1; a=rsa-sha256; t=1771306120; cv=none; d=zohomail.com; s=zohoarc; b=XoGm04E5wgb2RR7qyVGNZSBQQgnC4ONiFpfhUNyrI0iVJ/XIcNc1mW2VqbdI1GEc+iNHgb8EPyYBC3lacORImzCL48ZZyJgxFAhjH7fUAj7DLudLVS0Y8iijWJqTy3zD2BU83zf2cjYN0pbB07hbeF7RWD1GDQYQN/DyJp8I6I4= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1771306120; h=Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=af12Emi/cCgStn/UwxBq6KWZOfBbIxl3KK7Jm000Jrw=; b=hdUBiDbLdIQhD9PPT7qfG84gRnUvQDJJLo3YCzo2fkBDWoE1jA4qRq9fnSqEZYRrKkmUBUGxCgazXdb23Ts408DRSA2fhdVXRsmv2RZkQHWtiBfmnvtWKOU4gQxMuhYVcWOwbLDxCUicsH9BhYAire1yWE/exjkIcynuMK+kHP4= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; 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; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1771306120046461.31516786482916; Mon, 16 Feb 2026 21:28:40 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1vsDcq-0002c5-KX; Tue, 17 Feb 2026 00:27:56 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1vsDcm-0002ab-OS for qemu-devel@nongnu.org; Tue, 17 Feb 2026 00:27:52 -0500 Received: from forwardcorp1b.mail.yandex.net ([2a02:6b8:c02:900:1:45:d181:df01]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1vsDcj-0006cS-Mc for qemu-devel@nongnu.org; Tue, 17 Feb 2026 00:27:52 -0500 Received: from mail-nwsmtp-smtp-corp-canary-81.sas.yp-c.yandex.net (mail-nwsmtp-smtp-corp-canary-81.sas.yp-c.yandex.net [IPv6:2a02:6b8:c37:8aa5:0:640:e6ae:0]) by forwardcorp1b.mail.yandex.net (Yandex) with ESMTPS id A73C488503; Tue, 17 Feb 2026 08:27:46 +0300 (MSK) Received: from heifetz-lin.yandex-team.ru (unknown [2a02:6bf:8080:b54::1:2f]) by mail-nwsmtp-smtp-corp-canary-81.sas.yp-c.yandex.net (smtpcorp/Yandex) with ESMTPSA id eRRjrX2Ak0U0-no4eOMdv; Tue, 17 Feb 2026 08:27:46 +0300 X-Yandex-Fwd: 1 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=yandex-team.com; s=default; t=1771306066; bh=af12Emi/cCgStn/UwxBq6KWZOfBbIxl3KK7Jm000Jrw=; h=Message-Id:Date:In-Reply-To:Cc:Subject:References:To:From; b=SURyeHnvSEZV/Cw7htk6hFT91JgzgDqGty7JuzLp0yo23bgQKQ/GC6TSqxHBQa7sW 8NErywTjVtw+lamF6sbcnVHOCy1Vv8n9GTxMBHV/4nglxA7OchVUa10oepWVyOicHC aXyL7zoWJJn3lV4PJBMIWW+EnK+tMf02IJNihl7k= Authentication-Results: mail-nwsmtp-smtp-corp-canary-81.sas.yp-c.yandex.net; dkim=pass header.i=@yandex-team.com From: Sergei Heifetz To: qemu-devel@nongnu.org Cc: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , =?UTF-8?q?Alex=20Benn=C3=A9e?= , Eric Blake , =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= , =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= , Markus Armbruster , Fabiano Rosas , Paolo Bonzini , Thomas Huth , Gerd Hoffmann , Laurent Vivier Subject: [PATCH 4/8] hw/audio/pcspk: change PCSPK behaviour with --disable-audio Date: Tue, 17 Feb 2026 10:27:36 +0500 Message-Id: <20260217052740.114117-5-heifetz@yandex-team.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20260217052740.114117-1-heifetz@yandex-team.com> References: <20260217052740.114117-1-heifetz@yandex-team.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable 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: pass client-ip=2a02:6b8:c02:900:1:45:d181:df01; envelope-from=heifetz@yandex-team.com; helo=forwardcorp1b.mail.yandex.net X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: qemu development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @yandex-team.com) X-ZM-MESSAGEID: 1771306123894154100 Content-Type: text/plain; charset="utf-8" PCSPK (PC Speaker) is an embedded audio device. We don't want it to use aud= io when QEMU is configured with `--disable-audio`. This is achieved with minim= al, non-invasive changes to the code. In essence, the changes ensure that PCSPK does not use the corresponding audio backend, while functioning the same way in non-audio aspects. Signed-off-by: Sergei Heifetz --- hw/audio/pcspk.c | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/hw/audio/pcspk.c b/hw/audio/pcspk.c index 916c56fa4c..03fe816024 100644 --- a/hw/audio/pcspk.c +++ b/hw/audio/pcspk.c @@ -36,10 +36,12 @@ #include "qom/object.h" #include "trace.h" =20 +#ifdef CONFIG_AUDIO #define PCSPK_BUF_LEN 1792 #define PCSPK_SAMPLE_RATE 32000 #define PCSPK_MAX_FREQ (PCSPK_SAMPLE_RATE >> 1) #define PCSPK_MIN_COUNT DIV_ROUND_UP(PIT_FREQ, PCSPK_MAX_FREQ) +#endif =20 OBJECT_DECLARE_SIMPLE_TYPE(PCSpkState, PC_SPEAKER) =20 @@ -48,18 +50,25 @@ struct PCSpkState { =20 MemoryRegion ioport; uint32_t iobase; +#ifdef CONFIG_AUDIO uint8_t sample_buf[PCSPK_BUF_LEN]; +#endif AudioBackend *audio_be; +#ifdef CONFIG_AUDIO SWVoiceOut *voice; +#endif PITCommonState *pit; +#ifdef CONFIG_AUDIO unsigned int pit_count; unsigned int samples; unsigned int play_pos; +#endif uint8_t data_on; uint8_t dummy_refresh_clock; bool migrate; }; =20 +#ifdef CONFIG_AUDIO static const char *s_spk =3D "pcspk"; =20 static inline void generate_samples(PCSpkState *s) @@ -131,6 +140,7 @@ static int pcspk_audio_init(PCSpkState *s) =20 return 0; } +#endif =20 static uint64_t pcspk_io_read(void *opaque, hwaddr addr, unsigned size) @@ -161,11 +171,13 @@ static void pcspk_io_write(void *opaque, hwaddr addr,= uint64_t val, =20 s->data_on =3D (val >> 1) & 1; pit_set_gate(s->pit, 2, gate); +#ifdef CONFIG_AUDIO if (s->voice) { if (gate) /* restart */ s->play_pos =3D 0; AUD_set_active_out(s->voice, gate & s->data_on); } +#endif } =20 static const MemoryRegionOps pcspk_io_ops =3D { @@ -196,10 +208,12 @@ static void pcspk_realizefn(DeviceState *dev, Error *= *errp) =20 isa_register_ioport(isadev, &s->ioport, s->iobase); =20 +#ifdef CONFIG_AUDIO if (s->audio_be && AUD_backend_check(&s->audio_be, errp)) { pcspk_audio_init(s); return; } +#endif } =20 static bool migrate_needed(void *opaque) --=20 2.34.1