[PATCH qemu-server 6/6] hotplug: remove iothread if adding drive device failed

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

Otherwise it is left over after a failed attempt to add a drive with
iothreads.

Modify the relevant test that highlighted this problem.

The failure can be tested by disabling hotplug, e.g. for a i440fx guest
one can use the following commandline switches:

-global PIIX4_PM.acpi-root-pci-hotplug=off
-global PIIX4_PM.acpi-pci-hotplug-with-bridge-support=off
-global pci-bridge.shpc=off

to disable hotplug on all pci bridges and the pci root bus.

Signed-off-by: Dominik Csapak <d.csapak@proxmox.com>
---
 src/PVE/QemuServer.pm                        | 11 ++++++++++-
 src/test/hotplug/disk-add-fail.conf.expected |  2 +-
 2 files changed, 11 insertions(+), 2 deletions(-)

diff --git a/src/PVE/QemuServer.pm b/src/PVE/QemuServer.pm
index 34073ee8..8fade3fa 100644
--- a/src/PVE/QemuServer.pm
+++ b/src/PVE/QemuServer.pm
@@ -3906,6 +3906,8 @@ sub vm_deviceplug {
         if (my $err = $@) {
             eval { qemu_drivedel($vmid, $deviceid); };
             warn $@ if $@;
+            eval { qemu_iothread_del($vmid, $deviceid, $device) };
+            warn $@ if $@;
             die $err;
         }
     } elsif ($deviceid =~ m/^(virtioscsi|scsihw)(\d+)$/) {
@@ -3925,7 +3927,14 @@ sub vm_deviceplug {
         }
 
         qemu_deviceadd($vmid, $devicefull);
-        qemu_deviceaddverify($vmid, $deviceid);
+        eval { qemu_deviceaddverify($vmid, $deviceid) };
+        if (my $err = $@) {
+            if ($deviceid =~ m/^virtioscsi(\d+)$/ && $device->{iothread}) {
+                eval { qemu_iothread_del($vmid, $deviceid, $device) };
+                warn $@ if $@;
+            }
+            die $err;
+        }
     } elsif ($deviceid =~ m/^(scsi)(\d+)$/) {
         qemu_findorcreatescsihw($storecfg, $conf, $vmid, $device, $arch, $machine_type);
         qemu_driveadd($storecfg, $vmid, $device);
diff --git a/src/test/hotplug/disk-add-fail.conf.expected b/src/test/hotplug/disk-add-fail.conf.expected
index 8a36d951..28ec8e89 100644
--- a/src/test/hotplug/disk-add-fail.conf.expected
+++ b/src/test/hotplug/disk-add-fail.conf.expected
@@ -7,12 +7,12 @@ qmp blockdev-add {"detect-zeroes":"on","discard":"ignore","driver":"throttle","f
 hmp device_add driver=virtio-blk-pci,drive=drive-virtio1,id=virtio1,bus=pci.0,addr=0xb,iothread=iothread-virtio1,write-cache=on
 qmp blockdev-del {"node-name":"drive-virtio1"}
 qmp object-del {"id":"throttle-drive-virtio1"}
+qmp object-del {"id":"iothread-virtio1"}
 
 # hotplug errors
 virtio1: hotplug problem - error on hotplug device 'virtio1'
 
 # differences to a freshly started VM
-object iothread-virtio1: only present in running VM
 
 # resulting config
 bootdisk: scsi0
-- 
2.47.3