[PATCH qemu-server 2/2] hotplug pending: only check for USB hoptplug support when actually needed

[Fiona Ebner <f.ebner@proxmox.com>]

In particular, this makes the variables $ostype and $version more
local and, for VMs without and explicit machine version, avoids a
'query-version' QMP call when not actually needed.

Signed-off-by: Fiona Ebner <f.ebner@proxmox.com>
---
 src/PVE/QemuServer.pm | 24 +++++++++++++++---------
 1 file changed, 15 insertions(+), 9 deletions(-)

diff --git a/src/PVE/QemuServer.pm b/src/PVE/QemuServer.pm
index 26560122..da2379e0 100644
--- a/src/PVE/QemuServer.pm
+++ b/src/PVE/QemuServer.pm
@@ -4657,16 +4657,22 @@ sub vmconfig_hotplug_pending {
         PVE::QemuConfig->write_config($vmid, $conf);
     }
 
-    my $ostype = $conf->{ostype};
-    my $version = extract_version($machine_type, get_running_qemu_version($vmid));
     my $hotplug_features =
         parse_hotplug_features(defined($conf->{hotplug}) ? $conf->{hotplug} : '1');
+
+    my $usb_hotplug;
     my $usb_was_unplugged = 0;
-    my $usb_hotplug =
-        $hotplug_features->{usb}
-        && min_version($version, 7, 1)
-        && defined($ostype)
-        && ($ostype eq 'l26' || windows_version($ostype) > 7);
+    my $is_usb_hotplug_supported = sub {
+        return $usb_hotplug if defined($usb_hotplug);
+        my $ostype = $conf->{ostype};
+        my $version = extract_version($machine_type, get_running_qemu_version($vmid));
+        $usb_hotplug =
+            $hotplug_features->{usb}
+            && min_version($version, 7, 1)
+            && defined($ostype)
+            && ($ostype eq 'l26' || windows_version($ostype) > 7) ? 1 : 0;
+        return $usb_hotplug;
+    };
 
     my $cgroup = PVE::QemuServer::CGroup->new($vmid);
     my $pending_delete_hash = PVE::QemuConfig->parse_pending_delete($conf->{pending}->{delete});
@@ -4689,7 +4695,7 @@ sub vmconfig_hotplug_pending {
                 }
             } elsif ($opt =~ m/^usb(\d+)$/) {
                 my $index = $1;
-                die "skip\n" if !$usb_hotplug;
+                die "skip\n" if !$is_usb_hotplug_supported->();
                 vm_deviceunplug($vmid, $conf, "usbredirdev$index"); # if it's a spice port
                 vm_deviceunplug($vmid, $conf, $opt);
                 $usb_was_unplugged = 1;
@@ -4760,7 +4766,7 @@ sub vmconfig_hotplug_pending {
                 }
             } elsif ($opt =~ m/^usb(\d+)$/) {
                 my $index = $1;
-                die "skip\n" if !$usb_hotplug;
+                die "skip\n" if !$is_usb_hotplug_supported->();
                 my $d = eval { parse_property_string('pve-qm-usb', $value) };
                 my $id = $opt;
                 if ($d->{host} =~ m/^spice$/i) {
-- 
2.47.3