New upstream version 1.3.0~rc1

4 files changed, 100 insertions, 28 deletions

diff --git a/daemon/Makefile.in b/daemon/Makefile.in
index 532f61166..fe5bcdb16 100644
--- a/daemon/Makefile.in
+++ b/daemon/Makefile.in
@@ -1376,6 +1376,7 @@ LTLIBMULTITHREAD = @LTLIBMULTITHREAD@
 LTLIBOBJS = @LTLIBOBJS@
 LTLIBPTH = @LTLIBPTH@
 LTLIBTHREAD = @LTLIBTHREAD@
+LT_SYS_LIBRARY_PATH = @LT_SYS_LIBRARY_PATH@
 LVCHANGE = @LVCHANGE@
 LVCREATE = @LVCREATE@
 LVREMOVE = @LVREMOVE@
diff --git a/daemon/admin_dispatch.h b/daemon/admin_dispatch.h
index 820a6654d..0f62fbf00 100644
--- a/daemon/admin_dispatch.h
+++ b/daemon/admin_dispatch.h
@@ -1,12 +1,12 @@
 /* Automatically generated from ../src/admin/admin_protocol.x by gendispatch.pl.
  * Do not edit this file.  Any changes you make will be lost.
  */
-static int adminDispatchConnectClose(
+static int adminDispatchDaemonClose(
     virNetServerPtr server,
     virNetServerClientPtr client,
     virNetMessagePtr msg,
     virNetMessageErrorPtr rerr);
-static int adminDispatchConnectCloseHelper(
+static int adminDispatchDaemonCloseHelper(
     virNetServerPtr server,
     virNetServerClientPtr client,
     virNetMessagePtr msg,
@@ -15,24 +15,77 @@ static int adminDispatchConnectCloseHelper(
     void *ret ATTRIBUTE_UNUSED)
 {
   int rv;
-  virThreadJobSet("adminDispatchConnectClose");
+  virThreadJobSet("adminDispatchDaemonClose");
   VIR_DEBUG("server=%p client=%p msg=%p rerr=%p args=%p ret=%p",
             server, client, msg, rerr, args, ret);
-  rv = adminDispatchConnectClose(server, client, msg, rerr);
+  rv = adminDispatchDaemonClose(server, client, msg, rerr);
   virThreadJobClear(rv);
   return rv;
 }
-/* adminDispatchConnectClose body has to be implemented manually */
+/* adminDispatchDaemonClose body has to be implemented manually */
 
 
 
-static int adminDispatchConnectOpen(
+static int adminDispatchDaemonGetVersion(
     virNetServerPtr server,
     virNetServerClientPtr client,
     virNetMessagePtr msg,
     virNetMessageErrorPtr rerr,
-    admin_connect_open_args *args);
-static int adminDispatchConnectOpenHelper(
+    admin_daemon_get_version_ret *ret);
+static int adminDispatchDaemonGetVersionHelper(
+    virNetServerPtr server,
+    virNetServerClientPtr client,
+    virNetMessagePtr msg,
+    virNetMessageErrorPtr rerr,
+    void *args ATTRIBUTE_UNUSED,
+    void *ret)
+{
+  int rv;
+  virThreadJobSet("adminDispatchDaemonGetVersion");
+  VIR_DEBUG("server=%p client=%p msg=%p rerr=%p args=%p ret=%p",
+            server, client, msg, rerr, args, ret);
+  rv = adminDispatchDaemonGetVersion(server, client, msg, rerr, ret);
+  virThreadJobClear(rv);
+  return rv;
+}
+static int adminDispatchDaemonGetVersion(
+    virNetServerPtr server ATTRIBUTE_UNUSED,
+    virNetServerClientPtr client,
+    virNetMessagePtr msg ATTRIBUTE_UNUSED,
+    virNetMessageErrorPtr rerr,
+    admin_daemon_get_version_ret *ret)
+{
+    int rv = -1;
+    unsigned long long libVer;
+    struct daemonAdmClientPrivate *priv =
+        virNetServerClientGetPrivateData(client);
+
+    if (!priv->dmn) {
+        virReportError(VIR_ERR_INTERNAL_ERROR, "%s", _("connection not open"));
+        goto cleanup;
+    }
+
+    if (adminDaemonGetVersion(priv->dmn, &libVer) < 0)
+        goto cleanup;
+
+    ret->libVer = libVer;
+    rv = 0;
+
+cleanup:
+    if (rv < 0)
+        virNetMessageSaveError(rerr);
+    return rv;
+}
+
+
+
+static int adminDispatchDaemonOpen(
+    virNetServerPtr server,
+    virNetServerClientPtr client,
+    virNetMessagePtr msg,
+    virNetMessageErrorPtr rerr,
+    admin_daemon_open_args *args);
+static int adminDispatchDaemonOpenHelper(
     virNetServerPtr server,
     virNetServerClientPtr client,
     virNetMessagePtr msg,
@@ -41,14 +94,14 @@ static int adminDispatchConnectOpenHelper(
     void *ret ATTRIBUTE_UNUSED)
 {
   int rv;
-  virThreadJobSet("adminDispatchConnectOpen");
+  virThreadJobSet("adminDispatchDaemonOpen");
   VIR_DEBUG("server=%p client=%p msg=%p rerr=%p args=%p ret=%p",
             server, client, msg, rerr, args, ret);
-  rv = adminDispatchConnectOpen(server, client, msg, rerr, args);
+  rv = adminDispatchDaemonOpen(server, client, msg, rerr, args);
   virThreadJobClear(rv);
   return rv;
 }
-/* adminDispatchConnectOpen body has to be implemented manually */
+/* adminDispatchDaemonOpen body has to be implemented manually */
 
 
 
@@ -62,21 +115,30 @@ virNetServerProgramProc adminProcs[] = {
    true,
    0
 },
-{ /* Method ConnectOpen => 1 */
-   adminDispatchConnectOpenHelper,
-   sizeof(admin_connect_open_args),
-   (xdrproc_t)xdr_admin_connect_open_args,
+{ /* Method DaemonOpen => 1 */
+   adminDispatchDaemonOpenHelper,
+   sizeof(admin_daemon_open_args),
+   (xdrproc_t)xdr_admin_daemon_open_args,
    0,
    (xdrproc_t)xdr_void,
    true,
    0
 },
-{ /* Method ConnectClose => 2 */
-   adminDispatchConnectCloseHelper,
+{ /* Method DaemonClose => 2 */
+   adminDispatchDaemonCloseHelper,
+   0,
+   (xdrproc_t)xdr_void,
    0,
    (xdrproc_t)xdr_void,
+   true,
+   0
+},
+{ /* Method DaemonGetVersion => 3 */
+   adminDispatchDaemonGetVersionHelper,
    0,
    (xdrproc_t)xdr_void,
+   sizeof(admin_daemon_get_version_ret),
+   (xdrproc_t)xdr_admin_daemon_get_version_ret,
    true,
    0
 },
diff --git a/daemon/admin_server.c b/daemon/admin_server.c
index 712a44bec..678e8bcde 100644
--- a/daemon/admin_server.c
+++ b/daemon/admin_server.c
@@ -79,11 +79,11 @@ remoteAdmClientInitHook(virNetServerClientPtr client ATTRIBUTE_UNUSED,
 
 /* Functions */
 static int
-adminDispatchConnectOpen(virNetServerPtr server ATTRIBUTE_UNUSED,
-                         virNetServerClientPtr client,
-                         virNetMessagePtr msg ATTRIBUTE_UNUSED,
-                         virNetMessageErrorPtr rerr,
-                         struct admin_connect_open_args *args)
+adminDispatchDaemonOpen(virNetServerPtr server ATTRIBUTE_UNUSED,
+                        virNetServerClientPtr client,
+                        virNetMessagePtr msg ATTRIBUTE_UNUSED,
+                        virNetMessageErrorPtr rerr,
+                        struct admin_daemon_open_args *args)
 {
     unsigned int flags;
     struct daemonAdmClientPrivate *priv =
@@ -105,13 +105,22 @@ adminDispatchConnectOpen(virNetServerPtr server ATTRIBUTE_UNUSED,
 }
 
 static int
-adminDispatchConnectClose(virNetServerPtr server ATTRIBUTE_UNUSED,
-                          virNetServerClientPtr client,
-                          virNetMessagePtr msg ATTRIBUTE_UNUSED,
-                          virNetMessageErrorPtr rerr ATTRIBUTE_UNUSED)
+adminDispatchDaemonClose(virNetServerPtr server ATTRIBUTE_UNUSED,
+                         virNetServerClientPtr client,
+                         virNetMessagePtr msg ATTRIBUTE_UNUSED,
+                         virNetMessageErrorPtr rerr ATTRIBUTE_UNUSED)
 {
     virNetServerClientDelayedClose(client);
     return 0;
 }
 
+static int
+adminDaemonGetVersion(virNetDaemonPtr dmn ATTRIBUTE_UNUSED,
+                      unsigned long long *libVer)
+{
+    if (libVer)
+        *libVer = LIBVIR_VERSION_NUMBER;
+    return 0;
+}
+
 #include "admin_dispatch.h"
diff --git a/daemon/libvirtd.8.in b/daemon/libvirtd.8.in
index e66bfa940..c92a471d8 100644
--- a/daemon/libvirtd.8.in
+++ b/daemon/libvirtd.8.in
@@ -1,4 +1,4 @@
-.\" Automatically generated by Pod::Man 2.28 (Pod::Simple 3.29)
+.\" Automatically generated by Pod::Man 2.28 (Pod::Simple 3.31)
 .\"
 .\" Standard preamble:
 .\" ========================================================================
@@ -133,7 +133,7 @@
 .\" ========================================================================
 .\"
 .IX Title "LIBVIRTD 8"
-.TH LIBVIRTD 8 "2015-01-23" "libvirt-1.2.21" "Virtualization Support"
+.TH LIBVIRTD 8 "2015-01-23" "libvirt-1.3.0" "Virtualization Support"
 .\" For nroff, turn off justification.  Always turn off hyphenation; it makes
 .\" way too many mistakes in technical documents.
 .if n .ad l