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

add lock around update_vm code

Browse Source
This commit is contained in:
Dietmar Maurer 2012-01-27 09:53:48 +01:00
parent afdb31d5f8
commit 5d39a18227
1 changed files with 90 additions and 90 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
PVE/API2/Qemu.pm
View File

@ -455,6 +455,8 @@ __PACKAGE__->register_method({
&$resolve_cdrom_alias($param); &$resolve_cdrom_alias($param);
my $updatefn = sub {
my $conf = PVE::QemuServer::load_config($vmid); my $conf = PVE::QemuServer::load_config($vmid);
die "checksum missmatch (file change by other user?)\n" die "checksum missmatch (file change by other user?)\n"
@ -471,8 +473,6 @@ __PACKAGE__->register_method({
die "you can't use '-$opt' and '-delete $opt' at the same time\n" die "you can't use '-$opt' and '-delete $opt' at the same time\n"
if defined($param->{$opt}); if defined($param->{$opt});
my $unset = {};
if (!PVE::QemuServer::option_exists($opt)) { if (!PVE::QemuServer::option_exists($opt)) {
raise_param_exc({ delete => "unknown option '$opt'" }); raise_param_exc({ delete => "unknown option '$opt'" });
} }
@ -510,12 +510,9 @@ __PACKAGE__->register_method({
warn $@ if $@; warn $@ if $@;
} }
$unset->{$opt} = 1; PVE::QemuServer::change_config_nolock($vmid, {}, { $opt => 1 }, 1);
PVE::QemuServer::change_config_nolock($vmid, {}, $unset, 1);
} }
#add #add
foreach my $opt (keys %$param) { foreach my $opt (keys %$param) {
@ -573,6 +570,9 @@ __PACKAGE__->register_method({
PVE::QemuServer::change_config_nolock($vmid, { $opt => $param->{$opt} }, {}, 1); PVE::QemuServer::change_config_nolock($vmid, { $opt => $param->{$opt} }, {}, 1);
} }
};
PVE::QemuServer::lock_config($vmid, $updatefn);
return undef; return undef;
}}); }});