reindent couple of options

diff --git a/xenops/device.ml b/xenops/device.ml
index 56fdc43445d5400f66d59339593bd8de8a30811e..e6c562823d99ec9ec37a569b6420f2a39a0cc3aa 100644 (file)
--- a/xenops/device.ml
+++ b/xenops/device.ml
@@ -1066,7 +1066,7 @@ type info = {
        sound: string option;
        power_mgmt: int;
        oem_features: int;
-        inject_sci: int;
+       inject_sci: int;
        videoram: int;
        extras: (string * string option) list;
 }
@@ -1133,17 +1133,17 @@ let __start ~xs ~dmpath ~restore ?(timeout=qemu_dm_ready_timeout) info domid =
        ) info.nics in
        let qemu_pid_path = xs.Xs.getdomainpath domid ^ "/qemu-pid" in
 
-        if info.power_mgmt <> 0 then begin
-                try if (Unix.stat "/proc/acpi/battery").Unix.st_kind == Unix.S_DIR then
-                                xs.Xs.write (power_mgmt_path domid) (string_of_int info.power_mgmt);
-                with _ -> () ;
-        end;
+       if info.power_mgmt <> 0 then begin
+               try if (Unix.stat "/proc/acpi/battery").Unix.st_kind == Unix.S_DIR then
+                               xs.Xs.write (power_mgmt_path domid) (string_of_int info.power_mgmt);
+               with _ -> () ;
+       end;
 
-        if info.oem_features <> 0 then
-                xs.Xs.write (oem_features_path domid) (string_of_int info.oem_features);
+       if info.oem_features <> 0 then
+               xs.Xs.write (oem_features_path domid) (string_of_int info.oem_features);
 
-        if info.inject_sci <> 0 then
-                xs.Xs.write (inject_sci_path domid) (string_of_int info.inject_sci);
+       if info.inject_sci <> 0 then
+               xs.Xs.write (inject_sci_path domid) (string_of_int info.inject_sci);
 
        let log = logfile domid in
        let restorefile = sprintf "/tmp/xen.qemu-dm.%d" domid in

diff --git a/xenvm/vmact.ml b/xenvm/vmact.ml
index 0ce31849e71228a8e39904228b2068435d0ccdd1..558f8c64914e167f5cc3052c852291859c4f9a8a 100644 (file)
--- a/xenvm/vmact.ml
+++ b/xenvm/vmact.ml
@@ -134,7 +134,7 @@ let dm_info_of_cfg cfg =
                Device.Dm.disp = disp;
                Device.Dm.power_mgmt = cfg.power_management;
                Device.Dm.oem_features = cfg.oem_features;
-                Device.Dm.inject_sci = cfg.inject_sci;
+               Device.Dm.inject_sci = cfg.inject_sci;
                Device.Dm.videoram = (match cfg.videoram with None -> 4 | Some i -> i);
                Device.Dm.extras = cfg.extrahvm;
        }

diff --git a/xenvm/vmconfig.ml b/xenvm/vmconfig.ml
index 406ffd1823dc295c79d7321255dc4caae8b8ecff..ddeeded4fcf148961c08500e214fbcd6009b8646 100644 (file)
--- a/xenvm/vmconfig.ml
+++ b/xenvm/vmconfig.ml
@@ -110,9 +110,9 @@ type config = {
        vpt_align: int option;
        extra_local_watches: string list;
        extra_vm_watches: string list;
-        pci_msitranslate: int;
+       pci_msitranslate: int;
        sound: string option;
-        inject_sci: int;
+       inject_sci: int;
 }
 
 module Config = struct
@@ -262,9 +262,9 @@ let get cfg field =
        | "hpet"      -> string_of_int_option cfg.hpet
        | "vpt-align" -> string_of_int_option cfg.vpt_align
        | "power-management" -> string_of_int cfg.power_management
-        | "oem-features" -> string_of_int cfg.oem_features
-        | "pci-msitranslate" -> string_of_int cfg.pci_msitranslate
-        | "inject-sci" -> string_of_int cfg.inject_sci
+       | "oem-features" -> string_of_int cfg.oem_features
+       | "pci-msitranslate" -> string_of_int cfg.pci_msitranslate
+       | "inject-sci" -> string_of_int cfg.inject_sci
        | _            -> raise (Unknown_field field)
 
 let set cfg field value =
@@ -293,9 +293,9 @@ let set cfg field value =
        | "hpet"      -> { cfg with hpet = int_option_of_string value }
        | "vpt-align" -> { cfg with vpt_align = int_option_of_string value }
        | "power-management" -> { cfg with power_management = int_of_string value }
-        | "oem-features" -> { cfg with oem_features = int_of_string value }
-        | "pci-msitranslate" -> { cfg with pci_msitranslate = int_of_string value }
-        | "inject-sci" -> { cfg with inject_sci = int_of_string value } 
+       | "oem-features" -> { cfg with oem_features = int_of_string value }
+       | "pci-msitranslate" -> { cfg with pci_msitranslate = int_of_string value }
+       | "inject-sci" -> { cfg with inject_sci = int_of_string value } 
        | _           -> raise (Unknown_field field)
 
 let of_file error_report file =
@@ -348,7 +348,7 @@ let of_file error_report file =
        and extra_vm_watches = ref []
         and pci_msitranslate = ref 0 
        and sound = ref None
-        and inject_sci = ref 0
+       and inject_sci = ref 0
        in
 
        let set_action ref_var s =
@@ -500,7 +500,7 @@ let of_file error_report file =
                ("extra-vm-watch", Config.String set_vm_watch);
                 ("pci-msitranslate", Config.Set_int pci_msitranslate);
                ("sound", Config.String (fun s -> sound := Some s));
-                ("inject-sci", Config.Set_int inject_sci);
+               ("inject-sci", Config.Set_int inject_sci);
        ] in
 
        begin try
@@ -587,7 +587,7 @@ let of_file error_report file =
                notify = !notify;
                daemonize = !daemonize;
                power_management = !power_management;
-                oem_features = !oem_features;
+               oem_features = !oem_features;
                timer_mode = !timer_mode;
                timeoffset = !timeoffset;
                hpet = !hpet;
@@ -595,8 +595,8 @@ let of_file error_report file =
                snapshot_mode = !snapshot_mode;
                extra_local_watches = List.rev !extra_local_watches;
                extra_vm_watches = List.rev !extra_vm_watches;
-                pci_msitranslate = !pci_msitranslate;
+               pci_msitranslate = !pci_msitranslate;
                sound = !sound;
-                inject_sci = !inject_sci;
+               inject_sci = !inject_sci;
        }
 end

diff --git a/xenvm/xenvm.readme b/xenvm/xenvm.readme
index ab699d4ea5e4ecb2c76321c7a0af5be787e5bdc2..759f3e5d1fcf663b38b236873728f49f83805a82 100644 (file)
--- a/xenvm/xenvm.readme
+++ b/xenvm/xenvm.readme
@@ -81,7 +81,7 @@ timer-mode = int -- specify the timer mode used.
 timeoffset = string -- specify the time offset (i.e. timezone) used.
 pci-msitranslate = int -- specify whether or not to use MSI-INTx translation for guest.
 inject-sci = int -- specify whether or not to inject SCIs like lid close, power button press to guest.
-                    Default is to not inject SCIs but rely on xenmgr to implement relevant action.
+                    Default is to not inject SCIs.
 
 = Sending command to the monitor