From nobody Mon Feb 9 03:26:34 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of lists.libvirt.org designates 8.43.85.245 as permitted sender) client-ip=8.43.85.245; envelope-from=devel-bounces@lists.libvirt.org; helo=lists.libvirt.org; Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of lists.libvirt.org designates 8.43.85.245 as permitted sender) smtp.mailfrom=devel-bounces@lists.libvirt.org; dmarc=fail(p=none dis=none) header.from=gmail.com Return-Path: Received: from lists.libvirt.org (lists.libvirt.org [8.43.85.245]) by mx.zohomail.com with SMTPS id 1725996196508943.302925308748; Tue, 10 Sep 2024 12:23:16 -0700 (PDT) Received: by lists.libvirt.org (Postfix, from userid 996) id 4F5D019B9; Tue, 10 Sep 2024 15:23:15 -0400 (EDT) Received: from lists.libvirt.org (localhost [IPv6:::1]) by lists.libvirt.org (Postfix) with ESMTP id 00C6C19B6; Tue, 10 Sep 2024 15:22:51 -0400 (EDT) Received: by lists.libvirt.org (Postfix, from userid 996) id 5154B184D; Tue, 10 Sep 2024 15:22:47 -0400 (EDT) Received: from mail-oo1-f54.google.com (mail-oo1-f54.google.com [209.85.161.54]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by lists.libvirt.org (Postfix) with ESMTPS id 4CCFC15C3 for ; Tue, 10 Sep 2024 15:22:46 -0400 (EDT) Received: by mail-oo1-f54.google.com with SMTP id 006d021491bc7-5d5c7f24372so3539901eaf.0 for ; Tue, 10 Sep 2024 12:22:46 -0700 (PDT) Received: from home.. (syn-072-191-074-189.res.spectrum.com. [72.191.74.189]) by smtp.gmail.com with ESMTPSA id 586e51a60fabf-27ba40bacc4sm2211209fac.37.2024.09.10.12.22.44 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 10 Sep 2024 12:22:44 -0700 (PDT) X-Spam-Checker-Version: SpamAssassin 3.4.4 (2020-01-24) on lists.libvirt.org X-Spam-Level: X-Spam-Status: No, score=-0.5 required=5.0 tests=DKIM_ADSP_CUSTOM_MED, DKIM_INVALID,DKIM_SIGNED,FREEMAIL_FORGED_FROMDOMAIN,FREEMAIL_FROM, HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI,RCVD_IN_DNSWL_NONE, RCVD_IN_MSPIKE_H3,RCVD_IN_MSPIKE_WL,SPF_HELO_NONE autolearn=unavailable autolearn_force=no version=3.4.4 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1725996165; x=1726600965; darn=lists.libvirt.org; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:from:to:cc:subject:date:message-id:reply-to; bh=9SRkD9bZm6ltQlTvT2feQbbuvZhmFr208FwBYnHgBj4=; b=JAUQsd+U0S7F+x5sZi0aACFrtXJn6x1r2VgOmK5kwfnIu61V50syEhCaKDNrfuO2I8 nqBlq3+CSbJZuMweT2GirIV+YkHEkvMpeDe1Tw4pOEX2hZs/9Z+eXqzY2msg2Va+L2nM fPMqp0XB+HvVrx6JkY5kVOptH0L6v2qiAg2xOVBbnv8IXQKxRu2wrjUefIIZ1SttSbAo BmfOsVNIjoDfzaZNDiHnjMyVtPvlsjXpTz4nL5Ek4Tu7ynhP0uPjrGE2zh6TP9nZayTW Qhe/sLcCWRFFMUfCJuRbxejBjZoZzoI3ZJyFyR0mGb9jAIeLV62xdq0uGaLqN9sadaPk gOqg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1725996165; x=1726600965; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=9SRkD9bZm6ltQlTvT2feQbbuvZhmFr208FwBYnHgBj4=; b=fY9giyRgTQ0QSTaIfn6nYFbwvSnirnDRSUcLd5RXDryokBC3nnwGRe9jYefbWyRUl8 nueovEfmCqKgsW9bkDx8JKWBikcHFw+RSdYZFGjxnLlV+H4L4Tl1pjF46Qk/SVdZaZpS ftnt8dbPTKBoesUK0/OnJM+QEAKGG+Jn69RLY1ZZQlCdXRVHrtcIhUCDuwDi8MAgEp7N 8IYLS9ha3Ao9fF6QWUWSQ+8M3wXpxaSJPFvPY1gQpHyEeEQifbQ8D5GFh2P6YXZwZcFW WXef7rOyOkS7t++DwaZ+gCm6vpsRsp5pLgP5N5Dxv3w4JYLF2nDEygVbnMO0zoe+A+nk 6cSQ== X-Gm-Message-State: AOJu0YwRCW7iAzejpeSYuDVZzUTNu7EDaQHywZYg3WtXjE46cNGNzmt8 RxzKCSkM+LfAM1ON+nYKWJpTv0efTDVpm+Mw06MjDU0LLZPfIxlTb2sUnY2D X-Google-Smtp-Source: AGHT+IGKq1bgu8Y/Y17n2WcbG7XzIA5zTLJaa9VP4Z8Ng0w+clXrO4DkdfneRt1oxzQcIa1VA2fZHw== X-Received: by 2002:a05:6870:9114:b0:255:2e14:3d9d with SMTP id 586e51a60fabf-27b9d68f618mr7531607fac.5.1725996165253; Tue, 10 Sep 2024 12:22:45 -0700 (PDT) From: Praveen K Paladugu To: devel@lists.libvirt.org Subject: [PATCH v2] ch: Enable callbacks for ch domain events Date: Tue, 10 Sep 2024 14:22:43 -0500 Message-ID: <20240910192243.18189-1-praveenkpaladugu@gmail.com> X-Mailer: git-send-email 2.44.0 MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Message-ID-Hash: 54N2XATJXSLTDI7XQG43WRRM4VLFSAQC X-Message-ID-Hash: 54N2XATJXSLTDI7XQG43WRRM4VLFSAQC X-MailFrom: praveenkpaladugu@gmail.com X-Mailman-Rule-Misses: dmarc-mitigation; no-senders; approved; emergency; loop; banned-address; member-moderation; header-match-config-1; header-match-config-2; header-match-config-3; header-match-devel.lists.libvirt.org-0; nonmember-moderation; administrivia; implicit-dest; max-recipients; max-size; news-moderation; no-subject; suspicious-header CC: liuwe@microsoft.com X-Mailman-Version: 3.2.2 Precedence: list List-Id: Development discussions about the libvirt library & tools Archived-At: List-Archive: List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-ZohoMail-DKIM: fail (Header signature does not verify) X-ZM-MESSAGEID: 1725996197507116600 Content-Type: text/plain; charset="utf-8" From: Praveen K Paladugu Enable callbacks for define, undefine, started, booted, stopped, destroyed events of ch guests. Signed-off-by: Praveen K Paladugu Reviewed-by: Michal Privoznik --- src/ch/ch_conf.h | 4 +++ src/ch/ch_driver.c | 82 ++++++++++++++++++++++++++++++++++++++++++++-- 2 files changed, 84 insertions(+), 2 deletions(-) diff --git a/src/ch/ch_conf.h b/src/ch/ch_conf.h index a77cad7a2a..97c6c24aa5 100644 --- a/src/ch/ch_conf.h +++ b/src/ch/ch_conf.h @@ -24,6 +24,7 @@ #include "virthread.h" #include "ch_capabilities.h" #include "virebtables.h" +#include "object_event.h" =20 #define CH_DRIVER_NAME "CH" #define CH_CMD "cloud-hypervisor" @@ -75,6 +76,9 @@ struct _virCHDriver * then lockless thereafter */ virCHDriverConfig *config; =20 + /* Immutable pointer, self-locking APIs */ + virObjectEventState *domainEventState; + /* pid file FD, ensures two copies of the driver can't use the same ro= ot */ int lockFD; =20 diff --git a/src/ch/ch_driver.c b/src/ch/ch_driver.c index dab025edc1..d18f266387 100644 --- a/src/ch/ch_driver.c +++ b/src/ch/ch_driver.c @@ -28,6 +28,7 @@ #include "ch_monitor.h" #include "ch_process.h" #include "domain_cgroup.h" +#include "domain_event.h" #include "datatypes.h" #include "driver.h" #include "viraccessapicheck.h" @@ -263,6 +264,7 @@ chDomainCreateWithFlags(virDomainPtr dom, unsigned int = flags) virCHDriver *driver =3D dom->conn->privateData; virDomainObj *vm; virCHDomainObjPrivate *priv; + virObjectEvent *event; g_autofree char *managed_save_path =3D NULL; int ret =3D -1; =20 @@ -304,6 +306,14 @@ chDomainCreateWithFlags(virDomainPtr dom, unsigned int= flags) ret =3D virCHProcessStart(driver, vm, VIR_DOMAIN_RUNNING_BOOTED); } =20 + if (ret =3D=3D 0) { + event =3D virDomainEventLifecycleNewFromObj(vm, + VIR_DOMAIN_EVENT_STARTED, + VIR_DOMAIN_EVENT_STARTED= _BOOTED); + if (event) + virObjectEventStateQueue(driver->domainEventState, event); + } + endjob: virDomainObjEndJob(vm); =20 @@ -323,8 +333,10 @@ chDomainDefineXMLFlags(virConnectPtr conn, const char = *xml, unsigned int flags) { virCHDriver *driver =3D conn->privateData; g_autoptr(virDomainDef) vmdef =3D NULL; + g_autoptr(virDomainDef) oldDef =3D NULL; virDomainObj *vm =3D NULL; virDomainPtr dom =3D NULL; + virObjectEvent *event =3D NULL; g_autofree char *managed_save_path =3D NULL; unsigned int parse_flags =3D VIR_DOMAIN_DEF_PARSE_INACTIVE; =20 @@ -345,7 +357,7 @@ chDomainDefineXMLFlags(virConnectPtr conn, const char *= xml, unsigned int flags) =20 if (!(vm =3D virDomainObjListAdd(driver->domains, &vmdef, driver->xmlopt, - 0, NULL))) + 0, &oldDef))) goto cleanup; =20 /* cleanup if there's any stale managedsave dir */ @@ -358,11 +370,17 @@ chDomainDefineXMLFlags(virConnectPtr conn, const char= *xml, unsigned int flags) } =20 vm->persistent =3D 1; - + event =3D virDomainEventLifecycleNewFromObj(vm, + VIR_DOMAIN_EVENT_DEFINED, + !oldDef ? + VIR_DOMAIN_EVENT_DEFINED_ADD= ED : + VIR_DOMAIN_EVENT_DEFINED_UPD= ATED); dom =3D virGetDomain(conn, vm->def->name, vm->def->uuid, vm->def->id); =20 cleanup: virDomainObjEndAPI(&vm); + virObjectEventStateQueue(driver->domainEventState, event); + return dom; } =20 @@ -378,6 +396,7 @@ chDomainUndefineFlags(virDomainPtr dom, { virCHDriver *driver =3D dom->conn->privateData; virDomainObj *vm; + virObjectEvent *event =3D NULL; int ret =3D -1; =20 virCheckFlags(0, -1); @@ -393,6 +412,9 @@ chDomainUndefineFlags(virDomainPtr dom, "%s", _("Cannot undefine transient domain")); goto cleanup; } + event =3D virDomainEventLifecycleNewFromObj(vm, + VIR_DOMAIN_EVENT_UNDEFINED, + VIR_DOMAIN_EVENT_UNDEFINED_R= EMOVED); =20 vm->persistent =3D 0; if (!virDomainObjIsActive(vm)) { @@ -403,6 +425,8 @@ chDomainUndefineFlags(virDomainPtr dom, =20 cleanup: virDomainObjEndAPI(&vm); + virObjectEventStateQueue(driver->domainEventState, event); + return ret; } =20 @@ -643,6 +667,7 @@ chDomainDestroyFlags(virDomainPtr dom, unsigned int fla= gs) { virCHDriver *driver =3D dom->conn->privateData; virDomainObj *vm; + virObjectEvent *event =3D NULL; int ret =3D -1; =20 virCheckFlags(0, -1); @@ -662,6 +687,9 @@ chDomainDestroyFlags(virDomainPtr dom, unsigned int fla= gs) if (virCHProcessStop(driver, vm, VIR_DOMAIN_SHUTOFF_DESTROYED) < 0) goto endjob; =20 + event =3D virDomainEventLifecycleNewFromObj(vm, + VIR_DOMAIN_EVENT_STOPPED, + VIR_DOMAIN_EVENT_STOPPED_DES= TROYED); virCHDomainRemoveInactive(driver, vm); ret =3D 0; =20 @@ -670,6 +698,8 @@ chDomainDestroyFlags(virDomainPtr dom, unsigned int fla= gs) =20 cleanup: virDomainObjEndAPI(&vm); + virObjectEventStateQueue(driver->domainEventState, event); + return ret; } =20 @@ -1365,6 +1395,7 @@ static int chStateCleanup(void) virObjectUnref(ch_driver->xmlopt); virObjectUnref(ch_driver->caps); virObjectUnref(ch_driver->domains); + virObjectUnref(ch_driver->domainEventState); virMutexDestroy(&ch_driver->lock); g_clear_pointer(&ch_driver, g_free); =20 @@ -1414,6 +1445,9 @@ chStateInitialize(bool privileged, if (!(ch_driver->config =3D virCHDriverConfigNew(privileged))) goto cleanup; =20 + if (!(ch_driver->domainEventState =3D virObjectEventStateNew())) + goto cleanup; + if ((rv =3D chExtractVersion(ch_driver)) < 0) { if (rv =3D=3D -2) ret =3D VIR_DRV_STATE_INIT_SKIPPED; @@ -2205,6 +2239,48 @@ chDomainSetNumaParameters(virDomainPtr dom, return ret; } =20 +static int +chConnectDomainEventRegisterAny(virConnectPtr conn, + virDomainPtr dom, + int eventID, + virConnectDomainEventGenericCallback callb= ack, + void *opaque, + virFreeCallback freecb) +{ + virCHDriver *driver =3D conn->privateData; + int ret =3D -1; + + if (virConnectDomainEventRegisterAnyEnsureACL(conn) < 0) + return -1; + + if (virDomainEventStateRegisterID(conn, + driver->domainEventState, + dom, eventID, + callback, opaque, freecb, &ret) < 0) + ret =3D -1; + + return ret; +} + + +static int +chConnectDomainEventDeregisterAny(virConnectPtr conn, + int callbackID) +{ + virCHDriver *driver =3D conn->privateData; + + if (virConnectDomainEventDeregisterAnyEnsureACL(conn) < 0) + return -1; + + if (virObjectEventStateDeregisterID(conn, + driver->domainEventState, + callbackID, true) < 0) + return -1; + + return 0; +} + + /* Function Tables */ static virHypervisorDriver chHypervisorDriver =3D { .name =3D "CH", @@ -2262,6 +2338,8 @@ static virHypervisorDriver chHypervisorDriver =3D { .domainHasManagedSaveImage =3D chDomainHasManagedSaveImage, /* 10.2.= 0 */ .domainRestore =3D chDomainRestore, /* 10.2.0 */ .domainRestoreFlags =3D chDomainRestoreFlags, /* 10.2.0 */ + .connectDomainEventRegisterAny =3D chConnectDomainEventRegisterAny, /*= 10.8.0 */ + .connectDomainEventDeregisterAny =3D chConnectDomainEventDeregisterAny= , /* 10.8.0 */ }; =20 static virConnectDriver chConnectDriver =3D { --=20 2.44.0