fix cluster_lock_storage() call

diff --git a/Makefile b/Makefile
index 25bed7a8a50383e044361802cabbc925e96a6597..8242d9aeb6b1ee8b723a0eb8d6947829562e4e48 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -2,7 +2,7 @@ RELEASE=2.1
 
 VERSION=2.0
 PACKAGE=qemu-server
-PKGREL=40
+PKGREL=41
 
 DESTDIR=
 PREFIX=/usr

diff --git a/PVE/VZDump/QemuServer.pm b/PVE/VZDump/QemuServer.pm
index 94e1bd4d05fe1b267b1795cf3fd62ed19c3d390b..d555b09049c00b2c2fceedc8543dbbe8840cff1e 100644 (file)
--- a/PVE/VZDump/QemuServer.pm
+++ b/PVE/VZDump/QemuServer.pm
@@ -8,6 +8,7 @@ use PVE::INotify;
 use PVE::VZDump;
 use PVE::Cluster qw(cfs_read_file);
 use PVE::Tools;
+use PVE::Storage::Plugin;
 use PVE::Storage;
 use PVE::QemuServer;
 use IO::File;
@@ -62,7 +63,7 @@ sub prepare {
     PVE::QemuServer::foreach_drive($conf, sub {
        my ($ds, $drive) = @_;
 
-       return if PVE::QemuServer::drive_is_cdrom ($drive);
+       return if PVE::QemuServer::drive_is_cdrom($drive);
 
        if (defined($drive->{backup}) && $drive->{backup} eq "no") {
            $self->loginfo("exclude disk '$ds' (backup=no)");
@@ -71,7 +72,7 @@ sub prepare {
 
        my $volid = $drive->{file};
 
-       my ($storeid, $volname) = PVE::Storage::parse_volume_id ($volid, 1);
+       my ($storeid, $volname) = PVE::Storage::parse_volume_id($volid, 1);
        push @$vollist, $volid if $storeid;
        $drivehash->{$ds} = $drive;
     });
@@ -84,7 +85,7 @@ sub prepare {
 
        my $path;
 
-       my ($storeid, $volname) = PVE::Storage::parse_volume_id ($volid, 1);
+       my ($storeid, $volname) = PVE::Storage::parse_volume_id($volid, 1);
        if ($storeid) {
            $path = PVE::Storage::path($self->{storecfg}, $volid);
        } else {
@@ -232,10 +233,10 @@ sub snapshot_alloc {
 
     if ($storeid) {
 
-       my $scfg = PVE::Storage::storage_config ($self->{storecfg}, $storeid);
+       my $scfg = PVE::Storage::storage_config($self->{storecfg}, $storeid);
 
        # lock shared storage
-       return PVE::Storage::cluster_lock_storage ($storeid, $scfg->{shared}, undef, sub {
+       return PVE::Storage::Plugin->cluster_lock_storage($storeid, $scfg->{shared}, undef, sub {
                $self->cmd ($cmd);
        });
     } else {
@@ -254,9 +255,9 @@ sub snapshot_free {
     while(-b $snapdev) {
        eval {
            if ($storeid) {
-               my $scfg = PVE::Storage::storage_config ($self->{storecfg}, $storeid);
+               my $scfg = PVE::Storage::storage_config($self->{storecfg}, $storeid);
                # lock shared storage
-               return PVE::Storage::cluster_lock_storage($storeid, $scfg->{shared}, undef, sub {
+               return PVE::Storage::Plugin->cluster_lock_storage($storeid, $scfg->{shared}, undef, sub {
                    PVE::Tools::run_command($cmd, outfunc => sub {}, errfunc => sub {});
                });
            } else {

diff --git a/changelog.Debian b/changelog.Debian
index dc8d4c231615c522ba313845c37289b1a36ecae5..cdb0798b0cf63361565c8a3428087805ccec470f 100644 (file)
--- a/changelog.Debian
+++ b/changelog.Debian
@@ -1,3 +1,9 @@
+qemu-server (2.0-41) unstable; urgency=low
+
+  * more fixes for newer pve-storage versions
+
+ -- Proxmox Support Team <support@proxmox.com>  Thu, 24 May 2012 07:24:00 +0200
+
 qemu-server (2.0-40) unstable; urgency=low
 
   * minor fixes for newer pve-storage versions