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

add opensolaris ostype and disable x2apic

Browse Source 
Signed-off-by: Alexandre Derumier <aderumier@odiso.com>
This commit is contained in:
Alexandre Derumier 2013-09-23 09:10:32 +02:00 committed by Dietmar Maurer
parent 7e3c14faec
commit 6b9d84cfb2
1 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
PVE/QemuServer.pm
View File

@ -244,7 +244,7 @@ my $confdesc = {
ostype => { ostype => {
optional => 1, optional => 1,
type => 'string', type => 'string',
enum => [qw(other wxp w2k w2k3 w2k8 wvista win7 win8 l24 l26)], enum => [qw(other wxp w2k w2k3 w2k8 wvista win7 win8 l24 l26 solaris)],
description => <<EODESC, description => <<EODESC,
Used to enable special optimization/features for specific Used to enable special optimization/features for specific
operating systems: operating systems:
@ -259,8 +259,9 @@ win7 => Microsoft Windows 7
win8 => Microsoft Windows 8/2012 win8 => Microsoft Windows 8/2012
l24 => Linux 2.4 Kernel l24 => Linux 2.4 Kernel
l26 => Linux 2.6/3.X Kernel l26 => Linux 2.6/3.X Kernel
solaris => solaris/opensolaris/openindiania kernel
other|l24|l26 ... no special behaviour other|l24|l26|solaris ... no special behaviour
wxp|w2k|w2k3|w2k8|wvista|win7|win8 ... use --localtime switch wxp|w2k|w2k3|w2k8|wvista|win7|win8 ... use --localtime switch
EODESC EODESC
}, },
@ -2396,7 +2397,7 @@ sub config_to_command {
my $useLocaltime = $conf->{localtime}; my $useLocaltime = $conf->{localtime};
if (my $ost = $conf->{ostype}) { if (my $ost = $conf->{ostype}) {
# other, wxp, w2k, w2k3, w2k8, wvista, win7, win8, l24, l26 # other, wxp, w2k, w2k3, w2k8, wvista, win7, win8, l24, l26, solaris
if ($ost =~ m/^w/) { # windows if ($ost =~ m/^w/) { # windows
$useLocaltime = 1 if !defined($conf->{localtime}); $useLocaltime = 1 if !defined($conf->{localtime});
@ -2442,7 +2443,9 @@ sub config_to_command {
my $cpu = $nokvm ? "qemu64" : "kvm64"; my $cpu = $nokvm ? "qemu64" : "kvm64";
$cpu = $conf->{cpu} if $conf->{cpu}; $cpu = $conf->{cpu} if $conf->{cpu};
push @$cpuFlags , '+x2apic' if !$nokvm; push @$cpuFlags , '+x2apic' if !$nokvm && $conf->{ostype} ne 'solaris';
push @$cpuFlags , '-x2apic' if $conf->{ostype} eq 'solaris';
push @$cpuFlags, '+sep' if $cpu eq 'kvm64' || $cpu eq 'kvm32'; push @$cpuFlags, '+sep' if $cpu eq 'kvm64' || $cpu eq 'kvm32';