# HG changeset patch
# User Ian Campbell <ian.campbell@xxxxxxxxxx>
# Date 1303315988 -3600
# Node ID f026866216ece1a72b5a17e31a5fbef0c65358b0
# Parent 509371f075012b82059d270728accf612fb293a9
tools: ocaml: tweak whitespace in preparation for autogenerating xl bindings
Reduces the diff of existing vs auto-generated code.
Signed-off-by: Ian Campbell <ian.campbell@xxxxxxxxxx>
Acked-by: Ian Jackson <ian.jackson.citrix.com>
Committed-by: Ian Jackson <ian.jackson.citrix.com>
---
diff -r 509371f07501 -r f026866216ec tools/ocaml/libs/xl/xl.ml
--- a/tools/ocaml/libs/xl/xl.ml Wed Apr 20 17:13:07 2011 +0100
+++ b/tools/ocaml/libs/xl/xl.ml Wed Apr 20 17:13:08 2011 +0100
@@ -64,7 +64,6 @@
backend_domid : domid;
devid : int;
}
-
external add : t -> domid -> unit = "stub_xl_device_vkb_add"
external clean_shutdown : domid -> unit =
"stub_xl_device_vkb_clean_shutdown"
external hard_shutdown : domid -> unit =
"stub_xl_device_vkb_hard_shutdown"
@@ -77,7 +76,6 @@
devid : int;
consoletype : console_type;
}
-
external add : t -> domid -> unit = "stub_xl_device_console_add"
end
@@ -92,7 +90,6 @@
readwrite : bool;
is_cdrom : bool;
}
-
external add : t -> domid -> unit = "stub_xl_device_disk_add"
external del : t -> domid -> unit = "stub_xl_device_disk_del"
end
@@ -125,7 +122,6 @@
msitranslate : bool;
power_mgmt : bool;
}
-
external add : t -> domid -> unit = "stub_xl_device_pci_add"
external remove : t -> domid -> unit = "stub_xl_device_pci_remove"
external shutdown : domid -> unit = "stub_xl_device_pci_shutdown"
@@ -134,17 +130,17 @@
module Physinfo = struct
type t =
{
- threads_per_core: int;
- cores_per_socket: int;
- max_cpu_id: int;
- nr_cpus: int;
- cpu_khz: int;
- total_pages: int64;
- free_pages: int64;
- scrub_pages: int64;
- nr_nodes: int;
- hwcap: int32 array;
- physcap: int32;
+ threads_per_core : int;
+ cores_per_socket : int;
+ max_cpu_id : int;
+ nr_cpus : int;
+ cpu_khz : int;
+ total_pages : int64;
+ free_pages : int64;
+ scrub_pages : int64;
+ nr_nodes : int;
+ hwcap : int32 array;
+ physcap : int32;
}
external get : unit -> t = "stub_xl_physinfo"
@@ -153,8 +149,8 @@
module Sched_credit = struct
type t =
{
- weight: int;
- cap: int;
+ weight : int;
+ cap : int;
}
external domain_get : domid -> t = "stub_xl_sched_credit_domain_get"
external domain_set : domid -> t -> unit =
"stub_xl_sched_credit_domain_set"
@@ -163,11 +159,11 @@
module Topologyinfo = struct
type t =
{
- core: int;
- socket: int;
- node: int;
+ core : int;
+ socket : int;
+ node : int;
}
- external get: unit -> t = "stub_xl_topologyinfo"
+ external get : unit -> t = "stub_xl_topologyinfo"
end
external button_press : domid -> button -> unit = "stub_xl_button_press"
diff -r 509371f07501 -r f026866216ec tools/ocaml/libs/xl/xl.mli
--- a/tools/ocaml/libs/xl/xl.mli Wed Apr 20 17:13:07 2011 +0100
+++ b/tools/ocaml/libs/xl/xl.mli Wed Apr 20 17:13:08 2011 +0100
@@ -64,7 +64,6 @@
backend_domid : domid;
devid : int;
}
-
external add : t -> domid -> unit = "stub_xl_device_vkb_add"
external clean_shutdown : domid -> unit =
"stub_xl_device_vkb_clean_shutdown"
external hard_shutdown : domid -> unit =
"stub_xl_device_vkb_hard_shutdown"
@@ -92,7 +91,6 @@
readwrite : bool;
is_cdrom : bool;
}
-
external add : t -> domid -> unit = "stub_xl_device_disk_add"
external del : t -> domid -> unit = "stub_xl_device_disk_del"
end
@@ -125,7 +123,6 @@
msitranslate : bool;
power_mgmt : bool;
}
-
external add : t -> domid -> unit = "stub_xl_device_pci_add"
external remove : t -> domid -> unit = "stub_xl_device_pci_remove"
external shutdown : domid -> unit = "stub_xl_device_pci_shutdown"
@@ -134,29 +131,27 @@
module Physinfo : sig
type t =
{
- threads_per_core: int;
- cores_per_socket: int;
- max_cpu_id: int;
- nr_cpus: int;
- cpu_khz: int;
- total_pages: int64;
- free_pages: int64;
- scrub_pages: int64;
- nr_nodes: int;
- hwcap: int32 array;
- physcap: int32;
+ threads_per_core : int;
+ cores_per_socket : int;
+ max_cpu_id : int;
+ nr_cpus : int;
+ cpu_khz : int;
+ total_pages : int64;
+ free_pages : int64;
+ scrub_pages : int64;
+ nr_nodes : int;
+ hwcap : int32 array;
+ physcap : int32;
}
external get : unit -> t = "stub_xl_physinfo"
-
end
module Sched_credit : sig
type t =
{
- weight: int;
- cap: int;
+ weight : int;
+ cap : int;
}
-
external domain_get : domid -> t = "stub_xl_sched_credit_domain_get"
external domain_set : domid -> t -> unit =
"stub_xl_sched_credit_domain_set"
end
@@ -164,9 +159,9 @@
module Topologyinfo : sig
type t =
{
- core: int;
- socket: int;
- node: int;
+ core : int;
+ socket : int;
+ node : int;
}
external get : unit -> t = "stub_xl_topologyinfo"
end
diff -r 509371f07501 -r f026866216ec tools/ocaml/libs/xl/xl_stubs.c
--- a/tools/ocaml/libs/xl/xl_stubs.c Wed Apr 20 17:13:07 2011 +0100
+++ b/tools/ocaml/libs/xl/xl_stubs.c Wed Apr 20 17:13:08 2011 +0100
@@ -283,7 +283,7 @@
int i;
topologyinfo = caml_alloc_tuple(c_val->coremap.entries);
- for (i = 0; i < c_val->coremap.entries; i++) {
+ for (i = 0; i < c_val->coremap.entries; i++) {
v = Val_int(0); /* None */
if (c_val->coremap.array[i] != LIBXL_CPUARRAY_INVALID_ENTRY) {
topology = caml_alloc_tuple(3);
@@ -398,7 +398,7 @@
if (ret != 0)
failwith_xl("vkb_add", &lg);
FREE_CTX();
-
+
CAMLreturn(Val_unit);
}
@@ -413,7 +413,7 @@
if (ret != 0)
failwith_xl("vkb_clean_shutdown", &lg);
FREE_CTX();
-
+
CAMLreturn(Val_unit);
}
@@ -428,7 +428,7 @@
if (ret != 0)
failwith_xl("vkb_hard_shutdown", &lg);
FREE_CTX();
-
+
CAMLreturn(Val_unit);
}
@@ -446,7 +446,7 @@
if (ret != 0)
failwith_xl("vfb_add", &lg);
FREE_CTX();
-
+
CAMLreturn(Val_unit);
}
@@ -461,7 +461,7 @@
if (ret != 0)
failwith_xl("vfb_clean_shutdown", &lg);
FREE_CTX();
-
+
CAMLreturn(Val_unit);
}
@@ -476,7 +476,7 @@
if (ret != 0)
failwith_xl("vfb_hard_shutdown", &lg);
FREE_CTX();
-
+
CAMLreturn(Val_unit);
}
@@ -494,7 +494,7 @@
if (ret != 0)
failwith_xl("pci_add", &lg);
FREE_CTX();
-
+
CAMLreturn(Val_unit);
}
@@ -512,7 +512,7 @@
if (ret != 0)
failwith_xl("pci_remove", &lg);
FREE_CTX();
-
+
CAMLreturn(Val_unit);
}
@@ -527,7 +527,7 @@
if (ret != 0)
failwith_xl("pci_shutdown", &lg);
FREE_CTX();
-
+
CAMLreturn(Val_unit);
}
@@ -536,7 +536,7 @@
CAMLparam2(domid, button);
int ret;
INIT_STRUCT();
-
+
INIT_CTX();
ret = libxl_button_press(ctx, Int_val(domid), Int_val(button) +
LIBXL_BUTTON_POWER);
if (ret != 0)
_______________________________________________
Xen-changelog mailing list
Xen-changelog@xxxxxxxxxxxxxxxxxxx
http://lists.xensource.com/xen-changelog
|
Home