Skip to content
This repository was archived by the owner on May 22, 2018. It is now read-only.

Commit e9bacca

Browse files
CA-141364: Remove redundant (and erroneous bindings)
We no longer need these bindings since this work is done in Xenguest. Also, it appears both of the bindings mistakenly make the same call into libxc. Signed-off-by: Si Beaumont <[email protected]>
1 parent 0409955 commit e9bacca

File tree

3 files changed

+0
-35
lines changed

3 files changed

+0
-35
lines changed

xenctrlext/xenctrlext.ml

-2
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,6 @@ open Xenctrl
1717
external get_boot_cpufeatures: handle -> (int32 * int32 * int32 * int32 * int32 * int32 * int32 * int32) = "stub_xenctrlext_get_boot_cpufeatures"
1818

1919
external domain_set_timer_mode: handle -> domid -> int -> unit = "stub_xenctrlext_domain_set_timer_mode"
20-
external domain_set_hpet: handle -> domid -> int -> unit = "stub_xenctrlext_domain_set_hpet"
21-
external domain_set_vpt_align: handle -> domid -> int -> unit = "stub_xenctrlext_domain_set_vpt_align"
2220

2321
external domain_send_s3resume: handle -> domid -> unit = "stub_xenctrlext_domain_send_s3resume"
2422
external domain_get_acpi_s_state: handle -> domid -> int = "stub_xenctrlext_domain_get_acpi_s_state"

xenctrlext/xenctrlext.mli

-2
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,6 @@ open Xenctrl
1717
external get_boot_cpufeatures: handle -> (int32 * int32 * int32 * int32 * int32 * int32 * int32 * int32) = "stub_xenctrlext_get_boot_cpufeatures"
1818

1919
external domain_set_timer_mode: handle -> domid -> int -> unit = "stub_xenctrlext_domain_set_timer_mode"
20-
external domain_set_hpet: handle -> domid -> int -> unit = "stub_xenctrlext_domain_set_hpet"
21-
external domain_set_vpt_align: handle -> domid -> int -> unit = "stub_xenctrlext_domain_set_vpt_align"
2220

2321
external domain_send_s3resume: handle -> domid -> unit = "stub_xenctrlext_domain_send_s3resume"
2422
external domain_get_acpi_s_state: handle -> domid -> int = "stub_xenctrlext_domain_get_acpi_s_state"

xenctrlext/xenctrlext_stubs.c

-31
Original file line numberDiff line numberDiff line change
@@ -125,15 +125,6 @@ static int xcext_domain_set_timer_mode(xc_interface *xch, unsigned int domid, in
125125
HVM_PARAM_TIMER_MODE, (unsigned long) mode);
126126
}
127127

128-
static int xcext_domain_set_hpet(xc_interface *xch, unsigned int domid, int hpet)
129-
{
130-
return xc_set_hvm_param(xch, domid, HVM_PARAM_HPET_ENABLED, (unsigned long) hpet);
131-
}
132-
static int xcext_domain_set_vpt_align(xc_interface *xch, unsigned int domid, int vpt_align)
133-
{
134-
return xc_set_hvm_param(xch, domid, HVM_PARAM_HPET_ENABLED, (unsigned long) vpt_align);
135-
}
136-
137128
CAMLprim value stub_xenctrlext_domain_get_acpi_s_state(value xch, value domid)
138129
{
139130
CAMLparam2(xch, domid);
@@ -165,28 +156,6 @@ CAMLprim value stub_xenctrlext_domain_set_timer_mode(value xch, value id, value
165156
CAMLreturn(Val_unit);
166157
}
167158

168-
CAMLprim value stub_xenctrlext_domain_set_hpet(value xch, value id, value mode)
169-
{
170-
CAMLparam3(xch, id, mode);
171-
int ret;
172-
173-
ret = xcext_domain_set_hpet(_H(xch), _D(id), Int_val(mode));
174-
if (ret < 0)
175-
failwith_xc(_H(xch));
176-
CAMLreturn(Val_unit);
177-
}
178-
179-
CAMLprim value stub_xenctrlext_domain_set_vpt_align(value xch, value id, value mode)
180-
{
181-
CAMLparam3(xch, id, mode);
182-
int ret;
183-
184-
ret = xcext_domain_set_vpt_align(_H(xch), _D(id), Int_val(mode));
185-
if (ret < 0)
186-
failwith_xc(_H(xch));
187-
CAMLreturn(Val_unit);
188-
}
189-
190159
CAMLprim value stub_xenctrlext_domain_trigger_power(value xch, value domid)
191160
{
192161
CAMLparam2(xch, domid);

0 commit comments

Comments
 (0)