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

Refactors $nokvm to $kvm

Browse Source 
for improved readability and consistency with the option name.
This commit is contained in:
Philip Abernethy 2017-08-21 11:47:17 +02:00 committed by Fabian Grünbichler
parent 075e8249fa
commit 74c02ef7f8
1 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
PVE/QemuServer.pm
View File

@ -1740,8 +1740,8 @@ sub print_netdev_full {
sub print_cpu_device { sub print_cpu_device {
my ($conf, $id) = @_; my ($conf, $id) = @_;
my $nokvm = defined($conf->{kvm}) && $conf->{kvm} == 0 ? 1 : 0; my $kvm = $conf->{kvm} // 1;
my $cpu = $nokvm ? "qemu64" : "kvm64"; my $cpu = $kvm ? "kvm64" : "qemu64";
if (my $cputype = $conf->{cpu}) { if (my $cputype = $conf->{cpu}) {
my $cpuconf = PVE::JSONSchema::parse_property_string($cpu_fmt, $cputype) my $cpuconf = PVE::JSONSchema::parse_property_string($cpu_fmt, $cputype)
or die "Cannot parse cpu description: $cputype\n"; or die "Cannot parse cpu description: $cputype\n";
@ -2835,6 +2835,7 @@ sub config_to_command {
my $vernum = 0; # unknown my $vernum = 0; # unknown
my $ostype = $conf->{ostype}; my $ostype = $conf->{ostype};
my $winversion = windows_version($ostype); my $winversion = windows_version($ostype);
my $kvm = $conf->{kvm} // 1;
if ($kvmver =~ m/^(\d+)\.(\d+)$/) { if ($kvmver =~ m/^(\d+)\.(\d+)$/) {
$vernum = $1*1000000+$2*1000; $vernum = $1*1000000+$2*1000;
@ -3085,7 +3086,6 @@ sub config_to_command {
# time drift fix # time drift fix
my $tdf = defined($conf->{tdf}) ? $conf->{tdf} : $defaults->{tdf}; my $tdf = defined($conf->{tdf}) ? $conf->{tdf} : $defaults->{tdf};
my $nokvm = defined($conf->{kvm}) && $conf->{kvm} == 0 ? 1 : 0;
my $useLocaltime = $conf->{localtime}; my $useLocaltime = $conf->{localtime};
if ($winversion >= 5) { # windows if ($winversion >= 5) { # windows
@ -3104,7 +3104,7 @@ sub config_to_command {
push @$rtcFlags, 'driftfix=slew' if $tdf; push @$rtcFlags, 'driftfix=slew' if $tdf;
if ($nokvm) { if (!$kvm) {
push @$machineFlags, 'accel=tcg'; push @$machineFlags, 'accel=tcg';
} else { } else {
die "No accelerator found!\n" if !$cpuinfo->{hvm}; die "No accelerator found!\n" if !$cpuinfo->{hvm};
@ -3120,7 +3120,7 @@ sub config_to_command {
push @$rtcFlags, 'base=localtime'; push @$rtcFlags, 'base=localtime';
} }
my $cpu = $nokvm ? "qemu64" : "kvm64"; my $cpu = $kvm ? "kvm64" : "qemu64";
if (my $cputype = $conf->{cpu}) { if (my $cputype = $conf->{cpu}) {
my $cpuconf = PVE::JSONSchema::parse_property_string($cpu_fmt, $cputype) my $cpuconf = PVE::JSONSchema::parse_property_string($cpu_fmt, $cputype)
or die "Cannot parse cpu description: $cputype\n"; or die "Cannot parse cpu description: $cputype\n";
@ -3139,13 +3139,13 @@ sub config_to_command {
if (qemu_machine_feature_enabled ($machine_type, $kvmver, 2, 3)) { if (qemu_machine_feature_enabled ($machine_type, $kvmver, 2, 3)) {
push @$cpuFlags , '+kvm_pv_unhalt' if !$nokvm; push @$cpuFlags , '+kvm_pv_unhalt' if $kvm;
push @$cpuFlags , '+kvm_pv_eoi' if !$nokvm; push @$cpuFlags , '+kvm_pv_eoi' if $kvm;
} }
add_hyperv_enlightenments($cpuFlags, $winversion, $machine_type, $kvmver, $conf->{bios}, $gpu_passthrough) if !$nokvm; add_hyperv_enlightenments($cpuFlags, $winversion, $machine_type, $kvmver, $conf->{bios}, $gpu_passthrough) if $kvm;
push @$cpuFlags, 'enforce' if $cpu ne 'host' && !$nokvm; push @$cpuFlags, 'enforce' if $cpu ne 'host' && $kvm;
push @$cpuFlags, 'kvm=off' if $kvm_off; push @$cpuFlags, 'kvm=off' if $kvm_off;