From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-13.6 required=3.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id C8242C433E9 for ; Tue, 2 Mar 2021 17:57:26 +0000 (UTC) Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 3DA7164F1C for ; Tue, 2 Mar 2021 17:57:26 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 3DA7164F1C Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=redhat.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Received: from localhost ([::1]:51574 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lH9Gv-0001KC-6n for qemu-devel@archiver.kernel.org; Tue, 02 Mar 2021 12:57:25 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:58330) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lH9FE-00082z-E0 for qemu-devel@nongnu.org; Tue, 02 Mar 2021 12:55:40 -0500 Received: from us-smtp-delivery-124.mimecast.com ([170.10.133.124]:51868) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from ) id 1lH9FA-0007IN-Kk for qemu-devel@nongnu.org; Tue, 02 Mar 2021 12:55:40 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1614707735; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=+w1TdHsL+zCM/F/WczjhsSCYLbBjWjKeCO0aIS2FI2I=; b=PSo8dat8Ob+UyCBQGR0ClTe8MliIS7QeBmjmE06l2s3a1n5jb/Q7ePISixHD+J6hLh7EW/ wRa7z6yMwSfmOsnI8ObHEI4zgRc++8Ci6MkdjcgVA7KG7kr70AZ4afpdZwiM18hD77Um13 XSbpKd23RNT0iFOXCO0NTRVG8/24wGA= Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-48-H6RgHmGgNaewRf5pSdav0g-1; Tue, 02 Mar 2021 12:55:33 -0500 X-MC-Unique: H6RgHmGgNaewRf5pSdav0g-1 Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.phx2.redhat.com [10.5.11.15]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id E8D1E80402C; Tue, 2 Mar 2021 17:55:32 +0000 (UTC) Received: from localhost.localdomain.com (ovpn-113-132.ams2.redhat.com [10.36.113.132]) by smtp.corp.redhat.com (Postfix) with ESMTP id 2A37C62665; Tue, 2 Mar 2021 17:55:30 +0000 (UTC) From: =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= To: qemu-devel@nongnu.org Subject: [PATCH 1/3] qapi, audio: add query-audiodev command Date: Tue, 2 Mar 2021 17:55:22 +0000 Message-Id: <20210302175524.1290840-2-berrange@redhat.com> In-Reply-To: <20210302175524.1290840-1-berrange@redhat.com> References: <20210302175524.1290840-1-berrange@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.15 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=berrange@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Received-SPF: pass client-ip=170.10.133.124; envelope-from=berrange@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -27 X-Spam_score: -2.8 X-Spam_bar: -- X-Spam_report: (-2.8 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.001, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_LOW=-0.7, RCVD_IN_MSPIKE_H4=0.001, RCVD_IN_MSPIKE_WL=0.001, 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.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Michael Roth , =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= , Markus Armbruster , Gerd Hoffmann Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" Way back in QEMU 4.0, the -audiodev command line option was introduced for configuring audio backends. This CLI option does not use QemuOpts so it is not visible for introspection in 'query-command-line-options', instead using the QAPI Audiodev type. Unfortunately there is also no QMP command that uses the Audiodev type, so it is not introspectable with 'query-qmp-schema' either. This introduces a 'query-audiodev' command that simply reflects back the list of configured -audiodev command line options. This in turn makes Audiodev introspectable via 'query-qmp-schema'. Signed-off-by: Daniel P. Berrangé --- audio/audio.c | 19 +++++++++++++++++++ qapi/audio.json | 13 +++++++++++++ 2 files changed, 32 insertions(+) diff --git a/audio/audio.c b/audio/audio.c index 6734c8af70..40a4bbd7ce 100644 --- a/audio/audio.c +++ b/audio/audio.c @@ -28,8 +28,10 @@ #include "monitor/monitor.h" #include "qemu/timer.h" #include "qapi/error.h" +#include "qapi/clone-visitor.h" #include "qapi/qobject-input-visitor.h" #include "qapi/qapi-visit-audio.h" +#include "qapi/qapi-commands-audio.h" #include "qemu/cutils.h" #include "qemu/module.h" #include "sysemu/replay.h" @@ -2201,3 +2203,20 @@ size_t audio_rate_get_bytes(struct audio_pcm_info *info, RateCtl *rate, rate->bytes_sent += ret; return ret; } + +AudiodevList *qmp_query_audiodevs(Error **errp) +{ + AudiodevList *ret = NULL, *prev = NULL, *curr; + AudiodevListEntry *e; + QSIMPLEQ_FOREACH(e, &audiodevs, next) { + curr = g_new0(AudiodevList, 1); + curr->value = QAPI_CLONE(Audiodev, e->dev); + if (prev) { + prev->next = curr; + prev = curr; + } else { + ret = prev = curr; + } + } + return ret; +} diff --git a/qapi/audio.json b/qapi/audio.json index 9cba0df8a4..d7b91230d7 100644 --- a/qapi/audio.json +++ b/qapi/audio.json @@ -419,3 +419,16 @@ 'sdl': 'AudiodevSdlOptions', 'spice': 'AudiodevGenericOptions', 'wav': 'AudiodevWavOptions' } } + +## +# @query-audiodevs: +# +# Returns information about audiodev configuration +# +# Returns: array of @Audiodev +# +# Since: 6.0 +# +## +{ 'command': 'query-audiodevs', + 'returns': ['Audiodev'] } -- 2.29.2