[libvirt] [PATCH v2 1/3] storage: Add iscsi-direct pool list type flag
Add pool list type flag VIR_CONNECT_LIST_STORAGE_POOLS_ISCSI_DIRECT,
which was forgotten when introducing iscsi-direct pool at f0bf1be3.
https://bugzilla.redhat.com/show_bug.cgi?id=1726609
Signed-off-by: Han Han <hhan(a)redhat.com>
---
include/libvirt/libvirt-storage.h | 1 +
src/conf/storage_conf.h | 3 ++-
src/conf/virstorageobj.c | 4 +++-
src/libvirt-storage.c | 1 +
tools/virsh-pool.c | 2 +-
tools/virsh.pod | 2 +-
6 files changed, 9 insertions(+), 4 deletions(-)
diff --git a/include/libvirt/libvirt-storage.h b/include/libvirt/libvirt-storage.h
index 5a95b2b139..089e1e0bd1 100644
--- a/include/libvirt/libvirt-storage.h
+++ b/include/libvirt/libvirt-storage.h
@@ -244,6 +244,7 @@ typedef enum {
VIR_CONNECT_LIST_STORAGE_POOLS_GLUSTER = 1 << 16,
VIR_CONNECT_LIST_STORAGE_POOLS_ZFS = 1 << 17,
VIR_CONNECT_LIST_STORAGE_POOLS_VSTORAGE = 1 << 18,
+ VIR_CONNECT_LIST_STORAGE_POOLS_ISCSI_DIRECT = 1 << 19,
} virConnectListAllStoragePoolsFlags;
int virConnectListAllStoragePools(virConnectPtr conn,
diff --git a/src/conf/storage_conf.h b/src/conf/storage_conf.h
index 338e70244d..f399ac6192 100644
--- a/src/conf/storage_conf.h
+++ b/src/conf/storage_conf.h
@@ -484,7 +484,8 @@ VIR_ENUM_DECL(virStoragePartedFs);
VIR_CONNECT_LIST_STORAGE_POOLS_SHEEPDOG | \
VIR_CONNECT_LIST_STORAGE_POOLS_GLUSTER | \
VIR_CONNECT_LIST_STORAGE_POOLS_ZFS | \
- VIR_CONNECT_LIST_STORAGE_POOLS_VSTORAGE)
+ VIR_CONNECT_LIST_STORAGE_POOLS_VSTORAGE | \
+ VIR_CONNECT_LIST_STORAGE_POOLS_ISCSI_DIRECT)
#define VIR_CONNECT_LIST_STORAGE_POOLS_FILTERS_ALL \
(VIR_CONNECT_LIST_STORAGE_POOLS_FILTERS_ACTIVE | \
diff --git a/src/conf/virstorageobj.c b/src/conf/virstorageobj.c
index 31b5af8e9e..0ac128c4bc 100644
--- a/src/conf/virstorageobj.c
+++ b/src/conf/virstorageobj.c
@@ -1967,7 +1967,9 @@ virStoragePoolObjMatch(virStoragePoolObjPtr obj,
(MATCH(VIR_CONNECT_LIST_STORAGE_POOLS_ZFS) &&
(obj->def->type == VIR_STORAGE_POOL_ZFS)) ||
(MATCH(VIR_CONNECT_LIST_STORAGE_POOLS_VSTORAGE) &&
- (obj->def->type == VIR_STORAGE_POOL_VSTORAGE))))
+ (obj->def->type == VIR_STORAGE_POOL_VSTORAGE)) ||
+ (MATCH(VIR_CONNECT_LIST_STORAGE_POOLS_ISCSI_DIRECT) &&
+ (obj->def->type == VIR_STORAGE_POOL_ISCSI_DIRECT))))
return false;
}
diff --git a/src/libvirt-storage.c b/src/libvirt-storage.c
index 3bd61dc986..24e28083ed 100644
--- a/src/libvirt-storage.c
+++ b/src/libvirt-storage.c
@@ -93,6 +93,7 @@ virStoragePoolGetConnect(virStoragePoolPtr pool)
* VIR_CONNECT_LIST_STORAGE_POOLS_MPATH
* VIR_CONNECT_LIST_STORAGE_POOLS_RBD
* VIR_CONNECT_LIST_STORAGE_POOLS_SHEEPDOG
+ * VIR_CONNECT_LIST_STORAGE_POOLS_ISCSI_DIRECT
*
* Returns the number of storage pools found or -1 and sets @pools to
* NULL in case of error. On success, the array stored into @pools is
diff --git a/tools/virsh-pool.c b/tools/virsh-pool.c
index c56ab2d90a..510d41b508 100644
--- a/tools/virsh-pool.c
+++ b/tools/virsh-pool.c
@@ -1205,7 +1205,7 @@ cmdPoolList(vshControl *ctl, const vshCmd *cmd ATTRIBUTE_UNUSED)
flags |= VIR_CONNECT_LIST_STORAGE_POOLS_ISCSI;
break;
case VIR_STORAGE_POOL_ISCSI_DIRECT:
- flags |= VIR_CONNECT_LIST_STORAGE_POOLS_ISCSI;
+ flags |= VIR_CONNECT_LIST_STORAGE_POOLS_ISCSI_DIRECT;
break;
case VIR_STORAGE_POOL_SCSI:
flags |= VIR_CONNECT_LIST_STORAGE_POOLS_SCSI;
diff --git a/tools/virsh.pod b/tools/virsh.pod
index dbcac24292..62ffd43ba9 100644
--- a/tools/virsh.pod
+++ b/tools/virsh.pod
@@ -4093,7 +4093,7 @@ I<--uuid> and I<--name>.
You may also want to list pools with specified types using I<type>, the
pool types must be separated by comma, e.g. --type dir,disk. The valid pool
types include 'dir', 'fs', 'netfs', 'logical',
'disk', 'iscsi', 'scsi',
-'mpath', 'rbd', 'sheepdog' and 'gluster'.
+'mpath', 'rbd', 'sheepdog', 'gluster',
'iscsi-direct'.
The I<--details> option instructs virsh to additionally
display pool persistence and capacity related information where available.
--
2.20.1