[pve-devel] applied: [PATCH qemu-server] q35 already has an 'audio0' device, rename our to "audiodev$id"

[Thomas Lamprecht]

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.

While we just would had removed the audio0 device if we had detected
this earlier in the new 4.0 q35 config, we cannot do so anymore due
to migration compatibility.

So rename the device from "audio$id" to audiodev$id".

Co-authored-by: Aaron Lauterer <a.lauterer at proxmox.com>
Signed-off-by: Thomas Lamprecht <t.lamprecht at proxmox.com>
---

@Aaron: Much thanks for detecting this before rolling out, only tested the
i440fx, worked great there.. :)

 PVE/QemuServer.pm | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/PVE/QemuServer.pm b/PVE/QemuServer.pm
index e5a6935..8c519b5 100644
--- a/PVE/QemuServer.pm
+++ b/PVE/QemuServer.pm
@@ -3438,7 +3438,7 @@ sub conf_has_audio {
 
     return {
 	dev => $audioproperties->{device},
-	dev_id => "audio$id",
+	dev_id => "audiodev$id",
 	backend => $audiodriver,
 	backend_id => "$audiodriver-backend${id}",
     };
-- 
2.20.1