From ec21aa112d78c58cfdfabcd3585785f67aa0fff3 Mon Sep 17 00:00:00 2001 From: Derumier Alexandre Date: Fri, 20 Jan 2012 11:42:03 +0100 Subject: [PATCH] rename vm_deviceadd to vm_deviceplug, and vm_devicedel to vm_deviceunplug Signed-off-by: Derumier Alexandre --- PVE/API2/Qemu.pm | 2 +- PVE/QemuServer.pm | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/PVE/API2/Qemu.pm b/PVE/API2/Qemu.pm index 9be699b4..518a9824 100644 --- a/PVE/API2/Qemu.pm +++ b/PVE/API2/Qemu.pm @@ -533,7 +533,7 @@ __PACKAGE__->register_method({ } next if !defined($conf->{$opt}); if (PVE::QemuServer::valid_drivename($opt)) { - PVE::QemuServer::vm_devicedel($vmid, $conf, $opt); + PVE::QemuServer::vm_deviceunplug($vmid, $conf, $opt); my $drive = PVE::QemuServer::parse_drive($opt, $conf->{$opt}); if (PVE::QemuServer::drive_is_cdrom($drive)) { $cdchange->{$opt} = undef; diff --git a/PVE/QemuServer.pm b/PVE/QemuServer.pm index e3c6c28d..af6a14ea 100644 --- a/PVE/QemuServer.pm +++ b/PVE/QemuServer.pm @@ -1290,7 +1290,7 @@ sub create_disks { die "image '$path' does not exists\n"; } } - PVE::QemuServer::vm_deviceadd($storecfg, $conf, $vmid, $ds, $disk) if defined($conf); + PVE::QemuServer::vm_deviceplug($storecfg, $conf, $vmid, $ds, $disk) if defined($conf); }); }; @@ -2282,7 +2282,7 @@ sub vm_devices_list { return $devices; } -sub vm_deviceadd { +sub vm_deviceplug { my ($storecfg, $conf, $vmid, $deviceid, $device) = @_; return if !check_running($vmid) || !$conf->{hotplug} || $conf->{$deviceid}; @@ -2311,7 +2311,7 @@ sub vm_deviceadd { die "error on hotplug device $deviceid"; } -sub vm_devicedel { +sub vm_deviceunplug { my ($vmid, $conf, $deviceid) = @_; return if !check_running ($vmid) || !$conf->{hotplug};