From nobody Thu Apr 18 03:07:03 2024
Delivered-To: importer@patchew.org
Received-SPF: pass (zohomail.com: domain of redhat.com designates
 170.10.133.124 as permitted sender) client-ip=170.10.133.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.133.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=1683632757; cv=none;
	d=zohomail.com; s=zohoarc;
	b=Qk+NNDQvpL6H6+VeiuvT18ORdyGR/cNrLjbLuF9gcR/chW96GPfRwkLfMj6zYRDvvZyEYtHbhOFqC9eMQNt+g9iibo47pw3q0dAFkJWXHQLckOVjnhrO+2jngHSyaCetSUQPeg+uD+Mp9nqMnq/dZ+s5w7gQ23Oztjxz+ZU5xvU=
ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com;
 s=zohoarc;
	t=1683632757;
 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=rGIn/j5+gyS+JZd12fnbKmzWKiG9DCP4+IH/sZ+APEs=;
	b=eu8snWeznTwixnqDW/yvT+lygmPyco3eEifLcJJhZodGu2RUE41FmAwRPSSbYiBZPZZaSMiHi5xKFS7LinLp9LCrw2vLbZc0JMZxK0vb4RO6QYzNUAWys0bi7nuBVhYdcVcyhUyT41xCSHTQ93bN0S+c9ayw2wgp9Gg5MCM98rE=
ARC-Authentication-Results: i=1; mx.zohomail.com;
	dkim=pass;
	spf=pass (zohomail.com: domain of redhat.com designates 170.10.133.124 as
 permitted sender)  smtp.mailfrom=libvir-list-bounces@redhat.com;
	dmarc=pass header.from=<pkrempa@redhat.com> (p=none dis=none)
Return-Path: <libvir-list-bounces@redhat.com>
Received: from us-smtp-delivery-124.mimecast.com
 (us-smtp-delivery-124.mimecast.com [170.10.133.124]) by mx.zohomail.com
	with SMTPS id 1683632757448187.72335554017195;
 Tue, 9 May 2023 04:45:57 -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-66-jcFBpqB-O0u03udlR6Jp4w-1; Tue, 09 May 2023 07:45:53 -0400
Received: from smtp.corp.redhat.com (int-mx10.intmail.prod.int.rdu2.redhat.com
 [10.11.54.10])
	(using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits))
	(No client certificate requested)
	by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 48B1781DB6C;
	Tue,  9 May 2023 11:45:50 +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 3472D40F15C;
	Tue,  9 May 2023 11:45:50 +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 092F319465BD;
	Tue,  9 May 2023 11:45:50 +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 B12BE19465BC for <libvir-list@listman.corp.redhat.com>;
 Tue,  9 May 2023 11:45:48 +0000 (UTC)
Received: by smtp.corp.redhat.com (Postfix)
 id 95578492C3F; Tue,  9 May 2023 11:45:48 +0000 (UTC)
Received: from speedmetal.redhat.com (unknown [10.45.242.12])
 by smtp.corp.redhat.com (Postfix) with ESMTP id EB07A492C13
 for <libvir-list@redhat.com>; Tue,  9 May 2023 11:45:47 +0000 (UTC)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com;
	s=mimecast20190719; t=1683632756;
	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=rGIn/j5+gyS+JZd12fnbKmzWKiG9DCP4+IH/sZ+APEs=;
	b=P2dPOtYW3QsVw8yYr/s1s6VNS//MDFN7UAXD8wOBM/OnsqqO8wG1uI7y9lyx52GEN5EsAU
	zAZNvtIwCb8AWPe/lDfpWuJlWmvj+Zq0ufjdnxULG4qb1TKNrsoBSRj2R1p9k3ydjKQjOv
	YNm8DLprc62+kChDIpy66rtcsMK0ylQ=
X-MC-Unique: jcFBpqB-O0u03udlR6Jp4w-1
X-Original-To: libvir-list@listman.corp.redhat.com
From: Peter Krempa <pkrempa@redhat.com>
To: libvir-list@redhat.com
Subject: [PATCH 1/5] docs: formatdomain: Use code blocks to emphasize various
 sound device options
Date: Tue,  9 May 2023 13:45:42 +0200
Message-Id: 
 <84e9d6bff31a0f6b9b6bf0c326ab72b5f3bac118.1683632707.git.pkrempa@redhat.com>
In-Reply-To: <cover.1683632707.git.pkrempa@redhat.com>
References: <cover.1683632707.git.pkrempa@redhat.com>
MIME-Version: 1.0
X-Scanned-By: MIMEDefang 3.1 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
 <libvir-list.redhat.com>
List-Unsubscribe: <https://listman.redhat.com/mailman/options/libvir-list>,
 <mailto:libvir-list-request@redhat.com?subject=unsubscribe>
List-Archive: <http://listman.redhat.com/archives/libvir-list/>
List-Post: <mailto:libvir-list@redhat.com>
List-Help: <mailto:libvir-list-request@redhat.com?subject=help>
List-Subscribe: <https://listman.redhat.com/mailman/listinfo/libvir-list>,
 <mailto:libvir-list-request@redhat.com?subject=subscribe>
Errors-To: libvir-list-bounces@redhat.com
Sender: "libvir-list" <libvir-list-bounces@redhat.com>
X-Scanned-By: MIMEDefang 3.1 on 10.11.54.10
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: 1683632759687100003
Content-Type: text/plain; charset="utf-8"

Emphasize the various sound card models and other config options by
using ``...``.

Signed-off-by: Peter Krempa <pkrempa@redhat.com>
Reviewed-by: J=C3=A1n Tomko <jtomko@redhat.com>
---
 docs/formatdomain.rst | 50 +++++++++++++++++++++----------------------
 1 file changed, 25 insertions(+), 25 deletions(-)

diff --git a/docs/formatdomain.rst b/docs/formatdomain.rst
index 99e0a4241c..d62bda9adb 100644
--- a/docs/formatdomain.rst
+++ b/docs/formatdomain.rst
@@ -7209,9 +7209,9 @@ A virtual sound card can be attached to the host via =
the ``sound`` element.
 ``sound``
    The ``sound`` element has one mandatory attribute, ``model``, which spe=
cifies
    what real sound device is emulated. Valid values are specific to the
-   underlying hypervisor, though typical choices are 'sb16', 'es1370', 'pc=
spk',
-   'ac97' (:since:`Since 0.6.0`), 'ich6' (:since:`Since 0.8.8`), 'ich9'
-   (:since:`Since 1.1.3`), 'usb' (:since:`Since 1.2.8`) and 'ich7'
+   underlying hypervisor, though typical choices are ``sb16``, ``es1370``,
+   ``pcspk``, ``ac97`` (:since:`Since 0.6.0`), ``ich6`` (:since:`Since 0.8=
.8`),
+   ``ich9`` (:since:`Since 1.1.3`), ``usb`` (:since:`Since 1.2.8`) and ``i=
ch7``
    (:since:`Since 6.7.0`, bhyve only).

 :since:`Since 0.9.13` , a sound element with ``ich6`` or ``ich9`` models c=
an have
@@ -7221,9 +7221,9 @@ and recording.

 Valid values are:

--  'duplex' - advertise a line-in and a line-out
--  'micro' - advertise a speaker and a microphone
--  'output' - advertise a line-out :since:`Since 4.4.0`
+-  ``duplex`` - advertise a line-in and a line-out
+-  ``micro`` - advertise a speaker and a microphone
+-  ``output`` - advertise a line-out :since:`Since 4.4.0`

 ::

@@ -7264,8 +7264,8 @@ to the guest sound device.

 ``type``
    The required ``type`` attribute specifies audio backend type.
-   Currently, the supported values are 'none', 'alsa', 'coreaudio',
-   'dbus', jack', 'oss', 'pulseaudio', 'sdl', 'spice', 'file'.
+   Currently, the supported values are ``none``, ``alsa``, ``coreaudio``,
+   ``dbus``, ``jack``, ``oss``, ``pulseaudio``, ``sdl``, ``spice``, ``file=
``.

 ``id``
    Integer id of the audio device. Must be greater than 0.
@@ -7339,22 +7339,22 @@ is permitted with the following attributes.

 Note:
 If no ``<audio/>`` element is defined, and the ``graphics`` element is set=
 to
-either 'vnc' or 'sdl', the libvirtd or virtqemud process will honor the fo=
llowing
-environment variables:
+either ``vnc`` or ``sdl``, the libvirtd or virtqemud process will honor the
+following environment variables:

 * ``SDL_AUDIODRIVER``

-  Valid values are 'pulseaudio', 'esd', 'alsa' or 'arts'.
+  Valid values are ``pulseaudio``, ``esd``, ``alsa`` or ``arts``.

 * ``QEMU_AUDIO_DRV``

