From: David Scott Date: Wed, 30 Mar 2011 17:54:28 +0000 (+0100) Subject: tools: ocaml: rename the device_nic types and functions X-Git-Tag: archive/raspbian/4.8.0-1+rpi1~1^2~10434 X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=226a5d6458a51ba43a40d08c1e9c3aa2ba53dbce;p=xen.git tools: ocaml: rename the device_nic types and functions The aims are: 1. make the records instantiable if they have field names in common; and 2. to make it easier to derive the names programatically from the IDL Signed-off-by: David Scott Signed-off-by: Ian Campbell Acked-by: Ian Jackson Committed-by: Ian Jackson --- diff --git a/tools/ocaml/libs/xl/xl.ml b/tools/ocaml/libs/xl/xl.ml index 11a04bca13..10661c4342 100644 --- a/tools/ocaml/libs/xl/xl.ml +++ b/tools/ocaml/libs/xl/xl.ml @@ -1,5 +1,5 @@ (* - * Copyright (C) 2009-2010 Citrix Ltd. + * Copyright (C) 2009-2011 Citrix Ltd. * Author Vincent Hanquez * * This program is free software; you can redistribute it and/or modify @@ -97,18 +97,22 @@ type nic_type = | NICTYPE_IOEMU | NICTYPE_VIF -type nic_info = -{ - backend_domid : domid; - devid : int; - mtu : int; - model : string; - mac : int array; - bridge : string; - ifname : string; - script : string; - nictype : nic_type; -} +module Device_nic = struct + type t = + { + backend_domid : domid; + devid : int; + mtu : int; + model : string; + mac : int array; + bridge : string; + ifname : string; + script : string; + nictype : nic_type; + } + external add : t -> domid -> unit = "stub_xl_device_nic_add" + external del : t -> domid -> unit = "stub_xl_device_nic_del" +end type console_type = | CONSOLETYPE_XENCONSOLED @@ -190,9 +194,6 @@ external domain_build : build_info -> domid -> build_state = "stub_xl_domain_bui external disk_add : disk_info -> domid -> unit = "stub_xl_disk_add" external disk_remove : disk_info -> domid -> unit = "stub_xl_disk_remove" -external nic_add : nic_info -> domid -> unit = "stub_xl_nic_add" -external nic_remove : disk_info -> domid -> unit = "stub_xl_nic_remove" - external console_add : console_info -> build_state -> domid -> unit = "stub_xl_console_add" external vkb_add : vkb_info -> domid -> unit = "stub_xl_vkb_add" diff --git a/tools/ocaml/libs/xl/xl.mli b/tools/ocaml/libs/xl/xl.mli index b1d3f43d62..ef78143cab 100644 --- a/tools/ocaml/libs/xl/xl.mli +++ b/tools/ocaml/libs/xl/xl.mli @@ -1,5 +1,5 @@ (* - * Copyright (C) 2009-2010 Citrix Ltd. + * Copyright (C) 2009-2011 Citrix Ltd. * Author Vincent Hanquez * * This program is free software; you can redistribute it and/or modify @@ -97,18 +97,22 @@ type nic_type = | NICTYPE_IOEMU | NICTYPE_VIF -type nic_info = -{ - backend_domid : domid; - devid : int; - mtu : int; - model : string; - mac : int array; - bridge : string; - ifname : string; - script : string; - nictype : nic_type; -} +module Device_nic : sig + type t = + { + backend_domid : domid; + devid : int; + mtu : int; + model : string; + mac : int array; + bridge : string; + ifname : string; + script : string; + nictype : nic_type; + } + external add : t -> domid -> unit = "stub_xl_device_nic_add" + external del : t -> domid -> unit = "stub_xl_device_nic_del" +end type console_type = | CONSOLETYPE_XENCONSOLED @@ -190,9 +194,6 @@ external domain_build : build_info -> domid -> build_state = "stub_xl_domain_bui external disk_add : disk_info -> domid -> unit = "stub_xl_disk_add" external disk_remove : disk_info -> domid -> unit = "stub_xl_disk_remove" -external nic_add : nic_info -> domid -> unit = "stub_xl_nic_add" -external nic_remove : disk_info -> domid -> unit = "stub_xl_nic_remove" - external console_add : console_info -> build_state -> domid -> unit = "stub_xl_console_add" external vkb_add : vkb_info -> domid -> unit = "stub_xl_vkb_add" diff --git a/tools/ocaml/libs/xl/xl_stubs.c b/tools/ocaml/libs/xl/xl_stubs.c index 23d94b1a0f..dc565837d0 100644 --- a/tools/ocaml/libs/xl/xl_stubs.c +++ b/tools/ocaml/libs/xl/xl_stubs.c @@ -1,5 +1,5 @@ /* - * Copyright (C) 2009-2010 Citrix Ltd. + * Copyright (C) 2009-2011 Citrix Ltd. * Author Vincent Hanquez * * This program is free software; you can redistribute it and/or modify @@ -402,7 +402,7 @@ value stub_xl_disk_remove(value info, value domid) CAMLreturn(Val_unit); } -value stub_xl_nic_add(value info, value domid) +value stub_xl_device_nic_add(value info, value domid) { CAMLparam2(info, domid); libxl_device_nic c_info; @@ -419,7 +419,7 @@ value stub_xl_nic_add(value info, value domid) CAMLreturn(Val_unit); } -value stub_xl_nic_remove(value info, value domid) +value stub_xl_device_nic_del(value info, value domid) { CAMLparam2(info, domid); libxl_device_nic c_info; @@ -431,7 +431,7 @@ value stub_xl_nic_remove(value info, value domid) INIT_CTX(); ret = libxl_device_nic_del(ctx, Int_val(domid), &c_info, 0); if (ret != 0) - failwith_xl("nic_remove", &lg); + failwith_xl("nic_del", &lg); FREE_CTX(); CAMLreturn(Val_unit); }