From nobody Mon Feb 9 01:36:05 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=1626864351; cv=none; d=zohomail.com; s=zohoarc; b=KYikb5GSsmklPlRHNLayjOdKu+zm8SdlRT8COzOroSoHiTn8sdnBFhoG7Q4iQKCm+KDqVVgJy/s36jOOhxM7ypH+itauYXCW4mcaSiDE7LzL71ko3KQNGGMx10wUnOkUt/69Z2MXV1/vUJvEtLqGEqlPVmthq5PtDBo5Xa50RCw= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1626864351; 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=8/qh1n0a8QqZYwV4yzeLWx8sTYzG6dovfGAWbizlB/g=; b=GRgx9Cqdrlnb65J4yG0MGnLlbeJ66+hV9eS53utBoqFobLYBP6liq9r+sql/i2ryEvO3fRaPBSeS2GVjMFDPni6gzy7cGYGf2NQ7Htg2f2ORran0wb6+JoO7woCua9Im7K5qqt2CyN3lvRk4NqfqjOKyhOqcQpi5xBL7u9J0CVE= 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 1626864351552869.5312726822466; Wed, 21 Jul 2021 03:45:51 -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-244-hnYvgsEkPueB6mwjw5X_Qg-1; Wed, 21 Jul 2021 06:45:47 -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 2A9411932482; Wed, 21 Jul 2021 10:45:42 +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 067ED10074F1; Wed, 21 Jul 2021 10:45:42 +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 C98244A70B; Wed, 21 Jul 2021 10:45:41 +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 16LAgxFY000880 for ; Wed, 21 Jul 2021 06:42:59 -0400 Received: by smtp.corp.redhat.com (Postfix) id E09AB19D9B; Wed, 21 Jul 2021 10:42:59 +0000 (UTC) Received: from andariel.local (unknown [10.40.193.36]) by smtp.corp.redhat.com (Postfix) with ESMTP id 4ECD919C79 for ; Wed, 21 Jul 2021 10:42:59 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1626864350; 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=8/qh1n0a8QqZYwV4yzeLWx8sTYzG6dovfGAWbizlB/g=; b=Y3qwVL3QGyoWwZpjycJ1ot7ZH6EJnhkS/RiSRPkwUUXa/oJXAhx4uByIJstLSqgN0V5294 1kGl0DoALD9YoBT7yw+potgQXG+NhnF5f6av/g9jqRtYoNvhu0BL6ifTXtj4fao40Eh4QY MD9ZtZ2yqhWCIsFI3drYP+7oWbqOc7Y= X-MC-Unique: hnYvgsEkPueB6mwjw5X_Qg-1 From: Peter Krempa To: libvir-list@redhat.com Subject: [PATCH 09/33] qemu: Remove return value from qemuMonitorDomainWatchdogCallback Date: Wed, 21 Jul 2021 12:42:21 +0200 Message-Id: <1dc296d18d731c00223291c026a309f220795baa.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.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: 1626864353150100003 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 +--- 2 files changed, 5 insertions(+), 7 deletions(-) diff --git a/src/qemu/qemu_monitor.h b/src/qemu/qemu_monitor.h index a085e7ea27..260fb94696 100644 --- a/src/qemu/qemu_monitor.h +++ b/src/qemu/qemu_monitor.h @@ -179,10 +179,10 @@ typedef void (*qemuMonitorDomainRTCChangeCallback)(qe= muMonitor *mon, virDomainObj *vm, long long offset, void *opaque); -typedef int (*qemuMonitorDomainWatchdogCallback)(qemuMonitor *mon, - virDomainObj *vm, - int action, - void *opaque); +typedef void (*qemuMonitorDomainWatchdogCallback)(qemuMonitor *mon, + virDomainObj *vm, + int action, + void *opaque); typedef int (*qemuMonitorDomainIOErrorCallback)(qemuMonitor *mon, virDomainObj *vm, const char *diskAlias, diff --git a/src/qemu/qemu_process.c b/src/qemu/qemu_process.c index e41e350f33..8c7e9ad3ec 100644 --- a/src/qemu/qemu_process.c +++ b/src/qemu/qemu_process.c @@ -788,7 +788,7 @@ qemuProcessHandleRTCChange(qemuMonitor *mon G_GNUC_UNUS= ED, } -static int +static void qemuProcessHandleWatchdog(qemuMonitor *mon G_GNUC_UNUSED, virDomainObj *vm, int action, @@ -842,8 +842,6 @@ qemuProcessHandleWatchdog(qemuMonitor *mon G_GNUC_UNUSE= D, virObjectUnlock(vm); virObjectEventStateQueue(driver->domainEventState, watchdogEvent); virObjectEventStateQueue(driver->domainEventState, lifecycleEvent); - - return 0; } --=20 2.31.1