tools/xenstored: use new stable interface instead of libxenctrl

Replace the current use of the unstable xc_domain_getinfo_single()
interface with the stable domctl XEN_DOMCTL_get_domain_state call
via the new libxenmanage library.

This will remove the last usage of libxenctrl by Xenstore, so update
the library dependencies accordingly.

For now only do a direct replacement without using the functionality
of obtaining information about domains having changed the state.

Signed-off-by: Juergen Gross <jgross@suse.com>
Reviewed-by: Samuel Thibault <samuel.thibault@ens-lyon.org>
Reviewed-by: Anthony PERARD <anthony.perard@vates.tech>

diff --git a/stubdom/Makefile b/stubdom/Makefile
index c6978caa5a221ffd24a525873ad26a6ba0c96693..724ce4036536cbdbc8f474cd7a63dc1ffb267d6a 100644 (file)
--- a/stubdom/Makefile
+++ b/stubdom/Makefile
@@ -308,7 +308,7 @@ endif
 # libraries under tools/libs
 #######
 
-STUB_LIBS := toolcore toollog evtchn gnttab call foreignmemory devicemodel ctrl guest
+STUB_LIBS := toolcore toollog evtchn gnttab call foreignmemory devicemodel ctrl guest manage
 
 LIBDEP_guest := cross-zlib
 
@@ -466,7 +466,7 @@ grub: cross-polarssl grub-upstream $(CROSS_ROOT) grub-$(XEN_TARGET_ARCH)-minios-
 # xenstore
 ##########
 
-xenstore-minios.gen.cfg: APP_LIBS = gnttab evtchn toollog ctrl
+xenstore-minios.gen.cfg: APP_LIBS = gnttab evtchn toollog manage
 xenstore-minios.gen.cfg: xenstore-minios.cfg Makefile
        $(GEN_config) >$@
 
@@ -481,7 +481,7 @@ xenstore: $(CROSS_ROOT) xenstore-minios-config.mk
 # xenstorepvh
 #############
 
-xenstorepvh-minios.gen.cfg: APP_LIBS = gnttab evtchn toollog ctrl
+xenstorepvh-minios.gen.cfg: APP_LIBS = gnttab evtchn toollog manage
 xenstorepvh-minios.gen.cfg: xenstorepvh-minios.cfg Makefile
        $(GEN_config) >$@
 
@@ -524,7 +524,7 @@ else
 pv-grub-if-enabled:
 endif
 
-XENSTORE_DEPS := libxenevtchn libxengnttab libxenctrl
+XENSTORE_DEPS := libxenevtchn libxengnttab libxenmanage
 
 .PHONY: xenstore-stubdom
 xenstore-stubdom: mini-os-$(XEN_TARGET_ARCH)-xenstore $(XENSTORE_DEPS) xenstore

diff --git a/stubdom/mini-os.mk b/stubdom/mini-os.mk
index 7e4968e0268dd6993c1e0f0b24ba9d06fffc25f5..be32302f9ea9913a9f90219b729abd776ec49a61 100644 (file)
--- a/stubdom/mini-os.mk
+++ b/stubdom/mini-os.mk
@@ -13,5 +13,6 @@ GNTTAB_PATH = $(XEN_ROOT)/stubdom/libs-$(MINIOS_TARGET_ARCH)/gnttab
 CALL_PATH = $(XEN_ROOT)/stubdom/libs-$(MINIOS_TARGET_ARCH)/call
 FOREIGNMEMORY_PATH = $(XEN_ROOT)/stubdom/libs-$(MINIOS_TARGET_ARCH)/foreignmemory
 DEVICEMODEL_PATH = $(XEN_ROOT)/stubdom/libs-$(MINIOS_TARGET_ARCH)/devicemodel
+MANAGE_PATH = $(XEN_ROOT)/stubdom/libs-$(MINIOS_TARGET_ARCH)/manage
 CTRL_PATH = $(XEN_ROOT)/stubdom/libs-$(MINIOS_TARGET_ARCH)/ctrl
 GUEST_PATH = $(XEN_ROOT)/stubdom/libs-$(MINIOS_TARGET_ARCH)/guest

