From: Erik Skultety <eskultet@redhat.com>
Date: Fri, 24 Jun 2016 17:27:09 +0000 (+0200)
Subject: admin: enable both admin API functionality and tarball distribution
X-Git-Url: http://xenbits.xensource.com/gitweb?a=commitdiff_plain;h=52dbacc07a693e14079c445ec677ab03a0888106;p=libvirt.git

admin: enable both admin API functionality and tarball distribution

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>
---

diff --git a/Makefile.am b/Makefile.am
index ef88067881..99ee4763c5 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -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			\
diff --git a/daemon/libvirtd.c b/daemon/libvirtd.c
index a1e2015fe8..95c1b1c139 100644
--- a/daemon/libvirtd.c
+++ b/daemon/libvirtd.c
@@ -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,
diff --git a/docs/Makefile.am b/docs/Makefile.am
index 282d101535..206ef3b102 100644
--- a/docs/Makefile.am
+++ b/docs/Makefile.am
@@ -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 \
diff --git a/include/libvirt/Makefile.am b/include/libvirt/Makefile.am
index a59b8ab16c..65a1b23599 100644
--- a/include/libvirt/Makefile.am
+++ b/include/libvirt/Makefile.am
@@ -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)
diff --git a/src/libvirt_admin_public.syms b/src/libvirt_admin_public.syms
index 53df5fc9c0..c63b9bdf1e 100644
--- a/src/libvirt_admin_public.syms
+++ b/src/libvirt_admin_public.syms
@@ -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;