shaba/lvm2
1
0
Fork 0
mirror of git://sourceware.org/git/lvm2.git synced 2025-01-17 06:04:23 +03:00
Code Releases Activity

vgdisplay: split code for variants using command defs

Browse Source
This commit is contained in:
David Teigland 2024-12-05 15:31:31 -06:00
parent ccde015712
commit 017c668fd0
4 changed files with 31 additions and 57 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
tools/command-lines.in
View File

@ -1874,7 +1874,7 @@ ID: vgcreate_general
--- ---
vgdisplay --columns vgdisplay --columns
OO: OO_REPORT, --activevolumegroups OO: OO_REPORT
OP: VG|Tag ... OP: VG|Tag ...
IO: --partial, --ignoreskippedcluster IO: --partial, --ignoreskippedcluster
RULE: --noheadings not --headings RULE: --noheadings not --headings

1
tools/lvmcmdline.c
View File

@ -101,6 +101,7 @@ static const struct command_function _command_functions[CMD_COUNT] = {
/* vgdisplay variants */ /* vgdisplay variants */
{ vgdisplay_columns_CMD, vgdisplay_columns_cmd }, { vgdisplay_columns_CMD, vgdisplay_columns_cmd },
{ vgdisplay_colon_CMD, vgdisplay_colon_cmd }, { vgdisplay_colon_CMD, vgdisplay_colon_cmd },
{ vgdisplay_general_CMD, vgdisplay_general_cmd },
/* lvconvert utilities related to repair. */ /* lvconvert utilities related to repair. */
{ lvconvert_repair_CMD, lvconvert_repair_cmd }, { lvconvert_repair_CMD, lvconvert_repair_cmd },

1
tools/tools.h
View File

@ -195,6 +195,7 @@ int pvdisplay_columns_cmd(struct cmd_context *cmd, int argc, char **argv);
int pvdisplay_cmd(struct cmd_context *cmd, int argc, char **argv); int pvdisplay_cmd(struct cmd_context *cmd, int argc, char **argv);
int vgdisplay_columns_cmd(struct cmd_context *cmd, int argc, char **argv); int vgdisplay_columns_cmd(struct cmd_context *cmd, int argc, char **argv);
int vgdisplay_colon_cmd(struct cmd_context *cmd, int argc, char **argv); int vgdisplay_colon_cmd(struct cmd_context *cmd, int argc, char **argv);
int vgdisplay_general_cmd(struct cmd_context *cmd, int argc, char **argv);
int lvconvert_repair_cmd(struct cmd_context *cmd, int argc, char **argv); int lvconvert_repair_cmd(struct cmd_context *cmd, int argc, char **argv);
int lvconvert_replace_pv_cmd(struct cmd_context *cmd, int argc, char **argv); int lvconvert_replace_pv_cmd(struct cmd_context *cmd, int argc, char **argv);

78
tools/vgdisplay.c
View File

@ -15,24 +15,31 @@
#include "tools.h" #include "tools.h"
static int _vgdisplay_single(struct cmd_context *cmd, const char *vg_name, static int _vgdisplay_colon_single(struct cmd_context *cmd, const char *vg_name,
struct volume_group *vg, struct volume_group *vg,
struct processing_handle *handle __attribute__((unused))) struct processing_handle *handle __attribute__((unused)))
{ {
if (arg_is_set(cmd, activevolumegroups_ARG) && !lvs_in_vg_activated(vg)) if (arg_is_set(cmd, activevolumegroups_ARG) && !lvs_in_vg_activated(vg))
return ECMD_PROCESSED; return ECMD_PROCESSED;
if (arg_is_set(cmd, colon_ARG)) {
vgdisplay_colons(vg); vgdisplay_colons(vg);
return ECMD_PROCESSED; return ECMD_PROCESSED;
} }
static int _vgdisplay_general_single(struct cmd_context *cmd, const char *vg_name,
struct volume_group *vg,
struct processing_handle *handle __attribute__((unused)))
{
if (arg_is_set(cmd, activevolumegroups_ARG) && !lvs_in_vg_activated(vg))
return ECMD_PROCESSED;
if (arg_is_set(cmd, short_ARG)) { if (arg_is_set(cmd, short_ARG)) {
vgdisplay_short(vg); vgdisplay_short(vg);
return ECMD_PROCESSED; return ECMD_PROCESSED;
} }
vgdisplay_full(vg); /* was vg_show */ vgdisplay_full(vg);
if (arg_is_set(cmd, verbose_ARG)) { if (arg_is_set(cmd, verbose_ARG)) {
vgdisplay_extents(vg); vgdisplay_extents(vg);
@ -50,70 +57,35 @@ static int _vgdisplay_single(struct cmd_context *cmd, const char *vg_name,
return ECMD_PROCESSED; return ECMD_PROCESSED;
} }
int vgdisplay(struct cmd_context *cmd, int argc, char **argv) int vgdisplay_colon_cmd(struct cmd_context *cmd, int argc, char **argv)
{ {
if (arg_is_set(cmd, columns_ARG)) {
if (arg_is_set(cmd, colon_ARG) ||
arg_is_set(cmd, activevolumegroups_ARG) ||
arg_is_set(cmd, short_ARG)) {
log_error("Incompatible options selected");
return EINVALID_CMD_LINE;
}
return vgs(cmd, argc, argv);
}
if (arg_is_set(cmd, aligned_ARG) ||
arg_is_set(cmd, binary_ARG) ||
arg_is_set(cmd, noheadings_ARG) ||
arg_is_set(cmd, options_ARG) ||
arg_is_set(cmd, separator_ARG) ||
arg_is_set(cmd, sort_ARG) ||
arg_is_set(cmd, unbuffered_ARG)) {
log_error("Incompatible options selected.");
return EINVALID_CMD_LINE;
}
if (arg_is_set(cmd, colon_ARG) && arg_is_set(cmd, short_ARG)) {
log_error("Option -c is not allowed with option -s");
return EINVALID_CMD_LINE;
}
if (argc && arg_is_set(cmd, activevolumegroups_ARG)) { if (argc && arg_is_set(cmd, activevolumegroups_ARG)) {
log_error("Option -A is not allowed with volume group names"); log_error("Option -A is not allowed with volume group names");
return EINVALID_CMD_LINE; return EINVALID_CMD_LINE;
} }
/********* FIXME: Do without this - or else 2(+) passes! return process_each_vg(cmd, argc, argv, NULL, NULL, 0, 0, NULL, _vgdisplay_colon_single);
Figure out longest volume group name
for (c = opt; opt < argc; opt++) {
len = strlen(argv[opt]);
if (len > max_len)
max_len = len;
} }
**********/
return process_each_vg(cmd, argc, argv, NULL, NULL, 0, 0, NULL, int vgdisplay_general_cmd(struct cmd_context *cmd, int argc, char **argv)
_vgdisplay_single); {
if (argc && arg_is_set(cmd, activevolumegroups_ARG)) {
/******** FIXME Need to count number processed log_error("Option -A is not allowed with volume group names");
Add this to process_each_vg if arg_is_set(cmd,activevolumegroups_ARG) ? return EINVALID_CMD_LINE;
if (opt == argc) {
log_print("no ");
if (arg_is_set(cmd,activevolumegroups_ARG))
printf("active ");
printf("volume groups found\n\n");
return LVM_E_NO_VG;
} }
************/
return process_each_vg(cmd, argc, argv, NULL, NULL, 0, 0, NULL, _vgdisplay_general_single);
} }
int vgdisplay_columns_cmd(struct cmd_context *cmd, int argc, char **argv) int vgdisplay_columns_cmd(struct cmd_context *cmd, int argc, char **argv)
{ {
return vgdisplay(cmd, argc, argv); return vgs(cmd, argc, argv);
} }
int vgdisplay_colon_cmd(struct cmd_context *cmd, int argc, char **argv) int vgdisplay(struct cmd_context *cmd, int argc, char **argv)
{ {
return vgdisplay(cmd, argc, argv); log_error(INTERNAL_ERROR "Missing function for command definition %d:%s.",
cmd->command->command_index, command_enum(cmd->command->command_enum));
return ECMD_FAILED;
} }