From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from firstgate.proxmox.com (firstgate.proxmox.com [212.224.123.68]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by lists.proxmox.com (Postfix) with ESMTPS id BA50D68700 for ; Thu, 9 Sep 2021 14:41:21 +0200 (CEST) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id A237082E2 for ; Thu, 9 Sep 2021 14:40:51 +0200 (CEST) Received: from proxmox-new.maurer-it.com (proxmox-new.maurer-it.com [94.136.29.106]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by firstgate.proxmox.com (Proxmox) with ESMTPS id 1900982CC for ; Thu, 9 Sep 2021 14:40:51 +0200 (CEST) Received: from proxmox-new.maurer-it.com (localhost.localdomain [127.0.0.1]) by proxmox-new.maurer-it.com (Proxmox) with ESMTP id CFFA944513 for ; Thu, 9 Sep 2021 14:40:50 +0200 (CEST) From: =?UTF-8?q?Fabian=20Gr=C3=BCnbichler?= To: pve-devel@lists.proxmox.com Date: Thu, 9 Sep 2021 14:40:42 +0200 Message-Id: <20210909124042.2900922-1-f.gruenbichler@proxmox.com> X-Mailer: git-send-email 2.30.2 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-SPAM-LEVEL: Spam detection results: 0 AWL 0.417 Adjusted score from AWL reputation of From: address BAYES_00 -1.9 Bayes spam probability is 0 to 1% KAM_DMARC_STATUS 0.01 Test Rule for DKIM or SPF Failure with Strict Alignment SPF_HELO_NONE 0.001 SPF: HELO does not publish an SPF Record SPF_PASS -0.001 SPF: sender matches SPF record Subject: [pve-devel] [PATCH qemu-server] fix #3608: unbreak removal of scsi controller X-BeenThere: pve-devel@lists.proxmox.com X-Mailman-Version: 2.1.29 Precedence: list List-Id: Proxmox VE development discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 09 Sep 2021 12:41:21 -0000 the assumption that the index of the controller matches that of the last removed drive only holds for virtio-scsi-single controller, which makes the old code print a warning when removing the last drive of a non-virtio-scsi-single controller except when the indices line up by chance. we can simply only call a simplified qemu_iothread_del when removing a scsi disk of a VM with the virtio-scsi-single controller, and skip the call for the other controllers which don't support io-threads anyway. Signed-off-by: Fabian Grünbichler --- alternatively we could keep the old version but conditionally only call it for virtioscsi.* and not for scsihw.*, but the now aligned signature for adding and removing iothread objects seems like a nice bonus to me ;) PVE/QemuServer.pm | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) diff --git a/PVE/QemuServer.pm b/PVE/QemuServer.pm index cc73af8..c5232d6 100644 --- a/PVE/QemuServer.pm +++ b/PVE/QemuServer.pm @@ -4038,24 +4038,28 @@ sub vm_deviceunplug { #qemu_devicedelverify($vmid, $deviceid); } elsif ($deviceid =~ m/^(virtio)(\d+)$/) { + my $device = parse_drive($deviceid, $conf->{$deviceid}); qemu_devicedel($vmid, $deviceid); qemu_devicedelverify($vmid, $deviceid); qemu_drivedel($vmid, $deviceid); - qemu_iothread_del($conf, $vmid, $deviceid); + qemu_iothread_del($vmid, $deviceid, $device); } elsif ($deviceid =~ m/^(virtioscsi|scsihw)(\d+)$/) { qemu_devicedel($vmid, $deviceid); qemu_devicedelverify($vmid, $deviceid); - qemu_iothread_del($conf, $vmid, $deviceid); } elsif ($deviceid =~ m/^(scsi)(\d+)$/) { + my $device = parse_drive($deviceid, $conf->{$deviceid}); qemu_devicedel($vmid, $deviceid); qemu_drivedel($vmid, $deviceid); qemu_deletescsihw($conf, $vmid, $deviceid); + qemu_iothread_del($vmid, "virtioscsi$device->{index}", $device) + if $conf->{scsihw} && ($conf->{scsihw} eq 'virtio-scsi-single'); + } elsif ($deviceid =~ m/^(net)(\d+)$/) { qemu_devicedel($vmid, $deviceid); @@ -4094,13 +4098,8 @@ sub qemu_iothread_add { } sub qemu_iothread_del { - my($conf, $vmid, $deviceid) = @_; + my($vmid, $deviceid, $device) = @_; - my $confid = $deviceid; - if ($deviceid =~ m/^(?:virtioscsi|scsihw)(\d+)$/) { - $confid = 'scsi' . $1; - } - my $device = parse_drive($confid, $conf->{$confid}); if ($device->{iothread}) { my $iothreads = vm_iothreads_list($vmid); qemu_objectdel($vmid, "iothread-$deviceid") if $iothreads->{"iothread-$deviceid"}; -- 2.30.2