shaba/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2025-01-09 01:18:00 +03:00
Code Releases Activity

tools: Separate snapshot related completers into a file

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

Signed-off-by: Michal Privoznik <mprivozn@redhat.com>
Reviewed-by: Jonathon Jongsma <jjongsma@redhat.com>
This commit is contained in:
Michal Privoznik 2019-07-13 19:24:01 +02:00
parent 087354699a
commit 1bd11fff7a
5 changed files with 102 additions and 49 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
tools/Makefile.am
View File

@ -234,6 +234,7 @@ virsh_SOURCES = \
virsh-completer-nwfilter.c virsh-completer-nwfilter.h \
virsh-completer-pool.c virsh-completer-pool.h \
virsh-completer-secret.c virsh-completer-secret.h \
virsh-completer-snapshot.c virsh-completer-snapshot.h \
virsh-completer-volume.c virsh-completer-volume.h \
virsh-console.c virsh-console.h \
virsh-domain.c virsh-domain.h \

73
tools/virsh-completer-snapshot.c Normal file
View File

@ -0,0 +1,73 @@
/*
* virsh-completer-snapshot.c: virsh completer callbacks related to snapshots
*
* 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-snapshot.h"
#include "viralloc.h"
#include "virsh-util.h"
#include "virsh.h"
#include "virstring.h"
char **
virshSnapshotNameCompleter(vshControl *ctl,
const vshCmd *cmd,
unsigned int flags)
{
virshControlPtr priv = ctl->privData;
virDomainPtr dom = NULL;
virDomainSnapshotPtr *snapshots = NULL;
int rc;
int nsnapshots = 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 (!(dom = virshCommandOptDomain(ctl, cmd, NULL)))
return NULL;
if ((rc = virDomainListAllSnapshots(dom, &snapshots, flags)) < 0)
goto cleanup;
nsnapshots = rc;
if (VIR_ALLOC_N(tmp, nsnapshots + 1) < 0)
goto cleanup;
for (i = 0; i < nsnapshots; i++) {
const char *name = virDomainSnapshotGetName(snapshots[i]);
if (VIR_STRDUP(tmp[i], name) < 0)
goto cleanup;
}
VIR_STEAL_PTR(ret, tmp);
cleanup:
virshDomainFree(dom);
for (i = 0; i < nsnapshots; i++)
virshDomainSnapshotFree(snapshots[i]);
VIR_FREE(snapshots);
return ret;
}

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

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

45
tools/virsh-completer.c
View File

@ -194,51 +194,6 @@ virshCheckpointNameCompleter(vshControl *ctl,
return NULL;
}
char **
virshSnapshotNameCompleter(vshControl *ctl,
const vshCmd *cmd,
unsigned int flags)
{
virshControlPtr priv = ctl->privData;
virDomainPtr dom = NULL;
virDomainSnapshotPtr *snapshots = NULL;
int rc;
int nsnapshots = 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 (!(dom = virshCommandOptDomain(ctl, cmd, NULL)))
return NULL;
if ((rc = virDomainListAllSnapshots(dom, &snapshots, flags)) < 0)
goto cleanup;
nsnapshots = rc;
if (VIR_ALLOC_N(tmp, nsnapshots + 1) < 0)
goto cleanup;
for (i = 0; i < nsnapshots; i++) {
const char *name = virDomainSnapshotGetName(snapshots[i]);
if (VIR_STRDUP(tmp[i], name) < 0)
goto cleanup;
}
VIR_STEAL_PTR(ret, tmp);
cleanup:
virshDomainFree(dom);
for (i = 0; i < nsnapshots; i++)
virshDomainSnapshotFree(snapshots[i]);
VIR_FREE(snapshots);
return ret;
}
static char *
virshPagesizeNodeToString(xmlNodePtr node)

5
tools/virsh-completer.h
View File

@ -29,6 +29,7 @@
#include "virsh-completer-nwfilter.h"
#include "virsh-completer-pool.h"
#include "virsh-completer-secret.h"
#include "virsh-completer-snapshot.h"
#include "virsh-completer-volume.h"
char ** virshCommaStringListComplete(const char *input,
@ -38,10 +39,6 @@ char ** virshCheckpointNameCompleter(vshControl *ctl,
const vshCmd *cmd,
unsigned int flags);
char ** virshSnapshotNameCompleter(vshControl *ctl,
const vshCmd *cmd,
unsigned int flags);
char ** virshAllocpagesPagesizeCompleter(vshControl *ctl,
const vshCmd *cmd,
unsigned int flags);