From nobody Wed May 14 00:07:05 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 152882482874973.92989124447024; Tue, 12 Jun 2018 10:33:48 -0700 (PDT) Received: from smtp.corp.redhat.com (int-mx12.intmail.prod.int.phx2.redhat.com [10.5.11.27]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 6DAEF8764A; Tue, 12 Jun 2018 17:33:47 +0000 (UTC) Received: from colo-mx.corp.redhat.com (colo-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.20]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 2208B958A0; Tue, 12 Jun 2018 17:33:47 +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 93732180BACA; Tue, 12 Jun 2018 17:33:46 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.rdu2.redhat.com [10.11.54.6]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id w5CHXHuE013309 for ; Tue, 12 Jun 2018 13:33:17 -0400 Received: by smtp.corp.redhat.com (Postfix) id 8B179201E2A9; Tue, 12 Jun 2018 17:33:17 +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 65B5B201E288; Tue, 12 Jun 2018 17:33:17 +0000 (UTC) From: Anya Harter To: libvir-list@redhat.com Date: Tue, 12 Jun 2018 13:33:00 -0400 Message-Id: In-Reply-To: References: In-Reply-To: References: X-Scanned-By: MIMEDefang 2.78 on 10.11.54.6 X-loop: libvir-list@redhat.com Cc: Anya Harter Subject: [libvirt] [PATCH libvirt 1/4] events: remove testObjectEventQueue wrapper func 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.27 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.26]); Tue, 12 Jun 2018 17:33:48 +0000 (UTC) X-ZohoMail: RSF_0 Z_629925259 SPT_0 Content-Type: text/plain; charset="utf-8" And replace all calls with virObjectEventStateQueue such that: testObjectEventQueue(privconn, event); becomes: virObjectEventStateQueue(privconn->eventState, event); Signed-off-by: Anya Harter --- src/test/test_driver.c | 80 +++++++++++++++++++----------------------- 1 file changed, 37 insertions(+), 43 deletions(-) diff --git a/src/test/test_driver.c b/src/test/test_driver.c index eb4e5aa341..5494d51017 100644 --- a/src/test/test_driver.c +++ b/src/test/test_driver.c @@ -174,12 +174,6 @@ static void testDriverUnlock(testDriverPtr driver) virMutexUnlock(&driver->lock); } =20 -static void testObjectEventQueue(testDriverPtr driver, - virObjectEventPtr event) -{ - virObjectEventStateQueue(driver->eventState, event); -} - #define TEST_NAMESPACE_HREF "http://libvirt.org/schemas/domain/test/1.0" =20 typedef struct _testDomainNamespaceDef testDomainNamespaceDef; @@ -1692,7 +1686,7 @@ testDomainCreateXML(virConnectPtr conn, const char *x= ml, =20 cleanup: virDomainObjEndAPI(&dom); - testObjectEventQueue(privconn, event); + virObjectEventStateQueue(privconn->eventState, event); virDomainDefFree(def); testDriverUnlock(privconn); return ret; @@ -1791,7 +1785,7 @@ static int testDomainDestroyFlags(virDomainPtr domain, ret =3D 0; cleanup: virDomainObjEndAPI(&privdom); - testObjectEventQueue(privconn, event); + virObjectEventStateQueue(privconn->eventState, event); return ret; } =20 @@ -1825,7 +1819,7 @@ static int testDomainResume(virDomainPtr domain) =20 cleanup: virDomainObjEndAPI(&privdom); - testObjectEventQueue(privconn, event); + virObjectEventStateQueue(privconn->eventState, event); return ret; } =20 @@ -1855,7 +1849,7 @@ static int testDomainSuspend(virDomainPtr domain) =20 cleanup: virDomainObjEndAPI(&privdom); - testObjectEventQueue(privconn, event); + virObjectEventStateQueue(privconn->eventState, event); return ret; } =20 @@ -1890,7 +1884,7 @@ static int testDomainShutdownFlags(virDomainPtr domai= n, ret =3D 0; cleanup: virDomainObjEndAPI(&privdom); - testObjectEventQueue(privconn, event); + virObjectEventStateQueue(privconn->eventState, event); return ret; } =20 @@ -1958,7 +1952,7 @@ static int testDomainReboot(virDomainPtr domain, ret =3D 0; cleanup: virDomainObjEndAPI(&privdom); - testObjectEventQueue(privconn, event); + virObjectEventStateQueue(privconn->eventState, event); return ret; } =20 @@ -2102,7 +2096,7 @@ testDomainSaveFlags(virDomainPtr domain, const char *= path, unlink(path); } virDomainObjEndAPI(&privdom); - testObjectEventQueue(privconn, event); + virObjectEventStateQueue(privconn->eventState, event); return ret; } =20 @@ -2205,7 +2199,7 @@ testDomainRestoreFlags(virConnectPtr conn, VIR_FREE(xml); VIR_FORCE_CLOSE(fd); virDomainObjEndAPI(&dom); - testObjectEventQueue(privconn, event); + virObjectEventStateQueue(privconn->eventState, event); return ret; } =20 @@ -2275,7 +2269,7 @@ static int testDomainCoreDumpWithFormat(virDomainPtr = domain, cleanup: VIR_FORCE_CLOSE(fd); virDomainObjEndAPI(&privdom); - testObjectEventQueue(privconn, event); + virObjectEventStateQueue(privconn->eventState, event); return ret; } =20 @@ -2649,8 +2643,8 @@ testDomainRenameCallback(virDomainObjPtr privdom, cleanup: VIR_FREE(old_dom_name); VIR_FREE(new_dom_name); - testObjectEventQueue(driver, event_old); - testObjectEventQueue(driver, event_new); + virObjectEventStateQueue(driver->eventState, event_old); + virObjectEventStateQueue(driver->eventState, event_new); return ret; } =20 @@ -2786,7 +2780,7 @@ static virDomainPtr testDomainDefineXMLFlags(virConne= ctPtr conn, virDomainDefFree(def); virDomainDefFree(oldDef); virDomainObjEndAPI(&dom); - testObjectEventQueue(privconn, event); + virObjectEventStateQueue(privconn->eventState, event); return ret; } =20 @@ -2840,7 +2834,7 @@ static int testDomainSetMetadata(virDomainPtr dom, if (ret =3D=3D 0) { virObjectEventPtr ev =3D NULL; ev =3D virDomainEventMetadataChangeNewFromObj(privdom, type, uri); - testObjectEventQueue(privconn, ev); + virObjectEventStateQueue(privconn->eventState, ev); } =20 virDomainObjEndAPI(&privdom); @@ -2995,7 +2989,7 @@ static int testDomainCreateWithFlags(virDomainPtr dom= ain, unsigned int flags) =20 cleanup: virDomainObjEndAPI(&privdom); - testObjectEventQueue(privconn, event); + virObjectEventStateQueue(privconn->eventState, event); testDriverUnlock(privconn); return ret; } @@ -3061,7 +3055,7 @@ static int testDomainUndefineFlags(virDomainPtr domai= n, =20 cleanup: virDomainObjEndAPI(&privdom); - testObjectEventQueue(privconn, event); + virObjectEventStateQueue(privconn->eventState, event); return ret; } =20 @@ -3486,7 +3480,7 @@ testNetworkCreateXML(virConnectPtr conn, const char *= xml) =20 cleanup: virNetworkDefFree(newDef); - testObjectEventQueue(privconn, event); + virObjectEventStateQueue(privconn->eventState, event); virNetworkObjEndAPI(&obj); return net; } @@ -3519,7 +3513,7 @@ testNetworkDefineXML(virConnectPtr conn, =20 cleanup: virNetworkDefFree(newDef); - testObjectEventQueue(privconn, event); + virObjectEventStateQueue(privconn->eventState, event); virNetworkObjEndAPI(&obj); return net; } @@ -3550,7 +3544,7 @@ testNetworkUndefine(virNetworkPtr net) ret =3D 0; =20 cleanup: - testObjectEventQueue(privconn, event); + virObjectEventStateQueue(privconn->eventState, event); virNetworkObjEndAPI(&obj); return ret; } @@ -3625,7 +3619,7 @@ testNetworkCreate(virNetworkPtr net) ret =3D 0; =20 cleanup: - testObjectEventQueue(privconn, event); + virObjectEventStateQueue(privconn->eventState, event); virNetworkObjEndAPI(&obj); return ret; } @@ -3654,7 +3648,7 @@ testNetworkDestroy(virNetworkPtr net) ret =3D 0; =20 cleanup: - testObjectEventQueue(privconn, event); + virObjectEventStateQueue(privconn->eventState, event); virNetworkObjEndAPI(&obj); return ret; } @@ -4408,7 +4402,7 @@ testStoragePoolCreate(virStoragePoolPtr pool, VIR_STORAGE_POOL_EVENT_STARTED, 0); =20 - testObjectEventQueue(privconn, event); + virObjectEventStateQueue(privconn->eventState, event); virStoragePoolObjEndAPI(&obj); return 0; } @@ -4558,7 +4552,7 @@ testStoragePoolCreateXML(virConnectPtr conn, =20 cleanup: virStoragePoolDefFree(newDef); - testObjectEventQueue(privconn, event); + virObjectEventStateQueue(privconn->eventState, event); virStoragePoolObjEndAPI(&obj); testDriverUnlock(privconn); return pool; @@ -4610,7 +4604,7 @@ testStoragePoolDefineXML(virConnectPtr conn, =20 cleanup: virStoragePoolDefFree(newDef); - testObjectEventQueue(privconn, event); + virObjectEventStateQueue(privconn->eventState, event); virStoragePoolObjEndAPI(&obj); testDriverUnlock(privconn); return pool; @@ -4634,7 +4628,7 @@ testStoragePoolUndefine(virStoragePoolPtr pool) virStoragePoolObjRemove(privconn->pools, obj); virObjectUnref(obj); =20 - testObjectEventQueue(privconn, event); + virObjectEventStateQueue(privconn->eventState, event); return 0; } =20 @@ -4658,7 +4652,7 @@ testStoragePoolBuild(virStoragePoolPtr pool, =20 virStoragePoolObjEndAPI(&obj); =20 - testObjectEventQueue(privconn, event); + virObjectEventStateQueue(privconn->eventState, event); return 0; } =20 @@ -4692,7 +4686,7 @@ testDestroyVport(testDriverPtr privconn, virNodeDeviceObjListRemove(privconn->devs, obj); virObjectUnref(obj); =20 - testObjectEventQueue(privconn, event); + virObjectEventStateQueue(privconn->eventState, event); return 0; } =20 @@ -4732,7 +4726,7 @@ testStoragePoolDestroy(virStoragePoolPtr pool) ret =3D 0; =20 cleanup: - testObjectEventQueue(privconn, event); + virObjectEventStateQueue(privconn->eventState, event); virStoragePoolObjEndAPI(&obj); return ret; } @@ -4755,7 +4749,7 @@ testStoragePoolDelete(virStoragePoolPtr pool, VIR_STORAGE_POOL_EVENT_DELETED, 0); =20 - testObjectEventQueue(privconn, event); + virObjectEventStateQueue(privconn->eventState, event); =20 virStoragePoolObjEndAPI(&obj); return 0; @@ -4777,7 +4771,7 @@ testStoragePoolRefresh(virStoragePoolPtr pool, =20 event =3D virStoragePoolEventRefreshNew(pool->name, pool->uuid); =20 - testObjectEventQueue(privconn, event); + virObjectEventStateQueue(privconn->eventState, event); virStoragePoolObjEndAPI(&obj); return 0; } @@ -5561,7 +5555,7 @@ testNodeDeviceMockCreateVport(testDriverPtr driver, event =3D virNodeDeviceEventLifecycleNew(objdef->name, VIR_NODE_DEVICE_EVENT_CREATED, 0); - testObjectEventQueue(driver, event); + virObjectEventStateQueue(driver->eventState, event); =20 cleanup: VIR_FREE(xml); @@ -5673,7 +5667,7 @@ testNodeDeviceDestroy(virNodeDevicePtr dev) =20 cleanup: virNodeDeviceObjEndAPI(&obj); - testObjectEventQueue(driver, event); + virObjectEventStateQueue(driver->eventState, event); VIR_FREE(wwnn); VIR_FREE(wwpn); return ret; @@ -5950,7 +5944,7 @@ testDomainManagedSave(virDomainPtr dom, unsigned int = flags) ret =3D 0; cleanup: virDomainObjEndAPI(&vm); - testObjectEventQueue(privconn, event); + virObjectEventStateQueue(privconn->eventState, event); =20 return ret; } @@ -6467,7 +6461,7 @@ testDomainSnapshotCreateXML(virDomainPtr domain, } virDomainObjEndAPI(&vm); } - testObjectEventQueue(privconn, event); + virObjectEventStateQueue(privconn->eventState, event); virDomainSnapshotDefFree(def); return snapshot; } @@ -6708,7 +6702,7 @@ testDomainRevertToSnapshot(virDomainSnapshotPtr snaps= hot, event =3D virDomainEventLifecycleNewFromObj(vm, VIR_DOMAIN_EVENT_STOPPED, VIR_DOMAIN_EVENT_STOPPED_FROM_SNAPSHOT); - testObjectEventQueue(privconn, event); + virObjectEventStateQueue(privconn->eventState, event); goto load; } =20 @@ -6787,7 +6781,7 @@ testDomainRevertToSnapshot(virDomainSnapshotPtr snaps= hot, /* Flush first event, now do transition 2 or 3 */ bool paused =3D (flags & VIR_DOMAIN_SNAPSHOT_REVERT_PAUSED) != =3D 0; =20 - testObjectEventQueue(privconn, event); + virObjectEventStateQueue(privconn->eventState, event); event =3D virDomainEventLifecycleNewFromObj(vm, VIR_DOMAIN_EVENT_STARTED, VIR_DOMAIN_EVENT_STARTED_FROM_SNAPSHOT); @@ -6803,8 +6797,8 @@ testDomainRevertToSnapshot(virDomainSnapshotPtr snaps= hot, ret =3D 0; cleanup: if (event) { - testObjectEventQueue(privconn, event); - testObjectEventQueue(privconn, event2); + virObjectEventStateQueue(privconn->eventState, event); + virObjectEventStateQueue(privconn->eventState, event2); } else { virObjectUnref(event2); } --=20 2.17.1 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list