From nobody Mon Dec 15 03:06:44 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 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 --- 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