proxmox-mirrors/qemu-server
1
0
Fork 0
mirror of https://git.proxmox.com/git/qemu-server synced 2025-05-28 18:45:07 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

cfg2cmd: split out helper for vga properties

Browse Source 
To remove some line bloat from the config_to_command() function.

Signed-off-by: Fiona Ebner <f.ebner@proxmox.com>
This commit is contained in:
Fiona Ebner 2024-05-31 17:13:30 +02:00 committed by Fabian Grünbichler
parent 1f71de6713
commit 3de77f7590
1 changed files with 22 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
PVE/QemuServer.pm
View File

@ -3493,6 +3493,27 @@ my sub print_ovmf_drive_commandlines {
return ("if=pflash,unit=0,format=raw,readonly=on,file=$ovmf_code", $var_drive_str);
}
my sub get_vga_properties {
my ($conf, $arch, $machine_version, $winversion) = @_;
my $vga = parse_vga($conf->{vga});
my $qxlnum = vga_conf_has_spice($conf->{vga});
$vga->{type} = 'qxl' if $qxlnum;
if (!$vga->{type}) {
if ($arch eq 'aarch64') {
$vga->{type} = 'virtio';
} elsif (min_version($machine_version, 2, 9)) {
$vga->{type} = (!$winversion || $winversion >= 6) ? 'std' : 'cirrus';
} else {
$vga->{type} = ($winversion >= 6) ? 'std' : 'cirrus';
}
}
return ($vga, $qxlnum);
}
sub config_to_command {
my ($storecfg, $vmid, $conf, $defaults, $forcemachine, $forcecpu,
$live_restore_backing) = @_;
@ -3666,20 +3687,8 @@ sub config_to_command {
my @usbcontrollers = PVE::QemuServer::USB::get_usb_controllers(
$conf, $bridges, $arch, $machine_type, $machine_version);
push @$devices, @usbcontrollers if @usbcontrollers;
my $vga = parse_vga($conf->{vga});
my $qxlnum = vga_conf_has_spice($conf->{vga});
$vga->{type} = 'qxl' if $qxlnum;
if (!$vga->{type}) {
if ($arch eq 'aarch64') {
$vga->{type} = 'virtio';
} elsif (min_version($machine_version, 2, 9)) {
$vga->{type} = (!$winversion || $winversion >= 6) ? 'std' : 'cirrus';
} else {
$vga->{type} = ($winversion >= 6) ? 'std' : 'cirrus';
}
}
my ($vga, $qxlnum) = get_vga_properties($conf, $arch, $machine_version, $winversion);
# enable absolute mouse coordinates (needed by vnc)
my $tablet = $conf->{tablet};