diff --git a/tools/xenstored/Makefile b/tools/xenstored/Makefile
index 09adfe1d5064a29c37b18c341f73f388f8e3021d..81c42838e03b1623e225788cb36227005495204d 100644 (file)
--- a/tools/xenstored/Makefile
+++ b/tools/xenstored/Makefile
@@ -5,7 +5,7 @@ include Makefile.common
 
 xenstored: LDLIBS += $(LDLIBS_libxenevtchn)
 xenstored: LDLIBS += $(LDLIBS_libxengnttab)
-xenstored: LDLIBS += $(LDLIBS_libxenctrl)
+xenstored: LDLIBS += $(LDLIBS_libxenmanage)
 xenstored: LDLIBS += -lrt
 xenstored: LDLIBS += $(SOCKET_LIBS)
 

diff --git a/tools/xenstored/Makefile.common b/tools/xenstored/Makefile.common
index 27fdb3b49e4820db48c2da3cf8ae53211de63534..271134fcc155dc6b3cb13395be97437576b63c48 100644 (file)
--- a/tools/xenstored/Makefile.common
+++ b/tools/xenstored/Makefile.common
@@ -12,7 +12,7 @@ XENSTORED_OBJS-$(CONFIG_MiniOS) += minios.o lu_minios.o
 # Include configure output (config.h)
 CFLAGS += -include $(XEN_ROOT)/tools/config.h
 CFLAGS += $(CFLAGS_libxenevtchn)
-CFLAGS += $(CFLAGS_libxenctrl)
+CFLAGS += $(CFLAGS_libxenmanage)
 CFLAGS += $(CFLAGS_libxentoolcore)
 
 $(XENSTORED_OBJS-y): CFLAGS += $(CFLAGS_libxengnttab)

diff --git a/tools/xenstored/core.h b/tools/xenstored/core.h
index e58779e88c822809dd90259e2d3afeafd873c30b..632886cecf68de7721aa119dcaf80bd443e8365c 100644 (file)
--- a/tools/xenstored/core.h
+++ b/tools/xenstored/core.h
@@ -19,7 +19,6 @@
 #ifndef _XENSTORED_CORE_H
 #define _XENSTORED_CORE_H
 
-#include <xenctrl.h>
 #include <xengnttab.h>
 
 #include <sys/types.h>

diff --git a/tools/xenstored/domain.c b/tools/xenstored/domain.c
index 64c8fd0cc35bff704bbd18f6d354fac8dba0d856..a6506a5bb22413b35695639589c4cb2141aa9b0c 100644 (file)
--- a/tools/xenstored/domain.c
+++ b/tools/xenstored/domain.c
@@ -34,14 +34,15 @@
 #include "control.h"
 
 #include <xenevtchn.h>
-#include <xenctrl.h>
+#include <xenmanage.h>
+#include <xen-barrier.h>
 #include <xen/grant_table.h>
 
 #ifdef __MINIOS__
 #include <mini-os/xenbus.h>
 #endif
 
-static xc_interface **xc_handle;
+static xenmanage_handle *xm_handle;
 xengnttab_handle **xgt_handle;
 static evtchn_port_t virq_port;
 
@@ -619,32 +620,28 @@ static int destroy_domain(void *_domain)
        return 0;
 }
 
