Proxmox/qemu-server
5
0
Fork 0
mirror of git://git.proxmox.com/git/qemu-server.git synced 2025-01-08 21:18:03 +03:00
Code Releases Activity

cfg2cmd: factor out audio device generation

Browse Source 
and version guard it with 4.0 machines, just do be sure

Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>
This commit is contained in:
Thomas Lamprecht 2020-04-17 15:20:05 +02:00
parent 940e2a3a06
commit b01de19922
1 changed files with 26 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

41
PVE/QemuServer.pm
View File

@ -2751,6 +2751,29 @@ sub conf_has_audio {
};
}
sub audio_devs {
my ($audio, $audiopciaddr) = @_;
my $devs = [];
my $id = $audio->{dev_id};
my $audiodev = "audiodev=$audio->{backend_id}";
if ($audio->{dev} eq 'AC97') {
push @$devs, '-device', "AC97,id=${id}${audiopciaddr},$audiodev";
} elsif ($audio->{dev} =~ /intel\-hda$/) {
push @$devs, '-device', "$audio->{dev},id=${id}${audiopciaddr}";
push @$devs, '-device', "hda-micro,id=${id}-codec0,bus=${id}.0,cad=0,$audiodev";
push @$devs, '-device', "hda-duplex,id=${id}-codec1,bus=${id}.0,cad=1,$audiodev";
} else {
die "unkown audio device '$audio->{dev}', implement me!";
}
push @$devs, '-audiodev', "$audio->{backend},id=$audio->{backend_id}";
return $devs;
}
sub vga_conf_has_spice {
my ($vga) = @_;
@ -3250,22 +3273,10 @@ sub config_to_command {
}
}
if (my $audio = conf_has_audio($conf)) {
if (min_version($machine_version, 4, 0) && (my $audio = conf_has_audio($conf))) {
my $audiopciaddr = print_pci_addr("audio0", $bridges, $arch, $machine_type);
my $id = $audio->{dev_id};
if ($audio->{dev} eq 'AC97') {
push @$devices, '-device', "AC97,id=${id}${audiopciaddr},audiodev=$audio->{backend_id}";
} elsif ($audio->{dev} =~ /intel\-hda$/) {
push @$devices, '-device', "$audio->{dev},id=${id}${audiopciaddr}";
push @$devices, '-device', "hda-micro,id=${id}-codec0,bus=${id}.0,cad=0,audiodev=$audio->{backend_id}";
push @$devices, '-device', "hda-duplex,id=${id}-codec1,bus=${id}.0,cad=1,audiodev=$audio->{backend_id}";
} else {
die "unkown audio device '$audio->{dev}', implement me!";
}
push @$devices, '-audiodev', "$audio->{backend},id=$audio->{backend_id}";
my $audio_devs = audio_devs($audio, $audiopciaddr);
push @$devices, @$audio_devs;
}
my $sockets = 1;