On Tue, Jun 14, 2016 at 07:21:31PM -0400, Cole Robinson wrote:
On 06/14/2016 04:29 PM, Jovanka Gulicoska wrote:Changes since v2: fix comment formating, change in comment, move REMOTE_PROC_STORAGE_POOL_EVENT_LIFECYCLE to buttom of list --- daemon/libvirtd.h | 2 + daemon/remote.c | 207 ++++++++++++++++++++++++++++++++++++++++++- src/remote/remote_driver.c | 128 ++++++++++++++++++++++++++ src/remote/remote_protocol.x | 43 ++++++++- src/remote_protocol-structs | 16 ++++ 5 files changed, 392 insertions(+), 4 deletions(-)diff --git a/src/remote_protocol-structs b/src/remote_protocol-structs index fe1b8a8..85bc62d 100644 --- a/src/remote_protocol-structs +++ b/src/remote_protocol-structs @@ -2551,6 +2551,22 @@ struct remote_network_event_lifecycle_msg { int event; int detail; }; +struct remote_connect_storage_pool_event_register_any_args { + int eventID; + remote_storage_pool pool; +}; +struct remote_connect_storage_pool_event_register_any_ret { + int callbackID; +}; +struct remote_connect_storage_pool_event_deregister_any_args { + int callbackID; +}; +struct remote_storage_pool_event_lifecycle_msg { + int callbackID; + remote_nonnull_storage_pool pool; + int event; + int detail; +}; struct remote_domain_fsfreeze_args { remote_nonnull_domain dom; struct {This looks like it's missing peter's suggested change to avoid the 'make check' error (which I don't think you or I can reproduce but it seems to be some other build system problem)
That's because you don't have dvarwes installed (that installs pdwtags
which extracts this info that we can compare). It's just a matter of
indentation. Trying to match what's in other struct should just work.
Here is the full diff I got when I applied this series and ran a build:
diff --git i/src/remote_protocol-structs w/src/remote_protocol-structs
index 85bc62dac726..3934e0751b28 100644
--- i/src/remote_protocol-structs
+++ w/src/remote_protocol-structs
@@ -2552,8 +2552,8 @@ struct remote_network_event_lifecycle_msg {
int detail;
};
struct remote_connect_storage_pool_event_register_any_args {
- int eventID;
- remote_storage_pool pool;
+ int eventID;
+ remote_storage_pool pool;
};
struct remote_connect_storage_pool_event_register_any_ret {
int callbackID;
@@ -2562,10 +2562,10 @@ struct remote_connect_storage_pool_event_deregister_any_args {
int callbackID;
};
struct remote_storage_pool_event_lifecycle_msg {
- int callbackID;
- remote_nonnull_storage_pool pool;
- int event;
- int detail;
+ int callbackID;
+ remote_nonnull_storage_pool pool;
+ int event;
+ int detail;
};
struct remote_domain_fsfreeze_args {
remote_nonnull_domain dom;
@@ -3119,4 +3119,7 @@ enum remote_procedure {
REMOTE_PROC_DOMAIN_GET_PERF_EVENTS = 365,
REMOTE_PROC_DOMAIN_SET_PERF_EVENTS = 366,
REMOTE_PROC_DOMAIN_EVENT_CALLBACK_DEVICE_REMOVAL_FAILED = 367,
+ REMOTE_PROC_CONNECT_STORAGE_POOL_EVENT_REGISTER_ANY = 368,
+ REMOTE_PROC_CONNECT_STORAGE_POOL_EVENT_DEREGISTER_ANY = 369,
+ REMOTE_PROC_STORAGE_POOL_EVENT_LIFECYCLE = 370,
};
--
When I applied this the build succeeded.
Hope this helps,
Martin
- Cole -- libvir-list mailing list libvir-list@xxxxxxxxxx https://www.redhat.com/mailman/listinfo/libvir-list
Attachment:
signature.asc
Description: Digital signature
-- libvir-list mailing list libvir-list@xxxxxxxxxx https://www.redhat.com/mailman/listinfo/libvir-list