From nobody Tue May 13 23:52:03 2025 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of redhat.com designates 209.132.183.28 as permitted sender) client-ip=209.132.183.28; envelope-from=libvir-list-bounces@redhat.com; helo=mx1.redhat.com; Authentication-Results: mx.zohomail.com; spf=pass (zoho.com: domain of redhat.com designates 209.132.183.28 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass(p=none dis=none) header.from=redhat.com Return-Path: Received: from mx1.redhat.com (mx1.redhat.com [209.132.183.28]) by mx.zohomail.com with SMTPS id 1528745945655784.581376595892; Mon, 11 Jun 2018 12:39:05 -0700 (PDT) Received: from smtp.corp.redhat.com (int-mx10.intmail.prod.int.phx2.redhat.com [10.5.11.25]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id EFF9213A5C; Mon, 11 Jun 2018 19:39:03 +0000 (UTC) Received: from colo-mx.corp.redhat.com (colo-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.21]) by smtp.corp.redhat.com (Postfix) with ESMTPS id BEB342010CA0; Mon, 11 Jun 2018 19:39:03 +0000 (UTC) Received: from lists01.pubmisc.prod.ext.phx2.redhat.com (lists01.pubmisc.prod.ext.phx2.redhat.com [10.5.19.33]) by colo-mx.corp.redhat.com (Postfix) with ESMTP id 6BB824CA80; Mon, 11 Jun 2018 19:39:03 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.rdu2.redhat.com [10.11.54.4]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id w5BJcbof023245 for ; Mon, 11 Jun 2018 15:38:37 -0400 Received: by smtp.corp.redhat.com (Postfix) id 6CCAD2023488; Mon, 11 Jun 2018 19:38:37 +0000 (UTC) Received: from dhcp-17-130.bos.redhat.com (dhcp-17-130.bos.redhat.com [10.18.17.130]) by smtp.corp.redhat.com (Postfix) with ESMTP id 49D0D2023487; Mon, 11 Jun 2018 19:38:37 +0000 (UTC) From: Anya Harter To: libvir-list@redhat.com Date: Mon, 11 Jun 2018 15:38:19 -0400 Message-Id: <2668ff4c024caf8f7f5f3eedebd39d736e7fa74f.1528741339.git.aharter@redhat.com> In-Reply-To: References: In-Reply-To: References: X-Scanned-By: MIMEDefang 2.78 on 10.11.54.4 X-loop: libvir-list@redhat.com Cc: Anya Harter Subject: [libvirt] [PATCH libvirt 3/3] events: remove remoteEventQueue wrapper function X-BeenThere: libvir-list@redhat.com X-Mailman-Version: 2.1.12 Precedence: junk List-Id: Development discussions about the libvirt library & tools List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Sender: libvir-list-bounces@redhat.com Errors-To: libvir-list-bounces@redhat.com X-Scanned-By: MIMEDefang 2.84 on 10.5.11.25 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.29]); Mon, 11 Jun 2018 19:39:04 +0000 (UTC) X-ZohoMail: RSF_0 Z_629925259 SPT_0 Content-Type: text/plain; charset="utf-8" >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 con= n, } =20 =20 -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 *m= sg, @@ -4455,7 +4447,7 @@ remoteDomainBuildEventLifecycleHelper(virConnectPtr c= onn, event =3D virDomainEventLifecycleNewFromDom(dom, msg->event, msg->deta= il); virObjectUnref(dom); =20 - remoteEventQueue(priv, event, callbackID); + virObjectEventStateQueueRemote(priv->eventState, event, callbackID); } static void remoteDomainBuildEventLifecycle(virNetClientProgramPtr prog ATTRIBUTE_UNUS= ED, @@ -4493,7 +4485,7 @@ remoteDomainBuildEventRebootHelper(virConnectPtr conn, event =3D virDomainEventRebootNewFromDom(dom); virObjectUnref(dom); =20 - remoteEventQueue(priv, event, callbackID); + virObjectEventStateQueueRemote(priv->eventState, event, callbackID); } static void remoteDomainBuildEventReboot(virNetClientProgramPtr prog ATTRIBUTE_UNUSED, @@ -4530,7 +4522,7 @@ remoteDomainBuildEventRTCChangeHelper(virConnectPtr c= onn, event =3D virDomainEventRTCChangeNewFromDom(dom, msg->offset); virObjectUnref(dom); =20 - remoteEventQueue(priv, event, callbackID); + virObjectEventStateQueueRemote(priv->eventState, event, callbackID); } static void remoteDomainBuildEventRTCChange(virNetClientProgramPtr prog ATTRIBUTE_UNUS= ED, @@ -4567,7 +4559,7 @@ remoteDomainBuildEventWatchdogHelper(virConnectPtr co= nn, event =3D virDomainEventWatchdogNewFromDom(dom, msg->action); virObjectUnref(dom); =20 - remoteEventQueue(priv, event, callbackID); + virObjectEventStateQueueRemote(priv->eventState, event, callbackID); } static void remoteDomainBuildEventWatchdog(virNetClientProgramPtr prog ATTRIBUTE_UNUSE= D, @@ -4607,7 +4599,7 @@ remoteDomainBuildEventIOErrorHelper(virConnectPtr con= n, msg->action); virObjectUnref(dom); =20 - remoteEventQueue(priv, event, callbackID); + virObjectEventStateQueueRemote(priv->eventState, event, callbackID); } static void remoteDomainBuildEventIOError(virNetClientProgramPtr prog ATTRIBUTE_UNUSED, @@ -4649,7 +4641,7 @@ remoteDomainBuildEventIOErrorReasonHelper(virConnectP= tr conn, =20 virObjectUnref(dom); =20 - remoteEventQueue(priv, event, callbackID); + virObjectEventStateQueueRemote(priv->eventState, event, callbackID); } static void remoteDomainBuildEventIOErrorReason(virNetClientProgramPtr prog ATTRIBUTE_= UNUSED, @@ -4688,7 +4680,7 @@ remoteDomainBuildEventBlockJobHelper(virConnectPtr co= nn, =20 virObjectUnref(dom); =20 - remoteEventQueue(priv, event, callbackID); + virObjectEventStateQueueRemote(priv->eventState, event, callbackID); } static void remoteDomainBuildEventBlockJob(virNetClientProgramPtr prog ATTRIBUTE_UNUSE= D, @@ -4728,7 +4720,7 @@ remoteDomainBuildEventBlockJob2(virNetClientProgramPt= r prog ATTRIBUTE_UNUSED, =20 virObjectUnref(dom); =20 - remoteEventQueue(priv, event, msg->callbackID); + virObjectEventStateQueueRemote(priv->eventState, event, msg->callbackI= D); } =20 static void @@ -4782,7 +4774,7 @@ remoteDomainBuildEventGraphicsHelper(virConnectPtr co= nn, =20 virObjectUnref(dom); =20 - remoteEventQueue(priv, event, callbackID); + virObjectEventStateQueueRemote(priv->eventState, event, callbackID); return; =20 error: @@ -4843,7 +4835,7 @@ remoteDomainBuildEventControlErrorHelper(virConnectPt= r conn, =20 virObjectUnref(dom); =20 - remoteEventQueue(priv, event, callbackID); + virObjectEventStateQueueRemote(priv->eventState, event, callbackID); } static void remoteDomainBuildEventControlError(virNetClientProgramPtr prog ATTRIBUTE_U= NUSED, @@ -4886,7 +4878,7 @@ remoteDomainBuildEventDiskChangeHelper(virConnectPtr = conn, =20 virObjectUnref(dom); =20 - remoteEventQueue(priv, event, callbackID); + virObjectEventStateQueueRemote(priv->eventState, event, callbackID); } static void remoteDomainBuildEventDiskChange(virNetClientProgramPtr prog ATTRIBUTE_UNU= SED, @@ -4927,7 +4919,7 @@ remoteDomainBuildEventTrayChangeHelper(virConnectPtr = conn, =20 virObjectUnref(dom); =20 - remoteEventQueue(priv, event, callbackID); + virObjectEventStateQueueRemote(priv->eventState, event, callbackID); } static void remoteDomainBuildEventTrayChange(virNetClientProgramPtr prog ATTRIBUTE_UNU= SED, @@ -4966,7 +4958,7 @@ remoteDomainBuildEventPMWakeupHelper(virConnectPtr co= nn, =20 virObjectUnref(dom); =20 - remoteEventQueue(priv, event, callbackID); + virObjectEventStateQueueRemote(priv->eventState, event, callbackID); } static void remoteDomainBuildEventPMWakeup(virNetClientProgramPtr prog ATTRIBUTE_UNUSE= D, @@ -5006,7 +4998,7 @@ remoteDomainBuildEventPMSuspendHelper(virConnectPtr c= onn, =20 virObjectUnref(dom); =20 - remoteEventQueue(priv, event, callbackID); + virObjectEventStateQueueRemote(priv->eventState, event, callbackID); } static void remoteDomainBuildEventPMSuspend(virNetClientProgramPtr prog ATTRIBUTE_UNUS= ED, @@ -5045,7 +5037,7 @@ remoteDomainBuildEventBalloonChangeHelper(virConnectP= tr conn, event =3D virDomainEventBalloonChangeNewFromDom(dom, msg->actual); virObjectUnref(dom); =20 - remoteEventQueue(priv, event, callbackID); + virObjectEventStateQueueRemote(priv->eventState, event, callbackID); } static void remoteDomainBuildEventBalloonChange(virNetClientProgramPtr prog ATTRIBUTE_= UNUSED, @@ -5085,7 +5077,7 @@ remoteDomainBuildEventPMSuspendDiskHelper(virConnectP= tr conn, =20 virObjectUnref(dom); =20 - remoteEventQueue(priv, event, callbackID); + virObjectEventStateQueueRemote(priv->eventState, event, callbackID); } static void remoteDomainBuildEventPMSuspendDisk(virNetClientProgramPtr prog ATTRIBUTE_= UNUSED, @@ -5125,7 +5117,7 @@ remoteDomainBuildEventDeviceRemovedHelper(virConnectP= tr conn, =20 virObjectUnref(dom); =20 - remoteEventQueue(priv, event, callbackID); + virObjectEventStateQueueRemote(priv->eventState, event, callbackID); } static void remoteDomainBuildEventDeviceRemoved(virNetClientProgramPtr prog ATTRIBUTE_= UNUSED, @@ -5165,7 +5157,7 @@ remoteDomainBuildEventCallbackDeviceAdded(virNetClien= tProgramPtr prog ATTRIBUTE_ =20 virObjectUnref(dom); =20 - remoteEventQueue(priv, event, msg->callbackID); + virObjectEventStateQueueRemote(priv->eventState, event, msg->callbackI= D); } =20 =20 @@ -5187,7 +5179,7 @@ remoteDomainBuildEventCallbackDeviceRemovalFailed(vir= NetClientProgramPtr prog AT =20 virObjectUnref(dom); =20 - remoteEventQueue(priv, event, msg->callbackID); + virObjectEventStateQueueRemote(priv->eventState, event, msg->callbackI= D); } =20 static void @@ -5219,7 +5211,7 @@ remoteDomainBuildEventCallbackTunable(virNetClientPro= gramPtr prog ATTRIBUTE_UNUS =20 virObjectUnref(dom); =20 - remoteEventQueue(priv, event, msg->callbackID); + virObjectEventStateQueueRemote(priv->eventState, event, msg->callbackI= D); } =20 =20 @@ -5242,7 +5234,7 @@ remoteDomainBuildEventCallbackAgentLifecycle(virNetCl= ientProgramPtr prog ATTRIBU =20 virObjectUnref(dom); =20 - remoteEventQueue(priv, event, msg->callbackID); + virObjectEventStateQueueRemote(priv->eventState, event, msg->callbackI= D); } =20 =20 @@ -5265,7 +5257,7 @@ remoteDomainBuildEventCallbackMigrationIteration(virN= etClientProgramPtr prog ATT =20 virObjectUnref(dom); =20 - remoteEventQueue(priv, event, msg->callbackID); + virObjectEventStateQueueRemote(priv->eventState, event, msg->callbackI= D); } =20 =20 @@ -5298,7 +5290,7 @@ remoteDomainBuildEventCallbackJobCompleted(virNetClie= ntProgramPtr prog ATTRIBUTE =20 virObjectUnref(dom); =20 - remoteEventQueue(priv, event, msg->callbackID); + virObjectEventStateQueueRemote(priv->eventState, event, msg->callbackI= D); } =20 =20 @@ -5320,7 +5312,7 @@ remoteDomainBuildEventCallbackMetadataChange(virNetCl= ientProgramPtr prog ATTRIBU =20 virObjectUnref(dom); =20 - remoteEventQueue(priv, event, msg->callbackID); + virObjectEventStateQueueRemote(priv->eventState, event, msg->callbackI= D); } =20 =20 @@ -5343,7 +5335,7 @@ remoteNetworkBuildEventLifecycle(virNetClientProgramP= tr prog ATTRIBUTE_UNUSED, msg->detail); virObjectUnref(net); =20 - remoteEventQueue(priv, event, msg->callbackID); + virObjectEventStateQueueRemote(priv->eventState, event, msg->callbackI= D); } =20 static void @@ -5365,7 +5357,7 @@ remoteStoragePoolBuildEventLifecycle(virNetClientProg= ramPtr prog ATTRIBUTE_UNUSE msg->detail); virObjectUnref(pool); =20 - remoteEventQueue(priv, event, msg->callbackID); + virObjectEventStateQueueRemote(priv->eventState, event, msg->callbackI= D); } =20 static void @@ -5386,7 +5378,7 @@ remoteStoragePoolBuildEventRefresh(virNetClientProgra= mPtr prog ATTRIBUTE_UNUSED, event =3D virStoragePoolEventRefreshNew(pool->name, pool->uuid); virObjectUnref(pool); =20 - remoteEventQueue(priv, event, msg->callbackID); + virObjectEventStateQueueRemote(priv->eventState, event, msg->callbackI= D); } =20 static void @@ -5408,7 +5400,7 @@ remoteNodeDeviceBuildEventLifecycle(virNetClientProgr= amPtr prog ATTRIBUTE_UNUSED msg->detail); virObjectUnref(dev); =20 - remoteEventQueue(priv, event, msg->callbackID); + virObjectEventStateQueueRemote(priv->eventState, event, msg->callbackI= D); } =20 static void @@ -5429,7 +5421,7 @@ remoteNodeDeviceBuildEventUpdate(virNetClientProgramP= tr prog ATTRIBUTE_UNUSED, event =3D virNodeDeviceEventUpdateNew(dev->name); virObjectUnref(dev); =20 - remoteEventQueue(priv, event, msg->callbackID); + virObjectEventStateQueueRemote(priv->eventState, event, msg->callbackI= D); } =20 static void @@ -5451,7 +5443,7 @@ remoteSecretBuildEventLifecycle(virNetClientProgramPt= r prog ATTRIBUTE_UNUSED, msg->event, msg->detail); virObjectUnref(secret); =20 - remoteEventQueue(priv, event, msg->callbackID); + virObjectEventStateQueueRemote(priv->eventState, event, msg->callbackI= D); } =20 static void @@ -5472,7 +5464,7 @@ remoteSecretBuildEventValueChanged(virNetClientProgra= mPtr prog ATTRIBUTE_UNUSED, event =3D virSecretEventValueChangedNew(secret->uuid, secret->usageTyp= e, secret->usageID); virObjectUnref(secret); =20 - remoteEventQueue(priv, event, msg->callbackID); + virObjectEventStateQueueRemote(priv->eventState, event, msg->callbackI= D); } =20 static void @@ -5496,7 +5488,7 @@ remoteDomainBuildQemuMonitorEvent(virNetClientProgram= Ptr prog ATTRIBUTE_UNUSED, msg->details ? *msg->details : NU= LL); virObjectUnref(dom); =20 - remoteEventQueue(priv, event, msg->callbackID); + virObjectEventStateQueueRemote(priv->eventState, event, msg->callbackI= D); } =20 =20 @@ -5555,7 +5547,7 @@ remoteDomainBuildEventBlockThreshold(virNetClientProg= ramPtr prog ATTRIBUTE_UNUSE =20 virObjectUnref(dom); =20 - remoteEventQueue(priv, event, msg->callbackID); + virObjectEventStateQueueRemote(priv->eventState, event, msg->callbackI= D); } =20 =20 --=20 2.17.1 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list