[pve-devel] [PATCH qemu-server] Remove conflicting audio device definition in Q35

[Aaron Lauterer]

The latest changes to our audio device implemenation [0] changed the
naming of the device id to "audio<id>" which in practice resulted in
"audio0".

This conflicts with the predefined audio device in the Q35 configs
that is also using "audio0". The result is that a VM with a configured
audio device and Q35 type will not start.

The Q35 configs only configure the "ich9-intel-hda" device without any
"hda-micro" or "hda-duplex" devices. The "*intel-hda" is just the
controller and needs at least one of the other two to actually offer any
usable audio devices.

As it seems to be there by accident and is of no apparent use let's remove the
conflicting "audio0" device from the Q35 configs.

[0]: https://git.proxmox.com/?p=qemu-server.git;a=commitdiff;h=d5535a00c45b63fe4245abbd5949371560464e99;hp=1448547f4482b0d1492ca1c1f2edd513ed26b0ca

Signed-off-by: Aaron Lauterer <a.lauterer at proxmox.com>
---
 pve-q35-4.0.cfg | 7 -------
 pve-q35.cfg     | 7 -------
 2 files changed, 14 deletions(-)

diff --git a/pve-q35-4.0.cfg b/pve-q35-4.0.cfg
index 9a294bd..31fd79f 100644
--- a/pve-q35-4.0.cfg
+++ b/pve-q35-4.0.cfg
@@ -58,13 +58,6 @@
   masterbus = "ehci-2.0"
   firstport = "4"
 
-
-[device "audio0"]
-  driver = "ich9-intel-hda"
-  bus = "pcie.0"
-  addr = "1b.0"
-
-
 [device "ich9-pcie-port-1"]
   driver = "pcie-root-port"
   x-speed = "16"
diff --git a/pve-q35.cfg b/pve-q35.cfg
index c233036..1e14d7f 100644
--- a/pve-q35.cfg
+++ b/pve-q35.cfg
@@ -58,13 +58,6 @@
   masterbus = "ehci-2.0"
   firstport = "4"
 
-
-[device "audio0"]
-  driver = "ich9-intel-hda"
-  bus = "pcie.0"
-  addr = "1b.0"
-
-
 [device "ich9-pcie-port-1"]
   driver = "ioh3420"
   multifunction = "on"
-- 
2.20.1