-static bool get_domain_info(unsigned int domid, xc_domaininfo_t *dominfo)
-{
-       return xc_domain_getinfo_single(*xc_handle, domid, dominfo) == 0;
-}
-
 static int check_domain(const void *k, void *v, void *arg)
 {
-       xc_domaininfo_t dominfo;
+       unsigned int state;
        struct connection *conn;
-       bool dom_valid;
+       int dom_invalid;
        struct domain *domain = v;
        bool *notify = arg;
 
-       dom_valid = get_domain_info(domain->domid, &dominfo);
+       dom_invalid = xenmanage_get_domain_info(xm_handle, domain->domid,
+                                               &state, NULL);
        if (!domain->introduced) {
-               if (!dom_valid)
+               if (dom_invalid)
                        talloc_free(domain);
                return 0;
        }
-       if (dom_valid) {
-               if ((dominfo.flags & XEN_DOMINF_shutdown)
+       if (!dom_invalid) {
+               if ((state & XENMANAGE_GETDOMSTATE_STATE_SHUTDOWN)
                    && !domain->shutdown) {
                        domain->shutdown = true;
                        *notify = true;
                }
-               if (!(dominfo.flags & XEN_DOMINF_dying))
+               if (!(state & XENMANAGE_GETDOMSTATE_STATE_DEAD))
                        return 0;
        }
        if (domain->conn) {
@@ -786,10 +783,9 @@ static struct domain *find_or_alloc_domain(const void *ctx, unsigned int domid)
 static struct domain *find_or_alloc_existing_domain(unsigned int domid)
 {
        struct domain *domain;
-       xc_domaininfo_t dominfo;
 
        domain = find_domain_struct(domid);
-       if (!domain && get_domain_info(domid, &dominfo))
+       if (!domain && !xenmanage_get_domain_info(xm_handle, domid, NULL, NULL))
                domain = alloc_domain(NULL, domid);
 
        return domain;
@@ -1187,12 +1183,6 @@ int do_reset_watches(const void *ctx, struct connection *conn,
        return 0;
 }
 
-static int close_xc_handle(void *_handle)
-{
-       xc_interface_close(*(xc_interface**)_handle);
-       return 0;
-}
-
 static int close_xgt_handle(void *_handle)
 {
        xengnttab_close(*(xengnttab_handle **)_handle);
@@ -1258,15 +1248,9 @@ void domain_early_init(void)
        if (!domhash)
                barf_perror("Failed to allocate domain hashtable");
 
-       xc_handle = talloc(talloc_autofree_context(), xc_interface*);
-       if (!xc_handle)
-               barf_perror("Failed to allocate domain handle");
-
-       *xc_handle = xc_interface_open(0,0,0);
-       if (!*xc_handle)
-               barf_perror("Failed to open connection to hypervisor");
-
-       talloc_set_destructor(xc_handle, close_xc_handle);
+       xm_handle = xenmanage_open(NULL, 0);
+       if (!xm_handle)
+               barf_perror("Failed to open connection to libxenmanage");
 
        xgt_handle = talloc(talloc_autofree_context(), xengnttab_handle*);
        if (!xgt_handle)
@@ -1306,6 +1290,8 @@ void domain_deinit(void)
 {
        if (virq_port)
                xenevtchn_unbind(xce_handle, virq_port);
+
+       xenmanage_close(xm_handle);
 }
 
 /*
@@ -1335,13 +1321,13 @@ int domain_alloc_permrefs(struct node_perms *perms)
 {
        unsigned int i, domid;
        struct domain *d;
-       xc_domaininfo_t dominfo;
 
        for (i = 0; i < perms->num; i++) {
                domid = perms->p[i].id;
                d = find_domain_struct(domid);
                if (!d) {
-                       if (!get_domain_info(domid, &dominfo))
+                       if (xenmanage_get_domain_info(xm_handle, domid,
+                                                     NULL, NULL))
                                perms->p[i].perms |= XS_PERM_IGNORE;
                        else if (!alloc_domain(NULL, domid))
                                return ENOMEM;

diff --git a/tools/xenstored/lu.c b/tools/xenstored/lu.c
index bec2a84e1010f61f83a76b4f15e4d3b4cab9f02e..4fccbbc195a9c1e4b00831131d8c138adf97a4f0 100644 (file)
--- a/tools/xenstored/lu.c
+++ b/tools/xenstored/lu.c
@@ -11,6 +11,7 @@
 #include <stdlib.h>
 #include <syslog.h>
 #include <time.h>
+#include <unistd.h>
 #include <sys/mman.h>
 #include <sys/stat.h>
 

diff --git a/tools/xenstored/lu_daemon.c b/tools/xenstored/lu_daemon.c
index 6df6c80a2afeb612623315e1ec3300234df1883d..88d8d9e1b3874bab77f96ba59c357a89528abd15 100644 (file)
--- a/tools/xenstored/lu_daemon.c
+++ b/tools/xenstored/lu_daemon.c
@@ -6,6 +6,7 @@
  */
 
 #include <syslog.h>
+#include <unistd.h>
 #include <sys/stat.h>
 
 #include "talloc.h"