Mixing all completers in one file does not support maintainability. Separate those completers which relate to nodedev (e.g. they complete various nodedev aspects) into virsh-completer-nodedev.c Signed-off-by: Michal Privoznik <mprivozn@xxxxxxxxxx> --- tools/Makefile.am | 1 + tools/virsh-completer-nodedev.c | 117 ++++++++++++++++++++++++++++++++ tools/virsh-completer-nodedev.h | 35 ++++++++++ tools/virsh-completer.c | 90 ------------------------ tools/virsh-completer.h | 13 +--- 5 files changed, 154 insertions(+), 102 deletions(-) create mode 100644 tools/virsh-completer-nodedev.c create mode 100644 tools/virsh-completer-nodedev.h diff --git a/tools/Makefile.am b/tools/Makefile.am index 79e2ea7cd9..22f476a1c2 100644 --- a/tools/Makefile.am +++ b/tools/Makefile.am @@ -220,6 +220,7 @@ virsh_SOURCES = \ virsh-completer-domain.c virsh-completer-domain.h \ virsh-completer-interface.c virsh-completer-interface.h \ virsh-completer-network.c virsh-completer-network.h \ + virsh-completer-nodedev.c virsh-completer-nodedev.h \ virsh-completer-pool.c virsh-completer-pool.h \ virsh-completer-volume.c virsh-completer-volume.h \ virsh-console.c virsh-console.h \ diff --git a/tools/virsh-completer-nodedev.c b/tools/virsh-completer-nodedev.c new file mode 100644 index 0000000000..36f38acd57 --- /dev/null +++ b/tools/virsh-completer-nodedev.c @@ -0,0 +1,117 @@ +/* + * virsh-completer-nodedev.c: virsh completer callbacks related to nodedev + * + * Copyright (C) 2019 Red Hat, Inc. + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library. If not, see + * <http://www.gnu.org/licenses/>. + */ + +#include <config.h> + +#include "virsh-completer-nodedev.h" +#include "conf/node_device_conf.h" +#include "viralloc.h" +#include "virsh-nodedev.h" +#include "virsh.h" +#include "virstring.h" + +char ** +virshNodeDeviceNameCompleter(vshControl *ctl, + const vshCmd *cmd ATTRIBUTE_UNUSED, + unsigned int flags) +{ + virshControlPtr priv = ctl->privData; + virNodeDevicePtr *devs = NULL; + int ndevs = 0; + size_t i = 0; + char **ret = NULL; + VIR_AUTOSTRINGLIST tmp = NULL; + + virCheckFlags(0, NULL); + + if (!priv->conn || virConnectIsAlive(priv->conn) <= 0) + return NULL; + + if ((ndevs = virConnectListAllNodeDevices(priv->conn, &devs, flags)) < 0) + return NULL; + + if (VIR_ALLOC_N(tmp, ndevs + 1) < 0) + goto cleanup; + + for (i = 0; i < ndevs; i++) { + const char *name = virNodeDeviceGetName(devs[i]); + + if (VIR_STRDUP(tmp[i], name) < 0) + goto cleanup; + } + + VIR_STEAL_PTR(ret, tmp); + + cleanup: + for (i = 0; i < ndevs; i++) + virNodeDeviceFree(devs[i]); + VIR_FREE(devs); + return ret; +} + + +char ** +virshNodeDeviceEventNameCompleter(vshControl *ctl ATTRIBUTE_UNUSED, + const vshCmd *cmd ATTRIBUTE_UNUSED, + unsigned int flags) +{ + size_t i = 0; + char **ret = NULL; + VIR_AUTOSTRINGLIST tmp = NULL; + + virCheckFlags(0, NULL); + + if (VIR_ALLOC_N(tmp, VIR_NODE_DEVICE_EVENT_ID_LAST + 1) < 0) + return NULL; + + for (i = 0; i < VIR_NODE_DEVICE_EVENT_ID_LAST; i++) { + if (VIR_STRDUP(tmp[i], virshNodeDeviceEventCallbacks[i].name) < 0) + return NULL; + } + + VIR_STEAL_PTR(ret, tmp); + return ret; +} + + +char ** +virshNodeDeviceCapabilityNameCompleter(vshControl *ctl, + const vshCmd *cmd, + unsigned int flags) +{ + VIR_AUTOSTRINGLIST tmp = NULL; + const char *cap_str = NULL; + size_t i = 0; + + virCheckFlags(0, NULL); + + if (vshCommandOptStringQuiet(ctl, cmd, "cap", &cap_str) < 0) + return NULL; + + if (VIR_ALLOC_N(tmp, VIR_NODE_DEV_CAP_LAST + 1) < 0) + return NULL; + + for (i = 0; i < VIR_NODE_DEV_CAP_LAST; i++) { + if (VIR_STRDUP(tmp[i], virNodeDevCapTypeToString(i)) < 0) + return NULL; + } + + return virshCommaStringListComplete(cap_str, (const char **)tmp); +} diff --git a/tools/virsh-completer-nodedev.h b/tools/virsh-completer-nodedev.h new file mode 100644 index 0000000000..45c0b73c8c --- /dev/null +++ b/tools/virsh-completer-nodedev.h @@ -0,0 +1,35 @@ +/* + * virsh-completer-nodedev.h: virsh completer callbacks related to nodedev + * + * Copyright (C) 2019 Red Hat, Inc. + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library. If not, see + * <http://www.gnu.org/licenses/>. + */ + +#pragma once + +#include "vsh.h" + +char ** virshNodeDeviceNameCompleter(vshControl *ctl, + const vshCmd *cmd, + unsigned int flags); + +char ** virshNodeDeviceEventNameCompleter(vshControl *ctl, + const vshCmd *cmd, + unsigned int flags); + +char ** virshNodeDeviceCapabilityNameCompleter(vshControl *ctl, + const vshCmd *cmd, + unsigned int flags); diff --git a/tools/virsh-completer.c b/tools/virsh-completer.c index 108596e24d..0b99b3d578 100644 --- a/tools/virsh-completer.c +++ b/tools/virsh-completer.c @@ -143,46 +143,6 @@ virshCommaStringListComplete(const char *input, } -char ** -virshNodeDeviceNameCompleter(vshControl *ctl, - const vshCmd *cmd ATTRIBUTE_UNUSED, - unsigned int flags) -{ - virshControlPtr priv = ctl->privData; - virNodeDevicePtr *devs = NULL; - int ndevs = 0; - size_t i = 0; - char **ret = NULL; - VIR_AUTOSTRINGLIST tmp = NULL; - - virCheckFlags(0, NULL); - - if (!priv->conn || virConnectIsAlive(priv->conn) <= 0) - return NULL; - - if ((ndevs = virConnectListAllNodeDevices(priv->conn, &devs, flags)) < 0) - return NULL; - - if (VIR_ALLOC_N(tmp, ndevs + 1) < 0) - goto cleanup; - - for (i = 0; i < ndevs; i++) { - const char *name = virNodeDeviceGetName(devs[i]); - - if (VIR_STRDUP(tmp[i], name) < 0) - goto cleanup; - } - - VIR_STEAL_PTR(ret, tmp); - - cleanup: - for (i = 0; i < ndevs; i++) - virNodeDeviceFree(devs[i]); - VIR_FREE(devs); - return ret; -} - - char ** virshNWFilterNameCompleter(vshControl *ctl, const vshCmd *cmd ATTRIBUTE_UNUSED, @@ -452,56 +412,6 @@ virshSecretEventNameCompleter(vshControl *ctl ATTRIBUTE_UNUSED, } -char ** -virshNodeDeviceEventNameCompleter(vshControl *ctl ATTRIBUTE_UNUSED, - const vshCmd *cmd ATTRIBUTE_UNUSED, - unsigned int flags) -{ - size_t i = 0; - char **ret = NULL; - VIR_AUTOSTRINGLIST tmp = NULL; - - virCheckFlags(0, NULL); - - if (VIR_ALLOC_N(tmp, VIR_NODE_DEVICE_EVENT_ID_LAST + 1) < 0) - return NULL; - - for (i = 0; i < VIR_NODE_DEVICE_EVENT_ID_LAST; i++) { - if (VIR_STRDUP(tmp[i], virshNodeDeviceEventCallbacks[i].name) < 0) - return NULL; - } - - VIR_STEAL_PTR(ret, tmp); - return ret; -} - - -char ** -virshNodeDeviceCapabilityNameCompleter(vshControl *ctl, - const vshCmd *cmd, - unsigned int flags) -{ - VIR_AUTOSTRINGLIST tmp = NULL; - const char *cap_str = NULL; - size_t i = 0; - - virCheckFlags(0, NULL); - - if (vshCommandOptStringQuiet(ctl, cmd, "cap", &cap_str) < 0) - return NULL; - - if (VIR_ALLOC_N(tmp, VIR_NODE_DEV_CAP_LAST + 1) < 0) - return NULL; - - for (i = 0; i < VIR_NODE_DEV_CAP_LAST; i++) { - if (VIR_STRDUP(tmp[i], virNodeDevCapTypeToString(i)) < 0) - return NULL; - } - - return virshCommaStringListComplete(cap_str, (const char **)tmp); -} - - char ** virshCellnoCompleter(vshControl *ctl, const vshCmd *cmd ATTRIBUTE_UNUSED, diff --git a/tools/virsh-completer.h b/tools/virsh-completer.h index d4784105c1..39896c13c5 100644 --- a/tools/virsh-completer.h +++ b/tools/virsh-completer.h @@ -25,16 +25,13 @@ #include "virsh-completer-domain.h" #include "virsh-completer-interface.h" #include "virsh-completer-network.h" +#include "virsh-completer-nodedev.h" #include "virsh-completer-pool.h" #include "virsh-completer-volume.h" char ** virshCommaStringListComplete(const char *input, const char **options); -char ** virshNodeDeviceNameCompleter(vshControl *ctl, - const vshCmd *cmd, - unsigned int flags); - char ** virshNWFilterNameCompleter(vshControl *ctl, const vshCmd *cmd, unsigned int flags); @@ -59,14 +56,6 @@ char ** virshSecretEventNameCompleter(vshControl *ctl, const vshCmd *cmd, unsigned int flags); -char ** virshNodeDeviceEventNameCompleter(vshControl *ctl, - const vshCmd *cmd, - unsigned int flags); - -char ** virshNodeDeviceCapabilityNameCompleter(vshControl *ctl, - const vshCmd *cmd, - unsigned int flags); - char ** virshCellnoCompleter(vshControl *ctl, const vshCmd *cmd, unsigned int flags); -- 2.21.0 -- libvir-list mailing list libvir-list@xxxxxxxxxx https://www.redhat.com/mailman/listinfo/libvir-list