Skip to content

Commit d391152

Browse files
committed
python: add missing define for handwritten getter
Add missing defines for the hand written getters. Fixes: 7e797f4 ("libnvme: annotate libnvme_subsystem::iopolicy with !accessors:none") Signed-off-by: Daniel Wagner <wagi@kernel.org>
1 parent aff3d30 commit d391152

1 file changed

Lines changed: 35 additions & 19 deletions

File tree

libnvme/libnvme/nvme.i

Lines changed: 35 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -53,26 +53,42 @@ static inline PyObject *Py_NewRef(PyObject *obj)
5353
* to bridge between SWIG's API naming convention
5454
* "struct_member_[set|get]" and libnvme's API naming convention
5555
* "struct_[set|get]_member.
56-
*
57-
* - libnvme_subsystem_host_get: 'host' is the Python-visible name; the C
58-
* struct member is 's->h' and the hand-written accessor is
59-
* libnvme_subsystem_get_host() in tree.c.
60-
*
61-
* - libnvme_ctrl_state_get: 'state' has !accessors:none in private.h
62-
* (reads from sysfs dynamically); libnvme_ctrl_get_state() is
63-
* hand-written in tree.c.
64-
*
65-
* - libnvme_ctrl_subsystem_get: 'subsystem' is the Python-visible name;
66-
* the C struct member is named 's' and the hand-written accessor is
67-
* libnvme_ctrl_get_subsystem() in tree.c.
68-
*
69-
* - libnvme_ctrl_address_get: 'address' has !accessors:none in private.h
70-
* and maps to libnvme_ctrl_get_traddr(), not libnvme_ctrl_get_address().
7156
*/
72-
#define libnvme_subsystem_host_get libnvme_subsystem_get_host
73-
#define libnvme_ctrl_state_get libnvme_ctrl_get_state
74-
#define libnvme_ctrl_subsystem_get libnvme_ctrl_get_subsystem
75-
#define libnvme_ctrl_address_get libnvme_ctrl_get_traddr
57+
#define libnvme_ctrl_address_get libnvme_ctrl_get_traddr
58+
#define libnvme_ctrl_command_error_count_get libnvme_ctrl_get_command_error_count
59+
#define libnvme_ctrl_reconnect_count_get libnvme_ctrl_get_reconnect_count
60+
#define libnvme_ctrl_reset_count_get libnvme_ctrl_get_reset_count
61+
#define libnvme_ctrl_state_get libnvme_ctrl_get_state
62+
#define libnvme_ctrl_subsystem_get libnvme_ctrl_get_subsystem
63+
#define libnvme_ns_command_error_count_get libnvme_ns_get_command_error_count
64+
#define libnvme_ns_command_retry_count_get libnvme_ns_get_command_retry_count
65+
#define libnvme_ns_fail_no_available_path_count_get libnvme_ns_get_fail_no_available_path_count
66+
#define libnvme_ns_inflights_get libnvme_ns_get_inflights
67+
#define libnvme_ns_io_ticks_get libnvme_ns_get_io_ticks
68+
#define libnvme_ns_read_ios_get libnvme_ns_get_read_ios
69+
#define libnvme_ns_read_sectors_get libnvme_ns_get_read_sectors
70+
#define libnvme_ns_read_ticks_get libnvme_ns_get_read_ticks
71+
#define libnvme_ns_requeue_no_usable_path_count_get libnvme_ns_get_requeue_no_usable_path_count
72+
#define libnvme_ns_stat_interval_get libnvme_ns_get_stat_interval
73+
#define libnvme_ns_write_ios_get libnvme_ns_get_write_ios
74+
#define libnvme_ns_write_sectors_get libnvme_ns_get_write_sectors
75+
#define libnvme_ns_write_ticks_get libnvme_ns_get_write_ticks
76+
#define libnvme_path_ana_state_get libnvme_path_get_ana_stat
77+
#define libnvme_path_command_error_count_get libnvme_path_get_command_error_count
78+
#define libnvme_path_command_retry_count_get libnvme_path_get_command_retry_count
79+
#define libnvme_path_inflights_get libnvme_path_get_inflights
80+
#define libnvme_path_io_ticks_get libnvme_path_get_io_ticks
81+
#define libnvme_path_multipath_failover_count_get libnvme_path_get_multipath_failover_count
82+
#define libnvme_path_numa_nodes_get libnvme_path_get_numa_nodes
83+
#define libnvme_path_read_ios_get libnvme_path_get_read_ios
84+
#define libnvme_path_read_sectors_get libnvme_path_get_read_sectors
85+
#define libnvme_path_read_ticks_get libnvme_path_get_read_ticks
86+
#define libnvme_path_stat_interval_get libnvme_path_get_stat_interval
87+
#define libnvme_path_write_ios_get libnvme_path_get_write_ios
88+
#define libnvme_path_write_sectors_get libnvme_path_get_write_sectors
89+
#define libnvme_path_write_ticks_get libnvme_path_get_write_ticks
90+
#define libnvme_subsystem_host_get libnvme_subsystem_get_host
91+
#define libnvme_subsystem_iopolicy_get libnvme_subsystem_get_iopolicy
7692

7793
static int connect_err = 0;
7894
static int discover_err = 0;

0 commit comments

Comments
 (0)