-  Valid values are 'pa', 'none', 'alsa', 'coreaudio', 'jack', 'oss',
-  'sdl', 'spice' or 'wav'.
+  Valid values are ``pa``, ``none``, ``alsa``, ``coreaudio``, ``jack``, ``=
oss``,
+  ``sdl``, ``spice`` or ``wav``.

 None audio backend
 ^^^^^^^^^^^^^^^^^^

-The 'none' audio backend is a dummy backend that does not connect to
+The ``none`` audio backend is a dummy backend that does not connect to
 any host audio framework. It still allows a remote desktop server
 like VNC to send and receive audio though. This is the default backend
 when VNC graphics are enabled in QEMU.
@@ -7364,7 +7364,7 @@ when VNC graphics are enabled in QEMU.
 ALSA audio backend
 ^^^^^^^^^^^^^^^^^^

-The 'alsa' audio type uses the ALSA host audio device framework.
+The ``alsa`` audio type uses the ALSA host audio device framework.

 The following additional attributes are permitted on the ``<input>``
 and ``<output>`` elements
@@ -7386,7 +7386,7 @@ and ``<output>`` elements
 Coreaudio audio backend
 ^^^^^^^^^^^^^^^^^^^^^^^

-The 'coreaudio' audio backend delegates to a CoreAudio host audio framework
+The ``coreaudio`` audio backend delegates to a CoreAudio host audio framew=
ork
 for input and output on macOS.

 The following additional attributes are permitted on the ``<input>``
@@ -7409,7 +7409,7 @@ and ``<output>`` elements
 D-Bus audio backend
 ^^^^^^^^^^^^^^^^^^^

-The 'dbus' audio backend does not connect to any host audio framework. It
+The ``dbus`` audio backend does not connect to any host audio framework. It
 exports a D-Bus interface when associated with a D-Bus display.

 :since:`Since 8.4.0, qemu`
@@ -7417,7 +7417,7 @@ exports a D-Bus interface when associated with a D-Bu=
s display.
 Jack audio backend
 ^^^^^^^^^^^^^^^^^^

-The 'jack' audio backend delegates to a Jack daemon for audio input
+The ``jack`` audio backend delegates to a Jack daemon for audio input
 and output.

 The following additional attributes are permitted on the ``<input>``
@@ -7453,7 +7453,7 @@ and ``<output>`` elements
 OSS audio backend
 ^^^^^^^^^^^^^^^^^

-The 'oss' audio type uses the OSS host audio device framework.
+The ``oss`` audio type uses the OSS host audio device framework.

 The following additional attributes are permitted on the ``<audio>``
 element
@@ -7501,7 +7501,7 @@ and ``<output>`` elements
 PulseAudio audio backend
 ^^^^^^^^^^^^^^^^^^^^^^^^

-The 'pulseaudio' audio backend delegates to a PulseAudio daemon audio input
+The ``pulseaudio`` audio backend delegates to a PulseAudio daemon audio in=
put
 and output.

 The following additional attributes are permitted on the ``<audio>``
@@ -7538,7 +7538,7 @@ and ``<output>`` elements
 SDL audio backend
 ^^^^^^^^^^^^^^^^^

-The 'sdl' audio backend delegates to the SDL library for audio input
+The ``sdl`` audio backend delegates to the SDL library for audio input
 and output.

 The following additional attributes are permitted on the ``<audio>``
@@ -7547,7 +7547,7 @@ element
 * ``driver``

   SDL audio driver. The ``name`` attribute specifies SDL driver name,
-  one of 'esd', 'alsa', 'arts', 'pulseaudio'.
+  one of ``esd``, ``alsa``, ``arts``, ``pulseaudio``.

 The following additional attributes are permitted on the ``<input>``
 and ``<output>`` elements
@@ -7569,7 +7569,7 @@ and ``<output>`` elements
 Spice audio backend
 ^^^^^^^^^^^^^^^^^^^

-The 'spice' audio backend is similar to the 'none' backend in that
+The ``spice`` audio backend is similar to the ``none`` backend in that
 it does not connect to any host audio framework. It exclusively
 allows a SPICE server to send and receive audio. This is the default
 backend when SPICE graphics are enabled in QEMU.
@@ -7583,9 +7583,9 @@ backend when SPICE graphics are enabled in QEMU.
 File audio backend
 ^^^^^^^^^^^^^^^^^^

-The 'file' audio backend is an output only driver which records
+The ``file`` audio backend is an output only driver which records
 audio to a file. The file format is implementation defined, and
-defaults to 'WAV' with QEMU.
+defaults to ``WAV`` with QEMU.

 ::

--=20
2.40.0
From nobody Thu Apr 18 03:07:03 2024
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=1683632757; cv=none;
	d=zohomail.com; s=zohoarc;
	b=AX2ZHDTXDRzPI0QjGrUW5cKw466wsSm5SrlidJZGnU2MT3jLaOvRoy3Z/DpFYg8H/l3fq8XmGrMm1uLYk+hqFatac6Mmci12a2Mwjw8iV8Gusj5gbvaBXlCnvEitoZftXPih8ovkxQRp2SMqswTyAONhLN5fxPSLTiEzJsz/WYY=
ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com;
 s=zohoarc;
	t=1683632757;
 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=SjR3LvkdHgmhgWWe3vbDBh3d64rB8hlPO0JV+zb096I=;
	b=DAD9b1eRC5EsggBiwB40dfxlg+H6r7PnMCF5UxUCtJD/tU77lY9ur4UxuZtY30VjCCs8ZlrDp4Kn5T9zTXcqbMsIKpjHOldyz8fZKrDMrkhLHRFkp76Y82UiXLC2/6+8DhpoZ7buh/+qd+LFi+hlQGBy2m/RR1nTdTX9ucVHMDA=
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=<pkrempa@redhat.com> (p=none dis=none)
Return-Path: <libvir-list-bounces@redhat.com>
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 1683632757472609.1087668296248;
 Tue, 9 May 2023 04:45:57 -0700 (PDT)
