From nobody Sun Feb 8 17:04:19 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 170.10.133.124 as permitted sender) client-ip=170.10.133.124; envelope-from=libvir-list-bounces@redhat.com; helo=us-smtp-delivery-124.mimecast.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 170.10.133.124 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1653399333; cv=none; d=zohomail.com; s=zohoarc; b=RAwEyZxk2hUTP1qM4a6BSkXqQndTG7snwZcY7cfSBZo/7IMgZBU3uo/6HZ5ZGewibG5omst9ctUnCaN+37eAR4+x9o8olkMtu/d9tHdwSNyrLBC2RIz4Fhw5LzoeMREFKeTxI2yfCE1tHKht/NC1iuCTDmS3KM+SnvbGiTgpPNY= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1653399333; h=Content-Type:Content-Transfer-Encoding:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=9acG3hjhJ6h7NBAbeNCmkC3r40X6NwvBkJxpXyXDr3g=; b=ghbDYGREeAi0IkKTc3K+SF0eQWwMC7FL0ppVGGGFK/qaGRtwLSkFCGGJ4zV4a1IW9oRlC4ZvwAhuGeyN9ztrv7U/sMhVVO2j5UY0eTkYKzFzDi2h0FfdrHdd/WjjlSZR/JSS7P4i1n61KgN7WquNlwXg56pnaSL4vUZOpl5ZleA= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 170.10.133.124 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) by mx.zohomail.com with SMTPS id 1653399333371662.6762824610223; Tue, 24 May 2022 06:35:33 -0700 (PDT) Received: from mimecast-mx02.redhat.com (mimecast-mx02.redhat.com [66.187.233.88]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-180-WdUbKv_INRuTm7WXGO0eaA-1; Tue, 24 May 2022 09:35:29 -0400 Received: from smtp.corp.redhat.com (int-mx08.intmail.prod.int.rdu2.redhat.com [10.11.54.8]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 52674805F6C; Tue, 24 May 2022 13:35:18 +0000 (UTC) Received: from mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (unknown [10.30.29.100]) by smtp.corp.redhat.com (Postfix) with ESMTP id 3DF8AC08087; Tue, 24 May 2022 13:35:18 +0000 (UTC) Received: from mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (localhost [IPv6:::1]) by mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (Postfix) with ESMTP id 0F786194EBA8; Tue, 24 May 2022 13:35:18 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.rdu2.redhat.com [10.11.54.4]) by mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (Postfix) with ESMTP id 96432194EB9A for ; Tue, 24 May 2022 13:35:14 +0000 (UTC) Received: by smtp.corp.redhat.com (Postfix) id 788D62026D2F; Tue, 24 May 2022 13:35:14 +0000 (UTC) Received: from virval.usersys.redhat.com (unknown [10.43.2.187]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 1FF1C2026D6A for ; Tue, 24 May 2022 13:35:14 +0000 (UTC) Received: by virval.usersys.redhat.com (Postfix, from userid 500) id 1901B245B4E; Tue, 24 May 2022 15:35:13 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1653399331; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:list-id:list-help: list-unsubscribe:list-subscribe:list-post; bh=9acG3hjhJ6h7NBAbeNCmkC3r40X6NwvBkJxpXyXDr3g=; b=Adcum3Zl68WOOXMWa3yGvaCYdFGkbCloAupBN467eYgQlGzquHQ8GLxRKKrpGprEzJqs6V MgELDDXaqU4N89IUw7ZAzbUr5D4K3IOgKq+SZSh8VgvL+RkFfNH3CqTi+4nUNRDAJ7ogfT 7Lh33iEUJ3yYvVxTgb22jyK6VM6scNA= X-MC-Unique: WdUbKv_INRuTm7WXGO0eaA-1 X-Original-To: libvir-list@listman.corp.redhat.com From: Jiri Denemark To: libvir-list@redhat.com Subject: [libvirt PATCH 2/6] qemu: Pass arguments to qemuProcessEventSubmit directly Date: Tue, 24 May 2022 15:35:05 +0200 Message-Id: <212ac7cdc7715aecd6ec9babaa5cb511819ee9b5.1653399256.git.jdenemar@redhat.com> In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.78 on 10.11.54.4 X-BeenThere: libvir-list@redhat.com X-Mailman-Version: 2.1.29 Precedence: list List-Id: Development discussions about the libvirt library & tools List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: libvir-list-bounces@redhat.com Sender: "libvir-list" X-Scanned-By: MIMEDefang 2.85 on 10.11.54.8 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=libvir-list-bounces@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1653399333904100003 Content-Type: text/plain; charset="utf-8" Allocating and filling qemuProcessEvent structure is a repeated pattern before all calls to qemuProcessEventSubmit. We can move the allocation inside this function and let callers pass all arguments directly. Signed-off-by: Jiri Denemark --- src/qemu/qemu_process.c | 188 +++++++++++----------------------------- 1 file changed, 50 insertions(+), 138 deletions(-) diff --git a/src/qemu/qemu_process.c b/src/qemu/qemu_process.c index 33c3edb9cc..44a4bcfd74 100644 --- a/src/qemu/qemu_process.c +++ b/src/qemu/qemu_process.c @@ -265,27 +265,37 @@ qemuConnectAgent(virQEMUDriver *driver, virDomainObj = *vm) /** * qemuProcessEventSubmit: * @driver: QEMU driver object - * @event: pointer to the variable holding the event processing data (stol= en and cleared) + * @vm: pointer to the domain object, the function will take an extra refe= rence + * @eventType: the event to be processed + * @action: event specific action to be taken + * @status: event specific status + * @data: additional data for the event processor (the pointer is stolen a= nd it + * will be properly freed * - * Submits @event to be processed by the asynchronous event handling threa= d. - * In case when submission of the handling fails @event is properly freed = and - * cleared. If (*event)->vm is non-NULL the domain object is uref'd before= freeing - * @event. + * Submits @eventType to be processed by the asynchronous event handling t= hread. */ static void qemuProcessEventSubmit(virQEMUDriver *driver, - struct qemuProcessEvent **event) -{ - if (!*event) - return; - - if (virThreadPoolSendJob(driver->workerPool, 0, *event) < 0) { - if ((*event)->vm) - virObjectUnref((*event)->vm); - qemuProcessEventFree(*event); + virDomainObj *vm, + qemuProcessEventType eventType, + int action, + int status, + void *data) +{ + struct qemuProcessEvent *event =3D g_new0(struct qemuProcessEvent, 1); + + if (vm) + event->vm =3D virObjectRef(vm); + event->eventType =3D eventType; + event->action =3D action; + event->status =3D status; + event->data =3D data; + + if (virThreadPoolSendJob(driver->workerPool, 0, event) < 0) { + if (vm) + virObjectUnref(vm); + qemuProcessEventFree(event); } - - *event =3D NULL; } =20 =20 @@ -302,7 +312,6 @@ qemuProcessHandleMonitorEOF(qemuMonitor *mon, { virQEMUDriver *driver =3D opaque; qemuDomainObjPrivate *priv; - struct qemuProcessEvent *processEvent; =20 virObjectLock(vm); =20 @@ -314,12 +323,8 @@ qemuProcessHandleMonitorEOF(qemuMonitor *mon, goto cleanup; } =20 - processEvent =3D g_new0(struct qemuProcessEvent, 1); - - processEvent->eventType =3D QEMU_PROCESS_EVENT_MONITOR_EOF; - processEvent->vm =3D virObjectRef(vm); - - qemuProcessEventSubmit(driver, &processEvent); + qemuProcessEventSubmit(driver, vm, QEMU_PROCESS_EVENT_MONITOR_EOF, + 0, 0, NULL); =20 /* We don't want this EOF handler to be called over and over while the * thread is waiting for a job. @@ -795,17 +800,8 @@ qemuProcessHandleWatchdog(qemuMonitor *mon G_GNUC_UNUS= ED, } =20 if (vm->def->watchdog->action =3D=3D VIR_DOMAIN_WATCHDOG_ACTION_DUMP) { - struct qemuProcessEvent *processEvent; - processEvent =3D g_new0(struct qemuProcessEvent, 1); - - processEvent->eventType =3D QEMU_PROCESS_EVENT_WATCHDOG; - processEvent->action =3D VIR_DOMAIN_WATCHDOG_ACTION_DUMP; - /* Hold an extra reference because we can't allow 'vm' to be - * deleted before handling watchdog event is finished. - */ - processEvent->vm =3D virObjectRef(vm); - - qemuProcessEventSubmit(driver, &processEvent); + qemuProcessEventSubmit(driver, vm, QEMU_PROCESS_EVENT_WATCHDOG, + VIR_DOMAIN_WATCHDOG_ACTION_DUMP, 0, NULL); } =20 virObjectUnlock(vm); @@ -891,10 +887,8 @@ qemuProcessHandleBlockJob(qemuMonitor *mon G_GNUC_UNUS= ED, void *opaque) { qemuDomainObjPrivate *priv; - virQEMUDriver *driver =3D opaque; virDomainDiskDef *disk; g_autoptr(qemuBlockJobData) job =3D NULL; - char *data =3D NULL; =20 virObjectLock(vm); =20 @@ -920,16 +914,8 @@ qemuProcessHandleBlockJob(qemuMonitor *mon G_GNUC_UNUS= ED, virDomainObjBroadcast(vm); } else { /* there is no waiting SYNC API, dispatch the update to a thread */ - struct qemuProcessEvent *processEvent =3D g_new0(struct qemuProces= sEvent, 1); - - processEvent->eventType =3D QEMU_PROCESS_EVENT_BLOCK_JOB; - data =3D g_strdup(diskAlias); - processEvent->data =3D data; - processEvent->vm =3D virObjectRef(vm); - processEvent->action =3D type; - processEvent->status =3D status; - - qemuProcessEventSubmit(driver, &processEvent); + qemuProcessEventSubmit(opaque, vm, QEMU_PROCESS_EVENT_BLOCK_JOB, + type, status, g_strdup(diskAlias)); } =20 cleanup: @@ -944,7 +930,6 @@ qemuProcessHandleJobStatusChange(qemuMonitor *mon G_GNU= C_UNUSED, int status, void *opaque) { - virQEMUDriver *driver =3D opaque; qemuDomainObjPrivate *priv; qemuBlockJobData *job =3D NULL; int jobnewstate; @@ -975,15 +960,9 @@ qemuProcessHandleJobStatusChange(qemuMonitor *mon G_GN= UC_UNUSED, VIR_DEBUG("job '%s' handled synchronously", jobname); virDomainObjBroadcast(vm); } else { - struct qemuProcessEvent *processEvent =3D g_new0(struct qemuProces= sEvent, 1); - VIR_DEBUG("job '%s' handled by event thread", jobname); - - processEvent->eventType =3D QEMU_PROCESS_EVENT_JOB_STATUS_CHANGE; - processEvent->vm =3D virObjectRef(vm); - processEvent->data =3D virObjectRef(job); - - qemuProcessEventSubmit(driver, &processEvent); + qemuProcessEventSubmit(opaque, vm, QEMU_PROCESS_EVENT_JOB_STATUS_C= HANGE, + 0, 0, virObjectRef(job)); } =20 cleanup: @@ -1217,21 +1196,10 @@ qemuProcessHandleGuestPanic(qemuMonitor *mon G_GNUC= _UNUSED, qemuMonitorEventPanicInfo *info, void *opaque) { - virQEMUDriver *driver =3D opaque; - struct qemuProcessEvent *processEvent; - virObjectLock(vm); - processEvent =3D g_new0(struct qemuProcessEvent, 1); =20 - processEvent->eventType =3D QEMU_PROCESS_EVENT_GUESTPANIC; - processEvent->action =3D vm->def->onCrash; - processEvent->data =3D info; - /* Hold an extra reference because we can't allow 'vm' to be - * deleted before handling guest panic event is finished. - */ - processEvent->vm =3D virObjectRef(vm); - - qemuProcessEventSubmit(driver, &processEvent); + qemuProcessEventSubmit(opaque, vm, QEMU_PROCESS_EVENT_GUESTPANIC, + vm->def->onCrash, 0, info); =20 virObjectUnlock(vm); } @@ -1243,10 +1211,6 @@ qemuProcessHandleDeviceDeleted(qemuMonitor *mon G_GN= UC_UNUSED, const char *devAlias, void *opaque) { - virQEMUDriver *driver =3D opaque; - struct qemuProcessEvent *processEvent =3D NULL; - char *data; - virObjectLock(vm); =20 VIR_DEBUG("Device %s removed from domain %p %s", @@ -1256,14 +1220,8 @@ qemuProcessHandleDeviceDeleted(qemuMonitor *mon G_GN= UC_UNUSED, QEMU_DOMAIN_UNPLUGGING_DEVICE_STATUS= _OK)) goto cleanup; =20 - processEvent =3D g_new0(struct qemuProcessEvent, 1); - - processEvent->eventType =3D QEMU_PROCESS_EVENT_DEVICE_DELETED; - data =3D g_strdup(devAlias); - processEvent->data =3D data; - processEvent->vm =3D virObjectRef(vm); - - qemuProcessEventSubmit(driver, &processEvent); + qemuProcessEventSubmit(opaque, vm, QEMU_PROCESS_EVENT_DEVICE_DELETED, + 0, 0, g_strdup(devAlias)); =20 cleanup: virObjectUnlock(vm); @@ -1456,23 +1414,13 @@ qemuProcessHandleNicRxFilterChanged(qemuMonitor *mo= n G_GNUC_UNUSED, const char *devAlias, void *opaque) { - virQEMUDriver *driver =3D opaque; - struct qemuProcessEvent *processEvent =3D NULL; - char *data; - virObjectLock(vm); =20 VIR_DEBUG("Device %s RX Filter changed in domain %p %s", devAlias, vm, vm->def->name); =20 - processEvent =3D g_new0(struct qemuProcessEvent, 1); - - processEvent->eventType =3D QEMU_PROCESS_EVENT_NIC_RX_FILTER_CHANGED; - data =3D g_strdup(devAlias); - processEvent->data =3D data; - processEvent->vm =3D virObjectRef(vm); - - qemuProcessEventSubmit(driver, &processEvent); + qemuProcessEventSubmit(opaque, vm, QEMU_PROCESS_EVENT_NIC_RX_FILTER_CH= ANGED, + 0, 0, g_strdup(devAlias)); =20 virObjectUnlock(vm); } @@ -1485,24 +1433,13 @@ qemuProcessHandleSerialChanged(qemuMonitor *mon G_G= NUC_UNUSED, bool connected, void *opaque) { - virQEMUDriver *driver =3D opaque; - struct qemuProcessEvent *processEvent =3D NULL; - char *data; - virObjectLock(vm); =20 VIR_DEBUG("Serial port %s state changed to '%d' in domain %p %s", devAlias, connected, vm, vm->def->name); =20 - processEvent =3D g_new0(struct qemuProcessEvent, 1); - - processEvent->eventType =3D QEMU_PROCESS_EVENT_SERIAL_CHANGED; - data =3D g_strdup(devAlias); - processEvent->data =3D data; - processEvent->action =3D connected; - processEvent->vm =3D virObjectRef(vm); - - qemuProcessEventSubmit(driver, &processEvent); + qemuProcessEventSubmit(opaque, vm, QEMU_PROCESS_EVENT_SERIAL_CHANGED, + connected, 0, g_strdup(devAlias)); =20 virObjectUnlock(vm); } @@ -1663,9 +1600,7 @@ qemuProcessHandlePRManagerStatusChanged(qemuMonitor *= mon G_GNUC_UNUSED, bool connected, void *opaque) { - virQEMUDriver *driver =3D opaque; qemuDomainObjPrivate *priv; - struct qemuProcessEvent *processEvent =3D NULL; const char *managedAlias =3D qemuDomainGetManagedPRAlias(); =20 virObjectLock(vm); @@ -1688,12 +1623,8 @@ qemuProcessHandlePRManagerStatusChanged(qemuMonitor = *mon G_GNUC_UNUSED, priv =3D vm->privateData; priv->prDaemonRunning =3D false; =20 - processEvent =3D g_new0(struct qemuProcessEvent, 1); - - processEvent->eventType =3D QEMU_PROCESS_EVENT_PR_DISCONNECT; - processEvent->vm =3D virObjectRef(vm); - - qemuProcessEventSubmit(driver, &processEvent); + qemuProcessEventSubmit(opaque, vm, QEMU_PROCESS_EVENT_PR_DISCONNECT, + 0, 0, NULL); =20 cleanup: virObjectUnlock(vm); @@ -1709,8 +1640,6 @@ qemuProcessHandleRdmaGidStatusChanged(qemuMonitor *mo= n G_GNUC_UNUSED, unsigned long long interface_id, void *opaque) { - virQEMUDriver *driver =3D opaque; - struct qemuProcessEvent *processEvent =3D NULL; qemuMonitorRdmaGidStatus *info =3D NULL; =20 virObjectLock(vm); @@ -1726,13 +1655,8 @@ qemuProcessHandleRdmaGidStatusChanged(qemuMonitor *m= on G_GNUC_UNUSED, info->subnet_prefix =3D subnet_prefix; info->interface_id =3D interface_id; =20 - processEvent =3D g_new0(struct qemuProcessEvent, 1); - - processEvent->eventType =3D QEMU_PROCESS_EVENT_RDMA_GID_STATUS_CHANGED; - processEvent->vm =3D virObjectRef(vm); - processEvent->data =3D g_steal_pointer(&info); - - qemuProcessEventSubmit(driver, &processEvent); + qemuProcessEventSubmit(opaque, vm, QEMU_PROCESS_EVENT_RDMA_GID_STATUS_= CHANGED, + 0, 0, info); =20 virObjectUnlock(vm); } @@ -1743,16 +1667,10 @@ qemuProcessHandleGuestCrashloaded(qemuMonitor *mon = G_GNUC_UNUSED, virDomainObj *vm, void *opaque) { - virQEMUDriver *driver =3D opaque; - struct qemuProcessEvent *processEvent; - virObjectLock(vm); - processEvent =3D g_new0(struct qemuProcessEvent, 1); - - processEvent->eventType =3D QEMU_PROCESS_EVENT_GUEST_CRASHLOADED; - processEvent->vm =3D virObjectRef(vm); =20 - qemuProcessEventSubmit(driver, &processEvent); + qemuProcessEventSubmit(opaque, vm, QEMU_PROCESS_EVENT_GUEST_CRASHLOADE= D, + 0, 0, NULL); =20 virObjectUnlock(vm); } @@ -1822,8 +1740,6 @@ qemuProcessHandleMemoryDeviceSizeChange(qemuMonitor *= mon G_GNUC_UNUSED, unsigned long long size, void *opaque) { - virQEMUDriver *driver =3D opaque; - struct qemuProcessEvent *processEvent =3D NULL; qemuMonitorMemoryDeviceSizeChange *info =3D NULL; =20 virObjectLock(vm); @@ -1835,12 +1751,8 @@ qemuProcessHandleMemoryDeviceSizeChange(qemuMonitor = *mon G_GNUC_UNUSED, info->devAlias =3D g_strdup(devAlias); info->size =3D size; =20 - processEvent =3D g_new0(struct qemuProcessEvent, 1); - processEvent->eventType =3D QEMU_PROCESS_EVENT_MEMORY_DEVICE_SIZE_CHAN= GE; - processEvent->vm =3D virObjectRef(vm); - processEvent->data =3D g_steal_pointer(&info); - - qemuProcessEventSubmit(driver, &processEvent); + qemuProcessEventSubmit(opaque, vm, QEMU_PROCESS_EVENT_MEMORY_DEVICE_SI= ZE_CHANGE, + 0, 0, info); =20 virObjectUnlock(vm); } --=20 2.35.1