On 20.05.2015 18:11, Michal Privoznik wrote:
On 20.05.2015 07:19, Martin Kletzander wrote:
> For now there are only CONNECT_OPEN and CONNECT_CLOSE procedures.
>
> Signed-off-by: Martin Kletzander <mkletzan(a)redhat.com>
> ---
> .gitignore | 1 +
> src/Makefile.am | 13 +++++++++-
> src/admin/admin_protocol.x | 65 ++++++++++++++++++++++++++++++++++++++++++++++
> src/admin_protocol-structs | 9 +++++++
> 4 files changed, 87 insertions(+), 1 deletion(-)
> create mode 100644 src/admin/admin_protocol.x
> create mode 100644 src/admin_protocol-structs
>
ACK
I guess my ACK was premature. This needs to be squashed in for struct test to work:
diff --git a/src/Makefile.am b/src/Makefile.am
index 7e4554d..bd3f211 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -429,7 +429,7 @@ MAINTAINERCLEANFILES += $(ADMIN_PROTOCOL_GENERATED)
# The alternation of the following regexps matches both cases.
r1 = /\* \d+ \*/
r2 = /\* <[[:xdigit:]]+> \S+:\d+ \*/
-struct_prefix = (remote_|qemu_|lxc_|keepalive|vir(Net|LockSpace|LXCMonitor))
+struct_prefix = (remote_|qemu_|lxc_|keepalive|admin_|vir(Net|LockSpace|LXCMonitor))
# Depending on configure options, libtool creates one or both of
# remote/{,.libs/}libvirt_driver_remote_la-remote_protocol.o. We want
diff --git a/src/admin_protocol-structs b/src/admin_protocol-structs
index bc1d489..3ac31fa 100644
--- a/src/admin_protocol-structs
+++ b/src/admin_protocol-structs
@@ -1,9 +1,8 @@
/* -*- c -*- */
struct admin_connect_open_args {
- unsigned int flags;
+ u_int flags;
};
-
enum admin_procedure {
- ADMIN_PROC_CONNECT_OPEN = 1,
- ADMIN_PROC_CONNECT_CLOSE = 2,
+ ADMIN_PROC_CONNECT_OPEN = 1,
+ ADMIN_PROC_CONNECT_CLOSE = 2,
};
Michal