libxc: eliminate static variables, use xentoollog; API change

This patch eliminate the global variables in libxenctrl (used for
logging and error reporting).

Instead the information which was in the global variables is now in a
new xc_interface* opaque structure, which xc_interface open returns
instead of the raw file descriptor; furthermore, logging is done via
xentoollog.

There are three new parameters to xc_interface_open to control the
logging, but existing callers can just pass "0" for all three to get
the old behaviour.

All libxc callers have been adjusted accordingly.

Also update QEMU_TAG for corresponding qemu change.

Signed-off-by: Ian Jackson <ian.jackson@eu.citrix.com>

1 files changed, 3 insertions, 3 deletions

diff --git a/tools/memshr/interface.c b/tools/memshr/interface.c
index de8fa2745a..a61715ad7c 100644
--- a/tools/memshr/interface.c
+++ b/tools/memshr/interface.c
@@ -28,7 +28,7 @@
 typedef struct {
     int     enabled;
     domid_t domid;
-    int     xc_handle;
+    xc_interface *xc_handle;
 } memshr_vbd_info_t;
 
 memshr_vbd_info_t vbd_info = {0, DOMID_INVALID};
@@ -82,7 +82,7 @@ void memshr_daemon_initialize(void)
 
 void memshr_vbd_initialize(void)
 {
-    int xc_handle;
+    xc_interface *xc_handle;
 
     memset(&memshr, 0, sizeof(private_memshr_info_t));
 
@@ -113,7 +113,7 @@ void memshr_vbd_initialize(void)
     if(vbd_info.domid == DOMID_INVALID)
         return;
 
-    if((xc_handle = xc_interface_open()) < 0)
+    if((xc_handle = xc_interface_open(0,0,0)) == 0)
     {
         DPRINTF("Failed to open XC interface.\n");
         return;