From nobody Tue Feb 10 06:27:55 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=1640202359; cv=none;
	d=zohomail.com; s=zohoarc;
	b=aoK9zFbKOxTZ32lRCUSFaSYm0aKLZncsHgOF1rKTIqmYayw3EwA775jJyv7S94zzOaGMV9nlJlpRvCoA3zmStstCoD9PNq4pDaJVBOwC1FQ4A4xASlvglEXNwCZl5623qDypX+vIo2JJY0uX3/lBuqwiVIgJ1BpNwT7Kb2j55VQ=
ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com;
 s=zohoarc;
	t=1640202359;
 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=DEYsUMmwWMfgObSCS3dG++dhhbdiPblYP7D4xGrfAis=;
	b=Xn4QJsFmq6q0dJ4RrXpOeWbbGHSI77CwVUndE4V3JcCJztGhr5HrDMlI1HeGozZ3b1G5mDGd5J8rTnJ0PI3qFUG4LTrmgLhfZBw/0dKSzeFCAby91bBg3VKpboIcBv9z1QKXRss+AN/xitusGEdgxC9CD/QLyz0jDbmlKCPV/R4=
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=<marcandre.lureau@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 1640202359509735.9490924907694;
 Wed, 22 Dec 2021 11:45:59 -0800 (PST)
Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com
 [209.132.183.4]) by relay.mimecast.com with ESMTP with STARTTLS
 (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id
 us-mta-437-TO2FWwKvOkOEosCGGbksAw-1; Wed, 22 Dec 2021 14:45:54 -0500
Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.phx2.redhat.com
 [10.5.11.16])
	(using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits))
	(No client certificate requested)
	by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 81F5C760C1;
	Wed, 22 Dec 2021 19:45:48 +0000 (UTC)
Received: from colo-mx.corp.redhat.com
 (colo-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.21])
	by smtp.corp.redhat.com (Postfix) with ESMTPS id 5FADC7BB57;
	Wed, 22 Dec 2021 19:45:48 +0000 (UTC)
Received: from lists01.pubmisc.prod.ext.phx2.redhat.com
 (lists01.pubmisc.prod.ext.phx2.redhat.com [10.5.19.33])
	by colo-mx.corp.redhat.com (Postfix) with ESMTP id 3058B4A700;
	Wed, 22 Dec 2021 19:45:48 +0000 (UTC)
Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.phx2.redhat.com
	[10.5.11.14])
	by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP
	id 1BMJjlYr019148 for <libvir-list@listman.util.phx.redhat.com>;
	Wed, 22 Dec 2021 14:45:47 -0500
Received: by smtp.corp.redhat.com (Postfix)
	id F239A78AA7; Wed, 22 Dec 2021 19:45:46 +0000 (UTC)
Received: from localhost (unknown [10.39.208.37])
	by smtp.corp.redhat.com (Postfix) with ESMTP id 838E8752D7;
	Wed, 22 Dec 2021 19:45:45 +0000 (UTC)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com;
	s=mimecast20190719; t=1640202358;
	h=from:from:sender:sender: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:list-id:list-help:
	 list-unsubscribe:list-subscribe:list-post;
	bh=DEYsUMmwWMfgObSCS3dG++dhhbdiPblYP7D4xGrfAis=;
	b=TeoEJWfl641P1WJqDHu9SeckoSU/nfKRnRqpStzI0MVhdVfapdzL/PGot1IWQ8c6EfBJM0
	0/R9/MIka41fxIiphrtmcv9QoAkwW8zg7ECShx18JA+vrmXkANs6wLdYBa6DP4hOe+FmOb
	fJ3mfSO1LlA/7NB0kE45fe2SROVYGHc=
X-MC-Unique: TO2FWwKvOkOEosCGGbksAw-1
From: marcandre.lureau@redhat.com
To: libvir-list@redhat.com
Subject: [libvirt PATCH v3 09/16] conf: add <audio type='dbus'> support
Date: Wed, 22 Dec 2021 23:43:38 +0400
Message-Id: <20211222194345.766352-10-marcandre.lureau@redhat.com>
In-Reply-To: <20211222194345.766352-1-marcandre.lureau@redhat.com>
References: <20211222194345.766352-1-marcandre.lureau@redhat.com>
MIME-Version: 1.0
X-Scanned-By: MIMEDefang 2.79 on 10.5.11.14
X-loop: libvir-list@redhat.com
Cc: mprivozn@redhat.com,
	=?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= <marcandre.lureau@redhat.com>
