From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from gate001.proxmox.com (gate001.proxmox.com [IPv6:2a0f:8001:1:32::40]) by lore.proxmox.com (Postfix) with ESMTPS id C4AE01FF0B7 for ; Fri, 30 Oct 2026 11:12:18 +0100 (CET) Received: from gate001.proxmox.com (localhost.localdomain [127.0.0.1]) by gate001.proxmox.com (Proxmox) with ESMTP id 6B7DE21698; Fri, 30 Oct 2026 11:11:41 +0100 (CET) From: Dominik Csapak To: pve-devel@lists.proxmox.com Subject: [PATCH qemu-server v5 4/4] hotplug: clean up disk devices/objects if adding them failed Date: Fri, 30 Oct 2026 11:04:43 +0100 Message-ID: <20261030101134.2090350-5-d.csapak@proxmox.com> X-Mailer: git-send-email 2.47.3 In-Reply-To: <20261030101134.2090350-1-d.csapak@proxmox.com> References: <20261030101134.2090350-1-d.csapak@proxmox.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-SPAM-LEVEL: Spam detection results: 0 AWL 0.343 Adjusted score from AWL reputation of From: address DMARC_MISSING 0.1 Missing DMARC policy KAM_DMARC_STATUS 0.01 Test Rule for DKIM or SPF Failure with Strict Alignment (newer systems) RCVD_IN_DNSWL_MED -2.3 Sender listed at https://www.dnswl.org/, medium trust SPF_HELO_NONE 0.001 SPF: HELO does not publish an SPF Record SPF_PASS -0.001 SPF: sender matches SPF record Message-ID-Hash: OLYWHLWFNZ76MU4GGUU3EDSN6GMMUJNO X-Message-ID-Hash: OLYWHLWFNZ76MU4GGUU3EDSN6GMMUJNO X-MailFrom: d.csapak@proxmox.com X-Mailman-Rule-Misses: dmarc-mitigation; no-senders; approved; loop; banned-address; emergency; member-moderation; nonmember-moderation; administrivia; implicit-dest; max-recipients; max-size; news-moderation; no-subject; digests; suspicious-header X-Mailman-Version: 3.3.10 Precedence: list List-Id: Proxmox VE development discussion List-Help: List-Owner: List-Post: List-Subscribe: List-Unsubscribe: Otherwise, parts of a disk are left over after a failed attempt to add it. For VirtIO block disks this was the iothread. For SCSI disks, the newly added controller was left over, including its iothread in case of virtio-scsi-single, and if adding the controller itself failed, its iothread too. Use the same cleanup as for unplugging, so that all parts that might have been added are removed again. Also verify that a hotplugged SCSI disk actually shows up, like for VirtIO block disks. Since errors of the HMP device_add command are not reported, a failure was not noticed and the disk was moved from the pending section into the config. The failure can be tested by disabling hotplug, e.g. for an i440fx guest one can use the following command line 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. The added regression tests would have failed without the code change. Signed-off-by: Dominik Csapak --- src/PVE/QemuServer.pm | 37 ++++++++++++------- src/test/hotplug/disk-add-fail.conf | 19 ++++++++++ src/test/hotplug/disk-add-fail.conf.expected | 10 +++++ .../disk-add-scsi-single-disk-fail.conf | 19 ++++++++++ ...sk-add-scsi-single-disk-fail.conf.expected | 12 ++++++ .../hotplug/disk-add-scsi-single-fail.conf | 19 ++++++++++ .../disk-add-scsi-single-fail.conf.expected | 5 +++ 7 files changed, 107 insertions(+), 14 deletions(-) create mode 100644 src/test/hotplug/disk-add-fail.conf create mode 100644 src/test/hotplug/disk-add-fail.conf.expected create mode 100644 src/test/hotplug/disk-add-scsi-single-disk-fail.conf create mode 100644 src/test/hotplug/disk-add-scsi-single-disk-fail.conf.expected create mode 100644 src/test/hotplug/disk-add-scsi-single-fail.conf create mode 100644 src/test/hotplug/disk-add-scsi-single-fail.conf.expected diff --git a/src/PVE/QemuServer.pm b/src/PVE/QemuServer.pm index 3811bff2..7285a297 100644 --- a/src/PVE/QemuServer.pm +++ b/src/PVE/QemuServer.pm @@ -3903,17 +3903,18 @@ sub vm_deviceplug { PVE::QemuServer::USB::print_usbdevice_full($conf, $deviceid, $device, {}, $1 + 1), ); } elsif ($deviceid =~ m/^(virtio)(\d+)$/) { - qemu_iothread_add($vmid, $deviceid, $device); - - qemu_driveadd($storecfg, $vmid, $device); my $devicefull = print_drivedevice_full($storecfg, $conf, $vmid, $device, $arch, $machine_type); - qemu_deviceadd($vmid, $devicefull); - eval { qemu_deviceaddverify($vmid, $deviceid); }; + eval { + qemu_iothread_add($vmid, $deviceid, $device); + qemu_driveadd($storecfg, $vmid, $device); + qemu_deviceadd($vmid, $devicefull); + qemu_deviceaddverify($vmid, $deviceid); + }; + if (my $err = $@) { - eval { qemu_drivedel($vmid, $deviceid); }; - warn $@ if $@; + cleanup_disk($conf, $vmid, $deviceid, $device, undef, 1); die $err; } } elsif ($deviceid =~ m/^(virtioscsi|scsihw)(\d+)$/) { @@ -3924,7 +3925,6 @@ sub vm_deviceplug { my $devicefull = "$scsihw_type,id=$deviceid$pciaddr"; if ($deviceid =~ m/^virtioscsi(\d+)$/ && $device->{iothread}) { - qemu_iothread_add($vmid, $deviceid, $device); $devicefull .= ",iothread=iothread-$deviceid"; } @@ -3932,18 +3932,27 @@ sub vm_deviceplug { $devicefull .= ",num_queues=$device->{queues}"; } - qemu_deviceadd($vmid, $devicefull); - qemu_deviceaddverify($vmid, $deviceid); + eval { + qemu_iothread_add($vmid, $deviceid, $device) if $deviceid =~ m/^virtioscsi/; + qemu_deviceadd($vmid, $devicefull); + qemu_deviceaddverify($vmid, $deviceid); + }; + if (my $err = $@) { + cleanup_disk($conf, $vmid, $deviceid, $device, undef, 1); + die $err; + } } elsif ($deviceid =~ m/^(scsi)(\d+)$/) { qemu_findorcreatescsihw($storecfg, $conf, $vmid, $device, $arch, $machine_type); - qemu_driveadd($storecfg, $vmid, $device); my $devicefull = print_drivedevice_full($storecfg, $conf, $vmid, $device, $arch, $machine_type); - eval { qemu_deviceadd($vmid, $devicefull); }; + eval { + qemu_driveadd($storecfg, $vmid, $device); + qemu_deviceadd($vmid, $devicefull); + qemu_deviceaddverify($vmid, $deviceid); + }; if (my $err = $@) { - eval { qemu_drivedel($vmid, $deviceid); }; - warn $@ if $@; + cleanup_disk($conf, $vmid, $deviceid, $device, undef, 1); die $err; } } elsif ($deviceid =~ m/^(net)(\d+)$/) { diff --git a/src/test/hotplug/disk-add-fail.conf b/src/test/hotplug/disk-add-fail.conf new file mode 100644 index 00000000..800b113e --- /dev/null +++ b/src/test/hotplug/disk-add-fail.conf @@ -0,0 +1,19 @@ +# TEST: a disk that does not show up after hotplug is detached again +# FAIL_DEVICE_ADD: virtio1 +# EXPECTED_ERROR: virtio1: hotplug problem - error on hotplug device 'virtio1' +# STAYS_PENDING: 1 +bootdisk: scsi0 +cores: 2 +machine: pc-i440fx-10.1 +memory: 2048 +name: hotplug +net0: virtio=A2:C0:43:77:08:A0,bridge=vmbr0 +ostype: l26 +scsi0: local:8006/vm-8006-disk-0.qcow2,size=32G +scsihw: virtio-scsi-pci +smbios1: uuid=7b10d7af-b932-4c66-b2c3-3996152ec465 +sockets: 1 +vmgenid: c773c261-d800-4348-9f5d-167fadd53cf8 + +[PENDING] +virtio1: local:8006/vm-8006-disk-1.qcow2,iothread=1,size=32G diff --git a/src/test/hotplug/disk-add-fail.conf.expected b/src/test/hotplug/disk-add-fail.conf.expected new file mode 100644 index 00000000..30946720 --- /dev/null +++ b/src/test/hotplug/disk-add-fail.conf.expected @@ -0,0 +1,10 @@ +storage activate_volumes ["local:8006/vm-8006-disk-1.qcow2"] +qmp object-add {"id":"iothread-virtio1","qom-type":"iothread"} +qmp object-del {"id":"throttle-drive-virtio1"} +qmp object-add {"id":"throttle-drive-virtio1","limits":{},"qom-type":"throttle-group"} +qmp blockdev-add {"detect-zeroes":"on","discard":"ignore","driver":"throttle","file":{"cache":{"direct":true,"no-flush":false},"detect-zeroes":"on","discard":"ignore","driver":"qcow2","file":{"aio":"io_uring","cache":{"direct":true,"no-flush":false},"detect-zeroes":"on","discard":"ignore","driver":"file","filename":"/var/lib/vz/images/8006/vm-8006-disk-1.qcow2","node-name":"ef4c217a7f08cf59741edc1790023f5","read-only":false},"node-name":"ff4c217a7f08cf59741edc1790023f5","read-only":false},"node-name":"drive-virtio1","read-only":false,"throttle-group":"throttle-drive-virtio1"} +hmp device_add driver=virtio-blk-pci,drive=drive-virtio1,id=virtio1,bus=pci.0,addr=0xb,iothread=iothread-virtio1,write-cache=on +hmp device_del virtio1 +qmp blockdev-del {"node-name":"drive-virtio1"} +qmp object-del {"id":"throttle-drive-virtio1"} +qmp object-del {"id":"iothread-virtio1"} diff --git a/src/test/hotplug/disk-add-scsi-single-disk-fail.conf b/src/test/hotplug/disk-add-scsi-single-disk-fail.conf new file mode 100644 index 00000000..f493f589 --- /dev/null +++ b/src/test/hotplug/disk-add-scsi-single-disk-fail.conf @@ -0,0 +1,19 @@ +# TEST: a disk on virtio-scsi-single that does not show up after hotplug has its controller and iothread removed again +# FAIL_DEVICE_ADD: scsi1 +# EXPECTED_ERROR: scsi1: hotplug problem - error on hotplug device 'scsi1' +# STAYS_PENDING: 1 +bootdisk: scsi0 +cores: 2 +machine: pc-i440fx-10.1 +memory: 2048 +name: hotplug +net0: virtio=A2:C0:43:77:08:A0,bridge=vmbr0 +ostype: l26 +scsi0: local:8006/vm-8006-disk-0.qcow2,iothread=1,size=32G +scsihw: virtio-scsi-single +smbios1: uuid=7b10d7af-b932-4c66-b2c3-3996152ec465 +sockets: 1 +vmgenid: c773c261-d800-4348-9f5d-167fadd53cf8 + +[PENDING] +scsi1: local:8006/vm-8006-disk-1.qcow2,iothread=1,size=32G diff --git a/src/test/hotplug/disk-add-scsi-single-disk-fail.conf.expected b/src/test/hotplug/disk-add-scsi-single-disk-fail.conf.expected new file mode 100644 index 00000000..a5da2480 --- /dev/null +++ b/src/test/hotplug/disk-add-scsi-single-disk-fail.conf.expected @@ -0,0 +1,12 @@ +storage activate_volumes ["local:8006/vm-8006-disk-1.qcow2"] +qmp object-add {"id":"iothread-virtioscsi1","qom-type":"iothread"} +hmp device_add driver=virtio-scsi-pci,id=virtioscsi1,bus=pci.3,addr=0x2,iothread=iothread-virtioscsi1 +qmp object-del {"id":"throttle-drive-scsi1"} +qmp object-add {"id":"throttle-drive-scsi1","limits":{},"qom-type":"throttle-group"} +qmp blockdev-add {"detect-zeroes":"on","discard":"ignore","driver":"throttle","file":{"cache":{"direct":true,"no-flush":false},"detect-zeroes":"on","discard":"ignore","driver":"qcow2","file":{"aio":"io_uring","cache":{"direct":true,"no-flush":false},"detect-zeroes":"on","discard":"ignore","driver":"file","filename":"/var/lib/vz/images/8006/vm-8006-disk-1.qcow2","node-name":"e70a10e5fb0473d3fc55686f720db61","read-only":false},"node-name":"f70a10e5fb0473d3fc55686f720db61","read-only":false},"node-name":"drive-scsi1","read-only":false,"throttle-group":"throttle-drive-scsi1"} +hmp device_add driver=scsi-hd,bus=virtioscsi1.0,channel=0,scsi-id=0,lun=1,drive=drive-scsi1,id=scsi1,device_id=drive-scsi1,write-cache=on +hmp device_del scsi1 +qmp blockdev-del {"node-name":"drive-scsi1"} +qmp object-del {"id":"throttle-drive-scsi1"} +hmp device_del virtioscsi1 +qmp object-del {"id":"iothread-virtioscsi1"} diff --git a/src/test/hotplug/disk-add-scsi-single-fail.conf b/src/test/hotplug/disk-add-scsi-single-fail.conf new file mode 100644 index 00000000..d9a9a30f --- /dev/null +++ b/src/test/hotplug/disk-add-scsi-single-fail.conf @@ -0,0 +1,19 @@ +# TEST: a virtio-scsi-single controller that does not show up after hotplug has its iothread removed again +# FAIL_DEVICE_ADD: virtioscsi1 +# EXPECTED_ERROR: scsi1: hotplug problem - error on hotplug device 'virtioscsi1' +# STAYS_PENDING: 1 +bootdisk: scsi0 +cores: 2 +machine: pc-i440fx-10.1 +memory: 2048 +name: hotplug +net0: virtio=A2:C0:43:77:08:A0,bridge=vmbr0 +ostype: l26 +scsi0: local:8006/vm-8006-disk-0.qcow2,iothread=1,size=32G +scsihw: virtio-scsi-single +smbios1: uuid=7b10d7af-b932-4c66-b2c3-3996152ec465 +sockets: 1 +vmgenid: c773c261-d800-4348-9f5d-167fadd53cf8 + +[PENDING] +scsi1: local:8006/vm-8006-disk-1.qcow2,iothread=1,size=32G diff --git a/src/test/hotplug/disk-add-scsi-single-fail.conf.expected b/src/test/hotplug/disk-add-scsi-single-fail.conf.expected new file mode 100644 index 00000000..fc291ec6 --- /dev/null +++ b/src/test/hotplug/disk-add-scsi-single-fail.conf.expected @@ -0,0 +1,5 @@ +storage activate_volumes ["local:8006/vm-8006-disk-1.qcow2"] +qmp object-add {"id":"iothread-virtioscsi1","qom-type":"iothread"} +hmp device_add driver=virtio-scsi-pci,id=virtioscsi1,bus=pci.3,addr=0x2,iothread=iothread-virtioscsi1 +hmp device_del virtioscsi1 +qmp object-del {"id":"iothread-virtioscsi1"} -- 2.47.3