proxmox-mirrors/qemu-server
1
0
Fork 0
mirror of https://git.proxmox.com/git/qemu-server synced 2025-10-05 11:13:17 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

fix #3608: unbreak removal of scsi controller

Browse Source 
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 <f.gruenbichler@proxmox.com>
This commit is contained in:
Fabian Grünbichler 2021-09-09 14:40:42 +02:00 committed by Thomas Lamprecht
parent ae776a6288
commit 9a66c311ac
1 changed files with 7 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
PVE/QemuServer.pm
View File

@ -4038,24 +4038,28 @@ sub vm_deviceunplug {
#qemu_devicedelverify($vmid, $deviceid); #qemu_devicedelverify($vmid, $deviceid);
} elsif ($deviceid =~ m/^(virtio)(\d+)$/) { } elsif ($deviceid =~ m/^(virtio)(\d+)$/) {
my $device = parse_drive($deviceid, $conf->{$deviceid});
qemu_devicedel($vmid, $deviceid); qemu_devicedel($vmid, $deviceid);
qemu_devicedelverify($vmid, $deviceid); qemu_devicedelverify($vmid, $deviceid);
qemu_drivedel($vmid, $deviceid); qemu_drivedel($vmid, $deviceid);
qemu_iothread_del($conf, $vmid, $deviceid); qemu_iothread_del($vmid, $deviceid, $device);
} elsif ($deviceid =~ m/^(virtioscsi|scsihw)(\d+)$/) { } elsif ($deviceid =~ m/^(virtioscsi|scsihw)(\d+)$/) {
qemu_devicedel($vmid, $deviceid); qemu_devicedel($vmid, $deviceid);
qemu_devicedelverify($vmid, $deviceid); qemu_devicedelverify($vmid, $deviceid);
qemu_iothread_del($conf, $vmid, $deviceid);
} elsif ($deviceid =~ m/^(scsi)(\d+)$/) { } elsif ($deviceid =~ m/^(scsi)(\d+)$/) {
my $device = parse_drive($deviceid, $conf->{$deviceid});
qemu_devicedel($vmid, $deviceid); qemu_devicedel($vmid, $deviceid);
qemu_drivedel($vmid, $deviceid); qemu_drivedel($vmid, $deviceid);
qemu_deletescsihw($conf, $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+)$/) { } elsif ($deviceid =~ m/^(net)(\d+)$/) {
qemu_devicedel($vmid, $deviceid); qemu_devicedel($vmid, $deviceid);
@ -4094,13 +4098,8 @@ sub qemu_iothread_add {
} }
sub qemu_iothread_del { 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}) { if ($device->{iothread}) {
my $iothreads = vm_iothreads_list($vmid); my $iothreads = vm_iothreads_list($vmid);
qemu_objectdel($vmid, "iothread-$deviceid") if $iothreads->{"iothread-$deviceid"}; qemu_objectdel($vmid, "iothread-$deviceid") if $iothreads->{"iothread-$deviceid"};