proxmox-mirrors/qemu-server
1
0
Fork 0
mirror of https://git.proxmox.com/git/qemu-server synced 2025-08-05 12:46:25 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

cleanup spice code

Browse Source
This commit is contained in:
Dietmar Maurer 2013-10-02 09:11:57 +02:00
parent 2fa3151ebd
commit 590e698c07
1 changed files with 17 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
PVE/QemuServer.pm
View File

@ -2236,7 +2236,9 @@ sub foreach_volid {
sub vga_conf_has_spice { sub vga_conf_has_spice {
my ($vga) = @_; my ($vga) = @_;
return $vga && ($vga =~ m/^qxl/); return 0 if !$vga || $vga !~ m/^qxl([234])?$/;
return $1 || 1;
} }
sub config_to_command { sub config_to_command {
@ -2292,14 +2294,8 @@ sub config_to_command {
my $vga = $conf->{vga}; my $vga = $conf->{vga};
my $qxlnum = 0; my $qxlnum = vga_conf_has_spice($vga);
if (vga_conf_has_spice($vga)) { $vga = 'qxl' if $qxlnum;
$qxlnum = 1;
if($vga =~ m/^qxl(\d+)$/){
$qxlnum = $1;
}
$vga = 'qxl';
}
if (!$vga) { if (!$vga) {
if ($conf->{ostype} && ($conf->{ostype} eq 'win8' || if ($conf->{ostype} && ($conf->{ostype} eq 'win8' ||
@ -2317,7 +2313,7 @@ sub config_to_command {
$tablet = $conf->{tablet}; $tablet = $conf->{tablet};
} else { } else {
$tablet = $defaults->{tablet}; $tablet = $defaults->{tablet};
$tablet = 0 if vga_conf_has_spice($vga); # disable for spice because it is not needed $tablet = 0 if $qxlnum; # disable for spice because it is not needed
$tablet = 0 if $vga =~ m/^serial\d+$/; # disable if we use serial terminal (no vga card) $tablet = 0 if $vga =~ m/^serial\d+$/; # disable if we use serial terminal (no vga card)
} }
@ -2484,17 +2480,18 @@ sub config_to_command {
} }
my $spice_port; my $spice_port;
if (vga_conf_has_spice($vga)) {
if($qxlnum > 1 && $conf->{ostype} && $conf->{ostype} eq 'l26'){ if ($qxlnum) {
push @$cmd, '-global', 'qxl-vga.ram_size=134217728'; if ($qxlnum > 1) {
push @$cmd, '-global', 'qxl-vga.vram_size=67108864'; if ($conf->{ostype} && $conf->{ostype} =~ m/^w/){
} for(my $i = 1; $i < $qxlnum; $i++){
my $pciaddr = print_pci_addr("vga$i", $bridges);
if($qxlnum > 1 && $conf->{ostype} && $conf->{ostype} =~ m/^w/){ push @$cmd, '-device', "qxl,id=vga$i,ram_size=67108864,vram_size=33554432$pciaddr";
for(my $i = 1; $i < $qxlnum; $i++){ }
my $pciaddr = print_pci_addr("vga$i", $bridges); } else {
push @$cmd, '-device', "qxl,id=vga$i,ram_size=67108864,vram_size=33554432$pciaddr"; # assume other OS works like Linux
push @$cmd, '-global', 'qxl-vga.ram_size=134217728';
push @$cmd, '-global', 'qxl-vga.vram_size=67108864';
} }
} }