From nobody Sun Feb 8 20:23:03 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 170.10.129.124 as permitted sender) client-ip=170.10.129.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.129.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=1653399335; cv=none; d=zohomail.com; s=zohoarc; b=VGUnS6WCeazftFU3ewIdgc1RJBqmyr9KjdIRn79Gdoycz6wiuaekUyPjuFiKLY5q2irf9gG5OMGCyi8P0PMue7MeBT6QZk0jfjcGfu0VJqx9sJxHnNKthSixIFH7MKcsvWDDg401kfAdMzBRKTSypGllhqs0MnYhApnQnrW9pRY= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1653399335; 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=4dZ9Xsvtl49AKc7J5MjimvKcAwKapXedrgc4znXvdQ0=; b=kuhh6BlBvUusZrys0Mqfs2vBVa4tXYAwgwD6UA9wYuvYK/V6fulzYHODxHf76v/L4RwOIKbTH9jfocbsUiqHmFmd1WRWQHPraVtXIsx6FX0LtHIpxsQf/I/+2vvJX+ZJrROj8cNGhuw7ynyUP+fjHQJ6fJM2DgcN/xUMdf9p9Lo= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 170.10.129.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.129.124]) by mx.zohomail.com with SMTPS id 1653399335496471.1206079957067; Tue, 24 May 2022 06:35:35 -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-605-j5xRfgeGNrGrt3uFRdnISw-1; Tue, 24 May 2022 09:35:29 -0400 Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.rdu2.redhat.com [10.11.54.5]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 5911D18A65A0; 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 023B29E6F; 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 D5976194EB9C; Tue, 24 May 2022 13:35:17 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx07.intmail.prod.int.rdu2.redhat.com [10.11.54.7]) by mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (Postfix) with ESMTP id 6A777194EB9B for ; Tue, 24 May 2022 13:35:14 +0000 (UTC) Received: by smtp.corp.redhat.com (Postfix) id 589BF1410F37; 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 1C9F91410DD5 for ; Tue, 24 May 2022 13:35:14 +0000 (UTC) Received: by virval.usersys.redhat.com (Postfix, from userid 500) id 1BEAB245B50; 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=1653399334; 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=4dZ9Xsvtl49AKc7J5MjimvKcAwKapXedrgc4znXvdQ0=; b=b7iI1JA4IAHBqSEvmcvad3JqZ29N6OC2uSrK+529LRgBylYULbZPMY2pF1v9W8xUmBYRuU VVIwdnLn4yc1uVrW1ERd3weENt25bAldG9EE7R+8XLPXLHgOnKlQYNFFD0W4ejIFQHdcIo cDuovydQiRTJwV9cDhTYABhVZFy07Ts= X-MC-Unique: j5xRfgeGNrGrt3uFRdnISw-1 X-Original-To: libvir-list@listman.corp.redhat.com From: Jiri Denemark To: libvir-list@redhat.com Subject: [libvirt PATCH 4/6] qemu: Drop driver parameter from qemuProcessEventSubmit Date: Tue, 24 May 2022 15:35:07 +0200 Message-Id: <21d44a1a20c8b6623235353e69b805efd561488c.1653399256.git.jdenemar@redhat.com> In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.85 on 10.11.54.7 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.79 on 10.11.54.5 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: 1653399335847100005 Content-Type: text/plain; charset="utf-8" We can easily get it from the vm object. Signed-off-by: Jiri Denemark --- src/qemu/qemu_process.c | 49 ++++++++++++++++++++--------------------- 1 file changed, 24 insertions(+), 25 deletions(-) diff --git a/src/qemu/qemu_process.c b/src/qemu/qemu_process.c index e492f6961d..d837fb22c9 100644 --- a/src/qemu/qemu_process.c +++ b/src/qemu/qemu_process.c @@ -264,7 +264,6 @@ qemuConnectAgent(virQEMUDriver *driver, virDomainObj *v= m) =20 /** * qemuProcessEventSubmit: - * @driver: QEMU driver object * @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 @@ -275,14 +274,14 @@ qemuConnectAgent(virQEMUDriver *driver, virDomainObj = *vm) * Submits @eventType to be processed by the asynchronous event handling t= hread. */ static void -qemuProcessEventSubmit(virQEMUDriver *driver, - virDomainObj *vm, +qemuProcessEventSubmit(virDomainObj *vm, qemuProcessEventType eventType, int action, int status, void *data) { struct qemuProcessEvent *event =3D g_new0(struct qemuProcessEvent, 1); + virQEMUDriver *driver =3D QEMU_DOMAIN_PRIVATE(vm)->driver; =20 event->vm =3D virObjectRef(vm); event->eventType =3D eventType; @@ -321,7 +320,7 @@ qemuProcessHandleMonitorEOF(qemuMonitor *mon, goto cleanup; } =20 - qemuProcessEventSubmit(driver, vm, QEMU_PROCESS_EVENT_MONITOR_EOF, + qemuProcessEventSubmit(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 @@ -798,7 +797,7 @@ qemuProcessHandleWatchdog(qemuMonitor *mon G_GNUC_UNUSE= D, } =20 if (vm->def->watchdog->action =3D=3D VIR_DOMAIN_WATCHDOG_ACTION_DUMP) { - qemuProcessEventSubmit(driver, vm, QEMU_PROCESS_EVENT_WATCHDOG, + qemuProcessEventSubmit(vm, QEMU_PROCESS_EVENT_WATCHDOG, VIR_DOMAIN_WATCHDOG_ACTION_DUMP, 0, NULL); } =20 @@ -882,7 +881,7 @@ qemuProcessHandleBlockJob(qemuMonitor *mon G_GNUC_UNUSE= D, int type, int status, const char *error, - void *opaque) + void *opaque G_GNUC_UNUSED) { qemuDomainObjPrivate *priv; virDomainDiskDef *disk; @@ -912,7 +911,7 @@ qemuProcessHandleBlockJob(qemuMonitor *mon G_GNUC_UNUSE= D, virDomainObjBroadcast(vm); } else { /* there is no waiting SYNC API, dispatch the update to a thread */ - qemuProcessEventSubmit(opaque, vm, QEMU_PROCESS_EVENT_BLOCK_JOB, + qemuProcessEventSubmit(vm, QEMU_PROCESS_EVENT_BLOCK_JOB, type, status, g_strdup(diskAlias)); } =20 @@ -926,7 +925,7 @@ qemuProcessHandleJobStatusChange(qemuMonitor *mon G_GNU= C_UNUSED, virDomainObj *vm, const char *jobname, int status, - void *opaque) + void *opaque G_GNUC_UNUSED) { qemuDomainObjPrivate *priv; qemuBlockJobData *job =3D NULL; @@ -959,7 +958,7 @@ qemuProcessHandleJobStatusChange(qemuMonitor *mon G_GNU= C_UNUSED, virDomainObjBroadcast(vm); } else { VIR_DEBUG("job '%s' handled by event thread", jobname); - qemuProcessEventSubmit(opaque, vm, QEMU_PROCESS_EVENT_JOB_STATUS_C= HANGE, + qemuProcessEventSubmit(vm, QEMU_PROCESS_EVENT_JOB_STATUS_CHANGE, 0, 0, virObjectRef(job)); } =20 @@ -1192,11 +1191,11 @@ static void qemuProcessHandleGuestPanic(qemuMonitor *mon G_GNUC_UNUSED, virDomainObj *vm, qemuMonitorEventPanicInfo *info, - void *opaque) + void *opaque G_GNUC_UNUSED) { virObjectLock(vm); =20 - qemuProcessEventSubmit(opaque, vm, QEMU_PROCESS_EVENT_GUESTPANIC, + qemuProcessEventSubmit(vm, QEMU_PROCESS_EVENT_GUESTPANIC, vm->def->onCrash, 0, info); =20 virObjectUnlock(vm); @@ -1207,7 +1206,7 @@ void qemuProcessHandleDeviceDeleted(qemuMonitor *mon G_GNUC_UNUSED, virDomainObj *vm, const char *devAlias, - void *opaque) + void *opaque G_GNUC_UNUSED) { virObjectLock(vm); =20 @@ -1218,7 +1217,7 @@ qemuProcessHandleDeviceDeleted(qemuMonitor *mon G_GNU= C_UNUSED, QEMU_DOMAIN_UNPLUGGING_DEVICE_STATUS= _OK)) goto cleanup; =20 - qemuProcessEventSubmit(opaque, vm, QEMU_PROCESS_EVENT_DEVICE_DELETED, + qemuProcessEventSubmit(vm, QEMU_PROCESS_EVENT_DEVICE_DELETED, 0, 0, g_strdup(devAlias)); =20 cleanup: @@ -1410,14 +1409,14 @@ static void qemuProcessHandleNicRxFilterChanged(qemuMonitor *mon G_GNUC_UNUSED, virDomainObj *vm, const char *devAlias, - void *opaque) + void *opaque G_GNUC_UNUSED) { virObjectLock(vm); =20 VIR_DEBUG("Device %s RX Filter changed in domain %p %s", devAlias, vm, vm->def->name); =20 - qemuProcessEventSubmit(opaque, vm, QEMU_PROCESS_EVENT_NIC_RX_FILTER_CH= ANGED, + qemuProcessEventSubmit(vm, QEMU_PROCESS_EVENT_NIC_RX_FILTER_CHANGED, 0, 0, g_strdup(devAlias)); =20 virObjectUnlock(vm); @@ -1429,14 +1428,14 @@ qemuProcessHandleSerialChanged(qemuMonitor *mon G_G= NUC_UNUSED, virDomainObj *vm, const char *devAlias, bool connected, - void *opaque) + void *opaque G_GNUC_UNUSED) { virObjectLock(vm); =20 VIR_DEBUG("Serial port %s state changed to '%d' in domain %p %s", devAlias, connected, vm, vm->def->name); =20 - qemuProcessEventSubmit(opaque, vm, QEMU_PROCESS_EVENT_SERIAL_CHANGED, + qemuProcessEventSubmit(vm, QEMU_PROCESS_EVENT_SERIAL_CHANGED, connected, 0, g_strdup(devAlias)); =20 virObjectUnlock(vm); @@ -1596,7 +1595,7 @@ qemuProcessHandlePRManagerStatusChanged(qemuMonitor *= mon G_GNUC_UNUSED, virDomainObj *vm, const char *prManager, bool connected, - void *opaque) + void *opaque G_GNUC_UNUSED) { qemuDomainObjPrivate *priv; const char *managedAlias =3D qemuDomainGetManagedPRAlias(); @@ -1621,7 +1620,7 @@ qemuProcessHandlePRManagerStatusChanged(qemuMonitor *= mon G_GNUC_UNUSED, priv =3D vm->privateData; priv->prDaemonRunning =3D false; =20 - qemuProcessEventSubmit(opaque, vm, QEMU_PROCESS_EVENT_PR_DISCONNECT, + qemuProcessEventSubmit(vm, QEMU_PROCESS_EVENT_PR_DISCONNECT, 0, 0, NULL); =20 cleanup: @@ -1636,7 +1635,7 @@ qemuProcessHandleRdmaGidStatusChanged(qemuMonitor *mo= n G_GNUC_UNUSED, bool gid_status, unsigned long long subnet_prefix, unsigned long long interface_id, - void *opaque) + void *opaque G_GNUC_UNUSED) { qemuMonitorRdmaGidStatus *info =3D NULL; =20 @@ -1653,7 +1652,7 @@ qemuProcessHandleRdmaGidStatusChanged(qemuMonitor *mo= n G_GNUC_UNUSED, info->subnet_prefix =3D subnet_prefix; info->interface_id =3D interface_id; =20 - qemuProcessEventSubmit(opaque, vm, QEMU_PROCESS_EVENT_RDMA_GID_STATUS_= CHANGED, + qemuProcessEventSubmit(vm, QEMU_PROCESS_EVENT_RDMA_GID_STATUS_CHANGED, 0, 0, info); =20 virObjectUnlock(vm); @@ -1663,11 +1662,11 @@ qemuProcessHandleRdmaGidStatusChanged(qemuMonitor *= mon G_GNUC_UNUSED, static void qemuProcessHandleGuestCrashloaded(qemuMonitor *mon G_GNUC_UNUSED, virDomainObj *vm, - void *opaque) + void *opaque G_GNUC_UNUSED) { virObjectLock(vm); =20 - qemuProcessEventSubmit(opaque, vm, QEMU_PROCESS_EVENT_GUEST_CRASHLOADE= D, + qemuProcessEventSubmit(vm, QEMU_PROCESS_EVENT_GUEST_CRASHLOADED, 0, 0, NULL); =20 virObjectUnlock(vm); @@ -1736,7 +1735,7 @@ qemuProcessHandleMemoryDeviceSizeChange(qemuMonitor *= mon G_GNUC_UNUSED, virDomainObj *vm, const char *devAlias, unsigned long long size, - void *opaque) + void *opaque G_GNUC_UNUSED) { qemuMonitorMemoryDeviceSizeChange *info =3D NULL; =20 @@ -1749,7 +1748,7 @@ qemuProcessHandleMemoryDeviceSizeChange(qemuMonitor *= mon G_GNUC_UNUSED, info->devAlias =3D g_strdup(devAlias); info->size =3D size; =20 - qemuProcessEventSubmit(opaque, vm, QEMU_PROCESS_EVENT_MEMORY_DEVICE_SI= ZE_CHANGE, + qemuProcessEventSubmit(vm, QEMU_PROCESS_EVENT_MEMORY_DEVICE_SIZE_CHANG= E, 0, 0, info); =20 virObjectUnlock(vm); --=20 2.35.1