From 2ecccfce384e6fa2902c03f795cbc74ad950059d Mon Sep 17 00:00:00 2001 From: "Richard W.M. Jones" Date: Tue, 9 Nov 2021 10:11:02 +0000 Subject: [PATCH] daemon: Replace "noalloc" with [@@noalloc] --- daemon/md.c | 2 +- daemon/md.ml | 2 +- daemon/utils-c.c | 10 +++++----- daemon/utils.ml | 10 +++++----- 4 files changed, 12 insertions(+), 12 deletions(-) diff --git a/daemon/md.c b/daemon/md.c index 973418285..7d9051cdd 100644 --- a/daemon/md.c +++ b/daemon/md.c @@ -51,7 +51,7 @@ optgroup_mdadm_available (void) */ extern value guestfs_int_daemon_is_raid_device (value devicev); -/* NB: This is a "noalloc" call. */ +/* NB: This is a [@@noalloc] call. */ value guestfs_int_daemon_is_raid_device (value devv) { diff --git a/daemon/md.ml b/daemon/md.ml index 743f2cd26..bed0e6def 100644 --- a/daemon/md.ml +++ b/daemon/md.ml @@ -23,7 +23,7 @@ open Std_utils open Utils external is_raid_device : string -> bool = - "guestfs_int_daemon_is_raid_device" "noalloc" + "guestfs_int_daemon_is_raid_device" [@@noalloc] let re_md = PCRE.compile "^md[0-9]+$" diff --git a/daemon/utils-c.c b/daemon/utils-c.c index d3a8f330b..9e0c809d7 100644 --- a/daemon/utils-c.c +++ b/daemon/utils-c.c @@ -37,35 +37,35 @@ #pragma GCC diagnostic ignored "-Wmissing-prototypes" -/* NB: This is a "noalloc" call. */ +/* NB: This is a [@@noalloc] call. */ value guestfs_int_daemon_get_verbose_flag (value unitv) { return Val_bool (verbose); } -/* NB: This is a "noalloc" call. */ +/* NB: This is a [@@noalloc] call. */ value guestfs_int_daemon_is_device_parameter (value device) { return Val_bool (is_device_parameter (String_val (device))); } -/* NB: This is a "noalloc" call. */ +/* NB: This is a [@@noalloc] call. */ value guestfs_int_daemon_is_root_device (value device) { return Val_bool (is_root_device (String_val (device))); } -/* NB: This is a "noalloc" call. */ +/* NB: This is a [@@noalloc] call. */ value guestfs_int_daemon_prog_exists (value prog) { return Val_bool (prog_exists (String_val (prog))); } -/* NB: This is a "noalloc" call. */ +/* NB: This is a [@@noalloc] call. */ value guestfs_int_daemon_udev_settle (value optfilenamev, value unitv) { diff --git a/daemon/utils.ml b/daemon/utils.ml index 92e25fb39..b56306055 100644 --- a/daemon/utils.ml +++ b/daemon/utils.ml @@ -21,11 +21,11 @@ open Printf open Std_utils -external get_verbose_flag : unit -> bool = "guestfs_int_daemon_get_verbose_flag" "noalloc" -external is_device_parameter : string -> bool = "guestfs_int_daemon_is_device_parameter" "noalloc" -external is_root_device : string -> bool = "guestfs_int_daemon_is_root_device" "noalloc" -external prog_exists : string -> bool = "guestfs_int_daemon_prog_exists" "noalloc" -external udev_settle : ?filename:string -> unit -> unit = "guestfs_int_daemon_udev_settle" "noalloc" +external get_verbose_flag : unit -> bool = "guestfs_int_daemon_get_verbose_flag" [@@noalloc] +external is_device_parameter : string -> bool = "guestfs_int_daemon_is_device_parameter" [@@noalloc] +external is_root_device : string -> bool = "guestfs_int_daemon_is_root_device" [@@noalloc] +external prog_exists : string -> bool = "guestfs_int_daemon_prog_exists" [@@noalloc] +external udev_settle : ?filename:string -> unit -> unit = "guestfs_int_daemon_udev_settle" [@@noalloc] let commandr ?(fold_stdout_on_stderr = false) prog args = if verbose () then