[pve-devel] [PATCH v6 12/22] code cleanup, delete trailing white space

[Dietmar Maurer]

Signed-off-by: Dietmar Maurer <diet...@proxmox.com>
---
 PVE/QemuServer.pm |   20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/PVE/QemuServer.pm b/PVE/QemuServer.pm
index 2644117..dd06f2f 100644
--- a/PVE/QemuServer.pm
+++ b/PVE/QemuServer.pm
@@ -3480,7 +3480,7 @@ sub set_migration_caps {
 sub vmconfig_hotplug_pending {
     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
 
@@ -3521,9 +3521,9 @@ sub vmconfig_hotplug_pending {
     foreach my $opt (@delete) {
        if ($opt eq 'tablet') {
            if ($defaults->{tablet}) {
-               PVE::QemuServer::vm_deviceplug($storecfg, $conf, $vmid, $opt);
+               vm_deviceplug($storecfg, $conf, $vmid, $opt);
            } else {
-               PVE::QemuServer::vm_deviceunplug($vmid, $conf, $opt);
+               vm_deviceunplug($vmid, $conf, $opt);
            }
        } else {
            # skip non-hot-pluggable options
@@ -3543,9 +3543,9 @@ sub vmconfig_hotplug_pending {
 
        if ($opt eq 'tablet') {
            if ($value == 1) {
-               PVE::QemuServer::vm_deviceplug($storecfg, $conf, $vmid, $opt);
+               vm_deviceplug($storecfg, $conf, $vmid, $opt);
            } elsif ($value == 0) {
-               PVE::QemuServer::vm_deviceunplug($vmid, $conf, $opt);
+               vm_deviceunplug($vmid, $conf, $opt);
            }
        } else {
            # skip non-hot-pluggable options
@@ -3691,15 +3691,15 @@ sub vm_start {
        if ($migratedfrom) {
 
            eval {
-               PVE::QemuServer::set_migration_caps($vmid);
+               set_migration_caps($vmid);
            };
            warn $@ if $@;
 
            if ($spice_port) {
                print "spice listens on port $spice_port\n";
                if ($spice_ticket) {
-                   PVE::QemuServer::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, "set_password", protocol => 
'spice', password => $spice_ticket);
+                   vm_mon_cmd_nocheck($vmid, "expire_password", protocol => 
'spice', time => "+30");
                }
            }
 
@@ -4763,7 +4763,7 @@ sub restore_tar_archive {
     my $storecfg = cfs_read_file('storage.cfg');
 
     # 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;
 
     my $tocmd = "/usr/lib/qemu-server/qmextract";
@@ -5567,7 +5567,7 @@ sub get_current_qemu_machine {
     my ($vmid) = @_;
 
     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);
     foreach my $e (@$res) {
-- 
1.7.10.4

_______________________________________________
pve-devel mailing list
pve-devel@pve.proxmox.com
http://pve.proxmox.com/cgi-bin/mailman/listinfo/pve-devel