proxmox-mirrors/qemu-server
1
0
Fork 0
mirror of https://git.proxmox.com/git/qemu-server synced 2025-08-06 17:47:31 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

rework of hotplug/unplug in Qemu.pm

Browse Source 
manage errors on more than 1 device
use unused disk for new created disk but failed hotplug

Signed-off-by: Derumier Alexandre <aderumier@odiso.com>
This commit is contained in:
Derumier Alexandre 2012-01-20 11:42:08 +01:00 committed by Dietmar Maurer
parent a4f091a073
commit fcdb011702
2 changed files with 27 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
PVE/API2/Qemu.pm
View File

@ -439,6 +439,7 @@ __PACKAGE__->register_method({
my $digest = extract_param($param, 'digest'); my $digest = extract_param($param, 'digest');
my @hotplugerr = ();
my @paramarr = (); # used for log message my @paramarr = (); # used for log message
foreach my $key (keys %$param) { foreach my $key (keys %$param) {
push @paramarr, "-$key", $param->{$key}; push @paramarr, "-$key", $param->{$key};
@ -500,6 +501,17 @@ __PACKAGE__->register_method({
PVE::Cluster::log_msg('info', $user, "update VM $vmid: " . join (' ', @paramarr)); PVE::Cluster::log_msg('info', $user, "update VM $vmid: " . join (' ', @paramarr));
my @newdelete = ();
foreach my $opt (PVE::Tools::split_list($delete)) {
if(PVE::QemuServer::vm_deviceunplug($vmid, $conf, $opt)) {
push(@newdelete, $opt);
}
else {
push(@hotplugerr, $opt);
}
}
$delete = join(',', @newdelete) if scalar(@newdelete) > 0;
foreach my $opt (keys %$eject) { foreach my $opt (keys %$eject) {
if ($conf->{$opt}) { if ($conf->{$opt}) {
my $drive = PVE::QemuServer::parse_drive($opt, $conf->{$opt}); my $drive = PVE::QemuServer::parse_drive($opt, $conf->{$opt});
@ -533,7 +545,6 @@ __PACKAGE__->register_method({
} }
next if !defined($conf->{$opt}); next if !defined($conf->{$opt});
if (PVE::QemuServer::valid_drivename($opt)) { if (PVE::QemuServer::valid_drivename($opt)) {
PVE::QemuServer::vm_deviceunplug($vmid, $conf, $opt);
my $drive = PVE::QemuServer::parse_drive($opt, $conf->{$opt}); my $drive = PVE::QemuServer::parse_drive($opt, $conf->{$opt});
if (PVE::QemuServer::drive_is_cdrom($drive)) { if (PVE::QemuServer::drive_is_cdrom($drive)) {
$cdchange->{$opt} = undef; $cdchange->{$opt} = undef;
@ -561,6 +572,18 @@ __PACKAGE__->register_method({
PVE::QemuServer::create_disks($storecfg, $vmid, $param, $conf); PVE::QemuServer::create_disks($storecfg, $vmid, $param, $conf);
#hotplug disks
foreach my $opt (keys %$param) {
if($opt =~ m/^(scsi|virtio)(\d+)$/) {
my $device = PVE::QemuServer::parse_drive($opt, $param->{$opt});
if(!PVE::QemuServer::vm_deviceplug($storecfg, $conf, $vmid, $opt, $device)) {
$unset->{$opt} = 1;
PVE::QemuServer::add_unused_volume($param, $device->{file});
push(@hotplugerr, $opt);
}
}
}
PVE::QemuServer::change_config_nolock($vmid, $param, $unset, 1); PVE::QemuServer::change_config_nolock($vmid, $param, $unset, 1);
return if !PVE::QemuServer::check_running($vmid); return if !PVE::QemuServer::check_running($vmid);
@ -581,6 +604,9 @@ __PACKAGE__->register_method({
warn $@ if $@; warn $@ if $@;
} }
raise_param_exc({ hotplug => "error hotplug/unplug ".join(',', @hotplugerr)})
if scalar(@hotplugerr) > 0;
return undef; return undef;
}}); }});

1
PVE/QemuServer.pm
View File

@ -1290,7 +1290,6 @@ sub create_disks {
die "image '$path' does not exists\n"; die "image '$path' does not exists\n";
} }
} }
PVE::QemuServer::vm_deviceplug($storecfg, $conf, $vmid, $ds, $disk) if defined($conf);
}); });
}; };