aboutsummaryrefslogtreecommitdiffstats
path: root/tools/ocaml/libs
diff options
context:
space:
mode:
authorIan Campbell <ian.campbell@citrix.com>2011-10-18 13:36:43 +0100
committerIan Campbell <ian.campbell@citrix.com>2011-10-18 13:36:43 +0100
commit6dc92e085b34e9502e42a53fd6969c9af483a307 (patch)
tree0cdaec0f47a59c200b1f9b9389876ab1ac1a5a81 /tools/ocaml/libs
parent5d834c79a4c5bbd3c1e96af5305922560044d383 (diff)
downloadxen-6dc92e085b34e9502e42a53fd6969c9af483a307.tar.gz
xen-6dc92e085b34e9502e42a53fd6969c9af483a307.tar.bz2
xen-6dc92e085b34e9502e42a53fd6969c9af483a307.zip
libxl: convert PCI device handling to device API
Signed-off-by: Ian Campbell <ian.campbell@citrix.com> Acked-by: Ian Jackson <ian.jackson.citrix.com> Committed-by: Ian Jackson <ian.jackson.citrix.com>
Diffstat (limited to 'tools/ocaml/libs')
-rw-r--r--tools/ocaml/libs/xl/genwrap.py5
-rw-r--r--tools/ocaml/libs/xl/xenlight_stubs.c17
2 files changed, 2 insertions, 20 deletions
diff --git a/tools/ocaml/libs/xl/genwrap.py b/tools/ocaml/libs/xl/genwrap.py
index f9e2e81e95..5f8639a0a7 100644
--- a/tools/ocaml/libs/xl/genwrap.py
+++ b/tools/ocaml/libs/xl/genwrap.py
@@ -26,10 +26,7 @@ functions = { # ( name , [type1,type2,....] )
"device_vkb": DEVICE_FUNCTIONS,
"device_disk": DEVICE_FUNCTIONS,
"device_nic": DEVICE_FUNCTIONS,
- "device_pci": [ ("add", ["t", "domid", "unit"]),
- ("remove", ["t", "domid", "unit"]),
- ("shutdown", ["domid", "unit"]),
- ],
+ "device_pci": DEVICE_FUNCTIONS,
"physinfo": [ ("get", ["unit", "t"]),
],
"sched_credit": [ ("domain_get", ["domid", "t"]),
diff --git a/tools/ocaml/libs/xl/xenlight_stubs.c b/tools/ocaml/libs/xl/xenlight_stubs.c
index f7790b7dd0..be05b8ea87 100644
--- a/tools/ocaml/libs/xl/xenlight_stubs.c
+++ b/tools/ocaml/libs/xl/xenlight_stubs.c
@@ -424,7 +424,7 @@ value stub_xl_device_pci_remove(value info, value domid)
device_pci_val(&gc, &lg, &c_info, info);
INIT_CTX();
- ret = libxl_device_pci_remove(ctx, Int_val(domid), &c_info, 0);
+ ret = libxl_device_pci_remove(ctx, Int_val(domid), &c_info);
if (ret != 0)
failwith_xl("pci_remove", &lg);
FREE_CTX();
@@ -432,21 +432,6 @@ value stub_xl_device_pci_remove(value info, value domid)
CAMLreturn(Val_unit);
}
-value stub_xl_device_pci_shutdown(value domid)
-{
- CAMLparam1(domid);
- int ret;
- INIT_STRUCT();
-
- INIT_CTX();
- ret = libxl_device_pci_shutdown(ctx, Int_val(domid));
- if (ret != 0)
- failwith_xl("pci_shutdown", &lg);
- FREE_CTX();
-
- CAMLreturn(Val_unit);
-}
-
value stub_xl_button_press(value domid, value button)
{
CAMLparam2(domid, button);