Revert "Example virt-admin"

This reverts commit 4e7ccf8713.

I mistakenly pushed it along with the Admin API series.
This commit is contained in:
Martin Kletzander 2015-06-16 14:08:23 +02:00
parent 9a8d916e89
commit 220393bfb0
6 changed files with 3 additions and 194 deletions

2
.gitignore vendored
View File

@ -176,8 +176,6 @@
/tools/virsh-*-edit.c
/tools/virt-*-validate
/tools/virt-sanlock-cleanup
/tools/virt-admin/virt-admin.1
/tools/virt-admin/virt-admin
/tools/wireshark/src/plugin.c
/tools/wireshark/src/libvirt
/update.log

View File

@ -1,6 +1,6 @@
## Process this file with automake to produce Makefile.in
## Copyright (C) 2005-2015 Red Hat, Inc.
## Copyright (C) 2005-2013 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
@ -24,7 +24,7 @@ SUBDIRS = . gnulib/lib include src daemon tools docs gnulib/tests \
examples/dominfo examples/domsuspend examples/apparmor \
examples/xml/nwfilter examples/openauth examples/systemtap \
tools/wireshark examples/dommigrate \
examples/lxcconvert examples/domtop tools/virt-admin
examples/lxcconvert examples/domtop
ACLOCAL_AMFLAGS = -I m4

View File

@ -1680,10 +1680,6 @@ dnl virsh libraries
VIRSH_LIBS="$VIRSH_LIBS $READLINE_LIBS"
AC_SUBST([VIRSH_LIBS])
dnl virt-admin libraries
VIRT_ADMIN_LIBS="$VIRT_ADMIN_LIBS $READLINE_LIBS"
AC_SUBST([VIRT_ADMIN_LIBS])
dnl check if the network driver should be compiled
AC_ARG_WITH([network],
@ -2816,8 +2812,7 @@ AC_CONFIG_FILES([\
examples/xml/nwfilter/Makefile \
examples/lxcconvert/Makefile \
tools/wireshark/Makefile \
tools/wireshark/src/Makefile \
tools/virt-admin/Makefile])
tools/wireshark/src/Makefile])
AC_OUTPUT
AC_MSG_NOTICE([])

View File

@ -1,69 +0,0 @@
## Copyright (C) 2015 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/>.
AM_CPPFLAGS = \
-I$(top_builddir)/include -I$(top_srcdir)/include \
-I$(top_builddir)/gnulib/lib -I$(top_srcdir)/gnulib/lib \
-I$(top_builddir)/src -I$(top_srcdir)/src \
-I$(top_srcdir)/src/util \
-I$(top_srcdir) \
$(GETTEXT_CPPFLAGS)
AM_LDFLAGS = \
$(RELRO_LDFLAGS) \
$(NO_INDIRECT_LDFLAGS) \
$(NULL)
POD2MAN = pod2man -c "Virtualization Support" -r "$(PACKAGE)-$(VERSION)"
EXTRA_DIST = virt-admin.pod
DISTCLEANFILES =
bin_PROGRAMS = virt-admin
dist_man1_MANS = virt-admin.1
virt_admin_SOURCES = virt-admin.c
virt_admin_LDFLAGS = \
$(AM_LDFLAGS) \
$(COVERAGE_LDFLAGS) \
$(NULL)
virt_admin_LDADD = \
$(STATIC_BINARIES) \
$(PIE_LDFLAGS) \
../../src/libvirt-admin.la \
$(top_srcdir)/gnulib/lib/libgnu.la \
$(VIRT_ADMIN_LIBS) \
$(NULL)
virt_admin_CFLAGS = \
$(WARN_CFLAGS) \
$(PIE_CFLAGS) \
$(COVERAGE_CFLAGS) \
$(LIBXML_CFLAGS) \
$(READLINE_CFLAGS) \
$(NULL)
virt-admin.1: virt-admin.pod $(top_srcdir)/configure.ac
$(AM_V_GEN)$(POD2MAN) $< $(srcdir)/$@ \
&& if grep 'POD ERROR' $(srcdir)/$@ ; then \
rm $(srcdir)/$@; exit 1; fi
CLEANFILES = *.gcov .libs/*.gcda .libs/*.gcno *.gcno *.gcda
MAINTAINERCLEANFILES = $(dist_man1_MANS)

View File

@ -1,72 +0,0 @@
/*
* virt-admin.c: a shell to exercise the libvirt admin API
*
* Copyright (C) 2014-2015 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/>.
*
* Martin Kletzander <mkletzan@redhat.com>
*/
#include <config.h>
#include <stdio.h>
#include <stdlib.h>
#include <locale.h>
#include "configmake.h"
#include "internal.h"
#include <viralloc.h>
int
main(int argc ATTRIBUTE_UNUSED,
char **argv ATTRIBUTE_UNUSED)
{
int ret = EXIT_FAILURE;
char *greeting = NULL;
const char *uri = NULL;
virAdmConnectPtr conn = NULL;
if (!setlocale(LC_ALL, "")) {
perror("setlocale");
/* failure to setup locale is not fatal */
}
if (!bindtextdomain(PACKAGE, LOCALEDIR)) {
perror("bindtextdomain");
return EXIT_FAILURE;
}
if (!textdomain(PACKAGE)) {
perror("textdomain");
return EXIT_FAILURE;
}
if (argc > 1)
uri = argv[1];
if (!(conn = virAdmConnectOpen(uri, 0)))
goto cleanup;
if (!(greeting = virAdmHello(conn, 0)))
goto cleanup;
printf("%s\n", greeting);
ret = EXIT_SUCCESS;
cleanup:
VIR_FREE(greeting);
virAdmConnectClose(conn);
return ret;
}

View File

@ -1,43 +0,0 @@
=head1 NAME
virt-admin - client for admin interface of libvirt
=head1 SYNOPSIS
B<virt-admin>
=head1 DESCRIPTION
Libre ip_sum do { lor(); } sit; I'm @.
=head1 EXIT STATUS
It should be 0, really.
=head1 BUGS
None!
=head1 AUTHORS
Please refer to the AUTHORS file distributed with libvirt.
Martin Kletzander <mkletzan@redhat.com>
=head1 COPYRIGHT
Copyright (C) 2014-2015 Red Hat, Inc., and the authors listed in the
libvirt AUTHORS file.
=head1 LICENSE
virt-admin is distributed under the terms of the GNU GPL v2+. This is
free software; see the source for copying conditions. There is NO
warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR
PURPOSE
=head1 SEE ALSO
L<virsh(1)>, L<http://www.libvirt.org/>
=cut