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, 6 insertions, 5 deletions

diff --git a/tools/xcutils/lsevtchn.c b/tools/xcutils/lsevtchn.c
index 7e7bcbeff7..e79fe0990a 100644
--- a/tools/xcutils/lsevtchn.c
+++ b/tools/xcutils/lsevtchn.c
@@ -10,20 +10,21 @@
 
 int main(int argc, char **argv)
 {
-    int xc_fd, domid, port, rc;
+    xc_interface *xch;
+    int domid, port, rc;
     xc_evtchn_status_t status;
 
     domid = (argc > 1) ? strtol(argv[1], NULL, 10) : 0;
 
-    xc_fd = xc_interface_open();
-    if ( xc_fd < 0 )
+    xch = xc_interface_open(0,0,0);
+    if ( !xch )
         errx(1, "failed to open control interface");
 
     for ( port = 0; ; port++ )
     {
         status.dom = domid;
         status.port = port;
-        rc = xc_evtchn_status(xc_fd, &status);
+        rc = xc_evtchn_status(xch, &status);
         if ( rc < 0 )
             break;
 
@@ -59,7 +60,7 @@ int main(int argc, char **argv)
         printf("\n");
     }
 
-    xc_interface_close(xc_fd);
+    xc_interface_close(xch);
 
     return 0;
 }