Received: from mimecast-mx02.redhat.com (mx3-rdu2.redhat.com
 [66.187.233.73]) by relay.mimecast.com with ESMTP with STARTTLS
 (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id
 us-mta-107-yP9tr_UaNi-F-e0LqwvUgQ-1; Tue, 09 May 2023 07:45:54 -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 76AAB3C10ED4;
	Tue,  9 May 2023 11:45:51 +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 616C7492B00;
	Tue,  9 May 2023 11:45:51 +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 4ED1319452C5;
	Tue,  9 May 2023 11:45:51 +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 8BAF119465BC for <libvir-list@listman.corp.redhat.com>;
 Tue,  9 May 2023 11:45:49 +0000 (UTC)
Received: by smtp.corp.redhat.com (Postfix)
 id 7D3D4492C3F; Tue,  9 May 2023 11:45:49 +0000 (UTC)
Received: from speedmetal.redhat.com (unknown [10.45.242.12])
 by smtp.corp.redhat.com (Postfix) with ESMTP id F1750492C13
 for <libvir-list@redhat.com>; Tue,  9 May 2023 11:45:48 +0000 (UTC)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com;
	s=mimecast20190719; t=1683632756;
	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=SjR3LvkdHgmhgWWe3vbDBh3d64rB8hlPO0JV+zb096I=;
	b=BpxCcJcdg7b2AfXjW/mbgFYrU7N5iMnwBwyNztWPKPaj6XKCgcLt82LfI0TWkxV8lt6si3
	mANsjwj1XYgOoROeZGHxeZFtXEn0dy1wX5Xnx2Qrr/2uae9zgTgNqxWkj2gyz5G3JH2kc2
	Q1kpt42DID0d90TSJ+njBgdadzDoCY8=
X-MC-Unique: yP9tr_UaNi-F-e0LqwvUgQ-1
X-Original-To: libvir-list@listman.corp.redhat.com
From: Peter Krempa <pkrempa@redhat.com>
To: libvir-list@redhat.com
Subject: [PATCH 2/5] qemuxml2(argv|xml)test: Remove 'sound' case
Date: Tue,  9 May 2023 13:45:43 +0200
Message-Id: 
 <a2fca248b303b5f5d770cc6a9943ed0512b8507f.1683632707.git.pkrempa@redhat.com>
In-Reply-To: <cover.1683632707.git.pkrempa@redhat.com>
References: <cover.1683632707.git.pkrempa@redhat.com>
MIME-Version: 1.0
X-Scanned-By: MIMEDefang 3.1 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
 <libvir-list.redhat.com>
List-Unsubscribe: <https://listman.redhat.com/mailman/options/libvir-list>,
 <mailto:libvir-list-request@redhat.com?subject=unsubscribe>
List-Archive: <http://listman.redhat.com/archives/libvir-list/>
List-Post: <mailto:libvir-list@redhat.com>
List-Help: <mailto:libvir-list-request@redhat.com?subject=help>
List-Subscribe: <https://listman.redhat.com/mailman/listinfo/libvir-list>,
 <mailto:libvir-list-request@redhat.com?subject=subscribe>
Errors-To: libvir-list-bounces@redhat.com
Sender: "libvir-list" <libvir-list-bounces@redhat.com>
X-Scanned-By: MIMEDefang 3.1 on 10.11.54.9
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: 1683632759686100002
Content-Type: text/plain; charset="utf-8"

The test case is a subset of what the 'sound-device' case tests.

Signed-off-by: Peter Krempa <pkrempa@redhat.com>
Reviewed-by: J=C3=A1n Tomko <jtomko@redhat.com>
---
 tests/qemuxml2argvdata/sound.args  | 37 -------------------------
 tests/qemuxml2argvdata/sound.xml   | 34 -----------------------
 tests/qemuxml2argvtest.c           |  1 -
 tests/qemuxml2xmloutdata/sound.xml | 43 ------------------------------
 tests/qemuxml2xmltest.c            |  1 -
 5 files changed, 116 deletions(-)
 delete mode 100644 tests/qemuxml2argvdata/sound.args
 delete mode 100644 tests/qemuxml2argvdata/sound.xml
 delete mode 100644 tests/qemuxml2xmloutdata/sound.xml

diff --git a/tests/qemuxml2argvdata/sound.args b/tests/qemuxml2argvdata/sou=
nd.args
deleted file mode 100644
index d077c37c76..0000000000
--- a/tests/qemuxml2argvdata/sound.args
+++ /dev/null
@@ -1,37 +0,0 @@
-LC_ALL=3DC \
-PATH=3D/bin \
-HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGuest1 \
-USER=3Dtest \
-LOGNAME=3Dtest \
-XDG_DATA_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.local/share \
-XDG_CACHE_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.cache \
-XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
-/usr/bin/qemu-system-i386 \
--name guest=3DQEMUGuest1,debug-threads=3Don \
--S \
--object secret,id=3DmasterKey0,format=3Draw,file=3D/var/lib/libvirt/qemu/d=
omain--1-QEMUGuest1/master-key.aes \
--machine pc,usb=3Doff,dump-guest-core=3Doff \
--accel tcg \
--m 214 \
--overcommit mem-lock=3Doff \
--smp 1,sockets=3D1,cores=3D1,threads=3D1 \
--uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
--display none \
--no-user-config \
--nodefaults \
--chardev socket,id=3Dcharmonitor,fd=3D1729,server=3Don,wait=3Doff \
--mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \
--rtc base=3Dutc \
--no-shutdown \
--no-acpi \
--boot strict=3Don \
--usb \
--blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","no=
de-name":"libvirt-1-storage","auto-read-only":true,"discard":"unmap"}' \
--blockdev '{"node-name":"libvirt-1-format","read-only":false,"driver":"raw=
","file":"libvirt-1-storage"}' \
--device ide-hd,bus=3Dide.0,unit=3D0,drive=3Dlibvirt-1-format,id=3Dide0-0-0=
,bootindex=3D1 \
--audiodev '{"id":"audio1","driver":"none"}' \
--soundhw pcspk \
--device ES1370,id=3Dsound1,audiodev=3Daudio1,bus=3Dpci.0,addr=3D0x2 \
--device sb16,id=3Dsound2,audiodev=3Daudio1 \
--device AC97,id=3Dsound3,audiodev=3Daudio1,bus=3Dpci.0,addr=3D0x3 \
--msg timestamp=3Don
diff --git a/tests/qemuxml2argvdata/sound.xml b/tests/qemuxml2argvdata/soun=
d.xml
deleted file mode 100644
index dd45361a69..0000000000
--- a/tests/qemuxml2argvdata/sound.xml
+++ /dev/null
@@ -1,34 +0,0 @@
-<domain type=3D'qemu'>
-  <name>QEMUGuest1</name>
-  <uuid>c7a5fdbd-edaf-9455-926a-d65c16db1809</uuid>
-  <memory unit=3D'KiB'>219136</memory>
-  <currentMemory unit=3D'KiB'>219136</currentMemory>
-  <vcpu placement=3D'static'>1</vcpu>
-  <os>
-    <type arch=3D'i686' machine=3D'pc'>hvm</type>
-    <boot dev=3D'hd'/>
-  </os>
-  <clock offset=3D'utc'/>
-  <on_poweroff>destroy</on_poweroff>
-  <on_reboot>restart</on_reboot>
-  <on_crash>destroy</on_crash>
-  <devices>
-    <emulator>/usr/bin/qemu-system-i386</emulator>
-    <disk type=3D'block' device=3D'disk'>
-      <driver name=3D'qemu' type=3D'raw'/>
-      <source dev=3D'/dev/HostVG/QEMUGuest1'/>
-      <target dev=3D'hda' bus=3D'ide'/>
-      <address type=3D'drive' controller=3D'0' bus=3D'0' target=3D'0' unit=
=3D'0'/>
-    </disk>
-    <controller type=3D'usb' index=3D'0'/>
-    <controller type=3D'ide' index=3D'0'/>
-    <controller type=3D'pci' index=3D'0' model=3D'pci-root'/>
-    <input type=3D'mouse' bus=3D'ps2'/>
-    <input type=3D'keyboard' bus=3D'ps2'/>
-    <sound model=3D'pcspk'/>
-    <sound model=3D'es1370'/>
-    <sound model=3D'sb16'/>
-    <sound model=3D'ac97'/>
-    <memballoon model=3D'none'/>
-  </devices>
-</domain>
diff --git a/tests/qemuxml2argvtest.c b/tests/qemuxml2argvtest.c
index 3c75a2dce2..755e8fd664 100644
--- a/tests/qemuxml2argvtest.c
+++ b/tests/qemuxml2argvtest.c
@@ -1691,7 +1691,6 @@ mymain(void)
             QEMU_CAPS_VIRTIO_BALLOON_AUTODEFLATE);
     DO_TEST_NOCAPS("balloon-device-auto");
     DO_TEST_NOCAPS("balloon-device-period");