X-BeenThere: libvir-list@redhat.com
X-Mailman-Version: 2.1.12
Precedence: junk
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: <https://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>
Sender: libvir-list-bounces@redhat.com
Errors-To: libvir-list-bounces@redhat.com
X-Scanned-By: MIMEDefang 2.79 on 10.5.11.16
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-Type: text/plain; charset="utf-8"
Content-Transfer-Encoding: quoted-printable
X-ZohoMail-DKIM: pass (identity @redhat.com)
X-ZM-MESSAGEID: 1640202361481100001

From: Marc-Andr=C3=A9 Lureau <marcandre.lureau@redhat.com>

Signed-off-by: Marc-Andr=C3=A9 Lureau <marcandre.lureau@redhat.com>
---
 docs/schemas/domaincommon.rng                 | 29 ++++++++++++
 src/bhyve/bhyve_command.c                     |  1 +
 src/conf/domain_conf.c                        | 34 +++++++++++---
 src/conf/domain_conf.h                        |  2 +
 src/qemu/qemu_command.c                       |  7 +++
 src/qemu/qemu_validate.c                      |  3 ++
 .../qemuxml2argvdata/graphics-dbus-audio.xml  | 45 +++++++++++++++++++
 .../graphics-dbus-audio.xml                   |  1 +
 tests/qemuxml2xmltest.c                       |  4 ++
 9 files changed, 121 insertions(+), 5 deletions(-)
 create mode 100644 tests/qemuxml2argvdata/graphics-dbus-audio.xml
 create mode 120000 tests/qemuxml2xmloutdata/graphics-dbus-audio.xml

diff --git a/docs/schemas/domaincommon.rng b/docs/schemas/domaincommon.rng
index 29a506cff86a..5938f0d5acd3 100644
--- a/docs/schemas/domaincommon.rng
+++ b/docs/schemas/domaincommon.rng
@@ -4032,6 +4032,13 @@
                 </optional>
               </element>
             </optional>
+            <optional>
+              <element name=3D"audio">
+                <attribute name=3D"id">
+                  <ref name=3D"uint8"/>
+                </attribute>
+              </element>
+            </optional>
           </interleave>
         </group>
         <group>
@@ -4844,6 +4851,11 @@
     <ref name=3D"audiocommonchild"/>
   </define>
=20
+  <define name=3D"audiodbus">
+    <ref name=3D"audiocommonattr"/>
+    <ref name=3D"audiocommonchild"/>
+  </define>
+
   <define name=3D"audio">
     <element name=3D"audio">
       <attribute name=3D"id">
@@ -4872,6 +4884,23 @@
             </optional>
           </interleave>
         </group>
+        <group>
+          <attribute name=3D"type">
+            <value>dbus</value>
+          </attribute>
+          <interleave>
+            <optional>
+              <element name=3D"input">
+                <ref name=3D"audiodbus"/>
+              </element>
+            </optional>
+            <optional>
+              <element name=3D"output">
+                <ref name=3D"audiodbus"/>
+              </element>
+            </optional>
+          </interleave>
+        </group>
         <group>
           <attribute name=3D"type">
             <value>alsa</value>
diff --git a/src/bhyve/bhyve_command.c b/src/bhyve/bhyve_command.c
index 3368d20a042c..95bba738fe5d 100644
--- a/src/bhyve/bhyve_command.c
+++ b/src/bhyve/bhyve_command.c
@@ -551,6 +551,7 @@ bhyveBuildSoundArgStr(const virDomainDef *def G_GNUC_UN=
USED,
         case VIR_DOMAIN_AUDIO_TYPE_SDL:
         case VIR_DOMAIN_AUDIO_TYPE_SPICE:
         case VIR_DOMAIN_AUDIO_TYPE_FILE:
+        case VIR_DOMAIN_AUDIO_TYPE_DBUS:
             virReportError(VIR_ERR_CONFIG_UNSUPPORTED,
                            _("unsupported audio backend '%s'"),
                            virDomainAudioTypeTypeToString(audio->type));
diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c
index 1b44513d3415..791df66ff024 100644
--- a/src/conf/domain_conf.c
+++ b/src/conf/domain_conf.c
@@ -764,6 +764,7 @@ VIR_ENUM_IMPL(virDomainAudioType,
               "sdl",
               "spice",
               "file",
+              "dbus",
 );
=20
 VIR_ENUM_IMPL(virDomainAudioSDLDriver,
@@ -3032,6 +3033,7 @@ virDomainAudioDefFree(virDomainAudioDef *def)
         g_free(def->backend.file.path);
         break;
=20
+    case VIR_DOMAIN_AUDIO_TYPE_DBUS:
     case VIR_DOMAIN_AUDIO_TYPE_LAST:
         break;
     }
@@ -12908,6 +12910,14 @@ virDomainGraphicsDefParseXMLDBus(virDomainGraphics=
Def *def,
             return -1;
     }
=20
+    cur =3D virXPathNode("./audio", ctxt);
+    if (cur) {
+        if (virXMLPropUInt(cur, "id", 10,
+                           VIR_XML_PROP_REQUIRED | VIR_XML_PROP_NONZERO,
+                           &def->data.dbus.audioId) < 0)
+            return -1;
+    }
+
     return 0;
 }
