From nobody Sun Feb 8 21:06:44 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=1626864363; cv=none; d=zohomail.com; s=zohoarc; b=CXOqHxE3GjJjN781B34SQkEJGf1obEtCGyNHXI2zZlg/7kAmPHiHZWkb4fiqBAUO0SxTv4SqESOfvbymd3f6kUAvdBbrM9N/tNBdvszyA3kAnNI1UN/QYv+ys5R2eDDQVVBOZ0uXoVQ4ekYKfIMm/QAYRbWvjkEbcLjmtrDwpVE= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1626864363; 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=GEBl6TqVbGg6iu/4qwdTh0PIfVUtYB+EG86k4Zct6uU=; b=ncqZkeB3LNyR0TxkVwtihbc/NBLLz3a5ZmoZnXnZouVYEcgW5GMFa8Fzj16cMfYUOKQNTP8HWDKcdVl1lrXOSO9wle3eIF3fOreLe8Es1j2vjsFn1CvWkxzj65GNMGThGw3XdG2hOlIKex5KePMADbMoq+6OdfDpJfTss0TVHw8= 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 1626864363472965.9583459934418; Wed, 21 Jul 2021 03:46:03 -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-111-7LwTUOvROSGtaSVvv0d9HA-1; Wed, 21 Jul 2021 06:45:59 -0400 Received: from smtp.corp.redhat.com (int-mx07.intmail.prod.int.phx2.redhat.com [10.5.11.22]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id E5748100E444; Wed, 21 Jul 2021 10:45:49 +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 B88151081303; Wed, 21 Jul 2021 10:45:49 +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 857FB4A711; Wed, 21 Jul 2021 10:45:49 +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 16LAhKgJ001054 for ; Wed, 21 Jul 2021 06:43:20 -0400 Received: by smtp.corp.redhat.com (Postfix) id 48C5319D9B; Wed, 21 Jul 2021 10:43:20 +0000 (UTC) Received: from andariel.local (unknown [10.40.193.36]) by smtp.corp.redhat.com (Postfix) with ESMTP id A4FD919C79 for ; Wed, 21 Jul 2021 10:43:19 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1626864362; 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=GEBl6TqVbGg6iu/4qwdTh0PIfVUtYB+EG86k4Zct6uU=; b=A79u9j0ns9b21Yvh8SEvyPtCMEol99MWw9IqNKomTIFa0pyeNcfHyL8h0VZ4Uy2N6rOx5M LHaeKsWYJucl3By1G+dD1SukcoOWvzCUJhjr+cVDQJU6vMBDhzPdOf1/x5TUXgoI7ybEoX X2dw7EBORevzNF9s6fyNA/OuBbUHILY= X-MC-Unique: 7LwTUOvROSGtaSVvv0d9HA-1 From: Peter Krempa To: libvir-list@redhat.com Subject: [PATCH 26/33] qemu: Remove return value from qemuMonitorDomainAcpiOstInfoCallback Date: Wed, 21 Jul 2021 12:42:38 +0200 Message-Id: <8d3a995ccf2c600541742ce55cd299b0cc458b1c.1626864132.git.pkrempa@redhat.com> 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.84 on 10.5.11.22 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: 1626864364416100004 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 | 16 ++++++++-------- src/qemu/qemu_process.c | 4 +--- 2 files changed, 9 insertions(+), 11 deletions(-) diff --git a/src/qemu/qemu_monitor.h b/src/qemu/qemu_monitor.h index cbf1098fa7..c9be99e394 100644 --- a/src/qemu/qemu_monitor.h +++ b/src/qemu/qemu_monitor.h @@ -267,14 +267,14 @@ typedef void (*qemuMonitorDomainMigrationPassCallback= )(qemuMonitor *mon, int pass, void *opaque); -typedef int (*qemuMonitorDomainAcpiOstInfoCallback)(qemuMonitor *mon, - virDomainObj *vm, - const char *alias, - const char *slotType, - const char *slot, - unsigned int source, - unsigned int status, - void *opaque); +typedef void (*qemuMonitorDomainAcpiOstInfoCallback)(qemuMonitor *mon, + virDomainObj *vm, + const char *alias, + const char *slotType, + const char *slot, + unsigned int source, + unsigned int status, + void *opaque); typedef int (*qemuMonitorDomainBlockThresholdCallback)(qemuMonitor *mon, diff --git a/src/qemu/qemu_process.c b/src/qemu/qemu_process.c index 139bf7ccf1..c012e8b4de 100644 --- a/src/qemu/qemu_process.c +++ b/src/qemu/qemu_process.c @@ -1393,7 +1393,7 @@ qemuProcessHandleDeviceDeleted(qemuMonitor *mon G_GNU= C_UNUSED, * Note that qemu does not emit the event for all the documented sources = or * devices. */ -static int +static void qemuProcessHandleAcpiOstInfo(qemuMonitor *mon G_GNUC_UNUSED, virDomainObj *vm, const char *alias, @@ -1428,8 +1428,6 @@ qemuProcessHandleAcpiOstInfo(qemuMonitor *mon G_GNUC_= UNUSED, cleanup: virObjectUnlock(vm); virObjectEventStateQueue(driver->domainEventState, event); - - return 0; } --=20 2.31.1