-    DO_TEST_NOCAPS("sound");
     DO_TEST("sound-device",
             QEMU_CAPS_HDA_DUPLEX, QEMU_CAPS_HDA_MICRO,
             QEMU_CAPS_HDA_OUTPUT,
diff --git a/tests/qemuxml2xmloutdata/sound.xml b/tests/qemuxml2xmloutdata/=
sound.xml
deleted file mode 100644
index 1ffa7412d6..0000000000
--- a/tests/qemuxml2xmloutdata/sound.xml
+++ /dev/null
@@ -1,43 +0,0 @@
-<domain type=3D'qemu'>
-  <name>QEMUGuest1</name>
-  <uuid>c7a5fdbd-edaf-9455-926a-d65c16db1809</uuid>
-  <memory unit=3D'KiB'>219136</memory>
-  <currentMemory unit=3D'KiB'>219136</currentMemory>
-  <vcpu placement=3D'static'>1</vcpu>
-  <os>
-    <type arch=3D'i686' machine=3D'pc'>hvm</type>
-    <boot dev=3D'hd'/>
-  </os>
-  <clock offset=3D'utc'/>
-  <on_poweroff>destroy</on_poweroff>
-  <on_reboot>restart</on_reboot>
-  <on_crash>destroy</on_crash>
-  <devices>
-    <emulator>/usr/bin/qemu-system-i386</emulator>
-    <disk type=3D'block' device=3D'disk'>
-      <driver name=3D'qemu' type=3D'raw'/>
-      <source dev=3D'/dev/HostVG/QEMUGuest1'/>
-      <target dev=3D'hda' bus=3D'ide'/>
-      <address type=3D'drive' controller=3D'0' bus=3D'0' target=3D'0' unit=
=3D'0'/>
-    </disk>
-    <controller type=3D'usb' index=3D'0'>
-      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x01' f=
unction=3D'0x2'/>
-    </controller>
-    <controller type=3D'ide' index=3D'0'>
-      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x01' f=
unction=3D'0x1'/>
-    </controller>
-    <controller type=3D'pci' index=3D'0' model=3D'pci-root'/>
-    <input type=3D'mouse' bus=3D'ps2'/>
-    <input type=3D'keyboard' bus=3D'ps2'/>
-    <sound model=3D'pcspk'/>
-    <sound model=3D'es1370'>
-      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x02' f=
unction=3D'0x0'/>
-    </sound>
-    <sound model=3D'sb16'/>
-    <sound model=3D'ac97'>
-      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x03' f=
unction=3D'0x0'/>
-    </sound>
-    <audio id=3D'1' type=3D'none'/>
-    <memballoon model=3D'none'/>
-  </devices>
-</domain>
diff --git a/tests/qemuxml2xmltest.c b/tests/qemuxml2xmltest.c
index 066c5a49c4..8e9da95efb 100644
--- a/tests/qemuxml2xmltest.c
+++ b/tests/qemuxml2xmltest.c
@@ -449,7 +449,6 @@ mymain(void)
     DO_TEST("net-hostdev-vfio", QEMU_CAPS_DEVICE_VFIO_PCI);
     DO_TEST_NOCAPS("net-midonet");
     DO_TEST_NOCAPS("net-openvswitch");
-    DO_TEST_NOCAPS("sound");
     DO_TEST("sound-device",
             QEMU_CAPS_DEVICE_ICH9_INTEL_HDA,
             QEMU_CAPS_OBJECT_USB_AUDIO,
--=20
2.40.0
From nobody Thu Apr 18 03:07:03 2024
Delivered-To: importer@patchew.org
Received-SPF: pass (zohomail.com: domain of redhat.com designates
 170.10.133.124 as permitted sender) client-ip=170.10.133.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.133.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=1683632827; cv=none;
	d=zohomail.com; s=zohoarc;
	b=BorRMNs+jHCY2tRqLeoZG63tAV8YqJcpVRoWprWCxnKaNa3szb3ZxQGKmyj7mAPJY2WlkbM0o4spy6IeyAy45n/W4AjbpQBGO3x2jxqBw+FaO3sObKHLWtHfs3hc9M0NIHZcL4BvzCz30yEoeN8O4kJFYHlkRpCvkBNr+p50otk=
ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com;
 s=zohoarc;
	t=1683632827;
 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=Gfdy9ORyWvnORG7bg++hAKi9CEOGf6QGzDVNmgv2yGA=;
	b=B9uc3d2gUTKPDOGpC0OlvdqzkUuTT/5f7XKpg9rdjJ/cvWBW1ZjasXChu6581/7zwh+WV/zRR8ZkAHZDUik0oXxQTYktmSFx0obUtEHEJqvvuHpNBDgcPIBiOD2IgTM2H7ayGqkAbTm/oXtZq9zUesSfS+tO5SGopC29Ssqfi6c=
ARC-Authentication-Results: i=1; mx.zohomail.com;
	dkim=pass;
	spf=pass (zohomail.com: domain of redhat.com designates 170.10.133.124 as
 permitted sender)  smtp.mailfrom=libvir-list-bounces@redhat.com;
	dmarc=pass header.from=<pkrempa@redhat.com> (p=none dis=none)
Return-Path: <libvir-list-bounces@redhat.com>
Received: from us-smtp-delivery-124.mimecast.com
 (us-smtp-delivery-124.mimecast.com [170.10.133.124]) by mx.zohomail.com
	with SMTPS id 1683632827342855.0362311898951;
 Tue, 9 May 2023 04:47:07 -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-658-xN_U2Y8CNQa-Al3juOGNng-1; Tue, 09 May 2023 07:45:59 -0400
Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.rdu2.redhat.com
 [10.11.54.1])
	(using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits))
	(No client certificate requested)
	by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 31569857E64;
	Tue,  9 May 2023 11:45:56 +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 1F13440C2063;
	Tue,  9 May 2023 11:45:56 +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 F2BE219466DF;
	Tue,  9 May 2023 11:45:55 +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 64C2519465BD for <libvir-list@listman.corp.redhat.com>;
 Tue,  9 May 2023 11:45:50 +0000 (UTC)
Received: by smtp.corp.redhat.com (Postfix)
 id 58CDD492C13; Tue,  9 May 2023 11:45:50 +0000 (UTC)
Received: from speedmetal.redhat.com (unknown [10.45.242.12])
 by smtp.corp.redhat.com (Postfix) with ESMTP id CED95492B09
 for <libvir-list@redhat.com>; Tue,  9 May 2023 11:45:49 +0000 (UTC)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com;
	s=mimecast20190719; t=1683632826;
	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=Gfdy9ORyWvnORG7bg++hAKi9CEOGf6QGzDVNmgv2yGA=;
	b=f0W5k4DYo3pF0DtpObnacHb0TU+lH35ZIcZlJyMdchgF9b6UgCGdVH9BzyeaT9+uniIPbe
	FezjCvW9moRtTBJLqKeavRmNINiTWNgbVISufJ7s3lGACPkZu71E35UkiUmQyHVNkGcOJo
	lRBMk7Yh3tVZq0UYvyNFU8dwfDezqlE=
X-MC-Unique: xN_U2Y8CNQa-Al3juOGNng-1
X-Original-To: libvir-list@listman.corp.redhat.com
From: Peter Krempa <pkrempa@redhat.com>
To: libvir-list@redhat.com
Subject: [PATCH 3/5] qemuxml2(argv|xml)test: Modernize 'sound-device' case
Date: Tue,  9 May 2023 13:45:44 +0200
Message-Id: 
 <92cdb4d86fedab76e393a6f8e299b75b315bbb6c.1683632707.git.pkrempa@redhat.com>
In-Reply-To: <cover.1683632707.git.pkrempa@redhat.com>
References: <cover.1683632707.git.pkrempa@redhat.com>
MIME-Version: 1.0
X-Scanned-By: MIMEDefang 3.1 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
 <libvir-list.redhat.com>
List-Unsubscribe: <https://listman.redhat.com/mailman/options/libvir-list>,
 <mailto:libvir-list-request@redhat.com?subject=unsubscribe>
List-Archive: <http://listman.redhat.com/archives/libvir-list/>
List-Post: <mailto:libvir-list@redhat.com>
List-Help: <mailto:libvir-list-request@redhat.com?subject=help>
List-Subscribe: <https://listman.redhat.com/mailman/listinfo/libvir-list>,
 <mailto:libvir-list-request@redhat.com?subject=subscribe>
Errors-To: libvir-list-bounces@redhat.com
Sender: "libvir-list" <libvir-list-bounces@redhat.com>
X-Scanned-By: MIMEDefang 3.1 on 10.11.54.1
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: 1683632828356100001
Content-Type: text/plain; charset="utf-8"

Drop the unnecessary disk definition and use x86_64 emulator.

For 'qemuxml2argvtest' replace the fake-caps invocation by a 4.2.0
version-locked invocation and  add a '_CAPS_LATEST' invocation.

For 'qemuxml2xmltest' convert to use '_CAPS_LATEST' only.

There are no sound-device relevant changes in the output files.

Signed-off-by: Peter Krempa <pkrempa@redhat.com>
Reviewed-by: J=C3=A1n Tomko <jtomko@redhat.com>
---
 ...ce.args =3D> sound-device.x86_64-4.2.0.args} | 11 ++--
 .../sound-device.x86_64-latest.args           | 50 +++++++++++++++++++
 tests/qemuxml2argvdata/sound-device.xml       | 10 +---
 tests/qemuxml2argvtest.c                      |  7 +--
 ...ice.xml =3D> sound-device.x86_64-latest.xml} | 15 +++---
 tests/qemuxml2xmltest.c                       |  7 +--
 6 files changed, 66 insertions(+), 34 deletions(-)
 rename tests/qemuxml2argvdata/{sound-device.args =3D> sound-device.x86_64-=
4.2.0.args} (82%)
 create mode 100644 tests/qemuxml2argvdata/sound-device.x86_64-latest.args
 rename tests/qemuxml2xmloutdata/{sound-device.xml =3D> sound-device.x86_64=
-latest.xml} (83%)

diff --git a/tests/qemuxml2argvdata/sound-device.args b/tests/qemuxml2argvd=
ata/sound-device.x86_64-4.2.0.args
similarity index 82%
rename from tests/qemuxml2argvdata/sound-device.args
rename to tests/qemuxml2argvdata/sound-device.x86_64-4.2.0.args
index 0a9a3e5ddb..121b37ff99 100644
--- a/tests/qemuxml2argvdata/sound-device.args
+++ b/tests/qemuxml2argvdata/sound-device.x86_64-4.2.0.args
@@ -6,12 +6,13 @@ LOGNAME=3Dtest \
 XDG_DATA_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.local/share \
 XDG_CACHE_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.cache \
 XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
-/usr/bin/qemu-system-i386 \
+/usr/bin/qemu-system-x86_64 \
 -name guest=3DQEMUGuest1,debug-threads=3Don \
 -S \
 -object secret,id=3DmasterKey0,format=3Draw,file=3D/var/lib/libvirt/qemu/d=
omain--1-QEMUGuest1/master-key.aes \
--machine pc,usb=3Doff,dump-guest-core=3Doff \
+-machine pc-i440fx-4.2,usb=3Doff,dump-guest-core=3Doff \
 -accel tcg \
+-cpu qemu64 \
 -m 214 \
 -overcommit mem-lock=3Doff \
 -smp 1,sockets=3D1,cores=3D1,threads=3D1 \
@@ -25,10 +26,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGu=
est1/.config \
 -no-shutdown \
 -no-acpi \
 -boot strict=3Don \
