From nobody Fri Apr 26 09:58:48 2024 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 Reviewed-by: J=EF=BF=BDn Tomko --- 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 From nobody Fri Apr 26 09:58:48 2024 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 1528824836777479.4948038555384; Tue, 12 Jun 2018 10:33:56 -0700 (PDT) Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 6733CC049E32; Tue, 12 Jun 2018 17:33:55 +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 10A4D84ED; Tue, 12 Jun 2018 17:33:55 +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 80FD71800523; Tue, 12 Jun 2018 17:33:54 +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 w5CHXI7V013314 for ; Tue, 12 Jun 2018 13:33:18 -0400 Received: by smtp.corp.redhat.com (Postfix) id C1861201E2A7; 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 9C752201E288; Tue, 12 Jun 2018 17:33:17 +0000 (UTC) From: Anya Harter To: libvir-list@redhat.com Date: Tue, 12 Jun 2018 13:33:01 -0400 Message-Id: <6ba702e68254352e10e65a235d99ce0c4cc32809.1528824678.git.aharter@redhat.com> 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 2/4] events: remove libxlDomainEventQueue 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.79 on 10.5.11.12 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.31]); Tue, 12 Jun 2018 17:33:56 +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: libxlDomainEventQueue(driver, event); becomes: virObjectEventStateQueue(driver->domainEventState, event); And remove NULL checking from all callers. Signed-off-by: Anya Harter Reviewed-by: J=EF=BF=BDn Tomko --- src/libxl/libxl_domain.c | 24 ++++++------------------ src/libxl/libxl_domain.h | 4 ---- src/libxl/libxl_driver.c | 21 +++++++-------------- src/libxl/libxl_migration.c | 18 ++++++------------ 4 files changed, 19 insertions(+), 48 deletions(-) diff --git a/src/libxl/libxl_domain.c b/src/libxl/libxl_domain.c index d12b1b1b4b..2ab78ac9a5 100644 --- a/src/libxl/libxl_domain.c +++ b/src/libxl/libxl_domain.c @@ -526,10 +526,8 @@ libxlDomainShutdownThread(void *opaque) } =20 destroy: - if (dom_event) { - libxlDomainEventQueue(driver, dom_event); - dom_event =3D NULL; - } + virObjectEventStateQueue(driver->domainEventState, dom_event); + dom_event =3D NULL; libxlDomainDestroyInternal(driver, vm); libxlDomainCleanup(driver, vm); if (!vm->persistent) @@ -538,10 +536,8 @@ libxlDomainShutdownThread(void *opaque) goto endjob; =20 restart: - if (dom_event) { - libxlDomainEventQueue(driver, dom_event); - dom_event =3D NULL; - } + virObjectEventStateQueue(driver->domainEventState, dom_event); + dom_event =3D NULL; libxlDomainDestroyInternal(driver, vm); libxlDomainCleanup(driver, vm); if (libxlDomainStartNew(driver, vm, false) < 0) { @@ -554,8 +550,7 @@ libxlDomainShutdownThread(void *opaque) =20 cleanup: virDomainObjEndAPI(&vm); - if (dom_event) - libxlDomainEventQueue(driver, dom_event); + virObjectEventStateQueue(driver->domainEventState, dom_event); libxl_event_free(cfg->ctx, ev); VIR_FREE(shutdown_info); virObjectUnref(cfg); @@ -616,12 +611,6 @@ libxlDomainEventHandler(void *data, VIR_LIBXL_EVENT_CO= NST libxl_event *event) VIR_FREE(shutdown_info); } =20 -void -libxlDomainEventQueue(libxlDriverPrivatePtr driver, virObjectEventPtr even= t) -{ - virObjectEventStateQueue(driver->domainEventState, event); -} - char * libxlDomainManagedSavePath(libxlDriverPrivatePtr driver, virDomainObjPtr v= m) { @@ -1394,8 +1383,7 @@ libxlDomainStart(libxlDriverPrivatePtr driver, restore_fd < 0 ? VIR_DOMAIN_EVENT_STARTED_BOOTED : VIR_DOMAIN_EVENT_STARTED_RESTORED= ); - if (event) - libxlDomainEventQueue(driver, event); + virObjectEventStateQueue(driver->domainEventState, event); =20 ret =3D 0; goto cleanup; diff --git a/src/libxl/libxl_domain.h b/src/libxl/libxl_domain.h index b5b6332151..5d83230cd6 100644 --- a/src/libxl/libxl_domain.h +++ b/src/libxl/libxl_domain.h @@ -95,10 +95,6 @@ int libxlDomainJobUpdateTime(struct libxlDomainJobObj *job) ATTRIBUTE_RETURN_CHECK; =20 -void -libxlDomainEventQueue(libxlDriverPrivatePtr driver, - virObjectEventPtr event); - char * libxlDomainManagedSavePath(libxlDriverPrivatePtr driver, virDomainObjPtr vm); diff --git a/src/libxl/libxl_driver.c b/src/libxl/libxl_driver.c index 8c40661e5a..5a5e792957 100644 --- a/src/libxl/libxl_driver.c +++ b/src/libxl/libxl_driver.c @@ -1179,8 +1179,7 @@ libxlDomainSuspend(virDomainPtr dom) =20 cleanup: virDomainObjEndAPI(&vm); - if (event) - libxlDomainEventQueue(driver, event); + virObjectEventStateQueue(driver->domainEventState, event); virObjectUnref(cfg); return ret; } @@ -1234,8 +1233,7 @@ libxlDomainResume(virDomainPtr dom) =20 cleanup: virDomainObjEndAPI(&vm); - if (event) - libxlDomainEventQueue(driver, event); + virObjectEventStateQueue(driver->domainEventState, event); virObjectUnref(cfg); return ret; } @@ -1394,8 +1392,7 @@ libxlDomainDestroyFlags(virDomainPtr dom, =20 cleanup: virDomainObjEndAPI(&vm); - if (event) - libxlDomainEventQueue(driver, event); + virObjectEventStateQueue(driver->domainEventState, event); virObjectUnref(cfg); return ret; } @@ -1734,8 +1731,7 @@ libxlDoDomainSave(libxlDriverPrivatePtr driver, VIR_FREE(xml); if (VIR_CLOSE(fd) < 0) virReportSystemError(errno, "%s", _("cannot close file")); - if (event) - libxlDomainEventQueue(driver, event); + virObjectEventStateQueue(driver->domainEventState, event); virObjectUnref(cfg); return ret; } @@ -1950,8 +1946,7 @@ libxlDomainCoreDump(virDomainPtr dom, const char *to,= unsigned int flags) =20 cleanup: virDomainObjEndAPI(&vm); - if (event) - libxlDomainEventQueue(driver, event); + virObjectEventStateQueue(driver->domainEventState, event); virObjectUnref(cfg); return ret; } @@ -2755,8 +2750,7 @@ libxlDomainDefineXMLFlags(virConnectPtr conn, const c= har *xml, unsigned int flag virDomainDefFree(def); virDomainDefFree(oldDef); virDomainObjEndAPI(&vm); - if (event) - libxlDomainEventQueue(driver, event); + virObjectEventStateQueue(driver->domainEventState, event); virObjectUnref(cfg); return dom; } @@ -2827,8 +2821,7 @@ libxlDomainUndefineFlags(virDomainPtr dom, cleanup: VIR_FREE(name); virDomainObjEndAPI(&vm); - if (event) - libxlDomainEventQueue(driver, event); + virObjectEventStateQueue(driver->domainEventState, event); virObjectUnref(cfg); return ret; } diff --git a/src/libxl/libxl_migration.c b/src/libxl/libxl_migration.c index 206b878292..b2e5847c58 100644 --- a/src/libxl/libxl_migration.c +++ b/src/libxl/libxl_migration.c @@ -1284,10 +1284,8 @@ libxlDomainMigrationDstFinish(virConnectPtr dconn, VIR_DOMAIN_EVENT_SUSPENDED_PAUSED= ); } =20 - if (event) { - libxlDomainEventQueue(driver, event); - event =3D NULL; - } + virObjectEventStateQueue(driver->domainEventState, event); + event =3D NULL; =20 if (flags & VIR_MIGRATE_PERSIST_DEST) { unsigned int oldPersist =3D vm->persistent; @@ -1306,10 +1304,8 @@ libxlDomainMigrationDstFinish(virConnectPtr dconn, oldPersist ? VIR_DOMAIN_EVENT_DEFINED_UPDATED : VIR_DOMAIN_EVENT_DEFINED_ADDED); - if (event) { - libxlDomainEventQueue(driver, event); - event =3D NULL; - } + virObjectEventStateQueue(driver->domainEventState, event); + event =3D NULL; } =20 if (virDomainSaveStatus(driver->xmlopt, cfg->stateDir, vm, cfg->caps) = < 0) @@ -1329,8 +1325,7 @@ libxlDomainMigrationDstFinish(virConnectPtr dconn, virDomainObjListRemove(driver->domains, vm); } =20 - if (event) - libxlDomainEventQueue(driver, event); + virObjectEventStateQueue(driver->domainEventState, event); virObjectUnref(cfg); return dom; } @@ -1384,8 +1379,7 @@ libxlDomainMigrationSrcConfirm(libxlDriverPrivatePtr = driver, ret =3D 0; =20 cleanup: - if (event) - libxlDomainEventQueue(driver, event); + virObjectEventStateQueue(driver->domainEventState, event); virObjectUnref(cfg); return ret; } --=20 2.17.1 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list From nobody Fri Apr 26 09:58:48 2024 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 1528824807239868.9557691079083; Tue, 12 Jun 2018 10:33:27 -0700 (PDT) Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 77BB6308FB94; Tue, 12 Jun 2018 17:33:25 +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 1638B600C0; Tue, 12 Jun 2018 17:33:25 +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 065941800532; Tue, 12 Jun 2018 17:33:23 +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 w5CHXIc5013315 for ; Tue, 12 Jun 2018 13:33:18 -0400 Received: by smtp.corp.redhat.com (Postfix) id 052CF201E2AB; Tue, 12 Jun 2018 17:33:18 +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 D2B16201E288; Tue, 12 Jun 2018 17:33:17 +0000 (UTC) From: Anya Harter To: libvir-list@redhat.com Date: Tue, 12 Jun 2018 13:33:02 -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 3/4] events: remove qemuDomainEventQueue 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.79 on 10.5.11.11 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.43]); Tue, 12 Jun 2018 17:33:26 +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: qemuDomainEventQueue(driver, event); becomes: virObjectEventStateQueue(driver->domainEventState, event); And remove NULL checking from all callers. Signed-off-by: Anya Harter Reviewed-by: J=EF=BF=BDn Tomko --- src/qemu/qemu_blockjob.c | 4 +- src/qemu/qemu_cgroup.c | 2 +- src/qemu/qemu_domain.c | 11 +---- src/qemu/qemu_domain.h | 2 - src/qemu/qemu_driver.c | 88 ++++++++++++++++++--------------------- src/qemu/qemu_hotplug.c | 26 ++++++------ src/qemu/qemu_migration.c | 24 +++++------ src/qemu/qemu_process.c | 54 ++++++++++++------------ 8 files changed, 98 insertions(+), 113 deletions(-) diff --git a/src/qemu/qemu_blockjob.c b/src/qemu/qemu_blockjob.c index e0dfb88c1c..b08e047490 100644 --- a/src/qemu/qemu_blockjob.c +++ b/src/qemu/qemu_blockjob.c @@ -210,8 +210,8 @@ qemuBlockJobEventProcess(virQEMUDriverPtr driver, "after block job", vm->def->name); } =20 - qemuDomainEventQueue(driver, event); - qemuDomainEventQueue(driver, event2); + virObjectEventStateQueue(driver->domainEventState, event); + virObjectEventStateQueue(driver->domainEventState, event2); =20 virObjectUnref(cfg); } diff --git a/src/qemu/qemu_cgroup.c b/src/qemu/qemu_cgroup.c index 43c5ae8f8e..c8fba7f9e6 100644 --- a/src/qemu/qemu_cgroup.c +++ b/src/qemu/qemu_cgroup.c @@ -896,7 +896,7 @@ qemuSetupCpuCgroup(virDomainObjPtr vm) event =3D virDomainEventTunableNewFromObj(vm, eventParams, eve= ntNparams); } =20 - qemuDomainEventQueue(priv->driver, event); + virObjectEventStateQueue(priv->driver->domainEventState, event); } =20 return 0; diff --git a/src/qemu/qemu_domain.c b/src/qemu/qemu_domain.c index 756e938858..2119233907 100644 --- a/src/qemu/qemu_domain.c +++ b/src/qemu/qemu_domain.c @@ -256,13 +256,6 @@ qemuDomainDisableNamespace(virDomainObjPtr vm, } =20 =20 -void qemuDomainEventQueue(virQEMUDriverPtr driver, - virObjectEventPtr event) -{ - virObjectEventStateQueue(driver->domainEventState, event); -} - - void qemuDomainEventEmitJobCompleted(virQEMUDriverPtr driver, virDomainObjPtr vm) @@ -283,7 +276,7 @@ qemuDomainEventEmitJobCompleted(virQEMUDriverPtr driver, } =20 event =3D virDomainEventJobCompletedNewFromObj(vm, params, nparams); - qemuDomainEventQueue(driver, event); + virObjectEventStateQueue(driver->domainEventState, event); } =20 =20 @@ -7872,7 +7865,7 @@ qemuDomainCheckRemoveOptionalDisk(virQEMUDriverPtr dr= iver, virDomainDiskDefFree(disk); } =20 - qemuDomainEventQueue(driver, event); + virObjectEventStateQueue(driver->domainEventState, event); } =20 =20 diff --git a/src/qemu/qemu_domain.h b/src/qemu/qemu_domain.h index f17157b951..fd8d9b5305 100644 --- a/src/qemu/qemu_domain.h +++ b/src/qemu/qemu_domain.h @@ -493,8 +493,6 @@ int qemuDomainAsyncJobPhaseFromString(qemuDomainAsyncJo= b job, =20 void qemuDomainEventFlush(int timer, void *opaque); =20 -void qemuDomainEventQueue(virQEMUDriverPtr driver, - virObjectEventPtr event); void qemuDomainEventEmitJobCompleted(virQEMUDriverPtr driver, virDomainObjPtr vm); =20 diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index f0fb806fcd..7c79c324e6 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -975,7 +975,7 @@ static void qemuNotifyLoadDomain(virDomainObjPtr vm, in= t newVM, void *opaque) virDomainEventLifecycleNewFromObj(vm, VIR_DOMAIN_EVENT_DEFINED, VIR_DOMAIN_EVENT_DEFINED_ADDED); - qemuDomainEventQueue(driver, event); + virObjectEventStateQueue(driver->domainEventState, event); } } =20 @@ -1806,10 +1806,8 @@ static virDomainPtr qemuDomainCreateXML(virConnectPt= r conn, cleanup: virDomainDefFree(def); virDomainObjEndAPI(&vm); - if (event) { - qemuDomainEventQueue(driver, event); - qemuDomainEventQueue(driver, event2); - } + virObjectEventStateQueue(driver->domainEventState, event); + virObjectEventStateQueue(driver->domainEventState, event2); virObjectUnref(caps); virNWFilterUnlockFilterUpdates(); return dom; @@ -1879,7 +1877,7 @@ static int qemuDomainSuspend(virDomainPtr dom) cleanup: virDomainObjEndAPI(&vm); =20 - qemuDomainEventQueue(driver, event); + virObjectEventStateQueue(driver->domainEventState, event); virObjectUnref(cfg); return ret; } @@ -1942,7 +1940,7 @@ static int qemuDomainResume(virDomainPtr dom) =20 cleanup: virDomainObjEndAPI(&vm); - qemuDomainEventQueue(driver, event); + virObjectEventStateQueue(driver->domainEventState, event); virObjectUnref(cfg); return ret; } @@ -2250,7 +2248,7 @@ qemuDomainDestroyFlags(virDomainPtr dom, =20 cleanup: virDomainObjEndAPI(&vm); - qemuDomainEventQueue(driver, event); + virObjectEventStateQueue(driver->domainEventState, event); return ret; } =20 @@ -3385,7 +3383,7 @@ qemuDomainSaveInternal(virQEMUDriverPtr driver, VIR_DOMAIN_RUNNING_SAVE_CANCELED, QEMU_ASYNC_JOB_SAVE) < 0) { VIR_WARN("Unable to resume guest CPUs after save failure"); - qemuDomainEventQueue(driver, + virObjectEventStateQueue(driver->domainEventState, virDomainEventLifecycleNewFromObj(vm, VIR_DOMAIN_EVENT_SUSPENDED, VIR_DOMAIN_EVENT_SUSPENDED_API_ER= ROR)); @@ -3402,7 +3400,7 @@ qemuDomainSaveInternal(virQEMUDriverPtr driver, virObjectUnref(cookie); VIR_FREE(xml); virQEMUSaveDataFree(data); - qemuDomainEventQueue(driver, event); + virObjectEventStateQueue(driver->domainEventState, event); virObjectUnref(caps); return ret; } @@ -3973,7 +3971,7 @@ qemuDomainCoreDumpWithFormat(virDomainPtr dom, =20 cleanup: virDomainObjEndAPI(&vm); - qemuDomainEventQueue(driver, event); + virObjectEventStateQueue(driver->domainEventState, event); return ret; } =20 @@ -4251,7 +4249,7 @@ processGuestPanicEvent(virQEMUDriverPtr driver, VIR_DOMAIN_EVENT_CRASHED, VIR_DOMAIN_EVENT_CRASHED_PAN= ICKED); =20 - qemuDomainEventQueue(driver, event); + virObjectEventStateQueue(driver->domainEventState, event); =20 if (virDomainSaveStatus(driver->xmlopt, cfg->stateDir, vm, driver->cap= s) < 0) { VIR_WARN("Unable to save status on vm %s after state change", @@ -4275,7 +4273,7 @@ processGuestPanicEvent(virQEMUDriverPtr driver, VIR_DOMAIN_EVENT_STOPPED, VIR_DOMAIN_EVENT_STOPPED= _CRASHED); =20 - qemuDomainEventQueue(driver, event); + virObjectEventStateQueue(driver->domainEventState, event); virDomainAuditStop(vm, "destroyed"); removeInactive =3D true; break; @@ -4719,7 +4717,7 @@ processSerialChangedEvent(virQEMUDriverPtr driver, =20 event =3D virDomainEventAgentLifecycleNewFromObj(vm, newstate, VIR_CONNECT_DOMAIN_= EVENT_AGENT_LIFECYCLE_REASON_CHANNEL); - qemuDomainEventQueue(driver, event); + virObjectEventStateQueue(driver->domainEventState, event); } =20 endjob: @@ -4793,7 +4791,7 @@ processMonitorEOFEvent(virQEMUDriverPtr driver, eventReason); qemuProcessStop(driver, vm, stopReason, QEMU_ASYNC_JOB_NONE, stopFlags= ); virDomainAuditStop(vm, auditReason); - qemuDomainEventQueue(driver, event); + virObjectEventStateQueue(driver->domainEventState, event); =20 endjob: qemuDomainRemoveInactive(driver, vm); @@ -5072,7 +5070,7 @@ qemuDomainPinVcpuLive(virDomainObjPtr vm, virBitmapFree(tmpmap); virCgroupFree(&cgroup_vcpu); VIR_FREE(str); - qemuDomainEventQueue(driver, event); + virObjectEventStateQueue(driver->domainEventState, event); return ret; } =20 @@ -5309,7 +5307,7 @@ qemuDomainPinEmulator(virDomainPtr dom, cleanup: if (cgroup_emulator) virCgroupFree(&cgroup_emulator); - qemuDomainEventQueue(driver, event); + virObjectEventStateQueue(driver->domainEventState, event); VIR_FREE(str); virBitmapFree(pcpumap); virDomainObjEndAPI(&vm); @@ -5791,7 +5789,7 @@ qemuDomainPinIOThread(virDomainPtr dom, cleanup: if (cgroup_iothread) virCgroupFree(&cgroup_iothread); - qemuDomainEventQueue(driver, event); + virObjectEventStateQueue(driver->domainEventState, event); VIR_FREE(str); virBitmapFree(pcpumap); virDomainObjEndAPI(&vm); @@ -6622,7 +6620,7 @@ qemuDomainSaveImageStartVM(virConnectPtr conn, event =3D virDomainEventLifecycleNewFromObj(vm, VIR_DOMAIN_EVENT_STARTED, VIR_DOMAIN_EVENT_STARTED_RESTORED); - qemuDomainEventQueue(driver, event); + virObjectEventStateQueue(driver->domainEventState, event); =20 =20 /* If it was running before, resume it now unless caller requested pau= se. */ @@ -6645,7 +6643,7 @@ qemuDomainSaveImageStartVM(virConnectPtr conn, event =3D virDomainEventLifecycleNewFromObj(vm, VIR_DOMAIN_EVENT_SUSPENDED, detail); - qemuDomainEventQueue(driver, event); + virObjectEventStateQueue(driver->domainEventState, event); } =20 ret =3D 0; @@ -7293,14 +7291,12 @@ qemuDomainObjStart(virConnectPtr conn, virDomainEventLifecycleNewFromObj(vm, VIR_DOMAIN_EVENT_STARTED, VIR_DOMAIN_EVENT_STARTED_BOOTED); - if (event) { - qemuDomainEventQueue(driver, event); - if (start_paused) { - event =3D virDomainEventLifecycleNewFromObj(vm, - VIR_DOMAIN_EVENT_SUSPENDE= D, - VIR_DOMAIN_EVENT_SUSPENDE= D_PAUSED); - qemuDomainEventQueue(driver, event); - } + virObjectEventStateQueue(driver->domainEventState, event); + if (start_paused) { + event =3D virDomainEventLifecycleNewFromObj(vm, + VIR_DOMAIN_EVENT_SUSPENDED, + VIR_DOMAIN_EVENT_SUSPENDED_PA= USED); + virObjectEventStateQueue(driver->domainEventState, event); } } =20 @@ -7444,7 +7440,7 @@ qemuDomainDefineXMLFlags(virConnectPtr conn, virDomainDefFree(oldDef); virDomainDefFree(def); virDomainObjEndAPI(&vm); - qemuDomainEventQueue(driver, event); + virObjectEventStateQueue(driver->domainEventState, event); virObjectUnref(caps); virObjectUnref(cfg); return dom; @@ -7571,7 +7567,7 @@ qemuDomainUndefineFlags(virDomainPtr dom, cleanup: VIR_FREE(name); virDomainObjEndAPI(&vm); - qemuDomainEventQueue(driver, event); + virObjectEventStateQueue(driver->domainEventState, event); virObjectUnref(cfg); return ret; } @@ -7728,7 +7724,7 @@ qemuDomainAttachDeviceLive(virDomainObjPtr vm, * is in monitor */ virObjectEventPtr event; event =3D virDomainEventDeviceAddedNewFromObj(vm, alias); - qemuDomainEventQueue(driver, event); + virObjectEventStateQueue(driver->domainEventState, event); } =20 if (ret =3D=3D 0) @@ -10647,7 +10643,7 @@ qemuDomainSetSchedulerParametersFlags(virDomainPtr = dom, if (eventNparams) { event =3D virDomainEventTunableNewFromDom(dom, eventParams, eventN= params); eventNparams =3D 0; - qemuDomainEventQueue(driver, event); + virObjectEventStateQueue(driver->domainEventState, event); } =20 if (persistentDef) { @@ -14320,7 +14316,7 @@ qemuDomainSnapshotCreateActiveInternal(virQEMUDrive= rPtr driver, } } =20 - qemuDomainEventQueue(driver, event); + virObjectEventStateQueue(driver->domainEventState, event); =20 return ret; } @@ -15255,7 +15251,7 @@ qemuDomainSnapshotCreateActiveExternal(virQEMUDrive= rPtr driver, virDomainAuditStop(vm, "from-snapshot"); resume =3D false; thaw =3D 0; - qemuDomainEventQueue(driver, event); + virObjectEventStateQueue(driver->domainEventState, event); } else if (memory && pmsuspended) { /* qemu 1.3 is unable to save a domain in pm-suspended (S3) * state; so we must emit an event stating that it was @@ -15264,7 +15260,7 @@ qemuDomainSnapshotCreateActiveExternal(virQEMUDrive= rPtr driver, VIR_DOMAIN_PAUSED_FROM_SNAPSHOT); event =3D virDomainEventLifecycleNewFromObj(vm, VIR_DOMAIN_EVENT_S= USPENDED, VIR_DOMAIN_EVENT_SUSPENDED_FROM_S= NAPSHOT); - qemuDomainEventQueue(driver, event); + virObjectEventStateQueue(driver->domainEventState, event); } =20 ret =3D 0; @@ -15277,7 +15273,7 @@ qemuDomainSnapshotCreateActiveExternal(virQEMUDrive= rPtr driver, event =3D virDomainEventLifecycleNewFromObj(vm, VIR_DOMAIN_EVENT_SUSPENDED, VIR_DOMAIN_EVENT_SUSPENDED_API_ER= ROR); - qemuDomainEventQueue(driver, event); + virObjectEventStateQueue(driver->domainEventState, event); if (virGetLastErrorCode() =3D=3D VIR_ERR_OK) { virReportError(VIR_ERR_OPERATION_FAILED, "%s", _("resuming after snapshot failed")); @@ -16165,7 +16161,7 @@ qemuDomainRevertToSnapshot(virDomainSnapshotPtr sna= pshot, event =3D virDomainEventLifecycleNewFromObj(vm, VIR_DOMAIN_EVENT_STOP= PED, detail); - qemuDomainEventQueue(driver, event); + virObjectEventStateQueue(driver->domainEventState, eve= nt); goto load; } } @@ -16317,7 +16313,7 @@ qemuDomainRevertToSnapshot(virDomainSnapshotPtr sna= pshot, =20 start_flags |=3D paused ? VIR_QEMU_PROCESS_START_PAUSED : 0; =20 - qemuDomainEventQueue(driver, event); + virObjectEventStateQueue(driver->domainEventState, event); rc =3D qemuProcessStart(snapshot->domain->conn, driver, vm, NU= LL, QEMU_ASYNC_JOB_START, NULL, -1, NULL, NU= LL, VIR_NETDEV_VPORT_PROFILE_OP_CREATE, @@ -16377,15 +16373,13 @@ qemuDomainRevertToSnapshot(virDomainSnapshotPtr s= napshot, !(ret =3D virDomainSaveConfig(cfg->configDir, driver->caps, vm->newDef ? vm->newDef : vm->def))) { detail =3D VIR_DOMAIN_EVENT_DEFINED_FROM_SNAPSHOT; - qemuDomainEventQueue(driver, + virObjectEventStateQueue(driver->domainEventState, virDomainEventLifecycleNewFromObj(vm, VIR_DOMAIN_EVENT_DEFINED, detail)); } - if (event) { - qemuDomainEventQueue(driver, event); - qemuDomainEventQueue(driver, event2); - } + virObjectEventStateQueue(driver->domainEventState, event); + virObjectEventStateQueue(driver->domainEventState, event2); virDomainObjEndAPI(&vm); virObjectUnref(caps); virObjectUnref(cfg); @@ -18545,7 +18539,7 @@ qemuDomainSetBlockIoTune(virDomainPtr dom, if (eventNparams) { event =3D virDomainEventTunableNewFromDom(dom, eventParams, ev= entNparams); eventNparams =3D 0; - qemuDomainEventQueue(driver, event); + virObjectEventStateQueue(driver->domainEventState, event); } } =20 @@ -18845,7 +18839,7 @@ qemuDomainSetMetadata(virDomainPtr dom, if (ret =3D=3D 0) { virObjectEventPtr ev =3D NULL; ev =3D virDomainEventMetadataChangeNewFromObj(vm, type, uri); - qemuDomainEventQueue(driver, ev); + virObjectEventStateQueue(driver->domainEventState, ev); } =20 qemuDomainObjEndJob(driver, vm); @@ -20908,8 +20902,8 @@ qemuDomainRenameCallback(virDomainObjPtr vm, VIR_FREE(new_dom_cfg_file); VIR_FREE(old_dom_name); VIR_FREE(new_dom_name); - qemuDomainEventQueue(driver, event_old); - qemuDomainEventQueue(driver, event_new); + virObjectEventStateQueue(driver->domainEventState, event_old); + virObjectEventStateQueue(driver->domainEventState, event_new); virObjectUnref(cfg); return ret; =20 diff --git a/src/qemu/qemu_hotplug.c b/src/qemu/qemu_hotplug.c index 822e38ae08..7c0c366b99 100644 --- a/src/qemu/qemu_hotplug.c +++ b/src/qemu/qemu_hotplug.c @@ -2042,7 +2042,7 @@ qemuDomainAttachMemory(virQEMUDriverPtr driver, } =20 event =3D virDomainEventDeviceAddedNewFromObj(vm, objalias); - qemuDomainEventQueue(driver, event); + virObjectEventStateQueue(driver->domainEventState, event); =20 /* fix the balloon size */ ignore_value(qemuProcessRefreshBalloonState(driver, vm, QEMU_ASYNC_JOB= _NONE)); @@ -3807,7 +3807,7 @@ qemuDomainRemoveDiskDevice(virQEMUDriverPtr driver, virDomainAuditDisk(vm, disk->src, NULL, "detach", true); =20 event =3D virDomainEventDeviceRemovedNewFromObj(vm, disk->info.alias); - qemuDomainEventQueue(driver, event); + virObjectEventStateQueue(driver->domainEventState, event); =20 if (prManaged && !prUsed) qemuProcessKillManagedPRDaemon(vm); @@ -3848,7 +3848,7 @@ qemuDomainRemoveControllerDevice(virQEMUDriverPtr dri= ver, controller->info.alias, vm, vm->def->name); =20 event =3D virDomainEventDeviceRemovedNewFromObj(vm, controller->info.a= lias); - qemuDomainEventQueue(driver, event); + virObjectEventStateQueue(driver->domainEventState, event); =20 for (i =3D 0; i < vm->def->ncontrollers; i++) { if (vm->def->controllers[i] =3D=3D controller) { @@ -3894,7 +3894,7 @@ qemuDomainRemoveMemoryDevice(virQEMUDriverPtr driver, return -1; =20 event =3D virDomainEventDeviceRemovedNewFromObj(vm, mem->info.alias); - qemuDomainEventQueue(driver, event); + virObjectEventStateQueue(driver->domainEventState, event); =20 if ((idx =3D virDomainMemoryFindByDef(vm->def, mem)) >=3D 0) virDomainMemoryRemove(vm->def, idx); @@ -4020,7 +4020,7 @@ qemuDomainRemoveHostDevice(virQEMUDriverPtr driver, } =20 event =3D virDomainEventDeviceRemovedNewFromObj(vm, hostdev->info->ali= as); - qemuDomainEventQueue(driver, event); + virObjectEventStateQueue(driver->domainEventState, event); =20 if (hostdev->parent.type =3D=3D VIR_DOMAIN_DEVICE_NET) { net =3D hostdev->parent.data.net; @@ -4146,7 +4146,7 @@ qemuDomainRemoveNetDevice(virQEMUDriverPtr driver, virDomainAuditNet(vm, net, NULL, "detach", true); =20 event =3D virDomainEventDeviceRemovedNewFromObj(vm, net->info.alias); - qemuDomainEventQueue(driver, event); + virObjectEventStateQueue(driver->domainEventState, event); =20 for (i =3D 0; i < vm->def->nnets; i++) { if (vm->def->nets[i] =3D=3D net) { @@ -4229,7 +4229,7 @@ qemuDomainRemoveChrDevice(virQEMUDriverPtr driver, VIR_WARN("Unable to remove chr device from /dev"); =20 event =3D virDomainEventDeviceRemovedNewFromObj(vm, chr->info.alias); - qemuDomainEventQueue(driver, event); + virObjectEventStateQueue(driver->domainEventState, event); =20 qemuDomainReleaseDeviceAddress(vm, &chr->info, NULL); qemuDomainChrRemove(vm->def, chr); @@ -4290,7 +4290,7 @@ qemuDomainRemoveRNGDevice(virQEMUDriverPtr driver, VIR_WARN("Unable to remove RNG device from /dev"); =20 event =3D virDomainEventDeviceRemovedNewFromObj(vm, rng->info.alias); - qemuDomainEventQueue(driver, event); + virObjectEventStateQueue(driver->domainEventState, event); =20 if ((idx =3D virDomainRNGFind(vm->def, rng)) >=3D 0) virDomainRNGRemove(vm->def, idx); @@ -4345,7 +4345,7 @@ qemuDomainRemoveShmemDevice(virQEMUDriverPtr driver, goto cleanup; =20 event =3D virDomainEventDeviceRemovedNewFromObj(vm, shmem->info.alias); - qemuDomainEventQueue(driver, event); + virObjectEventStateQueue(driver->domainEventState, event); =20 if ((idx =3D virDomainShmemDefFind(vm->def, shmem)) >=3D 0) virDomainShmemDefRemove(vm->def, idx); @@ -4372,7 +4372,7 @@ qemuDomainRemoveWatchdog(virQEMUDriverPtr driver, watchdog->info.alias, vm, vm->def->name); =20 event =3D virDomainEventDeviceRemovedNewFromObj(vm, watchdog->info.ali= as); - qemuDomainEventQueue(driver, event); + virObjectEventStateQueue(driver->domainEventState, event); qemuDomainReleaseDeviceAddress(vm, &watchdog->info, NULL); virDomainWatchdogDefFree(vm->def->watchdog); vm->def->watchdog =3D NULL; @@ -4393,7 +4393,7 @@ qemuDomainRemoveInputDevice(virDomainObjPtr vm, dev->info.alias, vm, vm->def->name); =20 event =3D virDomainEventDeviceRemovedNewFromObj(vm, dev->info.alias); - qemuDomainEventQueue(driver, event); + virObjectEventStateQueue(driver->domainEventState, event); for (i =3D 0; i < vm->def->ninputs; i++) { if (vm->def->inputs[i] =3D=3D dev) break; @@ -4426,7 +4426,7 @@ qemuDomainRemoveVsockDevice(virDomainObjPtr vm, dev->info.alias, vm, vm->def->name); =20 event =3D virDomainEventDeviceRemovedNewFromObj(vm, dev->info.alias); - qemuDomainEventQueue(driver, event); + virObjectEventStateQueue(driver->domainEventState, event); qemuDomainReleaseDeviceAddress(vm, &dev->info, NULL); virDomainVsockDefFree(vm->def->vsock); vm->def->vsock =3D NULL; @@ -4466,7 +4466,7 @@ qemuDomainRemoveRedirdevDevice(virQEMUDriverPtr drive= r, virDomainAuditRedirdev(vm, dev, "detach", true); =20 event =3D virDomainEventDeviceRemovedNewFromObj(vm, dev->info.alias); - qemuDomainEventQueue(driver, event); + virObjectEventStateQueue(driver->domainEventState, event); =20 if ((idx =3D virDomainRedirdevDefFind(vm->def, dev)) >=3D 0) virDomainRedirdevDefRemove(vm->def, idx); diff --git a/src/qemu/qemu_migration.c b/src/qemu/qemu_migration.c index ee482475f5..910766080c 100644 --- a/src/qemu/qemu_migration.c +++ b/src/qemu/qemu_migration.c @@ -1245,7 +1245,7 @@ qemuMigrationSrcSetOffline(virQEMUDriverPtr driver, event =3D virDomainEventLifecycleNewFromObj(vm, VIR_DOMAIN_EVENT_SUSPENDED, VIR_DOMAIN_EVENT_SUSPENDED_MIGRAT= ED); - qemuDomainEventQueue(driver, event); + virObjectEventStateQueue(driver->domainEventState, event); } =20 return ret; @@ -1285,7 +1285,7 @@ qemuMigrationAnyPostcopyFailed(virQEMUDriverPtr drive= r, event =3D virDomainEventLifecycleNewFromObj(vm, VIR_DOMAIN_EVENT_SUSPENDED, VIR_DOMAIN_EVENT_SUSPENDED_POSTCOPY_FAILED= ); - qemuDomainEventQueue(driver, event); + virObjectEventStateQueue(driver->domainEventState, event); } else { virDomainObjSetState(vm, VIR_DOMAIN_PAUSED, VIR_DOMAIN_PAUSED_POSTCOPY_FAILED); @@ -2613,7 +2613,7 @@ qemuMigrationDstPrepareAny(virQEMUDriverPtr driver, qemuDomainRemoveInactiveJob(driver, vm); } virDomainObjEndAPI(&vm); - qemuDomainEventQueue(driver, event); + virObjectEventStateQueue(driver->domainEventState, event); qemuMigrationCookieFree(mig); virObjectUnref(caps); virNWFilterUnlockFilterUpdates(); @@ -2967,7 +2967,7 @@ qemuMigrationSrcConfirmPhase(virQEMUDriverPtr driver, event =3D virDomainEventLifecycleNewFromObj(vm, VIR_DOMAIN_EVENT_STOPPED, VIR_DOMAIN_EVENT_STOPPED_MIGRATED= ); - qemuDomainEventQueue(driver, event); + virObjectEventStateQueue(driver->domainEventState, event); qemuDomainEventEmitJobCompleted(driver, vm); } else { virErrorPtr orig_err =3D virSaveLastError(); @@ -2987,7 +2987,7 @@ qemuMigrationSrcConfirmPhase(virQEMUDriverPtr driver, event =3D virDomainEventLifecycleNewFromObj(vm, VIR_DOMAIN_EVENT_RES= UMED, VIR_DOMAIN_EVENT_RES= UMED_MIGRATED); - qemuDomainEventQueue(driver, event); + virObjectEventStateQueue(driver->domainEventState, event); } =20 qemuMigrationParamsReset(driver, vm, QEMU_ASYNC_JOB_MIGRATION_OUT, @@ -4649,7 +4649,7 @@ qemuMigrationSrcPerformJob(virQEMUDriverPtr driver, =20 cleanup: virDomainObjEndAPI(&vm); - qemuDomainEventQueue(driver, event); + virObjectEventStateQueue(driver->domainEventState, event); virObjectUnref(cfg); return ret; } @@ -4725,7 +4725,7 @@ qemuMigrationSrcPerformPhase(virQEMUDriverPtr driver, =20 cleanup: virDomainObjEndAPI(&vm); - qemuDomainEventQueue(driver, event); + virObjectEventStateQueue(driver->domainEventState, event); return ret; } =20 @@ -4889,7 +4889,7 @@ qemuMigrationDstPersist(virQEMUDriverPtr driver, oldPersist ? VIR_DOMAIN_EVENT_DEFINED_UPD= ATED : VIR_DOMAIN_EVENT_DEFINED_ADD= ED); - qemuDomainEventQueue(driver, event); + virObjectEventStateQueue(driver->domainEventState, event); =20 ret =3D 0; =20 @@ -5082,7 +5082,7 @@ qemuMigrationDstFinish(virQEMUDriverPtr driver, event =3D virDomainEventLifecycleNewFromObj(vm, VIR_DOMAIN_EVENT_RESUMED, VIR_DOMAIN_EVENT_RESUMED_POSTCOPY); - qemuDomainEventQueue(driver, event); + virObjectEventStateQueue(driver->domainEventState, event); } } =20 @@ -5117,14 +5117,14 @@ qemuMigrationDstFinish(virQEMUDriverPtr driver, event =3D virDomainEventLifecycleNewFromObj(vm, VIR_DOMAIN_EVENT_RESUMED, VIR_DOMAIN_EVENT_RESUMED_MIG= RATED); - qemuDomainEventQueue(driver, event); + virObjectEventStateQueue(driver->domainEventState, event); =20 if (virDomainObjGetState(vm, NULL) =3D=3D VIR_DOMAIN_PAUSED) { virDomainObjSetState(vm, VIR_DOMAIN_PAUSED, VIR_DOMAIN_PAUSED_USER= ); event =3D virDomainEventLifecycleNewFromObj(vm, VIR_DOMAIN_EVENT_SUSPEND= ED, VIR_DOMAIN_EVENT_SUSPEND= ED_PAUSED); - qemuDomainEventQueue(driver, event); + virObjectEventStateQueue(driver->domainEventState, event); } =20 if (virDomainObjIsActive(vm) && @@ -5146,7 +5146,7 @@ qemuMigrationDstFinish(virQEMUDriverPtr driver, event =3D virDomainEventLifecycleNewFromObj(vm, VIR_DOMAIN_EVENT_STOPPED, VIR_DOMAIN_EVENT_STOPPED_FAILED); - qemuDomainEventQueue(driver, event); + virObjectEventStateQueue(driver->domainEventState, event); } else { qemuMigrationAnyPostcopyFailed(driver, vm); } diff --git a/src/qemu/qemu_process.c b/src/qemu/qemu_process.c index 480bc8c1ad..84e0506d93 100644 --- a/src/qemu/qemu_process.c +++ b/src/qemu/qemu_process.c @@ -344,7 +344,7 @@ qemuProcessHandleMonitorError(qemuMonitorPtr mon ATTRIB= UTE_UNUSED, =20 ((qemuDomainObjPrivatePtr) vm->privateData)->monError =3D true; event =3D virDomainEventControlErrorNewFromObj(vm); - qemuDomainEventQueue(driver, event); + virObjectEventStateQueue(driver->domainEventState, event); =20 virObjectUnlock(vm); } @@ -416,7 +416,7 @@ qemuProcessHandleReset(qemuMonitorPtr mon ATTRIBUTE_UNU= SED, ret =3D 0; cleanup: virObjectUnlock(vm); - qemuDomainEventQueue(driver, event); + virObjectEventStateQueue(driver->domainEventState, event); virObjectUnref(cfg); return ret; } @@ -491,7 +491,7 @@ qemuProcessFakeReboot(void *opaque) if (ret =3D=3D -1) ignore_value(qemuProcessKill(vm, VIR_QEMU_PROCESS_KILL_FORCE)); virDomainObjEndAPI(&vm); - qemuDomainEventQueue(driver, event); + virObjectEventStateQueue(driver->domainEventState, event); virObjectUnref(cfg); } =20 @@ -540,7 +540,7 @@ qemuProcessHandleEvent(qemuMonitorPtr mon ATTRIBUTE_UNU= SED, seconds, micros, details); =20 virObjectUnlock(vm); - qemuDomainEventQueue(driver, event); + virObjectEventStateQueue(driver->domainEventState, event); =20 return 0; } @@ -612,7 +612,7 @@ qemuProcessHandleShutdown(qemuMonitorPtr mon ATTRIBUTE_= UNUSED, =20 unlock: virObjectUnlock(vm); - qemuDomainEventQueue(driver, event); + virObjectEventStateQueue(driver->domainEventState, event); virObjectUnref(cfg); =20 return 0; @@ -677,7 +677,7 @@ qemuProcessHandleStop(qemuMonitorPtr mon ATTRIBUTE_UNUS= ED, =20 unlock: virObjectUnlock(vm); - qemuDomainEventQueue(driver, event); + virObjectEventStateQueue(driver->domainEventState, event); virObjectUnref(cfg); =20 return 0; @@ -719,7 +719,7 @@ qemuProcessHandleResume(qemuMonitorPtr mon ATTRIBUTE_UN= USED, =20 unlock: virObjectUnlock(vm); - qemuDomainEventQueue(driver, event); + virObjectEventStateQueue(driver->domainEventState, event); virObjectUnref(cfg); return 0; } @@ -763,7 +763,7 @@ qemuProcessHandleRTCChange(qemuMonitorPtr mon ATTRIBUTE= _UNUSED, =20 virObjectUnlock(vm); =20 - qemuDomainEventQueue(driver, event); + virObjectEventStateQueue(driver->domainEventState, event); virObjectUnref(cfg); return 0; } @@ -823,8 +823,8 @@ qemuProcessHandleWatchdog(qemuMonitorPtr mon ATTRIBUTE_= UNUSED, =20 if (vm) virObjectUnlock(vm); - qemuDomainEventQueue(driver, watchdogEvent); - qemuDomainEventQueue(driver, lifecycleEvent); + virObjectEventStateQueue(driver->domainEventState, watchdogEvent); + virObjectEventStateQueue(driver->domainEventState, lifecycleEvent); =20 virObjectUnref(cfg); return 0; @@ -885,9 +885,9 @@ qemuProcessHandleIOError(qemuMonitorPtr mon ATTRIBUTE_U= NUSED, } virObjectUnlock(vm); =20 - qemuDomainEventQueue(driver, ioErrorEvent); - qemuDomainEventQueue(driver, ioErrorEvent2); - qemuDomainEventQueue(driver, lifecycleEvent); + virObjectEventStateQueue(driver->domainEventState, ioErrorEvent); + virObjectEventStateQueue(driver->domainEventState, ioErrorEvent2); + virObjectEventStateQueue(driver->domainEventState, lifecycleEvent); virObjectUnref(cfg); return 0; } @@ -1010,7 +1010,7 @@ qemuProcessHandleGraphics(qemuMonitorPtr mon ATTRIBUT= E_UNUSED, event =3D virDomainEventGraphicsNewFromObj(vm, phase, localAddr, remot= eAddr, authScheme, subject); virObjectUnlock(vm); =20 - qemuDomainEventQueue(driver, event); + virObjectEventStateQueue(driver->domainEventState, event); =20 return 0; =20 @@ -1071,7 +1071,7 @@ qemuProcessHandleTrayChange(qemuMonitorPtr mon ATTRIB= UTE_UNUSED, } =20 virObjectUnlock(vm); - qemuDomainEventQueue(driver, event); + virObjectEventStateQueue(driver->domainEventState, event); virObjectUnref(cfg); return 0; } @@ -1109,8 +1109,8 @@ qemuProcessHandlePMWakeup(qemuMonitorPtr mon ATTRIBUT= E_UNUSED, } =20 virObjectUnlock(vm); - qemuDomainEventQueue(driver, event); - qemuDomainEventQueue(driver, lifecycleEvent); + virObjectEventStateQueue(driver->domainEventState, event); + virObjectEventStateQueue(driver->domainEventState, lifecycleEvent); virObjectUnref(cfg); return 0; } @@ -1151,8 +1151,8 @@ qemuProcessHandlePMSuspend(qemuMonitorPtr mon ATTRIBU= TE_UNUSED, =20 virObjectUnlock(vm); =20 - qemuDomainEventQueue(driver, event); - qemuDomainEventQueue(driver, lifecycleEvent); + virObjectEventStateQueue(driver->domainEventState, event); + virObjectEventStateQueue(driver->domainEventState, lifecycleEvent); virObjectUnref(cfg); return 0; } @@ -1179,7 +1179,7 @@ qemuProcessHandleBalloonChange(qemuMonitorPtr mon ATT= RIBUTE_UNUSED, =20 virObjectUnlock(vm); =20 - qemuDomainEventQueue(driver, event); + virObjectEventStateQueue(driver->domainEventState, event); virObjectUnref(cfg); return 0; } @@ -1220,8 +1220,8 @@ qemuProcessHandlePMSuspendDisk(qemuMonitorPtr mon ATT= RIBUTE_UNUSED, =20 virObjectUnlock(vm); =20 - qemuDomainEventQueue(driver, event); - qemuDomainEventQueue(driver, lifecycleEvent); + virObjectEventStateQueue(driver->domainEventState, event); + virObjectEventStateQueue(driver->domainEventState, lifecycleEvent); virObjectUnref(cfg); =20 return 0; @@ -1367,7 +1367,7 @@ qemuProcessHandleAcpiOstInfo(qemuMonitorPtr mon ATTRI= BUTE_UNUSED, } =20 virObjectUnlock(vm); - qemuDomainEventQueue(driver, event); + virObjectEventStateQueue(driver->domainEventState, event); =20 return 0; } @@ -1407,7 +1407,7 @@ qemuProcessHandleBlockThreshold(qemuMonitorPtr mon AT= TRIBUTE_UNUSED, } =20 virObjectUnlock(vm); - qemuDomainEventQueue(driver, event); + virObjectEventStateQueue(driver->domainEventState, event); =20 return 0; } @@ -1567,7 +1567,7 @@ qemuProcessHandleMigrationPass(qemuMonitorPtr mon ATT= RIBUTE_UNUSED, goto cleanup; } =20 - qemuDomainEventQueue(driver, + virObjectEventStateQueue(driver->domainEventState, virDomainEventMigrationIterationNewFromObj(vm, pa= ss)); =20 cleanup: @@ -1977,7 +1977,7 @@ qemuProcessRefreshChannelVirtioState(virQEMUDriverPtr= driver, STREQ_NULLABLE(chr->target.name, "org.qemu.guest_agent.0")= && (event =3D virDomainEventAgentLifecycleNewFromObj(vm, entr= y->state, agentReaso= n))) - qemuDomainEventQueue(driver, event); + virObjectEventStateQueue(driver->domainEventState, event); =20 chr->state =3D entry->state; } @@ -7320,7 +7320,7 @@ qemuProcessAutoDestroy(virDomainObjPtr dom, =20 qemuDomainObjEndJob(driver, dom); =20 - qemuDomainEventQueue(driver, event); + virObjectEventStateQueue(driver->domainEventState, event); } =20 int qemuProcessAutoDestroyAdd(virQEMUDriverPtr driver, --=20 2.17.1 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list From nobody Fri Apr 26 09:58:48 2024 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 1528824846817688.7594782354003; Tue, 12 Jun 2018 10:34:06 -0700 (PDT) Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.phx2.redhat.com [10.5.11.14]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 1500D5F742; Tue, 12 Jun 2018 17:34:05 +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 CBC4019005; Tue, 12 Jun 2018 17:34:04 +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 45CC518037EC; Tue, 12 Jun 2018 17:34:04 +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 w5CHXIfx013316 for ; Tue, 12 Jun 2018 13:33:18 -0400 Received: by smtp.corp.redhat.com (Postfix) id 3ACBA201E2AD; Tue, 12 Jun 2018 17:33:18 +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 15AB7201E288; Tue, 12 Jun 2018 17:33:18 +0000 (UTC) From: Anya Harter To: libvir-list@redhat.com Date: Tue, 12 Jun 2018 13:33:03 -0400 Message-Id: <6ab66ce57804da2cf8d81b0a49a9fb5edef7846e.1528824678.git.aharter@redhat.com> 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 4/4] events: remove umlDomainEventQueue 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.79 on 10.5.11.14 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.39]); Tue, 12 Jun 2018 17:34:05 +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: umlDomainEventQueue(driver, event); becomes: virObjectEventStateQueue(driver->domainEventState, event); And remove NULL checking from all callers. Signed-off-by: Anya Harter Reviewed-by: J=EF=BF=BDn Tomko --- src/uml/uml_driver.c | 33 ++++++++------------------------- 1 file changed, 8 insertions(+), 25 deletions(-) diff --git a/src/uml/uml_driver.c b/src/uml/uml_driver.c index 53ec64e10f..0c5b7fcda7 100644 --- a/src/uml/uml_driver.c +++ b/src/uml/uml_driver.c @@ -125,8 +125,6 @@ static int umlOpenMonitor(struct uml_driver *driver, virDomainObjPtr vm); static int umlReadPidFile(struct uml_driver *driver, virDomainObjPtr vm); -static void umlDomainEventQueue(struct uml_driver *driver, - virObjectEventPtr event); =20 static int umlStartVMDaemon(virConnectPtr conn, struct uml_driver *driver, @@ -228,8 +226,7 @@ umlAutostartDomain(virDomainObjPtr vm, virDomainEventLifecycleNewFromObj(vm, VIR_DOMAIN_EVENT_STARTED, VIR_DOMAIN_EVENT_STARTED_BOOTED); - if (event) - umlDomainEventQueue(data->driver, event); + virObjectEventStateQueue(data->driver->domainEventState, event= ); } } virObjectUnlock(vm); @@ -425,10 +422,8 @@ umlInotifyEvent(int watch, } } virDomainObjEndAPI(&dom); - if (event) { - umlDomainEventQueue(driver, event); - event =3D NULL; - } + virObjectEventStateQueue(driver->domainEventState, event); + event =3D NULL; } =20 cleanup: @@ -646,8 +641,7 @@ static void umlNotifyLoadDomain(virDomainObjPtr vm, int= newVM, void *opaque) virDomainEventLifecycleNewFromObj(vm, VIR_DOMAIN_EVENT_DEFINED, VIR_DOMAIN_EVENT_DEFINED_ADDED); - if (event) - umlDomainEventQueue(driver, event); + virObjectEventStateQueue(driver->domainEventState, event); } } =20 @@ -783,8 +777,7 @@ static int umlProcessAutoDestroyDom(void *payload, virDomainObjListRemove(data->driver->domains, dom); =20 virDomainObjEndAPI(&dom); - if (event) - umlDomainEventQueue(data->driver, event); + virObjectEventStateQueue(data->driver->domainEventState, event); virHashRemoveEntry(data->driver->autodestroy, uuidstr); return 0; } @@ -1615,8 +1608,7 @@ static virDomainPtr umlDomainCreateXML(virConnectPtr = conn, const char *xml, cleanup: virDomainDefFree(def); virDomainObjEndAPI(&vm); - if (event) - umlDomainEventQueue(driver, event); + virObjectEventStateQueue(driver->domainEventState, event); umlDriverUnlock(driver); virNWFilterUnlockFilterUpdates(); return dom; @@ -1689,8 +1681,7 @@ umlDomainDestroyFlags(virDomainPtr dom, =20 cleanup: virDomainObjEndAPI(&vm); - if (event) - umlDomainEventQueue(driver, event); + virObjectEventStateQueue(driver->domainEventState, event); umlDriverUnlock(driver); return ret; } @@ -1949,8 +1940,7 @@ static int umlDomainCreateWithFlags(virDomainPtr dom,= unsigned int flags) =20 cleanup: virDomainObjEndAPI(&vm); - if (event) - umlDomainEventQueue(driver, event); + virObjectEventStateQueue(driver->domainEventState, event); umlDriverUnlock(driver); virNWFilterUnlockFilterUpdates(); return ret; @@ -2587,13 +2577,6 @@ umlConnectDomainEventDeregisterAny(virConnectPtr con= n, } =20 =20 -/* driver must be locked before calling */ -static void umlDomainEventQueue(struct uml_driver *driver, - virObjectEventPtr event) -{ - virObjectEventStateQueue(driver->domainEventState, event); -} - static int umlConnectListAllDomains(virConnectPtr conn, virDomainPtr **domains, unsigned int flags) --=20 2.17.1 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list