External/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2024-12-22 05:35:25 +00:00
Code Issues Packages Projects Releases Wiki Activity

tools: Separate checkpoint related completers into a file

Browse Source 
Mixing all completers in one file does not support
maintainability. Separate those completers which relate to
host (e.g. they complete various checkpoint aspects)
into virsh-completer-checkpoint.c

Signed-off-by: Michal Privoznik <mprivozn@redhat.com>
Reviewed-by: Jonathon Jongsma <jjongsma@redhat.com>
This commit is contained in:
Michal Privoznik 2019-08-07 09:44:55 +02:00
parent 3970753613
commit b6ea5fc2e9
4 changed files with 106 additions and 52 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
tools/Makefile.am
View File

@ -228,6 +228,7 @@ virsh_SOURCES = \
virsh-checkpoint.c virsh-checkpoint.h \
virsh-completer.c virsh-completer.h \
virsh-completer-domain.c virsh-completer-domain.h \
virsh-completer-checkpoint.c virsh-completer-checkpoint.h \
virsh-completer-host.c virsh-completer-host.h \
virsh-completer-interface.c virsh-completer-interface.h \
virsh-completer-network.c virsh-completer-network.h \

78
tools/virsh-completer-checkpoint.c Normal file
View File

@ -0,0 +1,78 @@
/*
* virsh-completer-checkpoint.c: virsh completer callbacks related to checkpoints
*
* 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-checkpoint.h"
#include "viralloc.h"
#include "virsh-util.h"
#include "virsh.h"
#include "virstring.h"
char **
virshCheckpointNameCompleter(vshControl *ctl,
const vshCmd *cmd,
unsigned int flags)
{
virshControlPtr priv = ctl->privData;
virDomainPtr dom = NULL;
virDomainCheckpointPtr *checkpoints = NULL;
int ncheckpoints = 0;
size_t i = 0;
char **ret = NULL;
virCheckFlags(0, NULL);
if (!priv->conn || virConnectIsAlive(priv->conn) <= 0)
return NULL;
if (!(dom = virshCommandOptDomain(ctl, cmd, NULL)))
return NULL;
if ((ncheckpoints = virDomainListAllCheckpoints(dom, &checkpoints,
flags)) < 0)
goto error;
if (VIR_ALLOC_N(ret, ncheckpoints + 1) < 0)
goto error;
for (i = 0; i < ncheckpoints; i++) {
const char *name = virDomainCheckpointGetName(checkpoints[i]);
if (VIR_STRDUP(ret[i], name) < 0)
goto error;
virshDomainCheckpointFree(checkpoints[i]);
}
VIR_FREE(checkpoints);
virshDomainFree(dom);
return ret;
error:
for (; i < ncheckpoints; i++)
virshDomainCheckpointFree(checkpoints[i]);
VIR_FREE(checkpoints);
for (i = 0; i < ncheckpoints; i++)
VIR_FREE(ret[i]);
VIR_FREE(ret);
virshDomainFree(dom);
return NULL;
}

27
tools/virsh-completer-checkpoint.h Normal file
View File

@ -0,0 +1,27 @@
/*
* virsh-completer-checkpoint.h: virsh completer callbacks related to checkpoints
*
* 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 ** virshCheckpointNameCompleter(vshControl *ctl,
const vshCmd *cmd,
unsigned int flags);

52
tools/virsh-completer.c
View File

@ -141,55 +141,3 @@ virshCommaStringListComplete(const char *input,
VIR_RETURN_PTR(ret);
}
char **
virshCheckpointNameCompleter(vshControl *ctl,
const vshCmd *cmd,
unsigned int flags)
{
virshControlPtr priv = ctl->privData;
virDomainPtr dom = NULL;
virDomainCheckpointPtr *checkpoints = NULL;
int ncheckpoints = 0;
size_t i = 0;
char **ret = NULL;
virCheckFlags(0, NULL);
if (!priv->conn || virConnectIsAlive(priv->conn) <= 0)
return NULL;
if (!(dom = virshCommandOptDomain(ctl, cmd, NULL)))
return NULL;
if ((ncheckpoints = virDomainListAllCheckpoints(dom, &checkpoints,
flags)) < 0)
goto error;
if (VIR_ALLOC_N(ret, ncheckpoints + 1) < 0)
goto error;
for (i = 0; i < ncheckpoints; i++) {
const char *name = virDomainCheckpointGetName(checkpoints[i]);
if (VIR_STRDUP(ret[i], name) < 0)
goto error;
virshDomainCheckpointFree(checkpoints[i]);
}
VIR_FREE(checkpoints);
virshDomainFree(dom);
return ret;
error:
for (; i < ncheckpoints; i++)
virshDomainCheckpointFree(checkpoints[i]);
VIR_FREE(checkpoints);
for (i = 0; i < ncheckpoints; i++)
VIR_FREE(ret[i]);
VIR_FREE(ret);
virshDomainFree(dom);
return NULL;
}