diff --git a/PVE/API2/Storage/Status.pm b/PVE/API2/Storage/Status.pm index d9326b7..8f97c18 100644 --- a/PVE/API2/Storage/Status.pm +++ b/PVE/API2/Storage/Status.pm @@ -47,7 +47,7 @@ __PACKAGE__->register_method ({ }), content => { description => "Only list stores which support this content type.", - type => 'string', format => 'pve-storage-content', + type => 'string', format => 'pve-storage-content-list', optional => 1, }, enabled => { diff --git a/PVE/Storage.pm b/PVE/Storage.pm index 8f81aeb..7b3dc70 100755 --- a/PVE/Storage.pm +++ b/PVE/Storage.pm @@ -882,14 +882,23 @@ sub storage_info { my $ids = $cfg->{ids}; my $info = {}; - + + my @ctypes = PVE::Tools::split_list($content); + my $slist = []; foreach my $storeid (keys %$ids) { - next if $content && !$ids->{$storeid}->{content}->{$content}; - next if !storage_check_enabled($cfg, $storeid, undef, 1); + my $want_ctype = 0; + foreach my $ctype (@ctypes) { + if ($ids->{$storeid}->{content}->{$ctype}) { + $want_ctype = 1; + last; + } + } + next if !$want_ctype; + my $type = $ids->{$storeid}->{type}; $info->{$storeid} = {