--usb \
--blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","no=
de-name":"libvirt-1-storage","auto-read-only":true,"discard":"unmap"}' \
--blockdev '{"node-name":"libvirt-1-format","read-only":false,"driver":"raw=
","file":"libvirt-1-storage"}' \
--device ide-hd,bus=3Dide.0,unit=3D0,drive=3Dlibvirt-1-format,id=3Dide0-0-0=
,bootindex=3D1 \
+-device piix3-usb-uhci,id=3Dusb,bus=3Dpci.0,addr=3D0x1.0x2 \
 -audiodev '{"id":"audio1","driver":"none"}' \
 -soundhw pcspk \
 -device ES1370,id=3Dsound1,audiodev=3Daudio1,bus=3Dpci.0,addr=3D0x2 \
@@ -48,4 +46,5 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue=
st1/.config \
 -device hda-output,id=3Dsound7-codec2,bus=3Dsound7.0,cad=3D2,audiodev=3Dau=
dio1 \
 -device usb-audio,id=3Dsound8,audiodev=3Daudio1,bus=3Dusb.0,port=3D1 \
 -device virtio-balloon-pci,id=3Dballoon0,bus=3Dpci.0,addr=3D0x8 \
+-sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource=
control=3Ddeny \
 -msg timestamp=3Don
diff --git a/tests/qemuxml2argvdata/sound-device.x86_64-latest.args b/tests=
/qemuxml2argvdata/sound-device.x86_64-latest.args
new file mode 100644
index 0000000000..3132760fe0
--- /dev/null
+++ b/tests/qemuxml2argvdata/sound-device.x86_64-latest.args
@@ -0,0 +1,50 @@
+LC_ALL=3DC \
+PATH=3D/bin \
+HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGuest1 \
+USER=3Dtest \
+LOGNAME=3Dtest \
+XDG_DATA_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.local/share \
+XDG_CACHE_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.cache \
+XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
+/usr/bin/qemu-system-x86_64 \
+-name guest=3DQEMUGuest1,debug-threads=3Don \
+-S \
+-object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/va=
r/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes"}' \
+-machine pc,usb=3Doff,dump-guest-core=3Doff,memory-backend=3Dpc.ram,acpi=
=3Doff \
+-accel tcg \
+-cpu qemu64 \
+-m 214 \
+-object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":224395264}'=
 \
+-overcommit mem-lock=3Doff \
+-smp 1,sockets=3D1,cores=3D1,threads=3D1 \
+-uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
+-display none \
+-no-user-config \
+-nodefaults \
+-chardev socket,id=3Dcharmonitor,fd=3D1729,server=3Don,wait=3Doff \
+-mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \
+-rtc base=3Dutc \
+-no-shutdown \
+-boot strict=3Don \
+-device '{"driver":"piix3-usb-uhci","id":"usb","bus":"pci.0","addr":"0x1.0=
x2"}' \
+-audiodev '{"id":"audio1","driver":"none"}' \
+-soundhw pcspk \
+-device '{"driver":"ES1370","id":"sound1","audiodev":"audio1","bus":"pci.0=
","addr":"0x2"}' \
+-device '{"driver":"sb16","id":"sound2","audiodev":"audio1"}' \
+-device '{"driver":"AC97","id":"sound3","audiodev":"audio1","bus":"pci.0",=
"addr":"0x3"}' \
+-device '{"driver":"intel-hda","id":"sound4","bus":"pci.0","addr":"0x4"}' \
+-device '{"driver":"hda-duplex","id":"sound4-codec0","bus":"sound4.0","cad=
":0,"audiodev":"audio1"}' \
+-device '{"driver":"intel-hda","id":"sound5","bus":"pci.0","addr":"0x5"}' \
+-device '{"driver":"hda-micro","id":"sound5-codec0","bus":"sound5.0","cad"=
:0,"audiodev":"audio1"}' \
+-device '{"driver":"hda-duplex","id":"sound5-codec1","bus":"sound5.0","cad=
":1,"audiodev":"audio1"}' \
+-device '{"driver":"hda-output","id":"sound5-codec2","bus":"sound5.0","cad=
":2,"audiodev":"audio1"}' \
+-device '{"driver":"ich9-intel-hda","id":"sound6","bus":"pci.0","addr":"0x=
6"}' \
+-device '{"driver":"hda-duplex","id":"sound6-codec0","bus":"sound6.0","cad=
":0,"audiodev":"audio1"}' \
+-device '{"driver":"ich9-intel-hda","id":"sound7","bus":"pci.0","addr":"0x=
7"}' \
+-device '{"driver":"hda-micro","id":"sound7-codec0","bus":"sound7.0","cad"=
:0,"audiodev":"audio1"}' \
+-device '{"driver":"hda-duplex","id":"sound7-codec1","bus":"sound7.0","cad=
":1,"audiodev":"audio1"}' \
+-device '{"driver":"hda-output","id":"sound7-codec2","bus":"sound7.0","cad=
":2,"audiodev":"audio1"}' \
+-device '{"driver":"usb-audio","id":"sound8","audiodev":"audio1","bus":"us=
b.0","port":"1"}' \
+-device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","add=
r":"0x8"}' \
+-sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource=
control=3Ddeny \
+-msg timestamp=3Don
diff --git a/tests/qemuxml2argvdata/sound-device.xml b/tests/qemuxml2argvda=
ta/sound-device.xml
index b9427f880a..35a60da197 100644
--- a/tests/qemuxml2argvdata/sound-device.xml
+++ b/tests/qemuxml2argvdata/sound-device.xml
@@ -5,20 +5,14 @@
   <currentMemory unit=3D'KiB'>219100</currentMemory>
   <vcpu placement=3D'static'>1</vcpu>
   <os>
-    <type arch=3D'i686' machine=3D'pc'>hvm</type>
-    <boot dev=3D'hd'/>
+    <type arch=3D'x86_64' machine=3D'pc'>hvm</type>
   </os>
   <clock offset=3D'utc'/>
   <on_poweroff>destroy</on_poweroff>
   <on_reboot>restart</on_reboot>
   <on_crash>destroy</on_crash>
   <devices>
-    <emulator>/usr/bin/qemu-system-i386</emulator>
-    <disk type=3D'block' device=3D'disk'>
-      <source dev=3D'/dev/HostVG/QEMUGuest1'/>
-      <target dev=3D'hda' bus=3D'ide'/>
-      <address type=3D'drive' controller=3D'0' bus=3D'0' target=3D'0' unit=
=3D'0'/>
-    </disk>
+    <emulator>/usr/bin/qemu-system-x86_64</emulator>
     <controller type=3D'usb' index=3D'0'/>
     <controller type=3D'ide' index=3D'0'/>
     <controller type=3D'pci' index=3D'0' model=3D'pci-root'/>
diff --git a/tests/qemuxml2argvtest.c b/tests/qemuxml2argvtest.c
index 755e8fd664..3100078b54 100644
--- a/tests/qemuxml2argvtest.c
+++ b/tests/qemuxml2argvtest.c
@@ -1691,11 +1691,8 @@ mymain(void)
             QEMU_CAPS_VIRTIO_BALLOON_AUTODEFLATE);
     DO_TEST_NOCAPS("balloon-device-auto");
     DO_TEST_NOCAPS("balloon-device-period");
-    DO_TEST("sound-device",
-            QEMU_CAPS_HDA_DUPLEX, QEMU_CAPS_HDA_MICRO,
-            QEMU_CAPS_HDA_OUTPUT,
-            QEMU_CAPS_DEVICE_ICH9_INTEL_HDA,
-            QEMU_CAPS_OBJECT_USB_AUDIO);
+    DO_TEST_CAPS_VER("sound-device", "4.2.0");
+    DO_TEST_CAPS_LATEST("sound-device");
     DO_TEST_CAPS_LATEST("fs9p");
     DO_TEST_CAPS_ARCH_LATEST("fs9p-ccw", "s390x");

diff --git a/tests/qemuxml2xmloutdata/sound-device.xml b/tests/qemuxml2xmlo=
utdata/sound-device.x86_64-latest.xml
similarity index 83%
rename from tests/qemuxml2xmloutdata/sound-device.xml
rename to tests/qemuxml2xmloutdata/sound-device.x86_64-latest.xml
index 87d9a5524c..89f537bb01 100644
--- a/tests/qemuxml2xmloutdata/sound-device.xml
+++ b/tests/qemuxml2xmloutdata/sound-device.x86_64-latest.xml
@@ -5,22 +5,19 @@
   <currentMemory unit=3D'KiB'>219100</currentMemory>
   <vcpu placement=3D'static'>1</vcpu>
   <os>
-    <type arch=3D'i686' machine=3D'pc'>hvm</type>
+    <type arch=3D'x86_64' machine=3D'pc'>hvm</type>
     <boot dev=3D'hd'/>
   </os>
