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

improve error messages

Browse Source
This commit is contained in:
Wolfgang Bumiller 2016-10-17 14:49:05 +02:00
parent 2e5416790f
commit 961af8a3c5
1 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
PVE/QemuServer.pm
View File

@ -3787,7 +3787,7 @@ sub qemu_cpu_hotplug {
while (1) { while (1) {
$currentrunningvcpus = vm_mon_cmd($vmid, "query-cpus"); $currentrunningvcpus = vm_mon_cmd($vmid, "query-cpus");
last if scalar(@{$currentrunningvcpus}) == $i-1; last if scalar(@{$currentrunningvcpus}) == $i-1;
raise_param_exc({ "cpu unplug" => "error unplug cpu$i" }) if $retry > 5; raise_param_exc({ vcpus => "error unplugging cpu$i" }) if $retry > 5;
$retry++; $retry++;
sleep 1; sleep 1;
} }
@ -3796,14 +3796,14 @@ sub qemu_cpu_hotplug {
PVE::QemuConfig->write_config($vmid, $conf); PVE::QemuConfig->write_config($vmid, $conf);
} }
} else { } else {
die "online cpu unplug is only possible since qemu 2.7\n" die "cpu hot-unplugging requires qemu version 2.7 or higher\n";
} }
return; return;
} }
my $currentrunningvcpus = vm_mon_cmd($vmid, "query-cpus"); my $currentrunningvcpus = vm_mon_cmd($vmid, "query-cpus");
die "vcpus in running vm is different than configuration\n" die "vcpus in running vm does not match its configuration\n"
if scalar(@{$currentrunningvcpus}) != $currentvcpus; if scalar(@{$currentrunningvcpus}) != $currentvcpus;
if (qemu_machine_feature_enabled ($machine_type, undef, 2, 7)) { if (qemu_machine_feature_enabled ($machine_type, undef, 2, 7)) {
@ -3817,7 +3817,7 @@ sub qemu_cpu_hotplug {
while (1) { while (1) {
$currentrunningvcpus = vm_mon_cmd($vmid, "query-cpus"); $currentrunningvcpus = vm_mon_cmd($vmid, "query-cpus");
last if scalar(@{$currentrunningvcpus}) == $i; last if scalar(@{$currentrunningvcpus}) == $i;
raise_param_exc({ "cpu hotplug" => "error hotplug cpu$i" }) if $retry > 10; raise_param_exc({ vcpus => "error hotplugging cpu$i" }) if $retry > 10;
sleep 1; sleep 1;
$retry++; $retry++;
} }
@ -5930,7 +5930,8 @@ sub clone_disk {
my $kvmver = get_running_qemu_version ($vmid); my $kvmver = get_running_qemu_version ($vmid);
if (!qemu_machine_feature_enabled (undef, $kvmver, 2, 7)) { if (!qemu_machine_feature_enabled (undef, $kvmver, 2, 7)) {
die "drive-mirror with iothread only works since qemu 2.7" if $drive->{iothread}; die "drive-mirror with iothread requires qemu version 2.7 or higher\n"
if $drive->{iothread};
} }
qemu_drive_mirror($vmid, $drivename, $newvolid, $newvmid, $sparseinit); qemu_drive_mirror($vmid, $drivename, $newvolid, $newvmid, $sparseinit);