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

code cleanup, delete trailing white space

Browse Source 
Signed-off-by: Dietmar Maurer <dietmar@proxmox.com>
This commit is contained in:
Dietmar Maurer 2014-11-19 10:43:42 +01:00
parent c750e90abd
commit 8e90138a8a
1 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
PVE/QemuServer.pm
View File

@ -3589,7 +3589,7 @@ sub set_migration_caps {
sub vmconfig_hotplug_pending { sub vmconfig_hotplug_pending {
my ($vmid, $conf, $storecfg) = @_; my ($vmid, $conf, $storecfg) = @_;
my $defaults = PVE::QemuServer::load_defaults(); my $defaults = load_defaults();
# commit values which do not have any impact on running VM first # commit values which do not have any impact on running VM first
@ -3630,9 +3630,9 @@ sub vmconfig_hotplug_pending {
foreach my $opt (@delete) { foreach my $opt (@delete) {
if ($opt eq 'tablet') { if ($opt eq 'tablet') {
if ($defaults->{tablet}) { if ($defaults->{tablet}) {
PVE::QemuServer::vm_deviceplug($storecfg, $conf, $vmid, $opt); vm_deviceplug($storecfg, $conf, $vmid, $opt);
} else { } else {
PVE::QemuServer::vm_deviceunplug($vmid, $conf, $opt); vm_deviceunplug($vmid, $conf, $opt);
} }
} else { } else {
# skip non-hot-pluggable options # skip non-hot-pluggable options
@ -3652,9 +3652,9 @@ sub vmconfig_hotplug_pending {
if ($opt eq 'tablet') { if ($opt eq 'tablet') {
if ($value == 1) { if ($value == 1) {
PVE::QemuServer::vm_deviceplug($storecfg, $conf, $vmid, $opt); vm_deviceplug($storecfg, $conf, $vmid, $opt);
} elsif ($value == 0) { } elsif ($value == 0) {
PVE::QemuServer::vm_deviceunplug($vmid, $conf, $opt); vm_deviceunplug($vmid, $conf, $opt);
} }
} else { } else {
# skip non-hot-pluggable options # skip non-hot-pluggable options
@ -3800,15 +3800,15 @@ sub vm_start {
if ($migratedfrom) { if ($migratedfrom) {
eval { eval {
PVE::QemuServer::set_migration_caps($vmid); set_migration_caps($vmid);
}; };
warn $@ if $@; warn $@ if $@;
if ($spice_port) { if ($spice_port) {
print "spice listens on port $spice_port\n"; print "spice listens on port $spice_port\n";
if ($spice_ticket) { if ($spice_ticket) {
PVE::QemuServer::vm_mon_cmd_nocheck($vmid, "set_password", protocol => 'spice', password => $spice_ticket); vm_mon_cmd_nocheck($vmid, "set_password", protocol => 'spice', password => $spice_ticket);
PVE::QemuServer::vm_mon_cmd_nocheck($vmid, "expire_password", protocol => 'spice', time => "+30"); vm_mon_cmd_nocheck($vmid, "expire_password", protocol => 'spice', time => "+30");
} }
} }
@ -4875,7 +4875,7 @@ sub restore_tar_archive {
my $storecfg = cfs_read_file('storage.cfg'); my $storecfg = cfs_read_file('storage.cfg');
# destroy existing data - keep empty config # destroy existing data - keep empty config
my $vmcfgfn = PVE::QemuServer::config_file($vmid); my $vmcfgfn = config_file($vmid);
destroy_vm($storecfg, $vmid, 1) if -f $vmcfgfn; destroy_vm($storecfg, $vmid, 1) if -f $vmcfgfn;
my $tocmd = "/usr/lib/qemu-server/qmextract"; my $tocmd = "/usr/lib/qemu-server/qmextract";
@ -5691,7 +5691,7 @@ sub get_current_qemu_machine {
my ($vmid) = @_; my ($vmid) = @_;
my $cmd = { execute => 'query-machines', arguments => {} }; my $cmd = { execute => 'query-machines', arguments => {} };
my $res = PVE::QemuServer::vm_qmp_command($vmid, $cmd); my $res = vm_qmp_command($vmid, $cmd);
my ($current, $default); my ($current, $default);
foreach my $e (@$res) { foreach my $e (@$res) {