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>

tools/python/xen/lowlevel/acm/acm.c

@@ -43,11 +43,11 @@ static PyObject *acm_error_obj;
 static void *__getssid(int domid, uint32_t *buflen)
 {
     struct acm_getssid getssid;
-    int xc_handle;
+    xc_interface *xc_handle;
     #define SSID_BUFFER_SIZE    4096
     void *buf = NULL;
 
-    if ((xc_handle = xc_interface_open()) < 0) {
+    if ((xc_handle = xc_interface_open(0,0,0)) == 0) {
         goto out1;
     }
     if ((buf = malloc(SSID_BUFFER_SIZE)) == NULL) {
@@ -148,7 +148,8 @@ static PyObject *getdecision(PyObject * self, PyObject * args)
 {
     char *arg1_name, *arg1, *arg2_name, *arg2, *decision = NULL;
     struct acm_getdecision getdecision;
-    int xc_handle, rc;
+    xc_interface *xc_handle;
+    int rc;
     uint32_t hooktype;
 
     if (!PyArg_ParseTuple(args, "ssssi", &arg1_name,
@@ -156,8 +157,8 @@ static PyObject *getdecision(PyObject * self, PyObject * args)
         return NULL;
     }
 
-    if ((xc_handle = xc_interface_open()) <= 0) {
-        PERROR("Could not open xen privcmd device!\n");
+    if ((xc_handle = xc_interface_open(0,0,0)) == 0) {
+        perror("Could not open xen privcmd device!\n");
         return NULL;
     }
 
@@ -209,7 +210,8 @@ const char hv_op_err[] = "Error from hypervisor operation.";
 static PyObject *chgpolicy(PyObject *self, PyObject *args)
 {
     struct acm_change_policy chgpolicy;
-    int xc_handle, rc;
+    xc_interface *xc_handle;
+    int rc;
     char *bin_pol = NULL, *del_arr = NULL, *chg_arr = NULL;
     int bin_pol_len = 0, del_arr_len = 0, chg_arr_len = 0;
     uint errarray_mbrs = 20 * 2;
@@ -236,7 +238,7 @@ static PyObject *chgpolicy(PyObject *self, PyObject *args)
     set_xen_guest_handle(chgpolicy.chg_array, chg_arr);
     set_xen_guest_handle(chgpolicy.err_array, error_array);
 
-    if ((xc_handle = xc_interface_open()) <= 0) {
+    if ((xc_handle = xc_interface_open(0,0,0)) == 0) {
         PyErr_SetString(PyExc_IOError, ctrlif_op);
         return NULL;
     }
@@ -261,7 +263,8 @@ static PyObject *chgpolicy(PyObject *self, PyObject *args)
 static PyObject *getpolicy(PyObject *self, PyObject *args)
 {
     struct acm_getpolicy getpolicy;
-    int xc_handle, rc;
+    xc_interface *xc_handle;
+    int rc;
     uint8_t pull_buffer[8192];
     PyObject *result;
     uint32_t len = sizeof(pull_buffer);
@@ -270,7 +273,7 @@ static PyObject *getpolicy(PyObject *self, PyObject *args)
     set_xen_guest_handle(getpolicy.pullcache, pull_buffer);
     getpolicy.pullcache_size = sizeof(pull_buffer);
 
-    if ((xc_handle = xc_interface_open()) <= 0) {
+    if ((xc_handle = xc_interface_open(0,0,0)) == 0) {
         PyErr_SetString(PyExc_IOError, ctrlif_op);
         return NULL;
     }
@@ -296,7 +299,8 @@ static PyObject *getpolicy(PyObject *self, PyObject *args)
 static PyObject *relabel_domains(PyObject *self, PyObject *args)
 {
     struct acm_relabel_doms reldoms;
-    int xc_handle, rc;
+    xc_interface *xc_handle;
+    int rc;
     char *relabel_rules = NULL;
     int rel_rules_len = 0;
     uint errarray_mbrs = 20 * 2;
@@ -317,7 +321,7 @@ static PyObject *relabel_domains(PyObject *self, PyObject *args)
     set_xen_guest_handle(reldoms.relabel_map, relabel_rules);
     set_xen_guest_handle(reldoms.err_array, error_array);
 
-    if ((xc_handle = xc_interface_open()) <= 0) {
+    if ((xc_handle = xc_interface_open(0,0,0)) == 0) {
         PyErr_SetString(PyExc_IOError, ctrlif_op);
         return NULL;
     }

tools/python/xen/lowlevel/checkpoint/checkpoint.h

@@ -18,7 +18,7 @@ typedef enum {
 } checkpoint_domtype;
 
 typedef struct {
-    int xch;               /* xc handle */
+    xc_interface *xch;
     int xce;               /* event channel handle */
     struct xs_handle* xsh; /* xenstore handle */
     int watching_shutdown; /* state of watch on @releaseDomain */

tools/python/xen/lowlevel/checkpoint/libcheckpoint.c

@@ -47,7 +47,7 @@ char* checkpoint_error(checkpoint_state* s)
 
 void checkpoint_init(checkpoint_state* s)
 {
-    s->xch = -1;
+    s->xch = NULL;
     s->xce = -1;
     s->xsh = NULL;
     s->watching_shutdown = 0;
@@ -74,8 +74,8 @@ int checkpoint_open(checkpoint_state* s, unsigned int domid)
 
     s->domid = domid;
 
-    s->xch = xc_interface_open();
-    if (s->xch < 0) {
+    s->xch = xc_interface_open(0,0,0);
+    if (!s->xch) {
        s->errstr = "could not open control interface (are you root?)";
 
        return -1;
@@ -145,9 +145,9 @@ void checkpoint_close(checkpoint_state* s)
   release_shutdown_watch(s);
   release_suspend_evtchn(s);
 
-  if (s->xch >= 0) {
+  if (s->xch) {
     xc_interface_close(s->xch);
-    s->xch = -1;
+    s->xch = NULL;
   }
   if (s->xce >= 0) {
     xc_evtchn_close(s->xce);
@@ -360,7 +360,7 @@ static void release_suspend_evtchn(checkpoint_state *s)
 {
   /* TODO: teach xen to clean up if port is unbound */
   if (s->xce >= 0 && s->suspend_evtchn >= 0) {
-    xc_suspend_evtchn_release(s->xce, s->domid, s->suspend_evtchn);
+    xc_suspend_evtchn_release(s->xch, s->xce, s->domid, s->suspend_evtchn);
     s->suspend_evtchn = -1;
   }
 }

tools/python/xen/lowlevel/flask/flask.c

@@ -23,13 +23,13 @@ static PyObject *xc_error_obj;
 
 typedef struct {
     PyObject_HEAD;
-    int xc_handle;
+    xc_interface *xc_handle;
 } XcObject;
 
 static PyObject *pyflask_context_to_sid(PyObject *self, PyObject *args,
                                                                  PyObject *kwds)
 {
-    int xc_handle;
+    xc_interface *xc_handle;
     char *ctx;
     char *buf;
     uint32_t len;
@@ -52,9 +52,8 @@ static PyObject *pyflask_context_to_sid(PyObject *self, PyObject *args,
     
     memcpy(buf, ctx, len);
     
-    xc_handle = xc_interface_open();
-    if (xc_handle < 0) {
-        errno = xc_handle;
+    xc_handle = xc_interface_open(0,0,0);
+    if (!xc_handle) {
         free(buf);
         return PyErr_SetFromErrno(xc_error_obj);
     }
@@ -76,7 +75,7 @@ static PyObject *pyflask_context_to_sid(PyObject *self, PyObject *args,
 static PyObject *pyflask_sid_to_context(PyObject *self, PyObject *args,
                                                                  PyObject *kwds)
 {
-    int xc_handle;
+    xc_interface *xc_handle;
     uint32_t sid;
     char ctx[CTX_LEN];
     uint32_t ctx_len = CTX_LEN;
@@ -88,9 +87,8 @@ static PyObject *pyflask_sid_to_context(PyObject *self, PyObject *args,
                                       &sid) )
         return NULL;
 
-    xc_handle = xc_interface_open();
-    if (xc_handle < 0) {
-        errno = xc_handle;
+    xc_handle = xc_interface_open(0,0,0);
+    if (!xc_handle) {
         return PyErr_SetFromErrno(xc_error_obj);
     }
     
@@ -108,7 +106,7 @@ static PyObject *pyflask_sid_to_context(PyObject *self, PyObject *args,
 
 static PyObject *pyflask_load(PyObject *self, PyObject *args, PyObject *kwds)
 {
-    int xc_handle;
+    xc_interface *xc_handle;
     char *policy;
     uint32_t len;
     int ret;
@@ -118,9 +116,8 @@ static PyObject *pyflask_load(PyObject *self, PyObject *args, PyObject *kwds)
     if( !PyArg_ParseTupleAndKeywords(args, kwds, "s#", kwd_list, &policy, &len) )
         return NULL;
 
-    xc_handle = xc_interface_open();
-    if (xc_handle < 0) {
-        errno = xc_handle;
+    xc_handle = xc_interface_open(0,0,0);
+    if (!xc_handle) {
         return PyErr_SetFromErrno(xc_error_obj);
     }
 
@@ -138,12 +135,11 @@ static PyObject *pyflask_load(PyObject *self, PyObject *args, PyObject *kwds)
 
 static PyObject *pyflask_getenforce(PyObject *self)
 {
-    int xc_handle;
+    xc_interface *xc_handle;
     int ret;
 
-    xc_handle = xc_interface_open();
-    if (xc_handle < 0) {
-        errno = xc_handle;
+    xc_handle = xc_interface_open(0,0,0);
+    if (!xc_handle) {
         return PyErr_SetFromErrno(xc_error_obj);
     }
     
@@ -162,7 +158,7 @@ static PyObject *pyflask_getenforce(PyObject *self)
 static PyObject *pyflask_setenforce(PyObject *self, PyObject *args,
                                                             PyObject *kwds)
 {
-    int xc_handle;
+    xc_interface *xc_handle;
     int mode;
     int ret;
 
@@ -172,9 +168,8 @@ static PyObject *pyflask_setenforce(PyObject *self, PyObject *args,
                                       &mode) )
         return NULL;
 
-    xc_handle = xc_interface_open();
-    if (xc_handle < 0) {
-        errno = xc_handle;
+    xc_handle = xc_interface_open(0,0,0);
+    if (!xc_handle) {
         return PyErr_SetFromErrno(xc_error_obj);
     }
     
@@ -193,7 +188,7 @@ static PyObject *pyflask_setenforce(PyObject *self, PyObject *args,
 static PyObject *pyflask_access(PyObject *self, PyObject *args,
                                                        PyObject *kwds)
 {
-    int xc_handle;
+    xc_interface *xc_handle;
     char *tcon, *scon;
     uint16_t tclass;
     uint32_t req, allowed, decided, auditallow, auditdeny, seqno;
@@ -209,9 +204,8 @@ static PyObject *pyflask_access(PyObject *self, PyObject *args,
                                       &auditallow, &auditdeny, &seqno) )
         return NULL;
 
-    xc_handle = xc_interface_open();
-    if (xc_handle < 0) {
-        errno = xc_handle;
+    xc_handle = xc_interface_open(0,0,0);
+    if (!xc_handle) {
         return PyErr_SetFromErrno(xc_error_obj);
     }
     

tools/python/xen/lowlevel/xc/xc.c

@@ -38,18 +38,32 @@ static PyObject *xc_error_obj, *zero;
 
 typedef struct {
     PyObject_HEAD;
-    int xc_handle;
+    xc_interface *xc_handle;
 } XcObject;
 
 
 static PyObject *dom_op(XcObject *self, PyObject *args,
-                        int (*fn)(int, uint32_t));
+                        int (*fn)(xc_interface *, uint32_t));
 
-static PyObject *pyxc_error_to_exception(void)
+static PyObject *pyxc_error_to_exception(xc_interface *xch)
 {
     PyObject *pyerr;
-    const xc_error *err = xc_get_last_error();
-    const char *desc = xc_error_code_to_desc(err->code);
+    static xc_error err_buf;
+    const char *desc;
+    const xc_error *err;
+
+    if (xch) {
+        err = xc_get_last_error(xch);
+    } else {
+        snprintf(err_buf.message, sizeof(err_buf.message),
+                 "xc_interface_open failed: %s",
+                 strerror(errno));
+        err_buf.message[sizeof(err_buf)-1] = 0;
+        err_buf.code = XC_INTERNAL_ERROR;
+        err = &err_buf;
+    }
+
+    desc = xc_error_code_to_desc(err->code);
 
     if ( err->code == XC_ERROR_NONE )
         return PyErr_SetFromErrno(xc_error_obj);
@@ -59,7 +73,7 @@ static PyObject *pyxc_error_to_exception(void)
     else
         pyerr = Py_BuildValue("(is)", err->code, desc);
 
-    xc_clear_last_error();
+    xc_clear_last_error(xch);
 
     if ( pyerr != NULL )
     {
@@ -82,17 +96,12 @@ static PyObject *pyxc_domain_dumpcore(XcObject *self, PyObject *args)
         return NULL;
 
     if ( xc_domain_dumpcore(self->xc_handle, dom, corefile) != 0 )
-        return pyxc_error_to_exception();
+        return pyxc_error_to_exception(self->xc_handle);
     
     Py_INCREF(zero);
     return zero;
 }
 
-static PyObject *pyxc_handle(XcObject *self)
-{
-    return PyInt_FromLong(self->xc_handle);
-}
-
 static PyObject *pyxc_domain_create(XcObject *self,
                                     PyObject *args,
                                     PyObject *kwds)
@@ -126,11 +135,11 @@ static PyObject *pyxc_domain_create(XcObject *self,
 
     if ( (ret = xc_domain_create(self->xc_handle, ssidref,
                                  handle, flags, &dom)) < 0 )
-        return pyxc_error_to_exception();
+        return pyxc_error_to_exception(self->xc_handle);
 
     if ( target )
         if ( (ret = xc_domain_set_target(self->xc_handle, dom, target)) < 0 )
-            return pyxc_error_to_exception();
+            return pyxc_error_to_exception(self->xc_handle);
 
 
     return PyInt_FromLong(dom);
@@ -149,7 +158,7 @@ static PyObject *pyxc_domain_max_vcpus(XcObject *self, PyObject *args)
       return NULL;
 
     if (xc_domain_max_vcpus(self->xc_handle, dom, max) != 0)
-        return pyxc_error_to_exception();
+        return pyxc_error_to_exception(self->xc_handle);
     
     Py_INCREF(zero);
     return zero;
@@ -188,7 +197,7 @@ static PyObject *pyxc_domain_shutdown(XcObject *self, PyObject *args)
       return NULL;
 
     if ( xc_domain_shutdown(self->xc_handle, dom, reason) != 0 )
-        return pyxc_error_to_exception();
+        return pyxc_error_to_exception(self->xc_handle);
     
     Py_INCREF(zero);
     return zero;
@@ -203,7 +212,7 @@ static PyObject *pyxc_domain_resume(XcObject *self, PyObject *args)
         return NULL;
 
     if ( xc_domain_resume(self->xc_handle, dom, fast) != 0 )
-        return pyxc_error_to_exception();
+        return pyxc_error_to_exception(self->xc_handle);
 
     Py_INCREF(zero);
     return zero;
@@ -228,14 +237,14 @@ static PyObject *pyxc_vcpu_setaffinity(XcObject *self,
         return NULL;
 
     if ( xc_physinfo(self->xc_handle, &info) != 0 )
-        return pyxc_error_to_exception();
+        return pyxc_error_to_exception(self->xc_handle);
   
     nr_cpus = info.nr_cpus;
 
     size = (nr_cpus + cpumap_size * 8 - 1)/ (cpumap_size * 8);
     cpumap = malloc(cpumap_size * size);
     if(cpumap == NULL)
-        return pyxc_error_to_exception();
+        return pyxc_error_to_exception(self->xc_handle);
 
     if ( (cpulist != NULL) && PyList_Check(cpulist) )
     {
@@ -253,7 +262,7 @@ static PyObject *pyxc_vcpu_setaffinity(XcObject *self,
     if ( xc_vcpu_setaffinity(self->xc_handle, dom, vcpu, cpumap, size * cpumap_size) != 0 )
     {
         free(cpumap);
-        return pyxc_error_to_exception();
+        return pyxc_error_to_exception(self->xc_handle);
     }
     Py_INCREF(zero);
     free(cpumap); 
@@ -285,7 +294,7 @@ static PyObject *pyxc_domain_sethandle(XcObject *self, PyObject *args)
     }
 
     if (xc_domain_sethandle(self->xc_handle, dom, handle) < 0)
-        return pyxc_error_to_exception();
+        return pyxc_error_to_exception(self->xc_handle);
     
     Py_INCREF(zero);
     return zero;
@@ -321,7 +330,7 @@ static PyObject *pyxc_domain_getinfo(XcObject *self,
     if (nr_doms < 0)
     {
         free(info);
-        return pyxc_error_to_exception();
+        return pyxc_error_to_exception(self->xc_handle);
     }
 
     list = PyList_New(nr_doms);
@@ -388,23 +397,23 @@ static PyObject *pyxc_vcpu_getinfo(XcObject *self,
         return NULL;
 
     if ( xc_physinfo(self->xc_handle, &pinfo) != 0 ) 
-        return pyxc_error_to_exception();
+        return pyxc_error_to_exception(self->xc_handle);
     nr_cpus = pinfo.nr_cpus;
 
     rc = xc_vcpu_getinfo(self->xc_handle, dom, vcpu, &info);
     if ( rc < 0 )
-        return pyxc_error_to_exception();
+        return pyxc_error_to_exception(self->xc_handle);
 
     size = (nr_cpus + cpumap_size * 8 - 1)/ (cpumap_size * 8); 
     if((cpumap = malloc(cpumap_size * size)) == NULL)
-        return pyxc_error_to_exception(); 
+        return pyxc_error_to_exception(self->xc_handle); 
     memset(cpumap, 0, cpumap_size * size);
 
     rc = xc_vcpu_getaffinity(self->xc_handle, dom, vcpu, cpumap, cpumap_size * size);
     if ( rc < 0 )
     {
         free(cpumap);
-        return pyxc_error_to_exception();
+        return pyxc_error_to_exception(self->xc_handle);
     }
 
     info_dict = Py_BuildValue("{s:i,s:i,s:i,s:L,s:i}",
@@ -440,9 +449,10 @@ static PyObject *pyxc_getBitSize(XcObject *self,
     if ( !PyArg_ParseTupleAndKeywords(args, kwds, "sss", kwd_list,
                                       &image, &cmdline, &features) )
         return NULL;
-    xc_get_bit_size(image, cmdline, features, &type);
+
+    xc_get_bit_size(self->xc_handle, image, cmdline, features, &type);
     if (type < 0)
-        return pyxc_error_to_exception();
+        return pyxc_error_to_exception(self->xc_handle);
     info_type = Py_BuildValue("{s:i}",
                               "type", type);
     return info_type;
@@ -481,9 +491,9 @@ static PyObject *pyxc_linux_build(XcObject *self,
                                       &features, &vhpt, &superpages) )
         return NULL;
 
-    xc_dom_loginit();
-    if (!(dom = xc_dom_allocate(cmdline, features)))
-        return pyxc_error_to_exception();
+    xc_dom_loginit(self->xc_handle);
+    if (!(dom = xc_dom_allocate(self->xc_handle, cmdline, features)))
+        return pyxc_error_to_exception(self->xc_handle);
 
     /* for IA64 */
     dom->vhpt_size_log2 = vhpt;
@@ -537,7 +547,7 @@ static PyObject *pyxc_linux_build(XcObject *self,
 
   out:
     xc_dom_release(dom);
-    return pyxc_error_to_exception();
+    return pyxc_error_to_exception(self->xc_handle);
 }
 
 static PyObject *pyxc_get_hvm_param(XcObject *self,
@@ -554,7 +564,7 @@ static PyObject *pyxc_get_hvm_param(XcObject *self,
         return NULL;
 
     if ( xc_get_hvm_param(self->xc_handle, dom, param, &value) != 0 )
-        return pyxc_error_to_exception();
+        return pyxc_error_to_exception(self->xc_handle);
 
     return PyLong_FromUnsignedLong(value);
 
@@ -574,7 +584,7 @@ static PyObject *pyxc_set_hvm_param(XcObject *self,
         return NULL;
 
     if ( xc_set_hvm_param(self->xc_handle, dom, param, value) != 0 )
-        return pyxc_error_to_exception();
+        return pyxc_error_to_exception(self->xc_handle);
 
     Py_INCREF(zero);
     return zero;
@@ -734,7 +744,7 @@ static PyObject *pyxc_get_device_group(XcObject *self,
     if ( rc < 0 )
     {
         free(sdev_array); 
-        return pyxc_error_to_exception();
+        return pyxc_error_to_exception(self->xc_handle);
     }
 
     if ( !num_sdevs )
@@ -855,7 +865,7 @@ static PyObject *pyxc_dom_check_cpuid(XcObject *self,
 
     if ( xc_cpuid_check(self->xc_handle, input,
                         (const char **)regs, regs_transform) )
-        return pyxc_error_to_exception();
+        return pyxc_error_to_exception(self->xc_handle);
 
     return pyxc_create_cpuid_dict(regs_transform);
 }
@@ -869,7 +879,7 @@ static PyObject *pyxc_dom_set_policy_cpuid(XcObject *self,
         return NULL;
 
     if ( xc_cpuid_apply_policy(self->xc_handle, domid) )
-        return pyxc_error_to_exception();
+        return pyxc_error_to_exception(self->xc_handle);
 
     Py_INCREF(zero);
     return zero;
@@ -895,7 +905,7 @@ static PyObject *pyxc_dom_set_cpuid(XcObject *self,
 
     if ( xc_cpuid_set(self->xc_handle, domid, input, (const char **)regs,
                       regs_transform) )
-        return pyxc_error_to_exception();
+        return pyxc_error_to_exception(self->xc_handle);
 
     return pyxc_create_cpuid_dict(regs_transform);
 }
@@ -910,7 +920,7 @@ static PyObject *pyxc_dom_set_machine_address_size(XcObject *self,
 	return NULL;
 
     if (xc_domain_set_machine_address_size(self->xc_handle, dom, width) != 0)
-	return pyxc_error_to_exception();
+	return pyxc_error_to_exception(self->xc_handle);
 
     Py_INCREF(zero);
     return zero;
@@ -926,7 +936,7 @@ static PyObject *pyxc_dom_suppress_spurious_page_faults(XcObject *self,
 	return NULL;
 
     if (xc_domain_suppress_spurious_page_faults(self->xc_handle, dom) != 0)
-	return pyxc_error_to_exception();
+	return pyxc_error_to_exception(self->xc_handle);
 
     Py_INCREF(zero);
     return zero;
@@ -986,7 +996,7 @@ static PyObject *pyxc_hvm_build(XcObject *self,
 
     if ( xc_hvm_build_target_mem(self->xc_handle, dom, memsize,
                                  target, image) != 0 )
-        return pyxc_error_to_exception();
+        return pyxc_error_to_exception(self->xc_handle);
 
 #if !defined(__ia64__)
     /* Fix up the HVM info table. */
@@ -1023,7 +1033,7 @@ static PyObject *pyxc_evtchn_alloc_unbound(XcObject *self,
         return NULL;
 
     if ( (port = xc_evtchn_alloc_unbound(self->xc_handle, dom, remote_dom)) < 0 )
-        return pyxc_error_to_exception();
+        return pyxc_error_to_exception(self->xc_handle);
 
     return PyInt_FromLong(port);
 }
@@ -1040,7 +1050,7 @@ static PyObject *pyxc_evtchn_reset(XcObject *self,
         return NULL;
 
     if ( xc_evtchn_reset(self->xc_handle, dom) < 0 )
-        return pyxc_error_to_exception();
+        return pyxc_error_to_exception(self->xc_handle);
 
     Py_INCREF(zero);
     return zero;
@@ -1061,7 +1071,7 @@ static PyObject *pyxc_physdev_map_pirq(PyObject *self,
         return NULL;
     ret = xc_physdev_map_pirq(xc->xc_handle, dom, index, &pirq);
     if ( ret != 0 )
-          return pyxc_error_to_exception();
+          return pyxc_error_to_exception(xc->xc_handle);
     return PyLong_FromUnsignedLong(pirq);
 }
 
@@ -1081,7 +1091,7 @@ static PyObject *pyxc_physdev_pci_access_modify(XcObject *self,
     ret = xc_physdev_pci_access_modify(
         self->xc_handle, dom, bus, dev, func, enable);
     if ( ret != 0 )
-        return pyxc_error_to_exception();
+        return pyxc_error_to_exception(self->xc_handle);
 
     Py_INCREF(zero);
     return zero;
@@ -1107,7 +1117,7 @@ static PyObject *pyxc_readconsolering(XcObject *self,
     ret = xc_readconsolering(self->xc_handle, &str, &count, clear,
                              incremental, &index);
     if ( ret < 0 )
-        return pyxc_error_to_exception();
+        return pyxc_error_to_exception(self->xc_handle);
 
     while ( !incremental && count == size )
     {
@@ -1160,7 +1170,7 @@ static PyObject *pyxc_physinfo(XcObject *self)
     const char *virtcap_names[] = { "hvm", "hvm_directio" };
 
     if ( xc_physinfo(self->xc_handle, &pinfo) != 0 )
-        return pyxc_error_to_exception();
+        return pyxc_error_to_exception(self->xc_handle);
 
     p = cpu_cap;
     *p = '\0';
@@ -1206,7 +1216,7 @@ static PyObject *pyxc_topologyinfo(XcObject *self)
     tinfo.max_cpu_index = MAX_CPU_INDEX;
 
     if ( xc_topologyinfo(self->xc_handle, &tinfo) != 0 )
-        return pyxc_error_to_exception();
+        return pyxc_error_to_exception(self->xc_handle);
 
     max_cpu_index = tinfo.max_cpu_index;
     if ( max_cpu_index > MAX_CPU_INDEX )
@@ -1286,7 +1296,7 @@ static PyObject *pyxc_numainfo(XcObject *self)
     ninfo.max_node_index = MAX_NODE_INDEX;
 
     if ( xc_numainfo(self->xc_handle, &ninfo) != 0 )
-        return pyxc_error_to_exception();
+        return pyxc_error_to_exception(self->xc_handle);
 
     max_node_index = ninfo.max_node_index;
     if ( max_node_index > MAX_NODE_INDEX )
@@ -1371,28 +1381,28 @@ static PyObject *pyxc_xeninfo(XcObject *self)
     xen_version = xc_version(self->xc_handle, XENVER_version, NULL);
 
     if ( xc_version(self->xc_handle, XENVER_extraversion, &xen_extra) != 0 )
-        return pyxc_error_to_exception();
+        return pyxc_error_to_exception(self->xc_handle);
 
     if ( xc_version(self->xc_handle, XENVER_compile_info, &xen_cc) != 0 )
-        return pyxc_error_to_exception();
+        return pyxc_error_to_exception(self->xc_handle);
 
     if ( xc_version(self->xc_handle, XENVER_changeset, &xen_chgset) != 0 )
-        return pyxc_error_to_exception();
+        return pyxc_error_to_exception(self->xc_handle);
 
     if ( xc_version(self->xc_handle, XENVER_capabilities, &xen_caps) != 0 )
-        return pyxc_error_to_exception();
+        return pyxc_error_to_exception(self->xc_handle);
 
     if ( xc_version(self->xc_handle, XENVER_platform_parameters, &p_parms) != 0 )
-        return pyxc_error_to_exception();
+        return pyxc_error_to_exception(self->xc_handle);
 
     if ( xc_version(self->xc_handle, XENVER_commandline, &xen_commandline) != 0 )
-        return pyxc_error_to_exception();
+        return pyxc_error_to_exception(self->xc_handle);
 
     snprintf(str, sizeof(str), "virt_start=0x%lx", p_parms.virt_start);
 
     xen_pagesize = xc_version(self->xc_handle, XENVER_pagesize, NULL);
     if (xen_pagesize < 0 )
-        return pyxc_error_to_exception();
+        return pyxc_error_to_exception(self->xc_handle);
 
     return Py_BuildValue("{s:i,s:i,s:s,s:s,s:i,s:s,s:s,s:s,s:s,s:s,s:s,s:s}",
                          "xen_major", xen_version >> 16,
@@ -1426,7 +1436,7 @@ static PyObject *pyxc_sedf_domain_set(XcObject *self,
         return NULL;
    if ( xc_sedf_domain_set(self->xc_handle, domid, period,
                            slice, latency, extratime,weight) != 0 )
-        return pyxc_error_to_exception();
+        return pyxc_error_to_exception(self->xc_handle);
 
     Py_INCREF(zero);
     return zero;
@@ -1443,7 +1453,7 @@ static PyObject *pyxc_sedf_domain_get(XcObject *self, PyObject *args)
     
     if (xc_sedf_domain_get(self->xc_handle, domid, &period,
                            &slice,&latency,&extratime,&weight))
-        return pyxc_error_to_exception();
+        return pyxc_error_to_exception(self->xc_handle);
 
     return Py_BuildValue("{s:i,s:L,s:L,s:L,s:i,s:i}",
                          "domid",    domid,
@@ -1471,7 +1481,7 @@ static PyObject *pyxc_shadow_control(PyObject *self,
     
     if ( xc_shadow_control(xc->xc_handle, dom, op, NULL, 0, NULL, 0, NULL) 
          < 0 )
-        return pyxc_error_to_exception();
+        return pyxc_error_to_exception(xc->xc_handle);
     
     Py_INCREF(zero);
     return zero;
@@ -1501,7 +1511,7 @@ static PyObject *pyxc_shadow_mem_control(PyObject *self,
         op = XEN_DOMCTL_SHADOW_OP_SET_ALLOCATION;
     }
     if ( xc_shadow_control(xc->xc_handle, dom, op, NULL, 0, &mb, 0, NULL) < 0 )
-        return pyxc_error_to_exception();
+        return pyxc_error_to_exception(xc->xc_handle);
     
     mbarg = mb;
     return Py_BuildValue("i", mbarg);
@@ -1537,7 +1547,7 @@ static PyObject *pyxc_sched_credit_domain_set(XcObject *self,
     sdom.cap = cap;
 
     if ( xc_sched_credit_domain_set(self->xc_handle, domid, &sdom) != 0 )
-        return pyxc_error_to_exception();
+        return pyxc_error_to_exception(self->xc_handle);
 
     Py_INCREF(zero);
     return zero;
@@ -1552,7 +1562,7 @@ static PyObject *pyxc_sched_credit_domain_get(XcObject *self, PyObject *args)
         return NULL;
     
     if ( xc_sched_credit_domain_get(self->xc_handle, domid, &sdom) != 0 )
-        return pyxc_error_to_exception();
+        return pyxc_error_to_exception(self->xc_handle);
 
     return Py_BuildValue("{s:H,s:H}",
                          "weight",  sdom.weight,
@@ -1577,7 +1587,7 @@ static PyObject *pyxc_sched_credit2_domain_set(XcObject *self,
     sdom.weight = weight;
 
     if ( xc_sched_credit2_domain_set(self->xc_handle, domid, &sdom) != 0 )
-        return pyxc_error_to_exception();
+        return pyxc_error_to_exception(self->xc_handle);
 
     Py_INCREF(zero);
     return zero;
@@ -1592,7 +1602,7 @@ static PyObject *pyxc_sched_credit2_domain_get(XcObject *self, PyObject *args)
         return NULL;
 
     if ( xc_sched_credit2_domain_get(self->xc_handle, domid, &sdom) != 0 )
-        return pyxc_error_to_exception();
+        return pyxc_error_to_exception(self->xc_handle);
 
     return Py_BuildValue("{s:H}",
                          "weight",  sdom.weight);
@@ -1607,7 +1617,7 @@ static PyObject *pyxc_domain_setmaxmem(XcObject *self, PyObject *args)
         return NULL;
 
     if (xc_domain_setmaxmem(self->xc_handle, dom, maxmem_kb) != 0)
-        return pyxc_error_to_exception();
+        return pyxc_error_to_exception(self->xc_handle);
     
     Py_INCREF(zero);
     return zero;
@@ -1625,7 +1635,7 @@ static PyObject *pyxc_domain_set_target_mem(XcObject *self, PyObject *args)
 
     if (xc_domain_memory_set_pod_target(self->xc_handle, dom, mem_pages,
                                         NULL, NULL, NULL) != 0)
-        return pyxc_error_to_exception();
+        return pyxc_error_to_exception(self->xc_handle);
     
     Py_INCREF(zero);
     return zero;
@@ -1640,7 +1650,7 @@ static PyObject *pyxc_domain_set_memmap_limit(XcObject *self, PyObject *args)
         return NULL;
 
     if ( xc_domain_set_memmap_limit(self->xc_handle, dom, maplimit_kb) != 0 )
-        return pyxc_error_to_exception();
+        return pyxc_error_to_exception(self->xc_handle);
     
     Py_INCREF(zero);
     return zero;
@@ -1662,7 +1672,7 @@ static PyObject *pyxc_domain_ioport_permission(XcObject *self,
     ret = xc_domain_ioport_permission(
         self->xc_handle, dom, first_port, nr_ports, allow_access);
     if ( ret != 0 )
-        return pyxc_error_to_exception();
+        return pyxc_error_to_exception(self->xc_handle);
 
     Py_INCREF(zero);
     return zero;
@@ -1685,7 +1695,7 @@ static PyObject *pyxc_domain_irq_permission(PyObject *self,
     ret = xc_domain_irq_permission(
         xc->xc_handle, dom, pirq, allow_access);
     if ( ret != 0 )
-        return pyxc_error_to_exception();
+        return pyxc_error_to_exception(xc->xc_handle);
 
     Py_INCREF(zero);
     return zero;
@@ -1708,7 +1718,7 @@ static PyObject *pyxc_domain_iomem_permission(PyObject *self,
     ret = xc_domain_iomem_permission(
         xc->xc_handle, dom, first_pfn, nr_pfns, allow_access);
     if ( ret != 0 )
-        return pyxc_error_to_exception();
+        return pyxc_error_to_exception(xc->xc_handle);
 
     Py_INCREF(zero);
     return zero;
@@ -1723,7 +1733,7 @@ static PyObject *pyxc_domain_set_time_offset(XcObject *self, PyObject *args)
         return NULL;
 
     if (xc_domain_set_time_offset(self->xc_handle, dom, offset) != 0)
-        return pyxc_error_to_exception();
+        return pyxc_error_to_exception(self->xc_handle);
 
     Py_INCREF(zero);
     return zero;
@@ -1737,7 +1747,7 @@ static PyObject *pyxc_domain_set_tsc_info(XcObject *self, PyObject *args)
         return NULL;
 
     if (xc_domain_set_tsc_info(self->xc_handle, dom, tsc_mode, 0, 0, 0) != 0)
-        return pyxc_error_to_exception();
+        return pyxc_error_to_exception(self->xc_handle);
 
     Py_INCREF(zero);
     return zero;
@@ -1751,7 +1761,7 @@ static PyObject *pyxc_domain_disable_migrate(XcObject *self, PyObject *args)
         return NULL;
 
     if (xc_domain_disable_migrate(self->xc_handle, dom) != 0)
-        return pyxc_error_to_exception();
+        return pyxc_error_to_exception(self->xc_handle);
 
     Py_INCREF(zero);
     return zero;
@@ -1771,7 +1781,7 @@ static PyObject *pyxc_domain_send_trigger(XcObject *self,
         return NULL;
 
     if (xc_domain_send_trigger(self->xc_handle, dom, trigger, vcpu) != 0)
-        return pyxc_error_to_exception();
+        return pyxc_error_to_exception(self->xc_handle);
 
     Py_INCREF(zero);
     return zero;
@@ -1789,14 +1799,14 @@ static PyObject *pyxc_send_debug_keys(XcObject *self,
         return NULL;
 
     if ( xc_send_debug_keys(self->xc_handle, keys) != 0 )
-        return pyxc_error_to_exception();
+        return pyxc_error_to_exception(self->xc_handle);
 
     Py_INCREF(zero);
     return zero;
 }
 
 static PyObject *dom_op(XcObject *self, PyObject *args,
-                        int (*fn)(int, uint32_t))
+                        int (*fn)(xc_interface*, uint32_t))
 {
     uint32_t dom;
 
@@ -1804,7 +1814,7 @@ static PyObject *dom_op(XcObject *self, PyObject *args,
         return NULL;
 
     if (fn(self->xc_handle, dom) != 0)
-        return pyxc_error_to_exception();
+        return pyxc_error_to_exception(self->xc_handle);
 
     Py_INCREF(zero);
     return zero;
@@ -1888,7 +1898,7 @@ static PyObject *pyxc_dom_set_memshr(XcObject *self, PyObject *args)
         return NULL;
 
     if (xc_memshr_control(self->xc_handle, dom, enable) != 0)
-        return pyxc_error_to_exception();
+        return pyxc_error_to_exception(self->xc_handle);
     
     Py_INCREF(zero);
     return zero;
@@ -1927,7 +1937,7 @@ static PyObject *pyxc_cpupool_create(XcObject *self,
         return NULL;
 
     if ( xc_cpupool_create(self->xc_handle, &cpupool, sched) < 0 )
-        return pyxc_error_to_exception();
+        return pyxc_error_to_exception(self->xc_handle);
 
     return PyInt_FromLong(cpupool);
 }
@@ -1941,7 +1951,7 @@ static PyObject *pyxc_cpupool_destroy(XcObject *self,
         return NULL;
 
     if (xc_cpupool_destroy(self->xc_handle, cpupool) != 0)
-        return pyxc_error_to_exception();
+        return pyxc_error_to_exception(self->xc_handle);
 
     Py_INCREF(zero);
     return zero;
@@ -1972,7 +1982,7 @@ static PyObject *pyxc_cpupool_getinfo(XcObject *self,
     if (nr_pools < 0)
     {
         free(info);
-        return pyxc_error_to_exception();
+        return pyxc_error_to_exception(self->xc_handle);
     }
 
     list = PyList_New(nr_pools);
@@ -2013,7 +2023,7 @@ static PyObject *pyxc_cpupool_addcpu(XcObject *self,
         return NULL;
 
     if (xc_cpupool_addcpu(self->xc_handle, cpupool, cpu) != 0)
-        return pyxc_error_to_exception();
+        return pyxc_error_to_exception(self->xc_handle);
 
     Py_INCREF(zero);
     return zero;
@@ -2033,7 +2043,7 @@ static PyObject *pyxc_cpupool_removecpu(XcObject *self,
         return NULL;
 
     if (xc_cpupool_removecpu(self->xc_handle, cpupool, cpu) != 0)
-        return pyxc_error_to_exception();
+        return pyxc_error_to_exception(self->xc_handle);
 
     Py_INCREF(zero);
     return zero;
@@ -2052,7 +2062,7 @@ static PyObject *pyxc_cpupool_movedomain(XcObject *self,
         return NULL;
 
     if (xc_cpupool_movedomain(self->xc_handle, cpupool, domid) != 0)
-        return pyxc_error_to_exception();
+        return pyxc_error_to_exception(self->xc_handle);
 
     Py_INCREF(zero);
     return zero;
@@ -2063,18 +2073,12 @@ static PyObject *pyxc_cpupool_freeinfo(XcObject *self)
     uint64_t cpumap;
 
     if (xc_cpupool_freeinfo(self->xc_handle, &cpumap) != 0)
-        return pyxc_error_to_exception();
+        return pyxc_error_to_exception(self->xc_handle);
 
     return cpumap_to_cpulist(cpumap);
 }
 
 static PyMethodDef pyxc_methods[] = {
-    { "handle",
-      (PyCFunction)pyxc_handle,
-      METH_NOARGS, "\n"
-      "Query the xc control interface file descriptor.\n\n"
-      "Returns: [int] file descriptor\n" },
-
     { "domain_create", 
       (PyCFunction)pyxc_domain_create, 
       METH_VARARGS | METH_KEYWORDS, "\n"
@@ -2689,7 +2693,7 @@ static PyObject *PyXc_new(PyTypeObject *type, PyObject *args, PyObject *kwds)
     if (self == NULL)
         return NULL;
 
-    self->xc_handle = -1;
+    self->xc_handle = NULL;
 
     return (PyObject *)self;
 }
@@ -2697,8 +2701,8 @@ static PyObject *PyXc_new(PyTypeObject *type, PyObject *args, PyObject *kwds)
 static int
 PyXc_init(XcObject *self, PyObject *args, PyObject *kwds)
 {
-    if ((self->xc_handle = xc_interface_open()) == -1) {
-        pyxc_error_to_exception();
+    if ((self->xc_handle = xc_interface_open(0,0,0)) == 0) {
+        pyxc_error_to_exception(0);
         return -1;
     }
 
@@ -2707,9 +2711,9 @@ PyXc_init(XcObject *self, PyObject *args, PyObject *kwds)
 
 static void PyXc_dealloc(XcObject *self)
 {
-    if (self->xc_handle != -1) {
+    if (self->xc_handle) {
         xc_interface_close(self->xc_handle);
-        self->xc_handle = -1;
+        self->xc_handle = NULL;
     }
 
     self->ob_type->tp_free((PyObject *)self);