proxmox-mirrors/qemu-server
1
0
Fork 0
mirror of https://git.proxmox.com/git/qemu-server synced 2025-12-09 20:25:45 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

whitespace/indentation fixes & cleanups

Browse Source 
Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>
This commit is contained in:
Thomas Lamprecht 2021-09-09 17:50:21 +02:00
parent 9a66c311ac
commit a8d0fec3c2
1 changed files with 17 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

44
PVE/QemuServer.pm
View File

@ -4026,46 +4026,36 @@ sub vm_deviceunplug {
die "can't unplug bootdisk '$deviceid'\n" if grep {$_ eq $deviceid} @$bootdisks; die "can't unplug bootdisk '$deviceid'\n" if grep {$_ eq $deviceid} @$bootdisks;
if ($deviceid eq 'tablet' || $deviceid eq 'keyboard') { if ($deviceid eq 'tablet' || $deviceid eq 'keyboard') {
qemu_devicedel($vmid, $deviceid); qemu_devicedel($vmid, $deviceid);
} elsif ($deviceid =~ m/^usb\d+$/) { } elsif ($deviceid =~ m/^usb\d+$/) {
die "usb hotplug currently not reliable\n"; die "usb hotplug currently not reliable\n";
# when unplugging usb devices this way, there may be remaining usb # when unplugging usb devices this way, there may be remaining usb
# controllers/hubs so we disable it for now # controllers/hubs so we disable it for now
#qemu_devicedel($vmid, $deviceid); #qemu_devicedel($vmid, $deviceid);
#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}); my $device = parse_drive($deviceid, $conf->{$deviceid});
qemu_devicedel($vmid, $deviceid);
qemu_devicedelverify($vmid, $deviceid);
qemu_drivedel($vmid, $deviceid);
qemu_iothread_del($vmid, $deviceid, $device);
} elsif ($deviceid =~ m/^(virtioscsi|scsihw)(\d+)$/) {
qemu_devicedel($vmid, $deviceid); qemu_devicedel($vmid, $deviceid);
qemu_devicedelverify($vmid, $deviceid); qemu_devicedelverify($vmid, $deviceid);
qemu_drivedel($vmid, $deviceid);
qemu_iothread_del($vmid, $deviceid, $device);
} elsif ($deviceid =~ m/^(virtioscsi|scsihw)(\d+)$/) {
qemu_devicedel($vmid, $deviceid);
qemu_devicedelverify($vmid, $deviceid);
} elsif ($deviceid =~ m/^(scsi)(\d+)$/) { } elsif ($deviceid =~ m/^(scsi)(\d+)$/) {
my $device = parse_drive($deviceid, $conf->{$deviceid}); 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) qemu_iothread_del($vmid, "virtioscsi$device->{index}", $device)
if $conf->{scsihw} && ($conf->{scsihw} eq 'virtio-scsi-single'); 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); qemu_devicedelverify($vmid, $deviceid);
qemu_devicedelverify($vmid, $deviceid); qemu_netdevdel($vmid, $deviceid);
qemu_netdevdel($vmid, $deviceid);
} else { } else {
die "can't unplug device '$deviceid'\n"; die "can't unplug device '$deviceid'\n";
} }
@ -4089,7 +4079,7 @@ sub qemu_devicedel {
} }
sub qemu_iothread_add { sub qemu_iothread_add {
my($vmid, $deviceid, $device) = @_; my ($vmid, $deviceid, $device) = @_;
if ($device->{iothread}) { if ($device->{iothread}) {
my $iothreads = vm_iothreads_list($vmid); my $iothreads = vm_iothreads_list($vmid);
@ -4098,7 +4088,7 @@ sub qemu_iothread_add {
} }
sub qemu_iothread_del { sub qemu_iothread_del {
my($vmid, $deviceid, $device) = @_; my ($vmid, $deviceid, $device) = @_;
if ($device->{iothread}) { if ($device->{iothread}) {
my $iothreads = vm_iothreads_list($vmid); my $iothreads = vm_iothreads_list($vmid);
@ -4107,7 +4097,7 @@ sub qemu_iothread_del {
} }
sub qemu_objectadd { sub qemu_objectadd {
my($vmid, $objectid, $qomtype) = @_; my ($vmid, $objectid, $qomtype) = @_;
mon_cmd($vmid, "object-add", id => $objectid, "qom-type" => $qomtype); mon_cmd($vmid, "object-add", id => $objectid, "qom-type" => $qomtype);
@ -4115,7 +4105,7 @@ sub qemu_objectadd {
} }
sub qemu_objectdel { sub qemu_objectdel {
my($vmid, $objectid) = @_; my ($vmid, $objectid) = @_;
mon_cmd($vmid, "object-del", id => $objectid); mon_cmd($vmid, "object-del", id => $objectid);
@ -4138,7 +4128,7 @@ sub qemu_driveadd {
} }
sub qemu_drivedel { sub qemu_drivedel {
my($vmid, $deviceid) = @_; my ($vmid, $deviceid) = @_;
my $ret = PVE::QemuServer::Monitor::hmp_cmd($vmid, "drive_del drive-$deviceid"); my $ret = PVE::QemuServer::Monitor::hmp_cmd($vmid, "drive_del drive-$deviceid");
$ret =~ s/^\s+//; $ret =~ s/^\s+//;
@ -4187,7 +4177,7 @@ sub qemu_findorcreatescsihw {
my $scsihwid="$controller_prefix$controller"; my $scsihwid="$controller_prefix$controller";
my $devices_list = vm_devices_list($vmid); my $devices_list = vm_devices_list($vmid);
if(!defined($devices_list->{$scsihwid})) { if (!defined($devices_list->{$scsihwid})) {
vm_deviceplug($storecfg, $conf, $vmid, $scsihwid, $device, $arch, $machine_type); vm_deviceplug($storecfg, $conf, $vmid, $scsihwid, $device, $arch, $machine_type);
} }
@ -4210,7 +4200,7 @@ sub qemu_deletescsihw {
foreach my $opt (keys %{$devices_list}) { foreach my $opt (keys %{$devices_list}) {
if (is_valid_drivename($opt)) { if (is_valid_drivename($opt)) {
my $drive = parse_drive($opt, $conf->{$opt}); my $drive = parse_drive($opt, $conf->{$opt});
if($drive->{interface} eq 'scsi' && $drive->{index} < (($maxdev-1)*($controller+1))) { if ($drive->{interface} eq 'scsi' && $drive->{index} < (($maxdev-1)*($controller+1))) {
return 1; return 1;
} }
} }