From nobody Sun Feb 8 17:14:39 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=1626864370; cv=none; d=zohomail.com; s=zohoarc; b=N+n/9zO2NK9lsk6b+G3eLNmjTV8Sq0AnodzjFTrHj24pHlE+3jabBIJmvvLMH/qgNkoHjdGjEm7dhHQ5rjPeIfghlFG2+UVisSTgtN1NrOJlYfHh7pEa60jwx+8Ntr0DJKBW+iRkxipTWlmMdav3kAfhoSxNakXCoE/Xa0/9sPg= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1626864370; 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=dTxG9Rq5npUADHizdi26eco3DjTqQaHUdIrXMoOfV+Y=; b=SRHocUbMDNOtAMxRinmcXx9gSKAgnZhpflyEFwhoNiJlm4NxF+LsSQMx5XiJfHIwN13H9CIDULpZNZ7zc4WA2eN4lYzh5M17WabvzvlCQvRFR/xvy4nhZ+CAyjGONyBj4DMlACZL8ddtWbrGnsKjhC6le7y7IG1MR++QT1d7vEc= 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 1626864370306775.178753803725; Wed, 21 Jul 2021 03:46:10 -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-198-mevaMj1KPbKKv5SGoummTQ-1; Wed, 21 Jul 2021 06:46:07 -0400 Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.phx2.redhat.com [10.5.11.14]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id B4668A0C01; Wed, 21 Jul 2021 10:46:02 +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 924545DF21; Wed, 21 Jul 2021 10:46:02 +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 5528D181A2A6; Wed, 21 Jul 2021 10:46:02 +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 16LAhEFY000966 for ; Wed, 21 Jul 2021 06:43:14 -0400 Received: by smtp.corp.redhat.com (Postfix) id 2E03919D9D; Wed, 21 Jul 2021 10:43:14 +0000 (UTC) Received: from andariel.local (unknown [10.40.193.36]) by smtp.corp.redhat.com (Postfix) with ESMTP id 905F419C79 for ; Wed, 21 Jul 2021 10:43:13 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1626864369; 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=dTxG9Rq5npUADHizdi26eco3DjTqQaHUdIrXMoOfV+Y=; b=a2U63b66KpIWmNTX+bQHyMQZ+VZFhdLE5t0L+ROo9HbA6o26iPQg0/TAtVDFouBkuIcfQU B7b19ngcVWKOa92YhjGc/mlfefbx0de9/5iDvqmzAqQgOjwKllB5DAl0xV4wubS9nYktbt ZFoHPEoP/2UIvzPh4aRe236WTOlAvps= X-MC-Unique: mevaMj1KPbKKv5SGoummTQ-1 From: Peter Krempa To: libvir-list@redhat.com Subject: [PATCH 20/33] qemu: Remove return value from qemuMonitorDomainDeviceDeletedCallback Date: Wed, 21 Jul 2021 12:42:32 +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.14 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: 1626864371004100002 Content-Type: text/plain; charset="utf-8" Change the callback prototype and fix the callback registered in the process code. Signed-off-by: Peter Krempa --- src/qemu/qemu_monitor.h | 8 ++++---- src/qemu/qemu_process.c | 4 ++-- src/qemu/qemu_processpriv.h | 8 ++++---- 3 files changed, 10 insertions(+), 10 deletions(-) diff --git a/src/qemu/qemu_monitor.h b/src/qemu/qemu_monitor.h index 76e87d5909..12e90c6545 100644 --- a/src/qemu/qemu_monitor.h +++ b/src/qemu/qemu_monitor.h @@ -238,10 +238,10 @@ typedef void (*qemuMonitorDomainGuestPanicCallback)(q= emuMonitor *mon, virDomainObj *vm, qemuMonitorEventPanicI= nfo *info, void *opaque); -typedef int (*qemuMonitorDomainDeviceDeletedCallback)(qemuMonitor *mon, - virDomainObj *vm, - const char *devAlias, - void *opaque); +typedef void (*qemuMonitorDomainDeviceDeletedCallback)(qemuMonitor *mon, + virDomainObj *vm, + const char *devAlia= s, + void *opaque); typedef int (*qemuMonitorDomainNicRxFilterChangedCallback)(qemuMonitor *mo= n, virDomainObj *v= m, const char *dev= Alias, diff --git a/src/qemu/qemu_process.c b/src/qemu/qemu_process.c index cf77b7448c..a9c501e94c 100644 --- a/src/qemu/qemu_process.c +++ b/src/qemu/qemu_process.c @@ -1297,7 +1297,7 @@ qemuProcessHandleGuestPanic(qemuMonitor *mon G_GNUC_U= NUSED, } -int +void qemuProcessHandleDeviceDeleted(qemuMonitor *mon G_GNUC_UNUSED, virDomainObj *vm, const char *devAlias, @@ -1330,7 +1330,7 @@ qemuProcessHandleDeviceDeleted(qemuMonitor *mon G_GNU= C_UNUSED, cleanup: virObjectUnlock(vm); - return 0; + return; error: qemuProcessEventFree(processEvent); goto cleanup; diff --git a/src/qemu/qemu_processpriv.h b/src/qemu/qemu_processpriv.h index d0b5735054..2bc60ce103 100644 --- a/src/qemu/qemu_processpriv.h +++ b/src/qemu/qemu_processpriv.h @@ -32,9 +32,9 @@ * This header file should never be used outside unit tests. */ -int qemuProcessHandleDeviceDeleted(qemuMonitor *mon, - virDomainObj *vm, - const char *devAlias, - void *opaque); +void qemuProcessHandleDeviceDeleted(qemuMonitor *mon, + virDomainObj *vm, + const char *devAlias, + void *opaque); int qemuProcessQMPInitMonitor(qemuMonitor *mon); --=20 2.31.1