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

whitespace cleanup

Browse Source 
Signed-off-by: Tim Marx <t.marx@proxmox.com>
This commit is contained in:
Tim Marx 2019-05-03 14:22:38 +02:00 committed by Thomas Lamprecht
parent 0410703f51
commit 370b05e719
2 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
PVE/QemuMigrate.pm
View File

@ -748,8 +748,8 @@ sub phase2 {
$self->log('info', "spice client_migrate_info"); $self->log('info', "spice client_migrate_info");
eval { eval {
PVE::QemuServer::vm_mon_cmd_nocheck($vmid, "client_migrate_info", protocol => 'spice', PVE::QemuServer::vm_mon_cmd_nocheck($vmid, "client_migrate_info", protocol => 'spice',
hostname => $proxyticket, 'tls-port' => $spice_port, hostname => $proxyticket, 'tls-port' => $spice_port,
'cert-subject' => $subject); 'cert-subject' => $subject);
}; };
$self->log('info', "client_migrate_info error: $@") if $@; $self->log('info', "client_migrate_info error: $@") if $@;
@ -854,7 +854,7 @@ sub phase2 {
$lstat = $stat->{ram}->{transferred}; $lstat = $stat->{ram}->{transferred};
} else { } else {
die $merr if $merr; die $merr if $merr;
die "unable to parse migration status '$stat->{status}' - aborting\n"; die "unable to parse migration status '$stat->{status}' - aborting\n";
@ -898,7 +898,7 @@ sub phase2_cleanup {
} }
my $nodename = PVE::INotify::nodename(); my $nodename = PVE::INotify::nodename();
my $cmd = [@{$self->{rem_ssh}}, 'qm', 'stop', $vmid, '--skiplock', '--migratedfrom', $nodename]; my $cmd = [@{$self->{rem_ssh}}, 'qm', 'stop', $vmid, '--skiplock', '--migratedfrom', $nodename];
eval{ PVE::Tools::run_command($cmd, outfunc => sub {}, errfunc => sub {}) }; eval{ PVE::Tools::run_command($cmd, outfunc => sub {}, errfunc => sub {}) };
if (my $err = $@) { if (my $err = $@) {

12
PVE/QemuServer.pm
View File

@ -1281,7 +1281,7 @@ my $hostpci_fmt = {
pattern => qr/$PCIRE(;$PCIRE)*/, pattern => qr/$PCIRE(;$PCIRE)*/,
format_description => 'HOSTPCIID[;HOSTPCIID2...]', format_description => 'HOSTPCIID[;HOSTPCIID2...]',
description => <<EODESCR, description => <<EODESCR,
Host PCI device pass through. The PCI ID of a host's PCI device or a list Host PCI device pass through. The PCI ID of a host's PCI device or a list
of PCI virtual functions of the host. HOSTPCIID syntax is: of PCI virtual functions of the host. HOSTPCIID syntax is:
'bus:dev.func' (hexadecimal numbers) 'bus:dev.func' (hexadecimal numbers)
@ -1335,7 +1335,7 @@ my $hostpcidesc = {
verbose_description => <<EODESCR, verbose_description => <<EODESCR,
Map host PCI devices into guest. Map host PCI devices into guest.
NOTE: This option allows direct access to host hardware. So it is no longer NOTE: This option allows direct access to host hardware. So it is no longer
possible to migrate such machines - use with special care. possible to migrate such machines - use with special care.
CAUTION: Experimental! User reported problems with this option. CAUTION: Experimental! User reported problems with this option.
@ -1905,7 +1905,7 @@ sub print_drive_full {
my $path; my $path;
my $volid = $drive->{file}; my $volid = $drive->{file};
my $format; my $format;
if (drive_is_cdrom($drive)) { if (drive_is_cdrom($drive)) {
$path = get_iso_path($storecfg, $vmid, $volid); $path = get_iso_path($storecfg, $vmid, $volid);
} else { } else {
@ -3798,7 +3798,7 @@ sub config_to_command {
push @$cmd, get_cpu_options($conf, $arch, $kvm, $machine_type, $kvm_off, $kvmver, $winversion, $gpu_passthrough); push @$cmd, get_cpu_options($conf, $arch, $kvm, $machine_type, $kvm_off, $kvmver, $winversion, $gpu_passthrough);
PVE::QemuServer::Memory::config($conf, $vmid, $sockets, $cores, $defaults, $hotplug_features, $cmd); PVE::QemuServer::Memory::config($conf, $vmid, $sockets, $cores, $defaults, $hotplug_features, $cmd);
push @$cmd, '-S' if $conf->{freeze}; push @$cmd, '-S' if $conf->{freeze};
push @$cmd, '-k', $conf->{keyboard} if defined($conf->{keyboard}); push @$cmd, '-k', $conf->{keyboard} if defined($conf->{keyboard});
@ -3922,7 +3922,7 @@ sub config_to_command {
my $queues = ''; my $queues = '';
if($conf->{scsihw} && $conf->{scsihw} eq "virtio-scsi-single" && $drive->{queues}){ if($conf->{scsihw} && $conf->{scsihw} eq "virtio-scsi-single" && $drive->{queues}){
$queues = ",num_queues=$drive->{queues}"; $queues = ",num_queues=$drive->{queues}";
} }
push @$devices, '-device', "$scsihw_type,id=$controller_prefix$controller$pciaddr$iothread$queues" if !$scsicontroller->{$controller}; push @$devices, '-device', "$scsihw_type,id=$controller_prefix$controller$pciaddr$iothread$queues" if !$scsicontroller->{$controller};
$scsicontroller->{$controller}=1; $scsicontroller->{$controller}=1;
@ -6586,7 +6586,7 @@ sub do_snapshots_with_qemu {
my $storage_name = PVE::Storage::parse_volume_id($volid); my $storage_name = PVE::Storage::parse_volume_id($volid);
if ($qemu_snap_storage->{$storecfg->{ids}->{$storage_name}->{type}} if ($qemu_snap_storage->{$storecfg->{ids}->{$storage_name}->{type}}
&& !$storecfg->{ids}->{$storage_name}->{krbd}){ && !$storecfg->{ids}->{$storage_name}->{krbd}){
return 1; return 1;
} }