Skip to content

Commit fa9639b

Browse files
authored
Merge pull request xapi-project#130 from jonludlam/CP-18404
CP-18404: Add boolean force option to VM.start
2 parents a74e90a + 2cc27e2 commit fa9639b

File tree

1 file changed

+4
-5
lines changed

1 file changed

+4
-5
lines changed

xen/xenops_interface.ml

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -94,7 +94,7 @@ module Network = struct
9494
| Local of string (** name of a local switch *)
9595
| Remote of string * string (** vm.id * switch *)
9696
type ts = t list
97-
97+
9898
let default_t = Local "xenbr0"
9999
end
100100

@@ -177,7 +177,7 @@ module Vm = struct
177177
with sexp
178178

179179
let default_video_card = Cirrus
180-
180+
181181
type hvm_info = {
182182
hap: bool;
183183
shadow_multiplier: float;
@@ -633,7 +633,7 @@ module VM = struct
633633
external migrate_receive_memory: debug_info -> Vm.id -> int64 -> string -> Xcp_channel.t -> Task.id option = ""
634634

635635
external create: debug_info -> Vm.id -> Task.id = ""
636-
external build: debug_info -> Vm.id -> Task.id = ""
636+
external build: debug_info -> Vm.id -> bool -> Task.id = ""
637637
external create_device_model: debug_info -> Vm.id -> bool -> Task.id = ""
638638
external destroy: debug_info -> Vm.id -> Task.id = ""
639639
external pause: debug_info -> Vm.id -> Task.id = ""
@@ -649,7 +649,7 @@ module VM = struct
649649
external list: debug_info -> unit -> (Vm.t * Vm.state) list = ""
650650
external delay: debug_info -> Vm.id -> float -> Task.id = ""
651651

652-
external start: debug_info -> Vm.id -> Task.id = ""
652+
external start: debug_info -> Vm.id -> bool -> Task.id = ""
653653
external shutdown: debug_info -> Vm.id -> float option -> Task.id = ""
654654
external reboot: debug_info -> Vm.id -> float option -> Task.id = ""
655655
external suspend: debug_info -> Vm.id -> disk -> Task.id = ""
@@ -713,4 +713,3 @@ module DEBUG = struct
713713
external trigger: debug_info -> string -> string list -> unit = ""
714714
external shutdown: debug_info -> unit -> unit = ""
715715
end
716-

0 commit comments

Comments
 (0)