# HG changeset patch
# User David Scott <dave.scott@xxxxxxxxxxxxx>
# Date 1301507668 -3600
# Node ID 899e9e118e6fb504a703679ed13330505cba5c24
# Parent bc8a988a7d78afc2ab1a92effe6267e25308562c
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 <dave.scott@xxxxxxxxxxxxx>
Signed-off-by: Ian Campbell <ian.campbell@xxxxxxxxxx>
diff -r bc8a988a7d78 -r 899e9e118e6f tools/ocaml/libs/xl/xl.ml
--- a/tools/ocaml/libs/xl/xl.ml Mon Apr 18 14:41:11 2011 +0100
+++ b/tools/ocaml/libs/xl/xl.ml Wed Mar 30 18:54:28 2011 +0100
@@ -1,5 +1,5 @@
(*
- * Copyright (C) 2009-2010 Citrix Ltd.
+ * Copyright (C) 2009-2011 Citrix Ltd.
* Author Vincent Hanquez <vincent.hanquez@xxxxxxxxxxxxx>
*
* 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 -> do
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 -r bc8a988a7d78 -r 899e9e118e6f tools/ocaml/libs/xl/xl.mli
--- a/tools/ocaml/libs/xl/xl.mli Mon Apr 18 14:41:11 2011 +0100
+++ b/tools/ocaml/libs/xl/xl.mli Wed Mar 30 18:54:28 2011 +0100
@@ -1,5 +1,5 @@
(*
- * Copyright (C) 2009-2010 Citrix Ltd.
+ * Copyright (C) 2009-2011 Citrix Ltd.
* Author Vincent Hanquez <vincent.hanquez@xxxxxxxxxxxxx>
*
* 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 -> do
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 -r bc8a988a7d78 -r 899e9e118e6f tools/ocaml/libs/xl/xl_stubs.c
--- a/tools/ocaml/libs/xl/xl_stubs.c Mon Apr 18 14:41:11 2011 +0100
+++ b/tools/ocaml/libs/xl/xl_stubs.c Wed Mar 30 18:54:28 2011 +0100
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2009-2010 Citrix Ltd.
+ * Copyright (C) 2009-2011 Citrix Ltd.
* Author Vincent Hanquez <vincent.hanquez@xxxxxxxxxxxxx>
*
* This program is free software; you can redistribute it and/or modify
@@ -402,7 +402,7 @@ value stub_xl_disk_remove(value info, va
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
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, val
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);
}
_______________________________________________
Xen-devel mailing list
Xen-devel@xxxxxxxxxxxxxxxxxxx
http://lists.xensource.com/xen-devel
|
Home