[PATCH qemu-server v2 5/6] hotplug: fix vm_deviceplug call for 'tablet' and 'keyboard' on aarch64

[Dominik Csapak <d.csapak@proxmox.com>]

vm_deviceplug has a 'device' parameter between 'deviceid' and 'arch',
but this was overlooked at these two callsites. This means that the
calls would give the 'machine_type' as 'arch'. On x86 this is harmless,
but on aarch64 systems this produced wrong behavior.

Fix this by simply adding 'undef' as device, since it's not used in
those cases anyway.

Modify the relevant test that highlighted this problem.

Signed-off-by: Dominik Csapak <d.csapak@proxmox.com>
---
 src/PVE/QemuServer.pm                          | 18 ++++++++++++------
 src/test/hotplug/aarch64/tablet-enable.conf    |  2 --
 .../aarch64/tablet-enable.conf.expected        |  3 ++-
 3 files changed, 14 insertions(+), 9 deletions(-)

diff --git a/src/PVE/QemuServer.pm b/src/PVE/QemuServer.pm
index 759f7db2..13318198 100644
--- a/src/PVE/QemuServer.pm
+++ b/src/PVE/QemuServer.pm
@@ -4689,9 +4689,12 @@ sub vmconfig_hotplug_pending {
             } elsif ($opt eq 'tablet') {
                 die "skip\n" if !$hotplug_features->{usb};
                 if ($defaults->{tablet}) {
-                    vm_deviceplug($storecfg, $conf, $vmid, 'tablet', $arch, $machine_type);
-                    vm_deviceplug($storecfg, $conf, $vmid, 'keyboard', $arch, $machine_type)
-                        if $arch eq 'aarch64';
+                    vm_deviceplug(
+                        $storecfg, $conf, $vmid, 'tablet', undef, $arch, $machine_type,
+                    );
+                    vm_deviceplug(
+                        $storecfg, $conf, $vmid, 'keyboard', undef, $arch, $machine_type,
+                    ) if $arch eq 'aarch64';
                 } else {
                     vm_deviceunplug($vmid, $conf, 'tablet');
                     vm_deviceunplug($vmid, $conf, 'keyboard') if $arch eq 'aarch64';
@@ -4760,9 +4763,12 @@ sub vmconfig_hotplug_pending {
             } elsif ($opt eq 'tablet') {
                 die "skip\n" if !$hotplug_features->{usb};
                 if ($value == 1) {
-                    vm_deviceplug($storecfg, $conf, $vmid, 'tablet', $arch, $machine_type);
-                    vm_deviceplug($storecfg, $conf, $vmid, 'keyboard', $arch, $machine_type)
-                        if $arch eq 'aarch64';
+                    vm_deviceplug(
+                        $storecfg, $conf, $vmid, 'tablet', undef, $arch, $machine_type,
+                    );
+                    vm_deviceplug(
+                        $storecfg, $conf, $vmid, 'keyboard', undef, $arch, $machine_type,
+                    ) if $arch eq 'aarch64';
                 } elsif ($value == 0) {
                     vm_deviceunplug($vmid, $conf, 'tablet');
                     vm_deviceunplug($vmid, $conf, 'keyboard') if $arch eq 'aarch64';
diff --git a/src/test/hotplug/aarch64/tablet-enable.conf b/src/test/hotplug/aarch64/tablet-enable.conf
index 443cae77..bb523819 100644
--- a/src/test/hotplug/aarch64/tablet-enable.conf
+++ b/src/test/hotplug/aarch64/tablet-enable.conf
@@ -1,7 +1,5 @@
 # TEST: enabling the tablet device on aarch64 hotplugs tablet and keyboard
 # HOST_ARCH: aarch64
-# EXPECTED_ERROR: tablet: hotplug problem - Too few arguments for subroutine 'PVE::QemuServer::QMPHelpers::qemu_deviceadd' (got 1; expected 2)
-# STAYS_PENDING: 1
 arch: aarch64
 bios: ovmf
 bootdisk: scsi0
diff --git a/src/test/hotplug/aarch64/tablet-enable.conf.expected b/src/test/hotplug/aarch64/tablet-enable.conf.expected
index 800f9296..7200f76b 100644
--- a/src/test/hotplug/aarch64/tablet-enable.conf.expected
+++ b/src/test/hotplug/aarch64/tablet-enable.conf.expected
@@ -1 +1,2 @@
-hmp device_add driver=usb-tablet,id=tablet,bus=uhci.0,port=1
+hmp device_add driver=usb-tablet,id=tablet,bus=ehci.0,port=1
+hmp device_add driver=usb-kbd,id=keyboard,bus=ehci.0,port=2
-- 
2.47.3