proxmox-mirrors/qemu-server
1
0
Fork 0
mirror of https://git.proxmox.com/git/qemu-server synced 2025-05-02 23:38:42 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

use 'boolean' for hotplug option

Browse Source 
cleanup coding style
This commit is contained in:
Dietmar Maurer 2011-10-11 13:20:59 +02:00
parent 2bbed6c09a
commit e8b9c17cac
1 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
PVE/QemuServer.pm
View File

@ -155,7 +155,7 @@ my $confdesc = {
}, },
hotplug => { hotplug => {
optional => 1, optional => 1,
type => 'integer', type => 'boolean',
description => "Activate hotplug for disk and network device", description => "Activate hotplug for disk and network device",
default => 0, default => 0,
}, },
@ -2277,20 +2277,20 @@ sub vm_deviceadd {
my $cfspath = cfs_config_path($vmid); my $cfspath = cfs_config_path($vmid);
my $conf = PVE::Cluster::cfs_read_file($cfspath) || {}; my $conf = PVE::Cluster::cfs_read_file($cfspath) || {};
return if !check_running ($vmid) || $conf->{hotplug} != 1 ; # do nothing if vm is running or hotplug option not set to 1 return if !check_running($vmid) || !$conf->{hotplug};
if($deviceid =~ m/^(virtio)(\d+)$/) { if($deviceid =~ m/^(virtio)(\d+)$/) {
my $drive = print_drive_full ($storecfg,$vmid, $device); my $drive = print_drive_full($storecfg,$vmid, $device);
vm_monitor_command ($vmid, "drive_add auto $drive", 1); vm_monitor_command($vmid, "drive_add auto $drive", 1);
my $devicefull = print_drivedevice_full ($storecfg,$vmid, $device); my $devicefull = print_drivedevice_full($storecfg,$vmid, $device);
vm_monitor_command ($vmid, "device_add $devicefull", 1); vm_monitor_command($vmid, "device_add $devicefull", 1);
} }
#verification #verification
sleep 2; #give a litlle time to os to add the device sleep 2; #give a litlle time to os to add the device
my $devices_list = vm_devices_list($vmid); my $devices_list = vm_devices_list($vmid);
die "error on hotplug device" if(! defined($devices_list->{$deviceid})); die "error on hotplug device" if !defined($devices_list->{$deviceid});
} }
@ -2300,18 +2300,18 @@ sub vm_devicedel {
my $cfspath = cfs_config_path($vmid); my $cfspath = cfs_config_path($vmid);
my $conf = PVE::Cluster::cfs_read_file($cfspath) || {}; my $conf = PVE::Cluster::cfs_read_file($cfspath) || {};
return if !check_running ($vmid) || $conf->{hotplug} != 1 ; return if !check_running ($vmid) || !$conf->{hotplug};
if($deviceid =~ m/^(virtio)(\d+)$/){ if($deviceid =~ m/^(virtio)(\d+)$/){
vm_monitor_command ($vmid, "drive_del drive-$deviceid",1); vm_monitor_command($vmid, "drive_del drive-$deviceid", 1);
vm_monitor_command ($vmid, "device_del $deviceid",1); vm_monitor_command($vmid, "device_del $deviceid", 1);
} }
sleep 2; sleep 2;
my $devices_list=vm_devices_list($vmid); my $devices_list = vm_devices_list($vmid);
die "error on hot-unplugging device " if(defined $devices_list->{$deviceid}); die "error on hot-unplugging device " if defined($devices_list->{$deviceid});
} }
sub vm_start { sub vm_start {