debuggers.hg

changeset 22276:a33886146b45

xl: Fix build in python binding since API change in 22229:1385b15e168f

Signed-off-by: Gianni Tedesco <gianni.tedesco@citrix.com>
Signed-off-by: Stefano Stabellini <stefano.stabellini@eu.citrix.com>
committer: Stefano Stabellini <stefano.stabellini@eu.citrix.com>
author Gianni Tedesco <gianni.tedesco@citrix.com>
date Fri Oct 08 11:41:57 2010 +0100 (2010-10-08)
parents 1385b15e168f
children a1405385db77
files tools/ocaml/libs/xl/xl_stubs.c tools/python/xen/lowlevel/xl/xl.c
line diff
     1.1 --- a/tools/ocaml/libs/xl/xl_stubs.c	Wed Oct 06 17:38:15 2010 +0100
     1.2 +++ b/tools/ocaml/libs/xl/xl_stubs.c	Fri Oct 08 11:41:57 2010 +0100
     1.3 @@ -638,7 +638,7 @@ value stub_xl_pci_remove(value info, val
     1.4  	device_pci_val(&gc, &c_info, info);
     1.5  
     1.6  	INIT_CTX();
     1.7 -	ret = libxl_device_pci_remove(&ctx, Int_val(domid), &c_info);
     1.8 +	ret = libxl_device_pci_remove(&ctx, Int_val(domid), &c_info, 0);
     1.9  	if (ret != 0)
    1.10  		failwith_xl("pci_remove", &lg);
    1.11  	FREE_CTX();
     2.1 --- a/tools/python/xen/lowlevel/xl/xl.c	Wed Oct 06 17:38:15 2010 +0100
     2.2 +++ b/tools/python/xen/lowlevel/xl/xl.c	Fri Oct 08 11:41:57 2010 +0100
     2.3 @@ -441,15 +441,16 @@ static PyObject *pyxl_pci_del(XlObject *
     2.4  {
     2.5      Py_device_pci *pci;
     2.6      PyObject *obj;
     2.7 -    int domid;
     2.8 -    if ( !PyArg_ParseTuple(args, "iO", &domid, &obj) )
     2.9 +    int domid, force = 0;
    2.10 +
    2.11 +    if ( !PyArg_ParseTuple(args, "iO|i", &domid, &obj, &force) )
    2.12          return NULL;
    2.13      if ( !Pydevice_pci_Check(obj) ) {
    2.14          PyErr_SetString(PyExc_TypeError, "Xxpected xl.device_pci");
    2.15          return NULL;
    2.16      }
    2.17      pci = (Py_device_pci *)obj;
    2.18 -    if ( libxl_device_pci_remove(&self->ctx, domid, &pci->obj) ) {
    2.19 +    if ( libxl_device_pci_remove(&self->ctx, domid, &pci->obj, force) ) {
    2.20          PyErr_SetString(xl_error_obj, "cannot remove pci device");
    2.21          return NULL;
    2.22      }