From nobody Sat Feb 7 08:13:38 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=1626864214; cv=none; d=zohomail.com; s=zohoarc; b=SAobuhIA287MOM8F++Qws5GdDolm3YfVLzkO6HW4BbXqAXjzPVQmStIRsJ/kLWVQPAAFD38mcCqZn86/gAmI17yIwjBuzfjq7E0nXE0RFpNYlR+X2rxzah0e3SpbxeTqVBDvwsPu4nCIh/lXmW4tXGK0qVyxRMZJl3VXJC/18T8= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1626864214; 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=33Qo56NfQF1MdXiN5PBnCsO0bNzFUrCIQ6V4rqKZilw=; b=YPSrw6run+A8IR30xVaE2DTbONsLkrvLVZTgoUpuPWjRZsbcBcI6A39rAPIhQ4mJc5oYAZ3ZTsAlUKpUZZtmJvFchnOWtCA0Guv8++Rj7Nk+yqzrsx2VkFnVmAJUeP1ob/Ki5mHojdmIVzdROT+LohOOMGyQElgnex05P+qxm8A= 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 162686421447270.99267263352021; Wed, 21 Jul 2021 03:43:34 -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-498-MiBhgUhKNpG6JikklhJFOQ-1; Wed, 21 Jul 2021 06:43:32 -0400 Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.phx2.redhat.com [10.5.11.16]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 04924801FCE; Wed, 21 Jul 2021 10:43:27 +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 D87065C22A; Wed, 21 Jul 2021 10:43:26 +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 A4CF3181A2A0; Wed, 21 Jul 2021 10:43:26 +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 16LAh0SN000887 for ; Wed, 21 Jul 2021 06:43:00 -0400 Received: by smtp.corp.redhat.com (Postfix) id DD71719D9B; Wed, 21 Jul 2021 10:43:00 +0000 (UTC) Received: from andariel.local (unknown [10.40.193.36]) by smtp.corp.redhat.com (Postfix) with ESMTP id 4C09E19C79 for ; Wed, 21 Jul 2021 10:43:00 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1626864213; 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=33Qo56NfQF1MdXiN5PBnCsO0bNzFUrCIQ6V4rqKZilw=; b=D35A6xw83/cFzRMkxrS3q/PrTpU6pP5QK4Kbz2eKPStJHDtBnaIN8lIwMF0aYJVL/6QmfL WbCYHpzF02f9UT/b0AF8+XXc4pGbo4NrcIazCqQ/Tb/dWk9m0hJN2TU3LX609PjweKafAg Szfb1NBqS5Ha7Oml/kwIGgxId009wRI= X-MC-Unique: MiBhgUhKNpG6JikklhJFOQ-1 From: Peter Krempa To: libvir-list@redhat.com Subject: [PATCH 10/33] qemu: Remove return value from qemuMonitorDomainIOErrorCallback Date: Wed, 21 Jul 2021 12:42:22 +0200 Message-Id: <8eceb961fb85a7bac28c2cb6d294edbcfb08babb.1626864131.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.79 on 10.5.11.16 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: 1626864215225100001 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 | 14 +++++++------- src/qemu/qemu_process.c | 3 +-- 2 files changed, 8 insertions(+), 9 deletions(-) diff --git a/src/qemu/qemu_monitor.h b/src/qemu/qemu_monitor.h index 260fb94696..af7fb098c6 100644 --- a/src/qemu/qemu_monitor.h +++ b/src/qemu/qemu_monitor.h @@ -183,13 +183,13 @@ typedef void (*qemuMonitorDomainWatchdogCallback)(qem= uMonitor *mon, virDomainObj *vm, int action, void *opaque); -typedef int (*qemuMonitorDomainIOErrorCallback)(qemuMonitor *mon, - virDomainObj *vm, - const char *diskAlias, - const char *nodename, - int action, - const char *reason, - void *opaque); +typedef void (*qemuMonitorDomainIOErrorCallback)(qemuMonitor *mon, + virDomainObj *vm, + const char *diskAlias, + const char *nodename, + int action, + const char *reason, + void *opaque); typedef int (*qemuMonitorDomainGraphicsCallback)(qemuMonitor *mon, virDomainObj *vm, int phase, diff --git a/src/qemu/qemu_process.c b/src/qemu/qemu_process.c index 8c7e9ad3ec..6e53aec49a 100644 --- a/src/qemu/qemu_process.c +++ b/src/qemu/qemu_process.c @@ -845,7 +845,7 @@ qemuProcessHandleWatchdog(qemuMonitor *mon G_GNUC_UNUSE= D, } -static int +static void qemuProcessHandleIOError(qemuMonitor *mon G_GNUC_UNUSED, virDomainObj *vm, const char *diskAlias, @@ -912,7 +912,6 @@ qemuProcessHandleIOError(qemuMonitor *mon G_GNUC_UNUSED, virObjectEventStateQueue(driver->domainEventState, ioErrorEvent); virObjectEventStateQueue(driver->domainEventState, ioErrorEvent2); virObjectEventStateQueue(driver->domainEventState, lifecycleEvent); - return 0; } static int --=20 2.31.1