From 18e09f52f227bdca81c42a158da9948c3948e6a8 Mon Sep 17 00:00:00 2001 From: Ian Campbell Date: Tue, 18 Oct 2011 13:36:43 +0100 Subject: [PATCH] libxl: remove libxl_device_console_add. It has no callers, the only code which adds consoles in internal to libxl and uses libxl__device_console_add directly. Rather than worrying about what the public API should look like in this case simply remove it, adding new APIs is much easier than fixing broken ones... Signed-off-by: Ian Campbell Acked-by: Ian Jackson Committed-by: Ian Jackson --- tools/libxl/libxl.c | 12 ------------ tools/libxl/libxl.h | 2 -- tools/ocaml/libs/xl/genwrap.py | 2 -- tools/ocaml/libs/xl/xenlight_stubs.c | 17 ----------------- 4 files changed, 33 deletions(-) diff --git a/tools/libxl/libxl.c b/tools/libxl/libxl.c index f065820695..5f982b7a82 100644 --- a/tools/libxl/libxl.c +++ b/tools/libxl/libxl.c @@ -1585,18 +1585,6 @@ out: return rc; } -int libxl_device_console_add(libxl_ctx *ctx, uint32_t domid, - libxl_device_console *console) -{ - libxl__gc gc = LIBXL_INIT_GC(ctx); - int rc = ERROR_INVAL; - - rc = libxl__device_console_add(&gc, domid, console, NULL); - - libxl__free_all(&gc); - return rc; -} - /******************************************************************************/ void libxl_device_vkb_init(libxl_device_vkb *vkb, int dev_num) { diff --git a/tools/libxl/libxl.h b/tools/libxl/libxl.h index 0d9aa833a5..56744b3da9 100644 --- a/tools/libxl/libxl.h +++ b/tools/libxl/libxl.h @@ -473,8 +473,6 @@ libxl_device_nic *libxl_device_nic_list(libxl_ctx *ctx, uint32_t domid, int *num int libxl_device_nic_getinfo(libxl_ctx *ctx, uint32_t domid, libxl_device_nic *nic, libxl_nicinfo *nicinfo); -int libxl_device_console_add(libxl_ctx *ctx, uint32_t domid, libxl_device_console *console); - void libxl_device_vkb_init(libxl_device_vkb *vkb, int dev_num); int libxl_device_vkb_add(libxl_ctx *ctx, uint32_t domid, libxl_device_vkb *vkb); int libxl_device_vkb_clean_shutdown(libxl_ctx *ctx, uint32_t domid); diff --git a/tools/ocaml/libs/xl/genwrap.py b/tools/ocaml/libs/xl/genwrap.py index 3a9b1c5e0d..f7edad0930 100644 --- a/tools/ocaml/libs/xl/genwrap.py +++ b/tools/ocaml/libs/xl/genwrap.py @@ -30,8 +30,6 @@ functions = { # ( name , [type1,type2,....] ) ("clean_shutdown", ["domid", "unit"]), ("hard_shutdown", ["domid", "unit"]), ], - "device_console": [ ("add", ["t", "domid", "unit"]), - ], "device_disk": DEVICE_FUNCTIONS, "device_nic": DEVICE_FUNCTIONS, "device_pci": [ ("add", ["t", "domid", "unit"]), diff --git a/tools/ocaml/libs/xl/xenlight_stubs.c b/tools/ocaml/libs/xl/xenlight_stubs.c index c7aeed0db5..3cf889b661 100644 --- a/tools/ocaml/libs/xl/xenlight_stubs.c +++ b/tools/ocaml/libs/xl/xenlight_stubs.c @@ -288,23 +288,6 @@ value stub_xl_device_nic_del(value info, value domid) CAMLreturn(Val_unit); } -value stub_xl_device_console_add(value info, value domid) -{ - CAMLparam2(info, domid); - libxl_device_console c_info; - int ret; - INIT_STRUCT(); - - device_console_val(&gc, &lg, &c_info, info); - - INIT_CTX(); - ret = libxl_device_console_add(ctx, Int_val(domid), &c_info); - if (ret != 0) - failwith_xl("console_add", &lg); - FREE_CTX(); - CAMLreturn(Val_unit); -} - value stub_xl_device_vkb_add(value info, value domid) { CAMLparam2(info, domid); -- 2.39.5