Re: [libvirt] [PATCH libvirt 3/3] events: remove remoteEventQueue wrapper function

2018-06-12 Thread Anya Harter 



On 06/11/2018 03:38 PM, Anya Harter wrote:
>>From remote_driver.c
> 
> And replace all calls with virObjectEventStateQueue such that:
> 
> remoteEventQueue(priv, event, callbackID);
> 
> becomes:
> 
> virObjectEventStateQueue(priv->eventState, event, callbackID);

Just a quick edit...

The last line of the commit message should read:
virObjectEventStateQueueRemote(priv->eventState, event, callbackID);

> 
> Signed-off-by: Anya Harter 
> ---
>  src/remote/remote_driver.c | 74 +-
>  1 file changed, 33 insertions(+), 41 deletions(-)
> 
> diff --git a/src/remote/remote_driver.c b/src/remote/remote_driver.c
> index fbec5c727b..c36941c27e 100644
> --- a/src/remote/remote_driver.c
> +++ b/src/remote/remote_driver.c
> @@ -4431,14 +4431,6 @@ remoteConnectDomainEventDeregister(virConnectPtr conn,
>  }
>  
>  
> -static void
> -remoteEventQueue(struct private_data *priv, virObjectEventPtr event,
> - int remoteID)
> -{
> -virObjectEventStateQueueRemote(priv->eventState, event, remoteID);
> -}
> -
> -
>  static void
>  remoteDomainBuildEventLifecycleHelper(virConnectPtr conn,
>remote_domain_event_lifecycle_msg *msg,
> @@ -4455,7 +4447,7 @@ remoteDomainBuildEventLifecycleHelper(virConnectPtr 
> conn,
>  event = virDomainEventLifecycleNewFromDom(dom, msg->event, msg->detail);
>  virObjectUnref(dom);
>  
> -remoteEventQueue(priv, event, callbackID);
> +virObjectEventStateQueueRemote(priv->eventState, event, callbackID);
>  }
>  static void
>  remoteDomainBuildEventLifecycle(virNetClientProgramPtr prog ATTRIBUTE_UNUSED,
> @@ -4493,7 +4485,7 @@ remoteDomainBuildEventRebootHelper(virConnectPtr conn,
>  event = virDomainEventRebootNewFromDom(dom);
>  virObjectUnref(dom);
>  
> -remoteEventQueue(priv, event, callbackID);
> +virObjectEventStateQueueRemote(priv->eventState, event, callbackID);
>  }
>  static void
>  remoteDomainBuildEventReboot(virNetClientProgramPtr prog ATTRIBUTE_UNUSED,
> @@ -4530,7 +4522,7 @@ remoteDomainBuildEventRTCChangeHelper(virConnectPtr 
> conn,
>  event = virDomainEventRTCChangeNewFromDom(dom, msg->offset);
>  virObjectUnref(dom);
>  
> -remoteEventQueue(priv, event, callbackID);
> +virObjectEventStateQueueRemote(priv->eventState, event, callbackID);
>  }
>  static void
>  remoteDomainBuildEventRTCChange(virNetClientProgramPtr prog ATTRIBUTE_UNUSED,
> @@ -4567,7 +4559,7 @@ remoteDomainBuildEventWatchdogHelper(virConnectPtr conn,
>  event = virDomainEventWatchdogNewFromDom(dom, msg->action);
>  virObjectUnref(dom);
>  
> -remoteEventQueue(priv, event, callbackID);
> +virObjectEventStateQueueRemote(priv->eventState, event, callbackID);
>  }
>  static void
>  remoteDomainBuildEventWatchdog(virNetClientProgramPtr prog ATTRIBUTE_UNUSED,
> @@ -4607,7 +4599,7 @@ remoteDomainBuildEventIOErrorHelper(virConnectPtr conn,
>  msg->action);
>  virObjectUnref(dom);
>  
> -remoteEventQueue(priv, event, callbackID);
> +virObjectEventStateQueueRemote(priv->eventState, event, callbackID);
>  }
>  static void
>  remoteDomainBuildEventIOError(virNetClientProgramPtr prog ATTRIBUTE_UNUSED,
> @@ -4649,7 +4641,7 @@ remoteDomainBuildEventIOErrorReasonHelper(virConnectPtr 
> conn,
>  
>  virObjectUnref(dom);
>  
> -remoteEventQueue(priv, event, callbackID);
> +virObjectEventStateQueueRemote(priv->eventState, event, callbackID);
>  }
>  static void
>  remoteDomainBuildEventIOErrorReason(virNetClientProgramPtr prog 
> ATTRIBUTE_UNUSED,
> @@ -4688,7 +4680,7 @@ remoteDomainBuildEventBlockJobHelper(virConnectPtr conn,
>  
>  virObjectUnref(dom);
>  
> -remoteEventQueue(priv, event, callbackID);
> +virObjectEventStateQueueRemote(priv->eventState, event, callbackID);
>  }
>  static void
>  remoteDomainBuildEventBlockJob(virNetClientProgramPtr prog ATTRIBUTE_UNUSED,
> @@ -4728,7 +4720,7 @@ remoteDomainBuildEventBlockJob2(virNetClientProgramPtr 
> prog ATTRIBUTE_UNUSED,
>  
>  virObjectUnref(dom);
>  
> -remoteEventQueue(priv, event, msg->callbackID);
> +virObjectEventStateQueueRemote(priv->eventState, event, msg->callbackID);
>  }
>  
>  static void
> @@ -4782,7 +4774,7 @@ remoteDomainBuildEventGraphicsHelper(virConnectPtr conn,
>  
>  virObjectUnref(dom);
>  
> -remoteEventQueue(priv, event, callbackID);
> +virObjectEventStateQueueRemote(priv->eventState, event, callbackID);
>  return;
>  
>   error:
> @@ -4843,7 +4835,7 @@ remoteDomainBuildEventControlErrorHelper(virConnectPtr 
> conn,
>  
>  virObjectUnref(dom);
>  
> -remoteEventQueue(priv, event, callbackID);
> +virObjectEventStateQueueRemote(priv->eventState, event, callbackID);
>  }
>  static void
>  remoteDomainBuildEventControlError(virNetClientProgramPtr prog 
> ATTRIBUTE_UNUSED,
> @@ -4886,7 +4878,7 @@ remoteDomainBuildEventDiskChangeHelper(virConnectPtr 
> conn,
>  
>

[libvirt] [PATCH libvirt 3/3] events: remove remoteEventQueue wrapper function

2018-06-11 Thread Anya Harter 
>From remote_driver.c

And replace all calls with virObjectEventStateQueue such that:

remoteEventQueue(priv, event, callbackID);

becomes:

virObjectEventStateQueue(priv->eventState, event, callbackID);

Signed-off-by: Anya Harter 
---
 src/remote/remote_driver.c | 74 +-
 1 file changed, 33 insertions(+), 41 deletions(-)

diff --git a/src/remote/remote_driver.c b/src/remote/remote_driver.c
index fbec5c727b..c36941c27e 100644
--- a/src/remote/remote_driver.c
+++ b/src/remote/remote_driver.c
@@ -4431,14 +4431,6 @@ remoteConnectDomainEventDeregister(virConnectPtr conn,
 }
 
 
-static void
-remoteEventQueue(struct private_data *priv, virObjectEventPtr event,
- int remoteID)
-{
-virObjectEventStateQueueRemote(priv->eventState, event, remoteID);
-}
-
-
 static void
 remoteDomainBuildEventLifecycleHelper(virConnectPtr conn,
   remote_domain_event_lifecycle_msg *msg,
@@ -4455,7 +4447,7 @@ remoteDomainBuildEventLifecycleHelper(virConnectPtr conn,
 event = virDomainEventLifecycleNewFromDom(dom, msg->event, msg->detail);
 virObjectUnref(dom);
 
-remoteEventQueue(priv, event, callbackID);
+virObjectEventStateQueueRemote(priv->eventState, event, callbackID);
 }
 static void
 remoteDomainBuildEventLifecycle(virNetClientProgramPtr prog ATTRIBUTE_UNUSED,
@@ -4493,7 +4485,7 @@ remoteDomainBuildEventRebootHelper(virConnectPtr conn,
 event = virDomainEventRebootNewFromDom(dom);
 virObjectUnref(dom);
 
-remoteEventQueue(priv, event, callbackID);
+virObjectEventStateQueueRemote(priv->eventState, event, callbackID);
 }
 static void
 remoteDomainBuildEventReboot(virNetClientProgramPtr prog ATTRIBUTE_UNUSED,
@@ -4530,7 +4522,7 @@ remoteDomainBuildEventRTCChangeHelper(virConnectPtr conn,
 event = virDomainEventRTCChangeNewFromDom(dom, msg->offset);
 virObjectUnref(dom);
 
-remoteEventQueue(priv, event, callbackID);
+virObjectEventStateQueueRemote(priv->eventState, event, callbackID);
 }
 static void
 remoteDomainBuildEventRTCChange(virNetClientProgramPtr prog ATTRIBUTE_UNUSED,
@@ -4567,7 +4559,7 @@ remoteDomainBuildEventWatchdogHelper(virConnectPtr conn,
 event = virDomainEventWatchdogNewFromDom(dom, msg->action);
 virObjectUnref(dom);
 
-remoteEventQueue(priv, event, callbackID);
+virObjectEventStateQueueRemote(priv->eventState, event, callbackID);
 }
 static void
 remoteDomainBuildEventWatchdog(virNetClientProgramPtr prog ATTRIBUTE_UNUSED,
@@ -4607,7 +4599,7 @@ remoteDomainBuildEventIOErrorHelper(virConnectPtr conn,
 msg->action);
 virObjectUnref(dom);
 
-remoteEventQueue(priv, event, callbackID);
+virObjectEventStateQueueRemote(priv->eventState, event, callbackID);
 }
 static void
 remoteDomainBuildEventIOError(virNetClientProgramPtr prog ATTRIBUTE_UNUSED,
@@ -4649,7 +4641,7 @@ remoteDomainBuildEventIOErrorReasonHelper(virConnectPtr 
conn,
 
 virObjectUnref(dom);
 
-remoteEventQueue(priv, event, callbackID);
+virObjectEventStateQueueRemote(priv->eventState, event, callbackID);
 }
 static void
 remoteDomainBuildEventIOErrorReason(virNetClientProgramPtr prog 
ATTRIBUTE_UNUSED,
@@ -4688,7 +4680,7 @@ remoteDomainBuildEventBlockJobHelper(virConnectPtr conn,
 
 virObjectUnref(dom);
 
-remoteEventQueue(priv, event, callbackID);
+virObjectEventStateQueueRemote(priv->eventState, event, callbackID);
 }
 static void
 remoteDomainBuildEventBlockJob(virNetClientProgramPtr prog ATTRIBUTE_UNUSED,
@@ -4728,7 +4720,7 @@ remoteDomainBuildEventBlockJob2(virNetClientProgramPtr 
prog ATTRIBUTE_UNUSED,
 
 virObjectUnref(dom);
 
-remoteEventQueue(priv, event, msg->callbackID);
+virObjectEventStateQueueRemote(priv->eventState, event, msg->callbackID);
 }
 
 static void
@@ -4782,7 +4774,7 @@ remoteDomainBuildEventGraphicsHelper(virConnectPtr conn,
 
 virObjectUnref(dom);
 
-remoteEventQueue(priv, event, callbackID);
+virObjectEventStateQueueRemote(priv->eventState, event, callbackID);
 return;
 
  error:
@@ -4843,7 +4835,7 @@ remoteDomainBuildEventControlErrorHelper(virConnectPtr 
conn,
 
 virObjectUnref(dom);
 
-remoteEventQueue(priv, event, callbackID);
+virObjectEventStateQueueRemote(priv->eventState, event, callbackID);
 }
 static void
 remoteDomainBuildEventControlError(virNetClientProgramPtr prog 
ATTRIBUTE_UNUSED,
@@ -4886,7 +4878,7 @@ remoteDomainBuildEventDiskChangeHelper(virConnectPtr conn,
 
 virObjectUnref(dom);
 
-remoteEventQueue(priv, event, callbackID);
+virObjectEventStateQueueRemote(priv->eventState, event, callbackID);
 }
 static void
 remoteDomainBuildEventDiskChange(virNetClientProgramPtr prog ATTRIBUTE_UNUSED,
@@ -4927,7 +4919,7 @@ remoteDomainBuildEventTrayChangeHelper(virConnectPtr conn,
 
 virObjectUnref(dom);
 
-remoteEventQueue(priv, event, callbackID);
+virObjectEventStateQueueRemote(priv->eventState, event, callbackID);