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

fix various conditionally declared vars

Browse Source 
Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>
This commit is contained in:
Thomas Lamprecht 2020-10-16 16:52:11 +02:00
parent d1c1af4b02
commit e5d611c382
2 changed files with 24 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
PVE/QemuMigrate.pm
View File

@ -974,7 +974,7 @@ sub phase2 {
my $downtimecounter = 0; my $downtimecounter = 0;
while (1) { while (1) {
$i++; $i++;
my $avglstat = $lstat/$i if $lstat; my $avglstat = $lstat ? $lstat / $i : 0;
usleep($usleep); usleep($usleep);
my $stat; my $stat;

36
PVE/QemuServer.pm
View File

@ -3210,17 +3210,7 @@ sub config_to_command {
push @$devices, '-device', $kbd if defined($kbd); push @$devices, '-device', $kbd if defined($kbd);
} }
my $bootorder = {}; my $bootorder = device_bootorder($conf);
my $boot = parse_property_string($boot_fmt, $conf->{boot}) if $conf->{boot};
if (!defined($boot) || $boot->{legacy}) {
$bootorder = bootorder_from_legacy($conf, $boot);
} elsif ($boot->{order}) {
# start at 100 to allow user to insert devices before us with -args
my $i = 100;
for my $dev (PVE::Tools::split_list($boot->{order})) {
$bootorder->{$dev} = $i++;
}
}
# host pci device passthrough # host pci device passthrough
my ($kvm_off, $gpu_passthrough, $legacy_igd) = PVE::QemuServer::PCI::print_hostpci_devices( my ($kvm_off, $gpu_passthrough, $legacy_igd) = PVE::QemuServer::PCI::print_hostpci_devices(
@ -3370,8 +3360,8 @@ sub config_to_command {
} }
} }
my $rng = parse_rng($conf->{rng0}) if $conf->{rng0}; my $rng = $conf->{rng0} ? parse_rng($conf->{rng0}) : undef;
if ($rng && &$version_guard(4, 1, 2)) { if ($rng && $version_guard->(4, 1, 2)) {
check_rng_source($rng->{source}); check_rng_source($rng->{source});
my $max_bytes = $rng->{max_bytes} // $rng_fmt->{max_bytes}->{default}; my $max_bytes = $rng->{max_bytes} // $rng_fmt->{max_bytes}->{default};
@ -7275,6 +7265,26 @@ sub get_default_bootdevices {
return \@ret; return \@ret;
} }
sub device_bootorder {
my ($conf) = @_;
return bootorder_from_legacy($conf) if !defined($conf->{boot});
my $boot = parse_property_string($boot_fmt, $conf->{boot});
my $bootorder = {};
if (!defined($boot) || $boot->{legacy}) {
$bootorder = bootorder_from_legacy($conf, $boot);
} elsif ($boot->{order}) {
my $i = 100; # start at 100 to allow user to insert devices before us with -args
for my $dev (PVE::Tools::split_list($boot->{order})) {
$bootorder->{$dev} = $i++;
}
}
return $bootorder;
}
# bash completion helper # bash completion helper
sub complete_backup_archives { sub complete_backup_archives {