=20
@@ -13398,6 +13408,9 @@ virDomainAudioDefParseXML(virDomainXMLOption *xmlop=
t G_GNUC_UNUSED,
         def->backend.file.path =3D virXMLPropString(node, "path");
         break;
=20
+    case VIR_DOMAIN_AUDIO_TYPE_DBUS:
+        break;
+
     case VIR_DOMAIN_AUDIO_TYPE_LAST:
     default:
         virReportEnumRangeError(virDomainAudioType, def->type);
@@ -25816,6 +25829,9 @@ virDomainAudioDefFormat(virBuffer *buf,
         virBufferEscapeString(&attrBuf, " path=3D'%s'", def->backend.file.=
path);
         break;
=20
+    case VIR_DOMAIN_AUDIO_TYPE_DBUS:
+        break;
+
     case VIR_DOMAIN_AUDIO_TYPE_LAST:
     default:
         virReportEnumRangeError(virDomainAudioType, def->type);
@@ -26750,7 +26766,7 @@ virDomainGraphicsDefFormat(virBuffer *buf,
             virBufferAsprintf(buf, " address=3D'%s'",
                               def->data.dbus.address);
=20
-        if (!def->data.dbus.gl)
+        if (!def->data.dbus.gl && def->data.dbus.audioId <=3D 0)
             break;
=20
         if (!children) {
@@ -26759,10 +26775,17 @@ virDomainGraphicsDefFormat(virBuffer *buf,
             children =3D true;
         }
=20
-        virBufferAsprintf(buf, "<gl enable=3D'%s'",
-                          virTristateBoolTypeToString(def->data.dbus.gl));
-        virBufferEscapeString(buf, " rendernode=3D'%s'", def->data.dbus.re=
ndernode);
-        virBufferAddLit(buf, "/>\n");
+        if (def->data.dbus.gl) {
+            virBufferAsprintf(buf, "<gl enable=3D'%s'",
+                              virTristateBoolTypeToString(def->data.dbus.g=
l));
+            virBufferEscapeString(buf, " rendernode=3D'%s'", def->data.dbu=
s.rendernode);
+            virBufferAddLit(buf, "/>\n");
+        }
+
+        if (def->data.dbus.audioId > 0)
+            virBufferAsprintf(buf, "<audio id=3D'%d'/>\n",
+                              def->data.dbus.audioId);
+
         break;
     case VIR_DOMAIN_GRAPHICS_TYPE_LAST:
         break;
@@ -30112,6 +30135,7 @@ virDomainAudioBackendIsEqual(virDomainAudioDef *thi=
s,
     case VIR_DOMAIN_AUDIO_TYPE_FILE:
         return STREQ_NULLABLE(this->backend.file.path, that->backend.file.=
path);
=20
+    case VIR_DOMAIN_AUDIO_TYPE_DBUS:
     case VIR_DOMAIN_AUDIO_TYPE_LAST:
     default:
         return false;
diff --git a/src/conf/domain_conf.h b/src/conf/domain_conf.h
index cd219df0ac3c..f15917c49500 100644
--- a/src/conf/domain_conf.h
+++ b/src/conf/domain_conf.h
@@ -1512,6 +1512,7 @@ typedef enum {
     VIR_DOMAIN_AUDIO_TYPE_SDL,
     VIR_DOMAIN_AUDIO_TYPE_SPICE,
     VIR_DOMAIN_AUDIO_TYPE_FILE,
+    VIR_DOMAIN_AUDIO_TYPE_DBUS,
=20
     VIR_DOMAIN_AUDIO_TYPE_LAST
 } virDomainAudioType;
@@ -1930,6 +1931,7 @@ struct _virDomainGraphicsDef {
             char *address;
             char *rendernode;
             virTristateBool gl;
+            unsigned int audioId;
             bool fromConfig;    /* true if the @address is config file ori=
ginated */
         } dbus;
     } data;
diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c
index 12197cfdb7b2..2524abb1e971 100644
--- a/src/qemu/qemu_command.c
+++ b/src/qemu/qemu_command.c
@@ -142,6 +142,7 @@ VIR_ENUM_IMPL(qemuAudioDriver,
               "sdl",
               "spice",
               "wav",
+              "dbus",
 );
=20
=20
@@ -7979,6 +7980,9 @@ qemuBuildAudioCommandLineArg(virCommand *cmd,
             return -1;
         break;
=20
+    case VIR_DOMAIN_AUDIO_TYPE_DBUS:
+        break;
+
     case VIR_DOMAIN_AUDIO_TYPE_LAST:
     default:
         virReportEnumRangeError(virDomainAudioType, def->type);
@@ -8183,6 +8187,9 @@ qemuBuildAudioCommandLineEnv(virCommand *cmd,
                                    audio->backend.file.path);
         break;
=20
+    case VIR_DOMAIN_AUDIO_TYPE_DBUS:
+        break;
+
     case VIR_DOMAIN_AUDIO_TYPE_LAST:
     default:
         virReportEnumRangeError(virDomainAudioType, audio->type);
diff --git a/src/qemu/qemu_validate.c b/src/qemu/qemu_validate.c
index 1001e44693f5..50253e9009b9 100644
--- a/src/qemu/qemu_validate.c
+++ b/src/qemu/qemu_validate.c
@@ -4455,6 +4455,9 @@ qemuValidateDomainDeviceDefAudio(virDomainAudioDef *a=
udio,
     case VIR_DOMAIN_AUDIO_TYPE_FILE:
         break;
=20
+    case VIR_DOMAIN_AUDIO_TYPE_DBUS:
+        break;
+
     case VIR_DOMAIN_AUDIO_TYPE_LAST:
     default:
         virReportEnumRangeError(virDomainAudioType, audio->type);
diff --git a/tests/qemuxml2argvdata/graphics-dbus-audio.xml b/tests/qemuxml=
2argvdata/graphics-dbus-audio.xml
new file mode 100644
index 000000000000..b1304e3f6ff8
--- /dev/null
+++ b/tests/qemuxml2argvdata/graphics-dbus-audio.xml
@@ -0,0 +1,45 @@
+<domain type=3D'qemu'>
+  <name>QEMUGuest1</name>
+  <uuid>c7a5fdbd-edaf-9455-926a-d65c16db1809</uuid>
+  <memory unit=3D'KiB'>219100</memory>
+  <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'/>
+  </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'/>
+    <graphics type=3D'dbus' p2p=3D'yes'>
+      <audio id=3D'1'/>
+    </graphics>
+    <audio id=3D'1' type=3D'dbus'>
+      <input mixingEngine=3D'no'/>
+      <output mixingEngine=3D'no'/>
+    </audio>
+    <video>
+      <model type=3D'cirrus' vram=3D'16384' heads=3D'1' primary=3D'yes'/>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x02' f=
unction=3D'0x0'/>
+    </video>
+    <memballoon model=3D'none'/>
+  </devices>
+</domain>
diff --git a/tests/qemuxml2xmloutdata/graphics-dbus-audio.xml b/tests/qemux=
ml2xmloutdata/graphics-dbus-audio.xml
new file mode 120000
index 000000000000..fe0f4a81d9e4
--- /dev/null
+++ b/tests/qemuxml2xmloutdata/graphics-dbus-audio.xml
@@ -0,0 +1 @@
+../qemuxml2argvdata/graphics-dbus-audio.xml
\ No newline at end of file
diff --git a/tests/qemuxml2xmltest.c b/tests/qemuxml2xmltest.c
index 00635cfd657e..276cb8bcc274 100644
--- a/tests/qemuxml2xmltest.c
+++ b/tests/qemuxml2xmltest.c
@@ -383,6 +383,10 @@ mymain(void)
     DO_TEST("graphics-dbus-p2p",
             QEMU_CAPS_DEVICE_CIRRUS_VGA,
             QEMU_CAPS_DISPLAY_DBUS);
+    DO_TEST("graphics-dbus-audio",
+            QEMU_CAPS_DEVICE_CIRRUS_VGA,
+            QEMU_CAPS_DISPLAY_DBUS,
+            QEMU_CAPS_AUDIODEV);
=20
     DO_TEST_CAPS_ARCH_LATEST("default-video-type-aarch64", "aarch64");
     DO_TEST_CAPS_ARCH_LATEST("default-video-type-ppc64", "ppc64");
--=20
2.34.1.8.g35151cf07204