From nobody Mon Feb 9 13:04:19 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 216.205.24.124 as permitted sender) client-ip=216.205.24.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 216.205.24.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=1626864236; cv=none; d=zohomail.com; s=zohoarc; b=RRPtyWoNFSeYVlTqa8xbMit87FRnxUFptms50kOUAV+ZklLvLrAeepuV0ix0iL4bcMTjtgQYL0175s4MfQBVUSSHDwig0FzHE817gAZeyb3i8hpuUUsRkJysnrtWGzOCk2DvfnHdh3yw1Q/adqmdJA6ECf/dHRYjbuZL3RF4sSw= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1626864236; 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=TDlGOGN3ztJuumH/jNJ3aCGvvMJYkEBf9pgJ+rFZ5L4=; b=MCwltni8HD0U7m36m2UVhmkMHHR83OOQ3yKHX1+QDnyXwjrtiOvvrFnKlZbJx0VAEKxjQcKRqikgKSAKmGIESswPcNuywIECuYKAPL+mWhUp2jKupuAu4WNPkaOm7qTsJ7GcedSFM7IjzNGkyGV5jGSzVukvtKbE1afU4g2Q9Vs= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 216.205.24.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 [216.205.24.124]) by mx.zohomail.com with SMTPS id 1626864236809223.71240196327028; Wed, 21 Jul 2021 03:43:56 -0700 (PDT) Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-109-SjrQcuLTPrm9y-sMWceHkw-1; Wed, 21 Jul 2021 06:43:54 -0400 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 mimecast-mx01.redhat.com (Postfix) with ESMTPS id E36CB802575; Wed, 21 Jul 2021 10:43:48 +0000 (UTC) Received: from colo-mx.corp.redhat.com (colo-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.21]) by smtp.corp.redhat.com (Postfix) with ESMTPS id C38DF60FB8; Wed, 21 Jul 2021 10:43:48 +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 903D04A70A; Wed, 21 Jul 2021 10:43:48 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx08.intmail.prod.int.phx2.redhat.com [10.5.11.23]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id 16LAhZRb001229 for ; Wed, 21 Jul 2021 06:43:35 -0400 Received: by smtp.corp.redhat.com (Postfix) id 917AB19D9B; Wed, 21 Jul 2021 10:43:35 +0000 (UTC) Received: from andariel.local (unknown [10.40.193.36]) by smtp.corp.redhat.com (Postfix) with ESMTP id F093419C79 for ; Wed, 21 Jul 2021 10:43:34 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1626864235; 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=TDlGOGN3ztJuumH/jNJ3aCGvvMJYkEBf9pgJ+rFZ5L4=; b=IpYmJwmh23TADzN2VvNwxu93icI07NxUJeWQuiRyR6hmhVX0zLDnHa7EETbGq5eY+7FPwE XlL8dUj8ec5hYB1nWCYItoOhCNVE7+cOtf9CiXCuoAes5szPCx+jOVcmCv/2HJna3kBp8X qf2/9bx6sy7oFmYYLQe2NqbArCFiTH0= X-MC-Unique: SjrQcuLTPrm9y-sMWceHkw-1 From: Peter Krempa To: libvir-list@redhat.com Subject: [PATCH 30/33] qemu: Remove return value from qemuMonitorDomainRdmaGidStatusChangedCallback Date: Wed, 21 Jul 2021 12:42:42 +0200 Message-Id: In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.84 on 10.5.11.23 X-loop: libvir-list@redhat.com 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: , Sender: libvir-list-bounces@redhat.com Errors-To: libvir-list-bounces@redhat.com X-Scanned-By: MIMEDefang 2.79 on 10.5.11.12 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: 1626864238980100001 Content-Type: text/plain; charset="utf-8" Change the callback prototype and fix the callback registered in the process code. It is also impossible for @info to be non-NULL in the cleanup section so the cleanup can be completely removed. Signed-off-by: Peter Krempa --- src/qemu/qemu_monitor.h | 14 +++++++------- src/qemu/qemu_process.c | 8 +------- 2 files changed, 8 insertions(+), 14 deletions(-) diff --git a/src/qemu/qemu_monitor.h b/src/qemu/qemu_monitor.h index caec6a424c..071a40de44 100644 --- a/src/qemu/qemu_monitor.h +++ b/src/qemu/qemu_monitor.h @@ -316,13 +316,13 @@ typedef void (*qemuMonitorDomainPRManagerStatusChange= dCallback)(qemuMonitor *mon bool conne= cted, void *opaq= ue); -typedef int (*qemuMonitorDomainRdmaGidStatusChangedCallback)(qemuMonitor *= mon, - virDomainObj = *vm, - const char *n= etdev, - bool gid_stat= us, - unsigned long= long subnet_prefix, - unsigned long= long interface_id, - void *opaque); +typedef void (*qemuMonitorDomainRdmaGidStatusChangedCallback)(qemuMonitor = *mon, + virDomainObj= *vm, + const char *= netdev, + bool gid_sta= tus, + unsigned lon= g long subnet_prefix, + unsigned lon= g long interface_id, + void *opaque= ); typedef int (*qemuMonitorDomainGuestCrashloadedCallback)(qemuMonitor *mon, virDomainObj *vm, diff --git a/src/qemu/qemu_process.c b/src/qemu/qemu_process.c index 1c9327e179..c31dbb5513 100644 --- a/src/qemu/qemu_process.c +++ b/src/qemu/qemu_process.c @@ -1751,7 +1751,7 @@ qemuProcessHandlePRManagerStatusChanged(qemuMonitor *= mon G_GNUC_UNUSED, } -static int +static void qemuProcessHandleRdmaGidStatusChanged(qemuMonitor *mon G_GNUC_UNUSED, virDomainObj *vm, const char *netdev, @@ -1763,7 +1763,6 @@ qemuProcessHandleRdmaGidStatusChanged(qemuMonitor *mo= n G_GNUC_UNUSED, virQEMUDriver *driver =3D opaque; struct qemuProcessEvent *processEvent =3D NULL; qemuMonitorRdmaGidStatus *info =3D NULL; - int ret =3D -1; virObjectLock(vm); @@ -1787,14 +1786,9 @@ qemuProcessHandleRdmaGidStatusChanged(qemuMonitor *m= on G_GNUC_UNUSED, if (virThreadPoolSendJob(driver->workerPool, 0, processEvent) < 0) { qemuProcessEventFree(processEvent); virObjectUnref(vm); - goto cleanup; } - ret =3D 0; - cleanup: - qemuMonitorEventRdmaGidStatusFree(info); virObjectUnlock(vm); - return ret; } --=20 2.31.1