git.annexia.org
/
libguestfs.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Add prototype for timeval_diff.
[libguestfs.git]
/
generator
/
generator_xdr.ml
diff --git
a/generator/generator_xdr.ml
b/generator/generator_xdr.ml
index
7f2e6eb
..
5714c80
100644
(file)
--- a/
generator/generator_xdr.ml
+++ b/
generator/generator_xdr.ml
@@
-64,10
+64,15
@@
let generate_xdr () =
) structs;
List.iter (
) structs;
List.iter (
- fun (shortname,
style
, _, _, _, _, _) ->
+ fun (shortname,
(ret, args, optargs)
, _, _, _, _, _) ->
let name = "guestfs_" ^ shortname in
let name = "guestfs_" ^ shortname in
- (match snd style with
+ (* Ordinary arguments and optional arguments are concatenated
+ * together in the XDR args struct. The optargs_bitmask field
+ * in the header controls which optional arguments are
+ * meaningful.
+ *)
+ (match args @ optargs with
| [] -> ()
| args ->
pr "struct %s_args {\n" name;
| [] -> ()
| args ->
pr "struct %s_args {\n" name;
@@
-83,10
+88,11
@@
let generate_xdr () =
| BufferIn n ->
pr " opaque %s<>;\n" n
| FileIn _ | FileOut _ -> ()
| BufferIn n ->
pr " opaque %s<>;\n" n
| FileIn _ | FileOut _ -> ()
+ | Pointer _ -> assert false
) args;
pr "};\n\n"
);
) args;
pr "};\n\n"
);
- (match
fst style
with
+ (match
ret
with
| RErr -> ()
| RInt n ->
pr "struct %s_ret {\n" name;
| RErr -> ()
| RInt n ->
pr "struct %s_ret {\n" name;
@@
-154,7
+160,7
@@
let generate_xdr () =
*/
const GUESTFS_PROGRAM = 0x2000F5F5;
*/
const GUESTFS_PROGRAM = 0x2000F5F5;
-const GUESTFS_PROTOCOL_VERSION =
2
;
+const GUESTFS_PROTOCOL_VERSION =
4
;
/* These constants must be larger than any possible message length. */
const GUESTFS_LAUNCH_FLAG = 0xf5f55ff5;
/* These constants must be larger than any possible message length. */
const GUESTFS_LAUNCH_FLAG = 0xf5f55ff5;
@@
-178,7
+184,8
@@
enum guestfs_message_status {
pr "\
struct guestfs_message_error {
pr "\
struct guestfs_message_error {
- int linux_errno; /* Linux errno if available. */
+ string errno_string<32>; /* errno eg. \"EINVAL\", empty string
+ if errno not available */
string error_message<GUESTFS_ERROR_LEN>;
};
string error_message<GUESTFS_ERROR_LEN>;
};
@@
-188,6
+195,8
@@
struct guestfs_message_header {
guestfs_procedure proc; /* GUESTFS_PROC_x */
guestfs_message_direction direction;
unsigned serial; /* message serial number */
guestfs_procedure proc; /* GUESTFS_PROC_x */
guestfs_message_direction direction;
unsigned serial; /* message serial number */
+ unsigned hyper progress_hint; /* upload hint for progress bar */
+ unsigned hyper optargs_bitmask; /* bitmask for optional args */
guestfs_message_status status;
};
guestfs_message_status status;
};