+  <cpu mode=3D'custom' match=3D'exact' check=3D'none'>
+    <model fallback=3D'forbid'>qemu64</model>
+  </cpu>
   <clock offset=3D'utc'/>
   <on_poweroff>destroy</on_poweroff>
   <on_reboot>restart</on_reboot>
   <on_crash>destroy</on_crash>
   <devices>
-    <emulator>/usr/bin/qemu-system-i386</emulator>
-    <disk type=3D'block' device=3D'disk'>
-      <driver name=3D'qemu' type=3D'raw'/>
-      <source dev=3D'/dev/HostVG/QEMUGuest1'/>
-      <target dev=3D'hda' bus=3D'ide'/>
-      <address type=3D'drive' controller=3D'0' bus=3D'0' target=3D'0' unit=
=3D'0'/>
-    </disk>
-    <controller type=3D'usb' index=3D'0'>
+    <emulator>/usr/bin/qemu-system-x86_64</emulator>
+    <controller type=3D'usb' index=3D'0' model=3D'piix3-uhci'>
       <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x01' f=
unction=3D'0x2'/>
     </controller>
     <controller type=3D'ide' index=3D'0'>
diff --git a/tests/qemuxml2xmltest.c b/tests/qemuxml2xmltest.c
index 8e9da95efb..93202e8e18 100644
--- a/tests/qemuxml2xmltest.c
+++ b/tests/qemuxml2xmltest.c
@@ -449,12 +449,7 @@ mymain(void)
     DO_TEST("net-hostdev-vfio", QEMU_CAPS_DEVICE_VFIO_PCI);
     DO_TEST_NOCAPS("net-midonet");
     DO_TEST_NOCAPS("net-openvswitch");
-    DO_TEST("sound-device",
-            QEMU_CAPS_DEVICE_ICH9_INTEL_HDA,
-            QEMU_CAPS_OBJECT_USB_AUDIO,
-            QEMU_CAPS_HDA_MICRO,
-            QEMU_CAPS_HDA_DUPLEX,
-            QEMU_CAPS_HDA_OUTPUT);
+    DO_TEST_CAPS_LATEST("sound-device");
     DO_TEST_NOCAPS("watchdog");
     DO_TEST_CAPS_LATEST("watchdog-q35-multiple");
     DO_TEST("net-bandwidth", QEMU_CAPS_DEVICE_VGA, QEMU_CAPS_VNC);
--=20
2.40.0
From nobody Thu Apr 18 03:07:03 2024
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=1683632760; cv=none;
	d=zohomail.com; s=zohoarc;
	b=dNiwEnBPuRNI6/71pyah7gNZunCVkxxZ1YywXjQH9kLaSYiUTEVxzQwzwu1eQ6L9W1Q0NThzv87SVcb5uBnMhI7sO3Vu/Bx/uo1lCChat19Q1t3iRSVYB8iY22rRoRwpkiHC/ggPfa6HXsrUNZW0LLXO6Emcw1OvJC65kMEV+9s=
ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com;
 s=zohoarc;
	t=1683632760;
 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=zvsi7GqaEbOFrgsP7C53dnSaDIfhzXiLE2cESQUEp+M=;
	b=TAlVmTG0HTE3BgWO2day/3TuRzM/MRQxtAPjrvlP8sJbjz1/Jqqyz8UcpKWm86GkLbHVXUyIL+6WhD3H8Mr6dI5U/Va/STaK7XFtspUXnCcb1OpCxXjFZO4jxGEOFCIp0uInBWYD1S1OsJCrBCFnGgcmbPn7/BybUQpnouiEFbo=
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=<pkrempa@redhat.com> (p=none dis=none)
Return-Path: <libvir-list-bounces@redhat.com>
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 1683632760307686.5522630006195;
 Tue, 9 May 2023 04:46:00 -0700 (PDT)
Received: from mimecast-mx02.redhat.com (mx3-rdu2.redhat.com
 [66.187.233.73]) by relay.mimecast.com with ESMTP with STARTTLS
 (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id
 us-mta-509-fDfMhPgVPSS6zvOCalit5Q-1; Tue, 09 May 2023 07:45:56 -0400
Received: from smtp.corp.redhat.com (int-mx08.intmail.prod.int.rdu2.redhat.com
 [10.11.54.8])
	(using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits))
	(No client certificate requested)
	by mimecast-mx02.redhat.com (Postfix) with ESMTPS id AA9FF1C0950D;
	Tue,  9 May 2023 11:45:52 +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 96095C084BB;
	Tue,  9 May 2023 11:45:52 +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 89FB119465BD;
	Tue,  9 May 2023 11:45:52 +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 38CD119465BD for <libvir-list@listman.corp.redhat.com>;
 Tue,  9 May 2023 11:45:51 +0000 (UTC)
Received: by smtp.corp.redhat.com (Postfix)
 id 2F0B3492C3F; Tue,  9 May 2023 11:45:51 +0000 (UTC)
Received: from speedmetal.redhat.com (unknown [10.45.242.12])
 by smtp.corp.redhat.com (Postfix) with ESMTP id A772C492C13
 for <libvir-list@redhat.com>; Tue,  9 May 2023 11:45:50 +0000 (UTC)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com;
	s=mimecast20190719; t=1683632759;
	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=zvsi7GqaEbOFrgsP7C53dnSaDIfhzXiLE2cESQUEp+M=;
	b=Lj4Kl8XVRAzsb92AHPeS4aN7nGj3D07ehnatUx3TO2icIzMzdTeG5lzmNf8bnRoZ4EyzLF
	3d2NY09ImWKERlnpaDniOSP/KktInUGXHw5qKlHDEjPBvOR+PO4tFjCsx+e1hu3IXKs69E
	HgFYu0hRtqdgM332VMJuhLQv3PVbPdI=
X-MC-Unique: fDfMhPgVPSS6zvOCalit5Q-1
X-Original-To: libvir-list@listman.corp.redhat.com
From: Peter Krempa <pkrempa@redhat.com>
To: libvir-list@redhat.com
Subject: [PATCH 4/5] conf: Register autoptr cleanup for 'virDomainSoundDef'
 and refactor virDomainSoundDefParseXML
Date: Tue,  9 May 2023 13:45:45 +0200
Message-Id: 
 <54a86f6c967a1ec76728d339f1ea543f169a0791.1683632707.git.pkrempa@redhat.com>
In-Reply-To: <cover.1683632707.git.pkrempa@redhat.com>
References: <cover.1683632707.git.pkrempa@redhat.com>
MIME-Version: 1.0
X-Scanned-By: MIMEDefang 3.1 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
 <libvir-list.redhat.com>
List-Unsubscribe: <https://listman.redhat.com/mailman/options/libvir-list>,
 <mailto:libvir-list-request@redhat.com?subject=unsubscribe>
List-Archive: <http://listman.redhat.com/archives/libvir-list/>
List-Post: <mailto:libvir-list@redhat.com>
List-Help: <mailto:libvir-list-request@redhat.com?subject=help>
List-Subscribe: <https://listman.redhat.com/mailman/listinfo/libvir-list>,
 <mailto:libvir-list-request@redhat.com?subject=subscribe>
Errors-To: libvir-list-bounces@redhat.com
Sender: "libvir-list" <libvir-list-bounces@redhat.com>
X-Scanned-By: MIMEDefang 3.1 on 10.11.54.8
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: 1683632761792100009
Content-Type: text/plain; charset="utf-8"

Use our modern cleanup path pattern.

Signed-off-by: Peter Krempa <pkrempa@redhat.com>
Reviewed-by: J=C3=A1n Tomko <jtomko@redhat.com>
---
 src/conf/domain_conf.c | 19 +++++++------------
 src/conf/domain_conf.h |  1 +
 2 files changed, 8 insertions(+), 12 deletions(-)

diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c
index ac7165bad4..204b6a85e1 100644
--- a/src/conf/domain_conf.c
+++ b/src/conf/domain_conf.c
@@ -11654,16 +11654,15 @@ virDomainSoundDefParseXML(virDomainXMLOption *xml=
opt,
                           xmlXPathContextPtr ctxt,
                           unsigned int flags)
 {
-    virDomainSoundDef *def;
+    g_autoptr(virDomainSoundDef) def =3D g_new0(virDomainSoundDef, 1);
     VIR_XPATH_NODE_AUTORESTORE(ctxt)
     xmlNodePtr audioNode;

-    def =3D g_new0(virDomainSoundDef, 1);
     ctxt->node =3D node;

     if (virXMLPropEnum(node, "model", virDomainSoundModelTypeFromString,
                        VIR_XML_PROP_REQUIRED, &def->model) < 0)
-        goto error;
+        return NULL;

     if (virDomainSoundModelSupportsCodecs(def)) {
         int ncodecs;
@@ -11672,7 +11671,7 @@ virDomainSoundDefParseXML(virDomainXMLOption *xmlop=
t,
         /* parse the <codec> subelements for sound models that support it =
*/
         ncodecs =3D virXPathNodeSet("./codec", ctxt, &codecNodes);
         if (ncodecs < 0)
-            goto error;
+            return NULL;

         if (ncodecs > 0) {
             size_t i;
@@ -11682,7 +11681,7 @@ virDomainSoundDefParseXML(virDomainXMLOption *xmlop=
t,
             for (i =3D 0; i < ncodecs; i++) {
                 virDomainSoundCodecDef *codec =3D virDomainSoundCodecDefPa=
rseXML(codecNodes[i]);
                 if (codec =3D=3D NULL)
-                    goto error;
+                    return NULL;

                 codec->cad =3D def->ncodecs; /* that will do for now */
                 def->codecs[def->ncodecs++] =3D codec;
@@ -11695,17 +11694,13 @@ virDomainSoundDefParseXML(virDomainXMLOption *xml=
opt,
         if (virXMLPropUInt(audioNode, "id", 10,
                            VIR_XML_PROP_REQUIRED | VIR_XML_PROP_NONZERO,
                            &def->audioId) < 0)
-            goto error;
+            return NULL;
     }

     if (virDomainDeviceInfoParseXML(xmlopt, node, ctxt, &def->info, flags)=
 < 0)
-        goto error;
-
-    return def;
+        return NULL;

- error:
-    virDomainSoundDefFree(def);
-    return NULL;
+    return g_steal_pointer(&def);
 }


diff --git a/src/conf/domain_conf.h b/src/conf/domain_conf.h
index 88aef29912..a04f7decc6 100644
--- a/src/conf/domain_conf.h
+++ b/src/conf/domain_conf.h
@@ -3569,6 +3569,7 @@ void virDomainSoundCodecDefFree(virDomainSoundCodecDe=
f *def);
 ssize_t virDomainSoundDefFind(const virDomainDef *def,
                               const virDomainSoundDef *sound);
 void virDomainSoundDefFree(virDomainSoundDef *def);
+G_DEFINE_AUTOPTR_CLEANUP_FUNC(virDomainSoundDef, virDomainSoundDefFree);
 virDomainSoundDef *virDomainSoundDefRemove(virDomainDef *def, size_t idx);
 void virDomainAudioDefFree(virDomainAudioDef *def);
 void virDomainMemballoonDefFree(virDomainMemballoonDef *def);
--=20
2.40.0
From nobody Thu Apr 18 03:07:03 2024
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=1683632760; cv=none;
	d=zohomail.com; s=zohoarc;
	b=P+5cPzpeZSBtTxpcyF/zA3Vg9WQehBk/E07jPQOXY+fVWjcca/VX21Fwa4IbYqMvpPP8TSgGpWOfjzUd7vLhPmZXVpkquPpK+2+dq03ECRXWnA4dntNanI6IBUBMB1Echa/RLZv3aiNutJJNg1DtfgP4rgRK7sGTRY2stbf+gYg=
ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com;
 s=zohoarc;
	t=1683632760;
 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=1QgprO4RlkaPZ7JZ9foGfdpgdnGnVmMJ9LZwWhwXOwg=;
	b=fGf6eBevBij/bmVOo+vr2qXgUSyliMXQfF9bTIqKoUIGP5QeyaCwOpqbyDslBbjrUQq7WhrtMeLyKT4QS3+sJydSyfhO3nTpSDvHddB+j2eNfCVz79aXZ3e03NGtT2Yr4QYJC/95mz8JoFIT7JXyaDoTYAbu5Evx+o6V9ngRbRc=
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=<pkrempa@redhat.com> (p=none dis=none)
Return-Path: <libvir-list-bounces@redhat.com>
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 1683632760512165.61911127233543;
 Tue, 9 May 2023 04:46:00 -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-297-fntbKU_NPCuN55Si4rebhw-1; Tue, 09 May 2023 07:45:56 -0400
Received: from smtp.corp.redhat.com (int-mx10.intmail.prod.int.rdu2.redhat.com
 [10.11.54.10])
	(using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits))
	(No client certificate requested)
	by mimecast-mx02.redhat.com (Postfix) with ESMTPS id EADC488D037;
	Tue,  9 May 2023 11:45:52 +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 D661D40F15C;
	Tue,  9 May 2023 11:45:52 +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 BC9AE19452D1;
	Tue,  9 May 2023 11:45:52 +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 2A96319465BC for <libvir-list@listman.corp.redhat.com>;
 Tue,  9 May 2023 11:45:52 +0000 (UTC)
Received: by smtp.corp.redhat.com (Postfix)
 id 1057D492C13; Tue,  9 May 2023 11:45:52 +0000 (UTC)
Received: from speedmetal.redhat.com (unknown [10.45.242.12])
 by smtp.corp.redhat.com (Postfix) with ESMTP id 80200492C3F
 for <libvir-list@redhat.com>; Tue,  9 May 2023 11:45:51 +0000 (UTC)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com;
	s=mimecast20190719; t=1683632759;
	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=1QgprO4RlkaPZ7JZ9foGfdpgdnGnVmMJ9LZwWhwXOwg=;
	b=G4bM5fVKpY42M4SKPScNMYfxQ8Dmb0h9Qi+EEAR8KXN6Rr5rQPXdjjZjK0A0XOBOpFGZ/a
	RHTwWaKPtb0RN5hBUWhChQ+ei552SM+qwsa0U1TKIGj4qJsnoiSd0sw7Si1t30SZ/kwv0k
	Ph0T6tHLXkNRjgxRK7x4O/hdVj0AemM=
X-MC-Unique: fntbKU_NPCuN55Si4rebhw-1
X-Original-To: libvir-list@listman.corp.redhat.com
From: Peter Krempa <pkrempa@redhat.com>
To: libvir-list@redhat.com
Subject: [PATCH 5/5] conf: qemu: Add support for multi-channel mode for 'usb'
 sound cards
Date: Tue,  9 May 2023 13:45:46 +0200
Message-Id: 
 <09ff6ca77f04809b87fd9ce09ab54e61ba747254.1683632708.git.pkrempa@redhat.com>
In-Reply-To: <cover.1683632707.git.pkrempa@redhat.com>
References: <cover.1683632707.git.pkrempa@redhat.com>
MIME-Version: 1.0
X-Scanned-By: MIMEDefang 3.1 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
 <libvir-list.redhat.com>
List-Unsubscribe: <https://listman.redhat.com/mailman/options/libvir-list>,
 <mailto:libvir-list-request@redhat.com?subject=unsubscribe>
List-Archive: <http://listman.redhat.com/archives/libvir-list/>
List-Post: <mailto:libvir-list@redhat.com>
List-Help: <mailto:libvir-list-request@redhat.com?subject=help>
List-Subscribe: <https://listman.redhat.com/mailman/listinfo/libvir-list>,
 <mailto:libvir-list-request@redhat.com?subject=subscribe>
Errors-To: libvir-list-bounces@redhat.com
Sender: "libvir-list" <libvir-list-bounces@redhat.com>
X-Scanned-By: MIMEDefang 3.1 on 10.11.54.10
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: 1683632761697100007
Content-Type: text/plain; charset="utf-8"

Allow users controlling the multi-channel mode by adding a
'multichannel' property parsed for USB audio devices and wire up the
support in the qemu driver.

Closes: https://gitlab.com/libvirt/libvirt/-/issues/472
Signed-off-by: Peter Krempa <pkrempa@redhat.com>
Reviewed-by: J=C3=A1n Tomko <jtomko@redhat.com>
---
 docs/formatdomain.rst                         |  5 ++++
 src/conf/domain_conf.c                        | 23 +++++++++++++++++++
 src/conf/domain_conf.h                        |  4 ++++
 src/conf/schemas/domaincommon.rng             |  5 ++++
 src/qemu/qemu_command.c                       |  3 +++
 .../sound-device.x86_64-4.2.0.args            |  2 +-
 .../sound-device.x86_64-latest.args           |  2 +-
 tests/qemuxml2argvdata/sound-device.xml       |  2 +-
 .../sound-device.x86_64-latest.xml            |  2 +-
 9 files changed, 44 insertions(+), 4 deletions(-)

diff --git a/docs/formatdomain.rst b/docs/formatdomain.rst
index d62bda9adb..99383e725c 100644
--- a/docs/formatdomain.rst
+++ b/docs/formatdomain.rst
@@ -7235,6 +7235,11 @@ Valid values are:
    </devices>
    ...

+:since:`Since 9.4.0` the ``usb`` sound device can be optionally switched i=
nto
+multi-channel mode by using the ``multichannel`` attribute::
+
+  <sound model=3D'usb' multichannel=3D'yes'/>
+
 Each ``sound`` element has an optional sub-element ``<address>`` which can=
 tie
 the device to a particular PCI slot. See `Device Addresses`_.

diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c
index 204b6a85e1..6a864a8db9 100644
--- a/src/conf/domain_conf.c
+++ b/src/conf/domain_conf.c
@@ -11689,6 +11689,12 @@ virDomainSoundDefParseXML(virDomainXMLOption *xmlo=
pt,
         }
     }

+    if (def->model =3D=3D VIR_DOMAIN_SOUND_MODEL_USB) {
+        if (virXMLPropTristateBool(node, "multichannel", VIR_XML_PROP_NONE,
+                                   &def->multichannel) < 0)
+            return NULL;
+    }
+
     audioNode =3D virXPathNode("./audio", ctxt);
     if (audioNode) {
         if (virXMLPropUInt(audioNode, "id", 10,
@@ -11721,6 +11727,9 @@ virDomainSoundDefEquals(const virDomainSoundDef *a,
             return false;
     }

+    if (a->multichannel !=3D b->multichannel)
+        return false;
+
     if (a->info.type !=3D VIR_DOMAIN_DEVICE_ADDRESS_TYPE_NONE &&
         !virDomainDeviceInfoAddressIsEqual(&a->info, &b->info))
         return false;
@@ -20010,6 +20019,14 @@ virDomainSoundDefCheckABIStability(virDomainSoundD=
ef *src,
         return false;
     }

+    if (src->multichannel !=3D dst->multichannel) {
+        virReportError(VIR_ERR_CONFIG_UNSUPPORTED,
+                       _("Target sound card multichannel setting '%1$s' do=
es not match source '%2$s'"),
+                       virTristateBoolTypeToString(dst->multichannel),
+                       virTristateBoolTypeToString(src->multichannel));
+        return false;
+    }
+
     if (!virDomainDeviceInfoCheckABIStability(&src->info, &dst->info))
         return false;

@@ -24531,6 +24548,12 @@ virDomainSoundDefFormat(virBuffer *buf,

     virBufferAsprintf(&attrBuf, " model=3D'%s'",  model);

+    if (def->model =3D=3D VIR_DOMAIN_SOUND_MODEL_USB &&
+        def->multichannel !=3D VIR_TRISTATE_BOOL_ABSENT) {
+        virBufferAsprintf(&attrBuf, " multichannel=3D'%s'",
+                          virTristateBoolTypeToString(def->multichannel));
+    }
+
     virXMLFormatElement(buf,  "sound", &attrBuf, &childBuf);

     return 0;
diff --git a/src/conf/domain_conf.h b/src/conf/domain_conf.h
index a04f7decc6..c1cb2ed69d 100644
--- a/src/conf/domain_conf.h
+++ b/src/conf/domain_conf.h
@@ -1596,6 +1596,10 @@ struct _virDomainSoundDef {
     size_t ncodecs;
     virDomainSoundCodecDef **codecs;

+    /* VIR_DOMAIN_SOUND_MODEL_USB can be optionally switched to
+     * multi-channel mode */
+    virTristateBool multichannel;
+
     unsigned int audioId;
 };

diff --git a/src/conf/schemas/domaincommon.rng b/src/conf/schemas/domaincom=
mon.rng
index 57fb4a5e33..f8c7b6a648 100644
--- a/src/conf/schemas/domaincommon.rng
+++ b/src/conf/schemas/domaincommon.rng
@@ -4969,6 +4969,11 @@
           <value>usb</value>
         </choice>
       </attribute>
+      <optional>
+        <attribute name=3D"multichannel">
+          <ref name=3D"virYesNo"/>
+        </attribute>
+      </optional>
       <interleave>
         <optional>
           <ref name=3D"alias"/>
diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c
index dcad449413..2a6d9408f6 100644
--- a/src/qemu/qemu_command.c
+++ b/src/qemu/qemu_command.c
@@ -4384,6 +4384,7 @@ qemuBuildSoundDevCmd(virCommand *cmd,
     g_autoptr(virJSONValue) props =3D NULL;
     const char *model =3D NULL;
     g_autofree char *audioid =3D NULL;
+    virTristateBool multichannel =3D VIR_TRISTATE_BOOL_ABSENT;

     switch (sound->model) {
     case VIR_DOMAIN_SOUND_MODEL_ES1370:
@@ -4397,6 +4398,7 @@ qemuBuildSoundDevCmd(virCommand *cmd,
         break;
     case VIR_DOMAIN_SOUND_MODEL_USB:
         model =3D "usb-audio";
+        multichannel =3D sound->multichannel;
         break;
     case VIR_DOMAIN_SOUND_MODEL_ICH9:
         model =3D "ich9-intel-hda";
@@ -4419,6 +4421,7 @@ qemuBuildSoundDevCmd(virCommand *cmd,
                               "s:driver", model,
                               "s:id", sound->info.alias,
                               "S:audiodev", audioid,
+                              "T:multi", multichannel,
                               NULL) < 0)
         return -1;

diff --git a/tests/qemuxml2argvdata/sound-device.x86_64-4.2.0.args b/tests/=
qemuxml2argvdata/sound-device.x86_64-4.2.0.args
index 121b37ff99..b2a5afd8c8 100644
--- a/tests/qemuxml2argvdata/sound-device.x86_64-4.2.0.args
+++ b/tests/qemuxml2argvdata/sound-device.x86_64-4.2.0.args
@@ -44,7 +44,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue=
st1/.config \
 -device hda-micro,id=3Dsound7-codec0,bus=3Dsound7.0,cad=3D0,audiodev=3Daud=
io1 \
 -device hda-duplex,id=3Dsound7-codec1,bus=3Dsound7.0,cad=3D1,audiodev=3Dau=
dio1 \
 -device hda-output,id=3Dsound7-codec2,bus=3Dsound7.0,cad=3D2,audiodev=3Dau=
dio1 \
--device usb-audio,id=3Dsound8,audiodev=3Daudio1,bus=3Dusb.0,port=3D1 \
+-device usb-audio,id=3Dsound8,audiodev=3Daudio1,multi=3Don,bus=3Dusb.0,por=
t=3D1 \
 -device virtio-balloon-pci,id=3Dballoon0,bus=3Dpci.0,addr=3D0x8 \
 -sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource=
control=3Ddeny \
 -msg timestamp=3Don
diff --git a/tests/qemuxml2argvdata/sound-device.x86_64-latest.args b/tests=
/qemuxml2argvdata/sound-device.x86_64-latest.args
index 3132760fe0..e0a2f21b31 100644
--- a/tests/qemuxml2argvdata/sound-device.x86_64-latest.args
+++ b/tests/qemuxml2argvdata/sound-device.x86_64-latest.args
@@ -44,7 +44,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue=
st1/.config \
 -device '{"driver":"hda-micro","id":"sound7-codec0","bus":"sound7.0","cad"=
:0,"audiodev":"audio1"}' \
 -device '{"driver":"hda-duplex","id":"sound7-codec1","bus":"sound7.0","cad=
":1,"audiodev":"audio1"}' \
 -device '{"driver":"hda-output","id":"sound7-codec2","bus":"sound7.0","cad=
":2,"audiodev":"audio1"}' \
--device '{"driver":"usb-audio","id":"sound8","audiodev":"audio1","bus":"us=
b.0","port":"1"}' \
+-device '{"driver":"usb-audio","id":"sound8","audiodev":"audio1","multi":t=
rue,"bus":"usb.0","port":"1"}' \
 -device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","add=
r":"0x8"}' \
 -sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource=
control=3Ddeny \
 -msg timestamp=3Don
diff --git a/tests/qemuxml2argvdata/sound-device.xml b/tests/qemuxml2argvda=
ta/sound-device.xml
index 35a60da197..c58033235c 100644
--- a/tests/qemuxml2argvdata/sound-device.xml
+++ b/tests/qemuxml2argvdata/sound-device.xml
@@ -34,7 +34,7 @@
       <codec type=3D'duplex'/>
       <codec type=3D'output'/>
     </sound>
-    <sound model=3D'usb'/>
+    <sound model=3D'usb' multichannel=3D'yes'/>
     <memballoon model=3D'virtio'/>
   </devices>
 </domain>
diff --git a/tests/qemuxml2xmloutdata/sound-device.x86_64-latest.xml b/test=
s/qemuxml2xmloutdata/sound-device.x86_64-latest.xml
index 89f537bb01..29d700cebb 100644
--- a/tests/qemuxml2xmloutdata/sound-device.x86_64-latest.xml
+++ b/tests/qemuxml2xmloutdata/sound-device.x86_64-latest.xml
@@ -52,7 +52,7 @@
       <codec type=3D'output'/>
       <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x07' f=
unction=3D'0x0'/>
     </sound>
-    <sound model=3D'usb'/>
+    <sound model=3D'usb' multichannel=3D'yes'/>
     <audio id=3D'1' type=3D'none'/>
     <memballoon model=3D'virtio'>
       <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x08' f=
unction=3D'0x0'/>
--=20
2.40.0