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

admin: enable both admin API functionality and tarball distribution

Browse Source 
This patch enables admin socket creation in daemon's code, bumps the library
version in libvirt_admin_public.syms, and performs all necessary modifications
to our makefiles so that admin API can finally be included in the tarball,
and eventually become part of an rpm package (a patch later in this series).

Signed-off-by: Erik Skultety <eskultet@redhat.com>
This commit is contained in:
Erik Skultety 2016-06-24 19:27:09 +02:00
parent 851a751575
commit 52dbacc07a
5 changed files with 7 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Makefile.am
View File

@ -44,7 +44,7 @@ EXTRA_DIST = \
AUTHORS.in
pkgconfigdir = $(libdir)/pkgconfig
pkgconfig_DATA = libvirt.pc libvirt-qemu.pc libvirt-lxc.pc
pkgconfig_DATA = libvirt.pc libvirt-qemu.pc libvirt-lxc.pc libvirt-admin.pc
NEWS: $(top_srcdir)/docs/news.xsl $(top_srcdir)/docs/news.html.in
$(AM_V_GEN)if [ -x $(XSLTPROC) ] ; then \

3
daemon/libvirtd.c
View File

@ -533,8 +533,7 @@ daemonSetupNetworking(virNetServerPtr srv,
virNetServerAddService(srv, svcRO, NULL) < 0)
goto cleanup;
/* Temporarily disabled */
if (sock_path_adm && false) {
if (sock_path_adm) {
VIR_DEBUG("Registering unix socket %s", sock_path_adm);
if (!(svcAdm = virNetServerServiceNewUNIX(sock_path_adm,
unix_sock_adm_mask,

5
docs/Makefile.am
View File

@ -132,7 +132,8 @@ apidir = $(pkgdatadir)/api
api_DATA = \
libvirt-api.xml \
libvirt-qemu-api.xml \
libvirt-lxc-api.xml
libvirt-lxc-api.xml \
libvirt-admin-api.xml
fig = \
libvirt-net-logical.fig \
@ -155,7 +156,7 @@ EXTRA_DIST= \
hacking1.xsl hacking2.xsl wrapstring.xsl \
$(dot_html) $(dot_html_in) $(gif) $(apihtml) $(apipng) \
$(devhelphtml) $(devhelppng) $(devhelpcss) $(devhelpxsl) \
$(xml) $(qemu_xml) $(lxc_xml) $(fig) $(png) $(css) \
$(xml) $(qemu_xml) $(lxc_xml) $(admin_xml) $(fig) $(png) $(css) \
$(patches) $(dot_php_in) $(dot_php_code_in) $(dot_php)\
$(internals_html_in) $(internals_html) \
sitemap.html.in aclperms.htmlinc \

6
include/libvirt/Makefile.am
View File

@ -19,14 +19,10 @@
virincdir = $(includedir)/libvirt
allheaders = $(wildcard $(srcdir)/*.h)
virinc_HEADERS = $(filter-out $(srcdir)/libvirt-admin.h \
$(srcdir)/libvirt-common.h, $(allheaders))
virinc_HEADERS = $(filter-out $(srcdir)/libvirt-common.h, $(allheaders))
virinc_HEADERS += libvirt-common.h
EXTRA_DIST = libvirt-common.h.in
# Temporarily disabled, but we need it for building
EXTRA_DIST += libvirt-admin.h
install-exec-hook:
$(mkinstalldirs) $(DESTDIR)$(virincdir)

2
src/libvirt_admin_public.syms
View File

@ -10,7 +10,7 @@
# soname version info can't enforce this since we never
# change the soname
#
LIBVIRT_ADMIN_1.3.0 {
LIBVIRT_ADMIN_2.0.0 {
global:
virAdmClientFree;
virAdmClientGetID;