From: Jiri Denemark Date: Mon, 13 Mar 2017 08:20:35 +0000 (+0100) Subject: Enable forgotten VIR_CONNECT_LIST_STORAGE_POOLS_* flags X-Git-Tag: v3.2.0-rc1~290 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=fafe9d7c74dacbf86d7a5e8aaaabfe27b5df77a3;p=thirdparty%2Flibvirt.git Enable forgotten VIR_CONNECT_LIST_STORAGE_POOLS_* flags VIR_CONNECT_LIST_STORAGE_POOLS_VSTORAGE and VIR_CONNECT_LIST_STORAGE_POOLS_ZFS were added to libvirt but the listing API was not properly updated to use them. https://bugzilla.redhat.com/show_bug.cgi?id=1431543 Signed-off-by: Jiri Denemark --- diff --git a/src/conf/storage_conf.c b/src/conf/storage_conf.c index a52eeba074..3cfaf2b9bc 100644 --- a/src/conf/storage_conf.c +++ b/src/conf/storage_conf.c @@ -2671,7 +2671,11 @@ virStoragePoolMatch(virStoragePoolObjPtr poolobj, (MATCH(VIR_CONNECT_LIST_STORAGE_POOLS_SHEEPDOG) && (poolobj->def->type == VIR_STORAGE_POOL_SHEEPDOG)) || (MATCH(VIR_CONNECT_LIST_STORAGE_POOLS_GLUSTER) && - (poolobj->def->type == VIR_STORAGE_POOL_GLUSTER)))) + (poolobj->def->type == VIR_STORAGE_POOL_GLUSTER)) || + (MATCH(VIR_CONNECT_LIST_STORAGE_POOLS_ZFS) && + poolobj->def->type == VIR_STORAGE_POOL_ZFS) || + (MATCH(VIR_CONNECT_LIST_STORAGE_POOLS_VSTORAGE) && + poolobj->def->type == VIR_STORAGE_POOL_VSTORAGE))) return false; } diff --git a/src/conf/storage_conf.h b/src/conf/storage_conf.h index 1723afc0a3..c3a88d2848 100644 --- a/src/conf/storage_conf.h +++ b/src/conf/storage_conf.h @@ -544,7 +544,8 @@ VIR_ENUM_DECL(virStoragePartedFs) VIR_CONNECT_LIST_STORAGE_POOLS_RBD | \ VIR_CONNECT_LIST_STORAGE_POOLS_SHEEPDOG | \ VIR_CONNECT_LIST_STORAGE_POOLS_GLUSTER | \ - VIR_CONNECT_LIST_STORAGE_POOLS_ZFS) + VIR_CONNECT_LIST_STORAGE_POOLS_ZFS | \ + VIR_CONNECT_LIST_STORAGE_POOLS_VSTORAGE) # define VIR_CONNECT_LIST_STORAGE_POOLS_FILTERS_ALL \ (VIR_CONNECT_LIST_STORAGE_POOLS_FILTERS_ACTIVE | \