proxmox-mirrors/qemu-server
1
0
Fork 0
mirror of https://git.proxmox.com/git/qemu-server synced 2025-04-30 23:11:25 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Implement volume-related helpers and use new foreach_volume

Browse Source 
Signed-off-by: Fabian Ebner <f.ebner@proxmox.com>
This commit is contained in:
Fabian Ebner 2020-03-26 09:09:36 +01:00 committed by Fabian Grünbichler
parent 818ce80ec1
commit beed0e3b0c
1 changed files with 33 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
PVE/QemuConfig.pm
View File

@ -77,6 +77,37 @@ sub has_feature {
return $err ? 0 : 1; return $err ? 0 : 1;
} }
sub valid_volume_keys {
my ($class, $reverse) = @_;
my @keys = PVE::QemuServer::Drive::valid_drive_names();
return $reverse ? reverse @keys : @keys;
}
# FIXME: adapt parse_drive to use $noerr for better error messages
sub parse_volume {
my ($class, $key, $volume_string, $noerr) = @_;
my $volume = PVE::QemuServer::Drive::parse_drive($key, $volume_string);
die "unable to parse volume\n" if !defined($volume) && !$noerr;
return $volume;
}
sub print_volume {
my ($class, $key, $volume) = @_;
return PVE::QemuServer::Drive::print_drive($volume);
}
sub volid_key {
my ($class) = @_;
return 'file';
}
sub get_replicatable_volumes { sub get_replicatable_volumes {
my ($class, $storecfg, $vmid, $conf, $cleanup, $noerr) = @_; my ($class, $storecfg, $vmid, $conf, $cleanup, $noerr) = @_;
@ -369,7 +400,7 @@ sub __snapshot_rollback_get_unused {
my $unused = []; my $unused = [];
$class->__snapshot_foreach_volume($conf, sub { $class->foreach_volume($conf, sub {
my ($vs, $volume) = @_; my ($vs, $volume) = @_;
return if PVE::QemuServer::drive_is_cdrom($volume); return if PVE::QemuServer::drive_is_cdrom($volume);
@ -377,7 +408,7 @@ sub __snapshot_rollback_get_unused {
my $found = 0; my $found = 0;
my $volid = $volume->{file}; my $volid = $volume->{file};
$class->__snapshot_foreach_volume($snap, sub { $class->foreach_volume($snap, sub {
my ($ds, $drive) = @_; my ($ds, $drive) = @_;
return if $found; return if $found;
@ -393,11 +424,6 @@ sub __snapshot_rollback_get_unused {
return $unused; return $unused;
} }
sub __snapshot_foreach_volume {
my ($class, $conf, $func) = @_;
PVE::QemuServer::foreach_drive($conf, $func);
}
# END implemented abstract methods from PVE::AbstractConfig # END implemented abstract methods from PVE::AbstractConfig
1; 1;