From nobody Sat Apr 27 14:42:40 2024 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=1626864202; cv=none; d=zohomail.com; s=zohoarc; b=RPjd7yC6jUD90KYW6vtnBQ4UfWv3hixKq+NiWj/OaqzETUxnferyIZdANTWGlAjw7Iqc3/FGDJvJdB47+4Afhz4imBI3ZUaru8deqZC41uK7hLKtRsT1EeVHvDNkWIyLYLMIeKraaJGPsj7Ifhxw2trmmgWglhBx4XFDAPi4K6w= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1626864202; 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=Wjq/wOVxf2797Uj8Yr6HYeyPc45U8jwuKZzA3S+3kSg=; b=AfrYqjKf9hQK0foeyfg+r7vfBf+kGfAKn8a2CWALQrAtQv4rGPswz4nCb+lCcrgdBtIWy4gfznxqC/BNFj/fcXzGMwRRniHqSwmoZpq7QU3KOGJ2j83btj6snAl9uFuXuWmfbJibR9AN1+R/bl7SWbNVjZMRkOEnnWkF4v1Jz8k= 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 1626864202530426.68992758417744; Wed, 21 Jul 2021 03:43:22 -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-174-ebPSqRO4NKKupq5snRv42w-1; Wed, 21 Jul 2021 06:43:19 -0400 Received: from smtp.corp.redhat.com (int-mx08.intmail.prod.int.phx2.redhat.com [10.5.11.23]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 7CF87802575; Wed, 21 Jul 2021 10:43:14 +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 BF29819D9B; Wed, 21 Jul 2021 10:43:13 +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 4B259181A1FE; Wed, 21 Jul 2021 10:43:13 +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 16LAgpqk000832 for ; Wed, 21 Jul 2021 06:42:51 -0400 Received: by smtp.corp.redhat.com (Postfix) id BFD6219D9B; Wed, 21 Jul 2021 10:42:51 +0000 (UTC) Received: from andariel.local (unknown [10.40.193.36]) by smtp.corp.redhat.com (Postfix) with ESMTP id 2D76F19C79 for ; Wed, 21 Jul 2021 10:42:50 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1626864201; 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=Wjq/wOVxf2797Uj8Yr6HYeyPc45U8jwuKZzA3S+3kSg=; b=jFkplem3m+jHGU0R0QO5BlaExtXDVCYAqeS9OYLBpCxwlEaLrr5rXbFdd8+zm3l4F9CYf/ w9PVDTgQ4y2kdPBgwnup8yGF0B7D1xIJbgDSB6x2cfuGBj7kSuD0HsfOnZvp3/suYvsVYG NY9EmVi3quXYIk24cC8b7JLGA9XEgBM= X-MC-Unique: ebPSqRO4NKKupq5snRv42w-1 From: Peter Krempa To: libvir-list@redhat.com Subject: [PATCH 01/33] qemu: monitor: Remove handlers for the 'POWERDOWN' event Date: Wed, 21 Jul 2021 12:42:13 +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.84 on 10.5.11.23 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: 1626864204274100001 Content-Type: text/plain; charset="utf-8" The qemu process code doesn't register a callback for it so we don't need to be handling it at all. Signed-off-by: Peter Krempa Reviewed-by: J=C3=A1n Tomko --- src/qemu/qemu_monitor.c | 11 ----------- src/qemu/qemu_monitor.h | 5 ----- src/qemu/qemu_monitor_json.c | 7 ------- 3 files changed, 23 deletions(-) diff --git a/src/qemu/qemu_monitor.c b/src/qemu/qemu_monitor.c index b06c842a7a..628b3fb71d 100644 --- a/src/qemu/qemu_monitor.c +++ b/src/qemu/qemu_monitor.c @@ -1195,17 +1195,6 @@ qemuMonitorEmitReset(qemuMonitor *mon) } -int -qemuMonitorEmitPowerdown(qemuMonitor *mon) -{ - int ret =3D -1; - VIR_DEBUG("mon=3D%p", mon); - - QEMU_MONITOR_CALLBACK(mon, ret, domainPowerdown, mon->vm); - return ret; -} - - int qemuMonitorEmitStop(qemuMonitor *mon) { diff --git a/src/qemu/qemu_monitor.h b/src/qemu/qemu_monitor.h index 6a25def78b..265c25c521 100644 --- a/src/qemu/qemu_monitor.h +++ b/src/qemu/qemu_monitor.h @@ -169,9 +169,6 @@ typedef int (*qemuMonitorDomainShutdownCallback)(qemuMo= nitor *mon, typedef int (*qemuMonitorDomainResetCallback)(qemuMonitor *mon, virDomainObj *vm, void *opaque); -typedef int (*qemuMonitorDomainPowerdownCallback)(qemuMonitor *mon, - virDomainObj *vm, - void *opaque); typedef int (*qemuMonitorDomainStopCallback)(qemuMonitor *mon, virDomainObj *vm, void *opaque); @@ -372,7 +369,6 @@ struct _qemuMonitorCallbacks { qemuMonitorDomainEventCallback domainEvent; qemuMonitorDomainShutdownCallback domainShutdown; qemuMonitorDomainResetCallback domainReset; - qemuMonitorDomainPowerdownCallback domainPowerdown; qemuMonitorDomainStopCallback domainStop; qemuMonitorDomainResumeCallback domainResume; qemuMonitorDomainRTCChangeCallback domainRTCChange; @@ -447,7 +443,6 @@ int qemuMonitorEmitEvent(qemuMonitor *mon, const char *= event, const char *details); int qemuMonitorEmitShutdown(qemuMonitor *mon, virTristateBool guest); int qemuMonitorEmitReset(qemuMonitor *mon); -int qemuMonitorEmitPowerdown(qemuMonitor *mon); int qemuMonitorEmitStop(qemuMonitor *mon); int qemuMonitorEmitResume(qemuMonitor *mon); int qemuMonitorEmitRTCChange(qemuMonitor *mon, long long offset); diff --git a/src/qemu/qemu_monitor_json.c b/src/qemu/qemu_monitor_json.c index 7e53e0ce84..ca2c3bb6cf 100644 --- a/src/qemu/qemu_monitor_json.c +++ b/src/qemu/qemu_monitor_json.c @@ -78,7 +78,6 @@ VIR_ENUM_IMPL(qemuMonitorJobStatus, static void qemuMonitorJSONHandleShutdown(qemuMonitor *mon, virJSONValue *= data); static void qemuMonitorJSONHandleReset(qemuMonitor *mon, virJSONValue *dat= a); -static void qemuMonitorJSONHandlePowerdown(qemuMonitor *mon, virJSONValue = *data); static void qemuMonitorJSONHandleStop(qemuMonitor *mon, virJSONValue *data= ); static void qemuMonitorJSONHandleResume(qemuMonitor *mon, virJSONValue *da= ta); static void qemuMonitorJSONHandleRTCChange(qemuMonitor *mon, virJSONValue = *data); @@ -137,7 +136,6 @@ static qemuEventHandler eventHandlers[] =3D { { "MIGRATION", qemuMonitorJSONHandleMigrationStatus, }, { "MIGRATION_PASS", qemuMonitorJSONHandleMigrationPass, }, { "NIC_RX_FILTER_CHANGED", qemuMonitorJSONHandleNicRxFilterChanged, }, - { "POWERDOWN", qemuMonitorJSONHandlePowerdown, }, { "PR_MANAGER_STATUS_CHANGED", qemuMonitorJSONHandlePRManagerStatusCha= nged, }, { "RDMA_GID_STATUS_CHANGED", qemuMonitorJSONHandleRdmaGidStatusChanged= , }, { "RESET", qemuMonitorJSONHandleReset, }, @@ -733,11 +731,6 @@ static void qemuMonitorJSONHandleReset(qemuMonitor *mo= n, virJSONValue *data G_GN qemuMonitorEmitReset(mon); } -static void qemuMonitorJSONHandlePowerdown(qemuMonitor *mon, virJSONValue = *data G_GNUC_UNUSED) -{ - qemuMonitorEmitPowerdown(mon); -} - static void qemuMonitorJSONHandleStop(qemuMonitor *mon, virJSONValue *data= G_GNUC_UNUSED) { qemuMonitorEmitStop(mon); --=20 2.31.1 From nobody Sat Apr 27 14:42:40 2024 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=1626864206; cv=none; d=zohomail.com; s=zohoarc; b=MuX3XGWEUzZBqTT1ZaYNYwWw8WgOHYlsekmBvkoH7bcFPu+IzomCXy+kN85qKbhqohcX+d2ZZwobnm0RgHPRfJ5Onj3NJuDiiCKel/LJg6C8V0hS3IlFkucC/hzhLqBbCeNLbG6HBDVaeYoFBqsYDqNh+FFWGyz++8JVfo3dKpg= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1626864206; 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=3I6IrXyQBVDCEMVT56ZaK2BORgK2fUIKxd5wpTe2Ne0=; b=VvKZ6U4W9Sjy7e4nPvxHSlUHKcPQYSrNE04v2BhPcznmpL83vhXuLKvopPtXlJIMFjxQiHIwDBBNXdNWxdnJGfuFZg3z6er67TufPYqT8yGCYjolEGzo8Y3xHgSq61/OHQtqZwvTNZDiDA/WQEttiVEiQGwze1Y/tO+qZu/Bu+4= 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 1626864206297377.9908213957257; Wed, 21 Jul 2021 03:43:26 -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-100-iQYOlX8zPPSmHWkI1lXbjw-1; Wed, 21 Jul 2021 06:43:23 -0400 Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 86BF5804141; Wed, 21 Jul 2021 10:43:18 +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 694C360583; Wed, 21 Jul 2021 10:43:18 +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 08CE64BB7C; Wed, 21 Jul 2021 10:43:18 +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 16LAgr1f000838 for ; Wed, 21 Jul 2021 06:42:53 -0400 Received: by smtp.corp.redhat.com (Postfix) id 0443B19D9B; Wed, 21 Jul 2021 10:42:53 +0000 (UTC) Received: from andariel.local (unknown [10.40.193.36]) by smtp.corp.redhat.com (Postfix) with ESMTP id 2CF4E19C79 for ; Wed, 21 Jul 2021 10:42:51 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1626864205; 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=3I6IrXyQBVDCEMVT56ZaK2BORgK2fUIKxd5wpTe2Ne0=; b=MGh5M0c3KNUBnNCRAqX+L0G9yKTzC1WNvO6dvyqRNHSYQilbUQFYfoZ78ec8DytY1PcFl8 PP231dkJnGjJ6aUOKHurUVqo37YINBl3GSETpMjxCSKZIV5vtvPxN0YghcGsSrL2mr9D86 TlqGc8+MyqS+dMNGKRCXE15RyMNKmog= X-MC-Unique: iQYOlX8zPPSmHWkI1lXbjw-1 From: Peter Krempa To: libvir-list@redhat.com Subject: [PATCH 02/33] qemu: monitor: Remove return value from qemuMonitorEmit* functions Date: Wed, 21 Jul 2021 12:42:14 +0200 Message-Id: <53dc1a9b7b02e6f58badbac43c3f64e5696f6c69.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.11 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: 1626864206542100001 Content-Type: text/plain; charset="utf-8" The callers in the monitor code invoking the callbacks after events are received don't actually check the return value from the callbacks and there isn't really anything we could do on failure. Remove the return value from the intermediary functions so we can later remove them from the callback prototypes. Signed-off-by: Peter Krempa Reviewed-by: J=C3=A1n Tomko --- src/qemu/qemu_monitor.c | 204 ++++++++++++---------------------------- src/qemu/qemu_monitor.h | 176 +++++++++++++++++----------------- 2 files changed, 150 insertions(+), 230 deletions(-) diff --git a/src/qemu/qemu_monitor.c b/src/qemu/qemu_monitor.c index 628b3fb71d..6e2d8010c5 100644 --- a/src/qemu/qemu_monitor.c +++ b/src/qemu/qemu_monitor.c @@ -1147,126 +1147,107 @@ qemuMonitorUpdateVideoVram64Size(qemuMonitor *mon, /* Ensure proper locking around callbacks. */ -#define QEMU_MONITOR_CALLBACK(mon, ret, callback, ...) \ +#define QEMU_MONITOR_CALLBACK(mon, callback, ...) \ do { \ virObjectRef(mon); \ virObjectUnlock(mon); \ if ((mon)->cb && (mon)->cb->callback) \ - (ret) =3D (mon)->cb->callback(mon, __VA_ARGS__, \ - (mon)->callbackOpaque); \ + (mon)->cb->callback(mon, __VA_ARGS__, (mon)->callbackOpaque); \ virObjectLock(mon); \ virObjectUnref(mon); \ } while (0) -int +void qemuMonitorEmitEvent(qemuMonitor *mon, const char *event, long long seconds, unsigned int micros, const char *details) { - int ret =3D -1; VIR_DEBUG("mon=3D%p event=3D%s", mon, event); - QEMU_MONITOR_CALLBACK(mon, ret, domainEvent, mon->vm, event, seconds, + QEMU_MONITOR_CALLBACK(mon, domainEvent, mon->vm, event, seconds, micros, details); - return ret; } -int +void qemuMonitorEmitShutdown(qemuMonitor *mon, virTristateBool guest) { - int ret =3D -1; VIR_DEBUG("mon=3D%p guest=3D%u", mon, guest); - QEMU_MONITOR_CALLBACK(mon, ret, domainShutdown, mon->vm, guest); - return ret; + QEMU_MONITOR_CALLBACK(mon, domainShutdown, mon->vm, guest); } -int +void qemuMonitorEmitReset(qemuMonitor *mon) { - int ret =3D -1; VIR_DEBUG("mon=3D%p", mon); - QEMU_MONITOR_CALLBACK(mon, ret, domainReset, mon->vm); - return ret; + QEMU_MONITOR_CALLBACK(mon, domainReset, mon->vm); } -int +void qemuMonitorEmitStop(qemuMonitor *mon) { - int ret =3D -1; VIR_DEBUG("mon=3D%p", mon); - QEMU_MONITOR_CALLBACK(mon, ret, domainStop, mon->vm); - return ret; + QEMU_MONITOR_CALLBACK(mon, domainStop, mon->vm); } -int +void qemuMonitorEmitResume(qemuMonitor *mon) { - int ret =3D -1; VIR_DEBUG("mon=3D%p", mon); - QEMU_MONITOR_CALLBACK(mon, ret, domainResume, mon->vm); - return ret; + QEMU_MONITOR_CALLBACK(mon, domainResume, mon->vm); } -int +void qemuMonitorEmitGuestPanic(qemuMonitor *mon, qemuMonitorEventPanicInfo *info) { - int ret =3D -1; VIR_DEBUG("mon=3D%p", mon); - QEMU_MONITOR_CALLBACK(mon, ret, domainGuestPanic, mon->vm, info); - return ret; + QEMU_MONITOR_CALLBACK(mon, domainGuestPanic, mon->vm, info); } -int +void qemuMonitorEmitRTCChange(qemuMonitor *mon, long long offset) { - int ret =3D -1; VIR_DEBUG("mon=3D%p", mon); - QEMU_MONITOR_CALLBACK(mon, ret, domainRTCChange, mon->vm, offset); - return ret; + QEMU_MONITOR_CALLBACK(mon, domainRTCChange, mon->vm, offset); } -int +void qemuMonitorEmitWatchdog(qemuMonitor *mon, int action) { - int ret =3D -1; VIR_DEBUG("mon=3D%p", mon); - QEMU_MONITOR_CALLBACK(mon, ret, domainWatchdog, mon->vm, action); - return ret; + QEMU_MONITOR_CALLBACK(mon, domainWatchdog, mon->vm, action); } -int +void qemuMonitorEmitIOError(qemuMonitor *mon, const char *diskAlias, const char *nodename, int action, const char *reason) { - int ret =3D -1; VIR_DEBUG("mon=3D%p", mon); - QEMU_MONITOR_CALLBACK(mon, ret, domainIOError, mon->vm, + QEMU_MONITOR_CALLBACK(mon, domainIOError, mon->vm, diskAlias, nodename, action, reason); - return ret; } -int +void qemuMonitorEmitGraphics(qemuMonitor *mon, int phase, int localFamily, @@ -1279,202 +1260,160 @@ qemuMonitorEmitGraphics(qemuMonitor *mon, const char *x509dname, const char *saslUsername) { - int ret =3D -1; VIR_DEBUG("mon=3D%p", mon); - QEMU_MONITOR_CALLBACK(mon, ret, domainGraphics, mon->vm, phase, + QEMU_MONITOR_CALLBACK(mon, domainGraphics, mon->vm, phase, localFamily, localNode, localService, remoteFamily, remoteNode, remoteService, authScheme, x509dname, saslUsername); - return ret; } -int +void qemuMonitorEmitTrayChange(qemuMonitor *mon, const char *devAlias, const char *devid, int reason) { - int ret =3D -1; VIR_DEBUG("mon=3D%p", mon); - QEMU_MONITOR_CALLBACK(mon, ret, domainTrayChange, mon->vm, + QEMU_MONITOR_CALLBACK(mon, domainTrayChange, mon->vm, devAlias, devid, reason); - - return ret; } -int +void qemuMonitorEmitPMWakeup(qemuMonitor *mon) { - int ret =3D -1; VIR_DEBUG("mon=3D%p", mon); - QEMU_MONITOR_CALLBACK(mon, ret, domainPMWakeup, mon->vm); - - return ret; + QEMU_MONITOR_CALLBACK(mon, domainPMWakeup, mon->vm); } -int +void qemuMonitorEmitPMSuspend(qemuMonitor *mon) { - int ret =3D -1; VIR_DEBUG("mon=3D%p", mon); - QEMU_MONITOR_CALLBACK(mon, ret, domainPMSuspend, mon->vm); - - return ret; + QEMU_MONITOR_CALLBACK(mon, domainPMSuspend, mon->vm); } -int +void qemuMonitorEmitPMSuspendDisk(qemuMonitor *mon) { - int ret =3D -1; VIR_DEBUG("mon=3D%p", mon); - QEMU_MONITOR_CALLBACK(mon, ret, domainPMSuspendDisk, mon->vm); - - return ret; + QEMU_MONITOR_CALLBACK(mon, domainPMSuspendDisk, mon->vm); } -int +void qemuMonitorEmitBlockJob(qemuMonitor *mon, const char *diskAlias, int type, int status, const char *error) { - int ret =3D -1; VIR_DEBUG("mon=3D%p", mon); - QEMU_MONITOR_CALLBACK(mon, ret, domainBlockJob, mon->vm, + QEMU_MONITOR_CALLBACK(mon, domainBlockJob, mon->vm, diskAlias, type, status, error); - return ret; } -int +void qemuMonitorEmitJobStatusChange(qemuMonitor *mon, const char *jobname, qemuMonitorJobStatus status) { - int ret =3D -1; VIR_DEBUG("mon=3D%p", mon); - QEMU_MONITOR_CALLBACK(mon, ret, jobStatusChange, mon->vm, jobname, sta= tus); - return ret; + QEMU_MONITOR_CALLBACK(mon, jobStatusChange, mon->vm, jobname, status); } -int +void qemuMonitorEmitBalloonChange(qemuMonitor *mon, unsigned long long actual) { - int ret =3D -1; VIR_DEBUG("mon=3D%p", mon); - QEMU_MONITOR_CALLBACK(mon, ret, domainBalloonChange, mon->vm, actual); - return ret; + QEMU_MONITOR_CALLBACK(mon, domainBalloonChange, mon->vm, actual); } -int +void qemuMonitorEmitDeviceDeleted(qemuMonitor *mon, const char *devAlias) { - int ret =3D -1; VIR_DEBUG("mon=3D%p", mon); - QEMU_MONITOR_CALLBACK(mon, ret, domainDeviceDeleted, mon->vm, devAlias= ); - - return ret; + QEMU_MONITOR_CALLBACK(mon, domainDeviceDeleted, mon->vm, devAlias); } -int +void qemuMonitorEmitNicRxFilterChanged(qemuMonitor *mon, const char *devAlias) { - int ret =3D -1; VIR_DEBUG("mon=3D%p", mon); - QEMU_MONITOR_CALLBACK(mon, ret, domainNicRxFilterChanged, mon->vm, dev= Alias); - - return ret; + QEMU_MONITOR_CALLBACK(mon, domainNicRxFilterChanged, mon->vm, devAlias= ); } -int +void qemuMonitorEmitSerialChange(qemuMonitor *mon, const char *devAlias, bool connected) { - int ret =3D -1; VIR_DEBUG("mon=3D%p, devAlias=3D'%s', connected=3D%d", mon, devAlias, = connected); - QEMU_MONITOR_CALLBACK(mon, ret, domainSerialChange, mon->vm, devAlias,= connected); - - return ret; + QEMU_MONITOR_CALLBACK(mon, domainSerialChange, mon->vm, devAlias, conn= ected); } -int +void qemuMonitorEmitSpiceMigrated(qemuMonitor *mon) { - int ret =3D -1; VIR_DEBUG("mon=3D%p", mon); - QEMU_MONITOR_CALLBACK(mon, ret, domainSpiceMigrated, mon->vm); - - return ret; + QEMU_MONITOR_CALLBACK(mon, domainSpiceMigrated, mon->vm); } -int +void qemuMonitorEmitMemoryFailure(qemuMonitor *mon, qemuMonitorEventMemoryFailure *mfp) { - int ret =3D -1; - - QEMU_MONITOR_CALLBACK(mon, ret, domainMemoryFailure, mon->vm, mfp); - - return ret; + QEMU_MONITOR_CALLBACK(mon, domainMemoryFailure, mon->vm, mfp); } -int +void qemuMonitorEmitMigrationStatus(qemuMonitor *mon, int status) { - int ret =3D -1; VIR_DEBUG("mon=3D%p, status=3D%s", mon, NULLSTR(qemuMonitorMigrationStatusTypeToString(status))= ); - QEMU_MONITOR_CALLBACK(mon, ret, domainMigrationStatus, mon->vm, status= ); - - return ret; + QEMU_MONITOR_CALLBACK(mon, domainMigrationStatus, mon->vm, status); } -int +void qemuMonitorEmitMigrationPass(qemuMonitor *mon, int pass) { - int ret =3D -1; VIR_DEBUG("mon=3D%p, pass=3D%d", mon, pass); - QEMU_MONITOR_CALLBACK(mon, ret, domainMigrationPass, mon->vm, pass); - - return ret; + QEMU_MONITOR_CALLBACK(mon, domainMigrationPass, mon->vm, pass); } -int +void qemuMonitorEmitAcpiOstInfo(qemuMonitor *mon, const char *alias, const char *slotType, @@ -1482,92 +1421,73 @@ qemuMonitorEmitAcpiOstInfo(qemuMonitor *mon, unsigned int source, unsigned int status) { - int ret =3D -1; VIR_DEBUG("mon=3D%p, alias=3D'%s', slotType=3D'%s', slot=3D'%s', sourc= e=3D'%u' status=3D%u", mon, NULLSTR(alias), slotType, slot, source, status); - QEMU_MONITOR_CALLBACK(mon, ret, domainAcpiOstInfo, mon->vm, + QEMU_MONITOR_CALLBACK(mon, domainAcpiOstInfo, mon->vm, alias, slotType, slot, source, status); - - return ret; } -int +void qemuMonitorEmitBlockThreshold(qemuMonitor *mon, const char *nodename, unsigned long long threshold, unsigned long long excess) { - int ret =3D -1; - VIR_DEBUG("mon=3D%p, node-name=3D'%s', threshold=3D'%llu', excess=3D'%= llu'", mon, nodename, threshold, excess); - QEMU_MONITOR_CALLBACK(mon, ret, domainBlockThreshold, mon->vm, + QEMU_MONITOR_CALLBACK(mon, domainBlockThreshold, mon->vm, nodename, threshold, excess); - - return ret; } -int +void qemuMonitorEmitDumpCompleted(qemuMonitor *mon, int status, qemuMonitorDumpStats *stats, const char *error) { - int ret =3D -1; - VIR_DEBUG("mon=3D%p", mon); - QEMU_MONITOR_CALLBACK(mon, ret, domainDumpCompleted, mon->vm, + QEMU_MONITOR_CALLBACK(mon, domainDumpCompleted, mon->vm, status, stats, error); - - return ret; } -int +void qemuMonitorEmitPRManagerStatusChanged(qemuMonitor *mon, const char *prManager, bool connected) { - int ret =3D -1; VIR_DEBUG("mon=3D%p, prManager=3D'%s', connected=3D%d", mon, prManager= , connected); - QEMU_MONITOR_CALLBACK(mon, ret, domainPRManagerStatusChanged, + QEMU_MONITOR_CALLBACK(mon, domainPRManagerStatusChanged, mon->vm, prManager, connected); - - return ret; } -int +void qemuMonitorEmitRdmaGidStatusChanged(qemuMonitor *mon, const char *netdev, bool gid_status, unsigned long long subnet_prefix, unsigned long long interface_id) { - int ret =3D -1; VIR_DEBUG("netdev=3D%s, gid_status=3D%d, subnet_prefix=3D0x%llx, inter= face_id=3D0x%llx", netdev, gid_status, subnet_prefix, interface_id); - QEMU_MONITOR_CALLBACK(mon, ret, domainRdmaGidStatusChanged, mon->vm, + QEMU_MONITOR_CALLBACK(mon, domainRdmaGidStatusChanged, mon->vm, netdev, gid_status, subnet_prefix, interface_id); - - return ret; } -int +void qemuMonitorEmitGuestCrashloaded(qemuMonitor *mon) { - int ret =3D -1; VIR_DEBUG("mon=3D%p", mon); - QEMU_MONITOR_CALLBACK(mon, ret, domainGuestCrashloaded, mon->vm); - return ret; + QEMU_MONITOR_CALLBACK(mon, domainGuestCrashloaded, mon->vm); } diff --git a/src/qemu/qemu_monitor.h b/src/qemu/qemu_monitor.h index 265c25c521..2fa5151652 100644 --- a/src/qemu/qemu_monitor.h +++ b/src/qemu/qemu_monitor.h @@ -438,95 +438,95 @@ int qemuMonitorUpdateVideoVram64Size(qemuMonitor *mon, const char *videoName) ATTRIBUTE_NONNULL(2) ATTRIBUTE_NONNULL(3); -int qemuMonitorEmitEvent(qemuMonitor *mon, const char *event, - long long seconds, unsigned int micros, - const char *details); -int qemuMonitorEmitShutdown(qemuMonitor *mon, virTristateBool guest); -int qemuMonitorEmitReset(qemuMonitor *mon); -int qemuMonitorEmitStop(qemuMonitor *mon); -int qemuMonitorEmitResume(qemuMonitor *mon); -int qemuMonitorEmitRTCChange(qemuMonitor *mon, long long offset); -int qemuMonitorEmitWatchdog(qemuMonitor *mon, int action); -int qemuMonitorEmitIOError(qemuMonitor *mon, - const char *diskAlias, - const char *nodename, - int action, - const char *reason); -int qemuMonitorEmitGraphics(qemuMonitor *mon, - int phase, - int localFamily, - const char *localNode, - const char *localService, - int remoteFamily, - const char *remoteNode, - const char *remoteService, - const char *authScheme, - const char *x509dname, - const char *saslUsername); -int qemuMonitorEmitTrayChange(qemuMonitor *mon, - const char *devAlias, - const char *devid, - int reason); -int qemuMonitorEmitPMWakeup(qemuMonitor *mon); -int qemuMonitorEmitPMSuspend(qemuMonitor *mon); -int qemuMonitorEmitBlockJob(qemuMonitor *mon, + void qemuMonitorEmitEvent(qemuMonitor *mon, const char *event, + long long seconds, unsigned int micros, + const char *details); +void qemuMonitorEmitShutdown(qemuMonitor *mon, virTristateBool guest); +void qemuMonitorEmitReset(qemuMonitor *mon); +void qemuMonitorEmitStop(qemuMonitor *mon); +void qemuMonitorEmitResume(qemuMonitor *mon); +void qemuMonitorEmitRTCChange(qemuMonitor *mon, long long offset); +void qemuMonitorEmitWatchdog(qemuMonitor *mon, int action); +void qemuMonitorEmitIOError(qemuMonitor *mon, const char *diskAlias, - int type, - int status, - const char *error); -int qemuMonitorEmitJobStatusChange(qemuMonitor *mon, - const char *jobname, - qemuMonitorJobStatus status); -int qemuMonitorEmitBalloonChange(qemuMonitor *mon, - unsigned long long actual); -int qemuMonitorEmitPMSuspendDisk(qemuMonitor *mon); -int qemuMonitorEmitGuestPanic(qemuMonitor *mon, - qemuMonitorEventPanicInfo *info); -int qemuMonitorEmitDeviceDeleted(qemuMonitor *mon, - const char *devAlias); -int qemuMonitorEmitNicRxFilterChanged(qemuMonitor *mon, - const char *devAlias); -int qemuMonitorEmitSerialChange(qemuMonitor *mon, - const char *devAlias, - bool connected); -int qemuMonitorEmitSpiceMigrated(qemuMonitor *mon); - -int qemuMonitorEmitMemoryFailure(qemuMonitor *mon, - qemuMonitorEventMemoryFailure *mfp); - -int qemuMonitorEmitMigrationStatus(qemuMonitor *mon, - int status); -int qemuMonitorEmitMigrationPass(qemuMonitor *mon, - int pass); - -int qemuMonitorEmitAcpiOstInfo(qemuMonitor *mon, - const char *alias, - const char *slotType, - const char *slot, - unsigned int source, - unsigned int status); - -int qemuMonitorEmitBlockThreshold(qemuMonitor *mon, - const char *nodename, - unsigned long long threshold, - unsigned long long excess); - -int qemuMonitorEmitDumpCompleted(qemuMonitor *mon, - int status, - qemuMonitorDumpStats *stats, - const char *error); - -int qemuMonitorEmitPRManagerStatusChanged(qemuMonitor *mon, - const char *prManager, - bool connected); - -int qemuMonitorEmitRdmaGidStatusChanged(qemuMonitor *mon, - const char *netdev, - bool gid_status, - unsigned long long subnet_prefix, - unsigned long long interface_id); - -int qemuMonitorEmitGuestCrashloaded(qemuMonitor *mon); + const char *nodename, + int action, + const char *reason); +void qemuMonitorEmitGraphics(qemuMonitor *mon, + int phase, + int localFamily, + const char *localNode, + const char *localService, + int remoteFamily, + const char *remoteNode, + const char *remoteService, + const char *authScheme, + const char *x509dname, + const char *saslUsername); +void qemuMonitorEmitTrayChange(qemuMonitor *mon, + const char *devAlias, + const char *devid, + int reason); +void qemuMonitorEmitPMWakeup(qemuMonitor *mon); +void qemuMonitorEmitPMSuspend(qemuMonitor *mon); +void qemuMonitorEmitBlockJob(qemuMonitor *mon, + const char *diskAlias, + int type, + int status, + const char *error); +void qemuMonitorEmitJobStatusChange(qemuMonitor *mon, + const char *jobname, + qemuMonitorJobStatus status); +void qemuMonitorEmitBalloonChange(qemuMonitor *mon, + unsigned long long actual); +void qemuMonitorEmitPMSuspendDisk(qemuMonitor *mon); +void qemuMonitorEmitGuestPanic(qemuMonitor *mon, + qemuMonitorEventPanicInfo *info); +void qemuMonitorEmitDeviceDeleted(qemuMonitor *mon, + const char *devAlias); +void qemuMonitorEmitNicRxFilterChanged(qemuMonitor *mon, + const char *devAlias); +void qemuMonitorEmitSerialChange(qemuMonitor *mon, + const char *devAlias, + bool connected); +void qemuMonitorEmitSpiceMigrated(qemuMonitor *mon); + +void qemuMonitorEmitMemoryFailure(qemuMonitor *mon, + qemuMonitorEventMemoryFailure *mfp); + +void qemuMonitorEmitMigrationStatus(qemuMonitor *mon, + int status); +void qemuMonitorEmitMigrationPass(qemuMonitor *mon, + int pass); + +void qemuMonitorEmitAcpiOstInfo(qemuMonitor *mon, + const char *alias, + const char *slotType, + const char *slot, + unsigned int source, + unsigned int status); + +void qemuMonitorEmitBlockThreshold(qemuMonitor *mon, + const char *nodename, + unsigned long long threshold, + unsigned long long excess); + +void qemuMonitorEmitDumpCompleted(qemuMonitor *mon, + int status, + qemuMonitorDumpStats *stats, + const char *error); + +void qemuMonitorEmitPRManagerStatusChanged(qemuMonitor *mon, + const char *prManager, + bool connected); + +void qemuMonitorEmitRdmaGidStatusChanged(qemuMonitor *mon, + const char *netdev, + bool gid_status, + unsigned long long subnet_prefix, + unsigned long long interface_id); + +void qemuMonitorEmitGuestCrashloaded(qemuMonitor *mon); int qemuMonitorStartCPUs(qemuMonitor *mon); int qemuMonitorStopCPUs(qemuMonitor *mon); --=20 2.31.1 From nobody Sat Apr 27 14:42:40 2024 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=1626864243; cv=none; d=zohomail.com; s=zohoarc; b=dPzIGestNvyDMRqU7TZPmIcXtRl0K2K6OKs7mGi5oH4pmGeWUqfXxhG2Q6F3Db1rVz2QMZkxFEf5wPFim4uC5rwtEG1+hABVt45oRGrngx+907L8bXOr42RPBv8isSQs3Urr37gJOa7EpfY4Y7Z7dGbC6a1nBcPVMFsPW8vuuXI= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1626864243; 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=r2hg0d5hTHBYWeEQrHMEHWb/W6o481hBR5ntwZXqHcw=; b=NcquH0iFb5Kkozitfg4gGhGJgeIQ9KyhdGsuC9lHF6hEkc0t47e/Vcfi3epMz1jHaq+szZ7Kq1x1OcGbVul7i2Qo77RbUVdjhNUvXnPF1l6859yxg+L5g3zDSxkPc6vBly8ItiWMe53VZW1qtkRJcItAqqJ1hFI/oZP35GYmWno= 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 1626864243764837.5865313550687; Wed, 21 Jul 2021 03:44: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-490-4BDSzN8nMaS5Mun2KPI3AQ-1; Wed, 21 Jul 2021 06:43:26 -0400 Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.phx2.redhat.com [10.5.11.15]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 552F28026AD; Wed, 21 Jul 2021 10:43:21 +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 306A484A0B; Wed, 21 Jul 2021 10:43:21 +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 EF93E181A1FE; Wed, 21 Jul 2021 10:43:20 +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 16LAgs2L000843 for ; Wed, 21 Jul 2021 06:42:54 -0400 Received: by smtp.corp.redhat.com (Postfix) id 01FC319D9B; Wed, 21 Jul 2021 10:42:54 +0000 (UTC) Received: from andariel.local (unknown [10.40.193.36]) by smtp.corp.redhat.com (Postfix) with ESMTP id 6330619C79 for ; Wed, 21 Jul 2021 10:42:53 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1626864242; 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=r2hg0d5hTHBYWeEQrHMEHWb/W6o481hBR5ntwZXqHcw=; b=Rerecq0NPiN3vPXaIzJkW+MW5RRSehQWyhnEk+4b6YD0ZJPlH+0oFG7IjdeW2p3GRkEV5G JN2I5eUIKiCJe/5ABTzUrQylO9DtGIaHjPEbqBnn6M1QAMSaikpmu1CKKvJ6YaZi8S+n8S IIjo64501r3206EUeCqGQ4vICksgPtI= X-MC-Unique: 4BDSzN8nMaS5Mun2KPI3AQ-1 From: Peter Krempa To: libvir-list@redhat.com Subject: [PATCH 03/33] qemu: Remove return value from qemuMonitorDomainEventCallback Date: Wed, 21 Jul 2021 12:42:15 +0200 Message-Id: <495e9b645f6a8888d56e4e4ce253ce8453e6ef48.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.15 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: 1626864245566100001 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 Reviewed-by: J=C3=A1n Tomko --- src/qemu/qemu_monitor.h | 14 +++++++------- src/qemu/qemu_process.c | 4 +--- 2 files changed, 8 insertions(+), 10 deletions(-) diff --git a/src/qemu/qemu_monitor.h b/src/qemu/qemu_monitor.h index 2fa5151652..d20b2e89d1 100644 --- a/src/qemu/qemu_monitor.h +++ b/src/qemu/qemu_monitor.h @@ -155,13 +155,13 @@ typedef void (*qemuMonitorEofNotifyCallback)(qemuMoni= tor *mon, typedef void (*qemuMonitorErrorNotifyCallback)(qemuMonitor *mon, virDomainObj *vm, void *opaque); -typedef int (*qemuMonitorDomainEventCallback)(qemuMonitor *mon, - virDomainObj *vm, - const char *event, - long long seconds, - unsigned int micros, - const char *details, - void *opaque); +typedef void (*qemuMonitorDomainEventCallback)(qemuMonitor *mon, + virDomainObj *vm, + const char *event, + long long seconds, + unsigned int micros, + const char *details, + void *opaque); typedef int (*qemuMonitorDomainShutdownCallback)(qemuMonitor *mon, virDomainObj *vm, virTristateBool guest, diff --git a/src/qemu/qemu_process.c b/src/qemu/qemu_process.c index 914f936e45..6b9658f5ac 100644 --- a/src/qemu/qemu_process.c +++ b/src/qemu/qemu_process.c @@ -546,7 +546,7 @@ qemuProcessShutdownOrReboot(virQEMUDriver *driver, } -static int +static void qemuProcessHandleEvent(qemuMonitor *mon G_GNUC_UNUSED, virDomainObj *vm, const char *eventName, @@ -567,8 +567,6 @@ qemuProcessHandleEvent(qemuMonitor *mon G_GNUC_UNUSED, virObjectUnlock(vm); virObjectEventStateQueue(driver->domainEventState, event); - - return 0; } --=20 2.31.1 From nobody Sat Apr 27 14:42:40 2024 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=1626864212; cv=none; d=zohomail.com; s=zohoarc; b=SsY4A47esetfGUoc9vTHVAPZhA5Q/O3krpnZArrUVyuL3qbIKZ24OCGKh4+j9yz6tVLLOV3N9HqlwsGo5pVz8BkD305wIe4h/oYGT9MLpyOsJdCxuW6UwXc+7Zblqas2CoH2BQRQtYEJf4BIekAWJZD4qzNksKUjvQVvEdXst5c= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1626864212; 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=STg64gLZ0zJwpYTVadXJs2l8qBybNoZYDsJDPMPY1Xo=; b=X0BYzWj3bCTbf3yf8funi/9tB9Nkauiq+ZQQp/cwvKuh93pjDK5jBQK3j+4fHXd/LWtgIkolyb7gLXgO2aMGeDTQQ0vTet1Hd1zkLPb/p/rxXgnYzRG/9c+JgHiZUyA39lbba52DJDFYgnY80GQGyI6JBoLDhmqsrSMVoznHpWk= 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 1626864212075821.5135465185818; Wed, 21 Jul 2021 03:43:32 -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-49-xkku-JrVMgmjrWGB7MhOag-1; Wed, 21 Jul 2021 06:43:29 -0400 Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.phx2.redhat.com [10.5.11.13]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 089841005D62; Wed, 21 Jul 2021 10:43:24 +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 E190560C59; Wed, 21 Jul 2021 10:43:23 +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 AB1B3181A29D; Wed, 21 Jul 2021 10:43:23 +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 16LAgtTA000848 for ; Wed, 21 Jul 2021 06:42:55 -0400 Received: by smtp.corp.redhat.com (Postfix) id F313019D9B; Wed, 21 Jul 2021 10:42:54 +0000 (UTC) Received: from andariel.local (unknown [10.40.193.36]) by smtp.corp.redhat.com (Postfix) with ESMTP id 601EA19C79 for ; Wed, 21 Jul 2021 10:42:54 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1626864211; 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=STg64gLZ0zJwpYTVadXJs2l8qBybNoZYDsJDPMPY1Xo=; b=Hji6X4EBM9W82Z+a+qkj/Rgb/sUIajufqQW/Qdqo0Q1Yote+px0RU9VbiPh33R9XHvnFGv oWnJ1rj/eyXw9xp3V6uBDKIXj01MFU/qioLJhfjD8Kdk3+JxQ+ehi3epAiGppZoYsoUMVS UsWiqghfrElFxFklQUa+bvXG2/F2m6o= X-MC-Unique: xkku-JrVMgmjrWGB7MhOag-1 From: Peter Krempa To: libvir-list@redhat.com Subject: [PATCH 04/33] qemu: Remove return value from qemuMonitorDomainShutdownCallback Date: Wed, 21 Jul 2021 12:42:16 +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.13 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: 1626864212981100001 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 Reviewed-by: J=C3=A1n Tomko --- 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 d20b2e89d1..58968d940d 100644 --- a/src/qemu/qemu_monitor.h +++ b/src/qemu/qemu_monitor.h @@ -162,10 +162,10 @@ typedef void (*qemuMonitorDomainEventCallback)(qemuMo= nitor *mon, unsigned int micros, const char *details, void *opaque); -typedef int (*qemuMonitorDomainShutdownCallback)(qemuMonitor *mon, - virDomainObj *vm, - virTristateBool guest, - void *opaque); +typedef void (*qemuMonitorDomainShutdownCallback)(qemuMonitor *mon, + virDomainObj *vm, + virTristateBool guest, + void *opaque); typedef int (*qemuMonitorDomainResetCallback)(qemuMonitor *mon, virDomainObj *vm, void *opaque); diff --git a/src/qemu/qemu_process.c b/src/qemu/qemu_process.c index 6b9658f5ac..925a774c3e 100644 --- a/src/qemu/qemu_process.c +++ b/src/qemu/qemu_process.c @@ -570,7 +570,7 @@ qemuProcessHandleEvent(qemuMonitor *mon G_GNUC_UNUSED, } -static int +static void qemuProcessHandleShutdown(qemuMonitor *mon G_GNUC_UNUSED, virDomainObj *vm, virTristateBool guest_initiated, @@ -642,8 +642,6 @@ qemuProcessHandleShutdown(qemuMonitor *mon G_GNUC_UNUSE= D, unlock: virObjectUnlock(vm); virObjectEventStateQueue(driver->domainEventState, event); - - return 0; } --=20 2.31.1 From nobody Sat Apr 27 14:42:40 2024 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=1626864344; cv=none; d=zohomail.com; s=zohoarc; b=cLOWV4kKrroLsIZRhV/SuPQLEPETxgqZzrSUvS/CQwsy86y7pn8IxP7sNcgyEBvBMM/+8uapScJNjEOeS6R5SIyqW6Y+Z/WfeT/dX91eaFWCKk6CbeRKVv3cvzhGfYyrlu8Fj6pM0ZldDKM3XjA8dc7G+BQGs1ny2nc/blyXqic= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1626864344; 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=YyszLl8nnx53ZXcbyumLuvOB2cu4/5VqVXhZV1BEAr0=; b=ODzvjbQgtYvnj+sLzPUAIkCiCzu9Xf6CLoPT0VCtYQoekCsZVHtk6S1gs57QZLcXG4vaMsoT1B05iO65SJVg/HraM/WCLIYxfDXsu0VDCEtc88ZDxoJkSBCkK/nJhKPusLU5e3cHMiUigQASjSq049ISqBiuuXEKXn3p9isp8TA= 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 1626864344161511.37867765715623; Wed, 21 Jul 2021 03:45:44 -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-63-9MarKGnwMyGnXmZutKcTZg-1; Wed, 21 Jul 2021 06:45:41 -0400 Received: from smtp.corp.redhat.com (int-mx08.intmail.prod.int.phx2.redhat.com [10.5.11.23]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 6DE0B10086E5; Wed, 21 Jul 2021 10:45:36 +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 46F4719D9B; Wed, 21 Jul 2021 10:45:36 +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 E33E14A705; Wed, 21 Jul 2021 10:45:35 +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 16LAgtCs000854 for ; Wed, 21 Jul 2021 06:42:56 -0400 Received: by smtp.corp.redhat.com (Postfix) id EF9E419D9B; Wed, 21 Jul 2021 10:42:55 +0000 (UTC) Received: from andariel.local (unknown [10.40.193.36]) by smtp.corp.redhat.com (Postfix) with ESMTP id 5D62D19C79 for ; Wed, 21 Jul 2021 10:42:55 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1626864343; 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=YyszLl8nnx53ZXcbyumLuvOB2cu4/5VqVXhZV1BEAr0=; b=TZFxFi472NA2ByHa8Uh8u7xtEGC/0ZjgZWksyXk82SabIZzMGSTBA+39RZFvSWJks4mJ/2 p2AYvb1sHKxho8u4Z9kn6ukumjA2o6dTehX10EB5h5tW4Vum3kNTvj78oujkJpVnyCnbU5 heU77T+CP01VPSigaWzhEs2HMbY/ngU= X-MC-Unique: 9MarKGnwMyGnXmZutKcTZg-1 From: Peter Krempa To: libvir-list@redhat.com Subject: [PATCH 05/33] qemu: Remove return value from qemuMonitorDomainResetCallback Date: Wed, 21 Jul 2021 12:42:17 +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.84 on 10.5.11.23 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: 1626864344507100003 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 Reviewed-by: J=C3=A1n Tomko --- src/qemu/qemu_monitor.h | 6 +++--- src/qemu/qemu_process.c | 5 +---- 2 files changed, 4 insertions(+), 7 deletions(-) diff --git a/src/qemu/qemu_monitor.h b/src/qemu/qemu_monitor.h index 58968d940d..969bcb1454 100644 --- a/src/qemu/qemu_monitor.h +++ b/src/qemu/qemu_monitor.h @@ -166,9 +166,9 @@ typedef void (*qemuMonitorDomainShutdownCallback)(qemuM= onitor *mon, virDomainObj *vm, virTristateBool guest, void *opaque); -typedef int (*qemuMonitorDomainResetCallback)(qemuMonitor *mon, - virDomainObj *vm, - void *opaque); +typedef void (*qemuMonitorDomainResetCallback)(qemuMonitor *mon, + virDomainObj *vm, + void *opaque); typedef int (*qemuMonitorDomainStopCallback)(qemuMonitor *mon, virDomainObj *vm, void *opaque); diff --git a/src/qemu/qemu_process.c b/src/qemu/qemu_process.c index 925a774c3e..90b22167cf 100644 --- a/src/qemu/qemu_process.c +++ b/src/qemu/qemu_process.c @@ -400,7 +400,7 @@ qemuProcessFindDomainDiskByAliasOrQOM(virDomainObj *vm, } -static int +static void qemuProcessHandleReset(qemuMonitor *mon G_GNUC_UNUSED, virDomainObj *vm, void *opaque) @@ -409,7 +409,6 @@ qemuProcessHandleReset(qemuMonitor *mon G_GNUC_UNUSED, virObjectEvent *event; qemuDomainObjPrivate *priv; g_autoptr(virQEMUDriverConfig) cfg =3D virQEMUDriverGetConfig(driver); - int ret =3D -1; virObjectLock(vm); @@ -441,11 +440,9 @@ qemuProcessHandleReset(qemuMonitor *mon G_GNUC_UNUSED, qemuDomainObjEndJob(driver, vm); } - ret =3D 0; cleanup: virObjectUnlock(vm); virObjectEventStateQueue(driver->domainEventState, event); - return ret; } --=20 2.31.1 From nobody Sat Apr 27 14:42:40 2024 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=1626864342; cv=none; d=zohomail.com; s=zohoarc; b=Cip1+R5egRxRgDd/3SRye+7/QSbtKya5YtSpLnjzzfVpRBZAWhQHo6Zj3a4z5n0pHkUU48YPBBocd4RFqDnYx/Pr+7PtlGK6fTAX/H+I8uAnqrarwtgakmEu5hlmRZVnI23MJ/ZBJvaZCNUDt1tQ3im3a9Yuoev9s+3WAAR65zw= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1626864342; 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=y2wKfQSfXvw3Y1jYczCEnD5NHalMN82SAs4dumyip3E=; b=Xm3BFYgv8z5iXJNrpf+rkXgoPmxD3/60YLjE30/lNvYiMT701tXBa96zoG6EsA3dRSp9BSa8XmlHu5HrnG4DCVIh7n5b6SfLlPvtg4qNs5MQ2bGTfPocHjGWEpS1JhWzzvZMOenMoEAWT9PkC+DD0FANY6sMI6tt3nxIDrYava4= 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 1626864342436823.1753502105837; Wed, 21 Jul 2021 03:45:42 -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-593-w4F4NMi6N-m6Gfp3UGAB5g-1; Wed, 21 Jul 2021 06:45:39 -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 5ABF594DFE; Wed, 21 Jul 2021 10:45:34 +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 380185D9FC; Wed, 21 Jul 2021 10:45:34 +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 EF16E1819AC9; Wed, 21 Jul 2021 10:45:33 +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 16LAgufn000860 for ; Wed, 21 Jul 2021 06:42:56 -0400 Received: by smtp.corp.redhat.com (Postfix) id ECF7B19D9B; Wed, 21 Jul 2021 10:42:56 +0000 (UTC) Received: from andariel.local (unknown [10.40.193.36]) by smtp.corp.redhat.com (Postfix) with ESMTP id 5A91619C79 for ; Wed, 21 Jul 2021 10:42:56 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1626864341; 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=y2wKfQSfXvw3Y1jYczCEnD5NHalMN82SAs4dumyip3E=; b=ZLS9FN0u5fgxR+XkbaPK3lHrFEO0/lhiI6+B8i+VLO6D9/FuGjkj+05S1Vau7sC9pz06gk l6s7RFwcOn3ddP5xI5Kmd4RgjGeueZhJ2Kp5J9IA9BgeJVpbfOdSQGYarOeDxXhk2+JVKV LzqYUQ5y9wO5HrTgCHVqq2k82kBi2nA= X-MC-Unique: w4F4NMi6N-m6Gfp3UGAB5g-1 From: Peter Krempa To: libvir-list@redhat.com Subject: [PATCH 06/33] qemu: Remove return value from qemuMonitorDomainStopCallback Date: Wed, 21 Jul 2021 12:42:18 +0200 Message-Id: <67b5104057386c2602464450659c9e82943ef93c.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.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: 1626864344331100001 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 Reviewed-by: J=C3=A1n Tomko --- src/qemu/qemu_monitor.h | 6 +++--- src/qemu/qemu_process.c | 4 +--- 2 files changed, 4 insertions(+), 6 deletions(-) diff --git a/src/qemu/qemu_monitor.h b/src/qemu/qemu_monitor.h index 969bcb1454..f35f07f3ac 100644 --- a/src/qemu/qemu_monitor.h +++ b/src/qemu/qemu_monitor.h @@ -169,9 +169,9 @@ typedef void (*qemuMonitorDomainShutdownCallback)(qemuM= onitor *mon, typedef void (*qemuMonitorDomainResetCallback)(qemuMonitor *mon, virDomainObj *vm, void *opaque); -typedef int (*qemuMonitorDomainStopCallback)(qemuMonitor *mon, - virDomainObj *vm, - void *opaque); +typedef void (*qemuMonitorDomainStopCallback)(qemuMonitor *mon, + virDomainObj *vm, + void *opaque); typedef int (*qemuMonitorDomainResumeCallback)(qemuMonitor *mon, virDomainObj *vm, void *opaque); diff --git a/src/qemu/qemu_process.c b/src/qemu/qemu_process.c index 90b22167cf..c501a981ca 100644 --- a/src/qemu/qemu_process.c +++ b/src/qemu/qemu_process.c @@ -642,7 +642,7 @@ qemuProcessHandleShutdown(qemuMonitor *mon G_GNUC_UNUSE= D, } -static int +static void qemuProcessHandleStop(qemuMonitor *mon G_GNUC_UNUSED, virDomainObj *vm, void *opaque) @@ -700,8 +700,6 @@ qemuProcessHandleStop(qemuMonitor *mon G_GNUC_UNUSED, virObjectUnlock(vm); virObjectEventStateQueue(driver->domainEventState, event); - - return 0; } --=20 2.31.1 From nobody Sat Apr 27 14:42:40 2024 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=1626864346; cv=none; d=zohomail.com; s=zohoarc; b=JjabxZhumYrEP5XhSVFwtQeCaisApACnsZJxcD3mI1xUVZyI2sjSGGod/nKSaIFF8dmYVNtHFoTgrwU/a6w8Br0pyuXS2EPIl/uYSl6hV/N7CQBPJ8qY07YfZIW5jgAVuMF90WmqymV3o+7DjImJdYx0aS1TnlpkSsKBzWt8VUU= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1626864346; 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=+GFfJfVVTZSYQDhhHKoH0Ep4BGjzktiWYdqIGgbAEws=; b=QkRAHxdVjQ63L9N+EVJAplP6Vngj5De39u3U/V0htBuYyTHJzqLuQwADtIo+YGiClAa4wVMbqbUOHcZV5bVH6uKdD1Z6NL/TBnaMDI18U83nzO6HtccaDXf62cAs/HJ9RrVRJLaWapZOC9txEulPI3gKRFDqydwz3j4MsPBXfmQ= 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 1626864346106445.8212860493089; Wed, 21 Jul 2021 03:45:46 -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-598-168KRem4Oe661Pn5rPdEZw-1; Wed, 21 Jul 2021 06:45:42 -0400 Received: from smtp.corp.redhat.com (int-mx08.intmail.prod.int.phx2.redhat.com [10.5.11.23]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 8F2BC10086CB; Wed, 21 Jul 2021 10:45:37 +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 6398F1970E; Wed, 21 Jul 2021 10:45:37 +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 2CE3C4A705; Wed, 21 Jul 2021 10:45:37 +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 16LAgvDx000865 for ; Wed, 21 Jul 2021 06:42:57 -0400 Received: by smtp.corp.redhat.com (Postfix) id E78B019D9B; Wed, 21 Jul 2021 10:42:57 +0000 (UTC) Received: from andariel.local (unknown [10.40.193.36]) by smtp.corp.redhat.com (Postfix) with ESMTP id 560D719C79 for ; Wed, 21 Jul 2021 10:42:57 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1626864345; 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=+GFfJfVVTZSYQDhhHKoH0Ep4BGjzktiWYdqIGgbAEws=; b=V3Hf+bnw4XWdCZIYtlmHu65q+2ULFJbf38dzXE50LvaC3iuXl30wi1brfnP6FKi0dsVa1P /7OHeEChKglUFifHAUZJkv1tA+F3PnLCSAU7GPuKD8OxtdJcGvi/ukqgBUqdaBeq8ZIa7D etfpu5kpLx9NMRzbHaAUQ4a7lwB3Y8c= X-MC-Unique: 168KRem4Oe661Pn5rPdEZw-1 From: Peter Krempa To: libvir-list@redhat.com Subject: [PATCH 07/33] qemu: Remove return value from qemuMonitorDomainResumeCallback Date: Wed, 21 Jul 2021 12:42:19 +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.84 on 10.5.11.23 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: 1626864346640100005 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 Reviewed-by: J=C3=A1n Tomko --- src/qemu/qemu_monitor.h | 6 +++--- src/qemu/qemu_process.c | 3 +-- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/src/qemu/qemu_monitor.h b/src/qemu/qemu_monitor.h index f35f07f3ac..db995de93e 100644 --- a/src/qemu/qemu_monitor.h +++ b/src/qemu/qemu_monitor.h @@ -172,9 +172,9 @@ typedef void (*qemuMonitorDomainResetCallback)(qemuMoni= tor *mon, typedef void (*qemuMonitorDomainStopCallback)(qemuMonitor *mon, virDomainObj *vm, void *opaque); -typedef int (*qemuMonitorDomainResumeCallback)(qemuMonitor *mon, - virDomainObj *vm, - void *opaque); +typedef void (*qemuMonitorDomainResumeCallback)(qemuMonitor *mon, + virDomainObj *vm, + void *opaque); typedef int (*qemuMonitorDomainRTCChangeCallback)(qemuMonitor *mon, virDomainObj *vm, long long offset, diff --git a/src/qemu/qemu_process.c b/src/qemu/qemu_process.c index c501a981ca..80e8e20128 100644 --- a/src/qemu/qemu_process.c +++ b/src/qemu/qemu_process.c @@ -703,7 +703,7 @@ qemuProcessHandleStop(qemuMonitor *mon G_GNUC_UNUSED, } -static int +static void qemuProcessHandleResume(qemuMonitor *mon G_GNUC_UNUSED, virDomainObj *vm, void *opaque) @@ -743,7 +743,6 @@ qemuProcessHandleResume(qemuMonitor *mon G_GNUC_UNUSED, virObjectUnlock(vm); virObjectEventStateQueue(driver->domainEventState, event); - return 0; } static int --=20 2.31.1 From nobody Sat Apr 27 14:42:40 2024 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=1626864349; cv=none; d=zohomail.com; s=zohoarc; b=aFrxSEFT4t2o5ToWPuTS0smYak5zCJRh6TZszBIHESDjojVN37zkp+bYPQatjgD+ya6YT3BKGhNJGNAxUfKu56pT2+4VgX2I2p3ITKkncBCnkw3sS5RrfzYvp9dSwrK5XJiCeCO2FILw7GgX5F2zch569Q4jQH+7FPD83bzgE50= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1626864349; 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=FJ/yYrWIsQKS2u+TW8hkxUbJwa2b3CLiqG8dkxfDHp4=; b=DigYiodZ3yP7f6DIbREJcDuUuik72287g4T7M2wr+PpAv/jfN5xc+3aRvzS0Snv96/WuVRnz3QuwhVgVq/nOwkaH/KcYJTvjFEPWruL3UXqKah0TU5nnHog5K3kJwxixi3+QcrKLNLnEQnAMl5re6aiqz47e7x7gxpyetuF2gH0= 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 1626864349534941.1092830837817; Wed, 21 Jul 2021 03:45:49 -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-421-B5_P3GfyPTCZYPko9D3AAA-1; Wed, 21 Jul 2021 06:45:47 -0400 Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.phx2.redhat.com [10.5.11.13]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 7329410086C4; Wed, 21 Jul 2021 10:45:39 +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 2C05660C9B; Wed, 21 Jul 2021 10:45:39 +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 EE9F04A709; Wed, 21 Jul 2021 10:45:38 +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 16LAgwLZ000871 for ; Wed, 21 Jul 2021 06:42:58 -0400 Received: by smtp.corp.redhat.com (Postfix) id E3F9E19D9B; Wed, 21 Jul 2021 10:42:58 +0000 (UTC) Received: from andariel.local (unknown [10.40.193.36]) by smtp.corp.redhat.com (Postfix) with ESMTP id 51B4019C79 for ; Wed, 21 Jul 2021 10:42:58 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1626864348; 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=FJ/yYrWIsQKS2u+TW8hkxUbJwa2b3CLiqG8dkxfDHp4=; b=WG52gaT6za5QFXvFSRtmXxgkt/Fge+0KDgxnrQSPBSfYuSubG7JhkIovPCv9Goxu1Sy9y0 QHcjoO/BM0RvU3ajaQoc7UnR7yEy5VhRzxAqxGWy5+dVDOZCU1kb403VS5jivONM5TMUlQ m+hVE0wFIcIOYWbi4dbSaCwMXRulyyY= X-MC-Unique: B5_P3GfyPTCZYPko9D3AAA-1 From: Peter Krempa To: libvir-list@redhat.com Subject: [PATCH 08/33] qemu: Remove return value from qemuMonitorDomainRTCChangeCallback Date: Wed, 21 Jul 2021 12:42:20 +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.13 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: 1626864351175100001 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 Reviewed-by: J=C3=A1n Tomko --- src/qemu/qemu_monitor.h | 8 ++++---- src/qemu/qemu_process.c | 3 +-- 2 files changed, 5 insertions(+), 6 deletions(-) diff --git a/src/qemu/qemu_monitor.h b/src/qemu/qemu_monitor.h index db995de93e..a085e7ea27 100644 --- a/src/qemu/qemu_monitor.h +++ b/src/qemu/qemu_monitor.h @@ -175,10 +175,10 @@ typedef void (*qemuMonitorDomainStopCallback)(qemuMon= itor *mon, typedef void (*qemuMonitorDomainResumeCallback)(qemuMonitor *mon, virDomainObj *vm, void *opaque); -typedef int (*qemuMonitorDomainRTCChangeCallback)(qemuMonitor *mon, - virDomainObj *vm, - long long offset, - void *opaque); +typedef void (*qemuMonitorDomainRTCChangeCallback)(qemuMonitor *mon, + virDomainObj *vm, + long long offset, + void *opaque); typedef int (*qemuMonitorDomainWatchdogCallback)(qemuMonitor *mon, virDomainObj *vm, int action, diff --git a/src/qemu/qemu_process.c b/src/qemu/qemu_process.c index 80e8e20128..e41e350f33 100644 --- a/src/qemu/qemu_process.c +++ b/src/qemu/qemu_process.c @@ -745,7 +745,7 @@ qemuProcessHandleResume(qemuMonitor *mon G_GNUC_UNUSED, virObjectEventStateQueue(driver->domainEventState, event); } -static int +static void qemuProcessHandleRTCChange(qemuMonitor *mon G_GNUC_UNUSED, virDomainObj *vm, long long offset, @@ -785,7 +785,6 @@ qemuProcessHandleRTCChange(qemuMonitor *mon G_GNUC_UNUS= ED, virObjectUnlock(vm); virObjectEventStateQueue(driver->domainEventState, event); - return 0; } --=20 2.31.1 From nobody Sat Apr 27 14:42:40 2024 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 Reviewed-by: J=C3=A1n Tomko --- 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 From nobody Sat Apr 27 14:42:40 2024 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 Reviewed-by: J=C3=A1n Tomko --- 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 From nobody Sat Apr 27 14:42:40 2024 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=1626864354; cv=none; d=zohomail.com; s=zohoarc; b=O+JZ85MPmsLi6SBWKCiXrbZbXAWT6Uci0gehMtuP893Ii4g9HqEe+37PKyAlfYegG+1LLtmziKBgEMpVNwWUp6Eflrddrz+T9grRv+P1jmJ3gFCxnG8e4img1s5qXebmIVHQfC83xGiEckP2dlS5Tv5Xu9oT2i9rl6nu3W0WaFU= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1626864354; 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=oRE60RABhWOjQ7BKSQwFgr+VwqufkoAQZXMiE9ZB5WM=; b=hVcRBgtUA1TRC7fgqoODh8IzCXkM9THg9i++iGY9XCcE8p6XjGnVW5mCCbek+sG+5WJJxX3FfswCZwVmMB6EpAX1bn3KCl4qDAyCNm2MuvFVmhyEr++wKY8kDEcYvXABoxP0Y7fJNlWzALHHi4WQOq4PwKuXCQnQJigJaq712lY= 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 1626864354129709.0670399111915; Wed, 21 Jul 2021 03:45:54 -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-559-DTkcyuXdNRmbg-M3lrKEpA-1; Wed, 21 Jul 2021 06:45:51 -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 E43961932488; Wed, 21 Jul 2021 10:45:44 +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 C43B45C23A; Wed, 21 Jul 2021 10:45:44 +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 68AEE181A28E; Wed, 21 Jul 2021 10:45:44 +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 16LAh1ld000892 for ; Wed, 21 Jul 2021 06:43:01 -0400 Received: by smtp.corp.redhat.com (Postfix) id D9DD019D9B; Wed, 21 Jul 2021 10:43:01 +0000 (UTC) Received: from andariel.local (unknown [10.40.193.36]) by smtp.corp.redhat.com (Postfix) with ESMTP id 4718D19C79 for ; Wed, 21 Jul 2021 10:43:01 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1626864353; 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=oRE60RABhWOjQ7BKSQwFgr+VwqufkoAQZXMiE9ZB5WM=; b=MFIAm60ZyaFQ9jMZaXbs/1dKalI4UoqEHoGeRdxcic8ZfdGBMK/hkWocde8t4Ggn0wSs3L bSJu0b2iqB147sy/zxikvo5CoM0XDPPMSpLp6Pvp0FnCw3bXypS1MKYQw6zdHC84SqtOJD S+b1Cr21cc5qnNVPtRVxdCwzyuo8eX0= X-MC-Unique: DTkcyuXdNRmbg-M3lrKEpA-1 From: Peter Krempa To: libvir-list@redhat.com Subject: [PATCH 11/33] qemu: Remove return value from qemuMonitorDomainGraphicsCallback Date: Wed, 21 Jul 2021 12:42:23 +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.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: 1626864355384100001 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 Reviewed-by: J=C3=A1n Tomko --- src/qemu/qemu_monitor.h | 26 +++++++++++++------------- src/qemu/qemu_process.c | 4 +--- 2 files changed, 14 insertions(+), 16 deletions(-) diff --git a/src/qemu/qemu_monitor.h b/src/qemu/qemu_monitor.h index af7fb098c6..a4c82ce5d5 100644 --- a/src/qemu/qemu_monitor.h +++ b/src/qemu/qemu_monitor.h @@ -190,19 +190,19 @@ typedef void (*qemuMonitorDomainIOErrorCallback)(qemu= Monitor *mon, int action, const char *reason, void *opaque); -typedef int (*qemuMonitorDomainGraphicsCallback)(qemuMonitor *mon, - virDomainObj *vm, - int phase, - int localFamily, - const char *localNode, - const char *localService, - int remoteFamily, - const char *remoteNode, - const char *remoteService, - const char *authScheme, - const char *x509dname, - const char *saslUsername, - void *opaque); +typedef void (*qemuMonitorDomainGraphicsCallback)(qemuMonitor *mon, + virDomainObj *vm, + int phase, + int localFamily, + const char *localNode, + const char *localService, + int remoteFamily, + const char *remoteNode, + const char *remoteServic= e, + const char *authScheme, + const char *x509dname, + const char *saslUsername, + void *opaque); typedef int (*qemuMonitorDomainBlockJobCallback)(qemuMonitor *mon, virDomainObj *vm, const char *diskAlias, diff --git a/src/qemu/qemu_process.c b/src/qemu/qemu_process.c index 6e53aec49a..27ea7d8c08 100644 --- a/src/qemu/qemu_process.c +++ b/src/qemu/qemu_process.c @@ -1039,7 +1039,7 @@ qemuProcessHandleJobStatusChange(qemuMonitor *mon G_G= NUC_UNUSED, } -static int +static void qemuProcessHandleGraphics(qemuMonitor *mon G_GNUC_UNUSED, virDomainObj *vm, int phase, @@ -1089,8 +1089,6 @@ qemuProcessHandleGraphics(qemuMonitor *mon G_GNUC_UNU= SED, virObjectUnlock(vm); virObjectEventStateQueue(driver->domainEventState, event); - - return 0; } static int --=20 2.31.1 From nobody Sat Apr 27 14:42:40 2024 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=1626864395; cv=none; d=zohomail.com; s=zohoarc; b=X1RGX0FAoZ5OuZqzcudF0v1RgHRtxi0iep3Am/nvvCwg7KV5mVdd8Uj0GkBeGwjw39cHZQpZkEDqh/2USR+i8IVNyvP42rQQ1TUiakXS6uS5Ys1yslcbwzh6hqq/WmgYU/vgtETXLB75wY2Fyy1LxgirZ+MgpqwCZfxeMboJ3ZU= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1626864395; 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=956k8RL89sBis3frKIdyilCV8W2Zkpe755bD3Wk1KNQ=; b=iGoSftn9n9xL+iPuDCW+KV2Td2V6DwTpWcy+hh2jxn4Pxa2Dd9EFnJBMlZ6XTFerNBmJKAnG+5eWmam3IIOzqSlSyN+kDPr8aA0wR4M7ZYKARodN2SOCzMggvinpZJHkXU076NHRgQaocGRoRqkIc1kW2Lm6YPq+w7sS0IloK7M= 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 1626864395651840.1689754120528; Wed, 21 Jul 2021 03:46:35 -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-522-JROSNF0RP3K2XbuaBJDI2g-1; Wed, 21 Jul 2021 06:45:53 -0400 Received: from smtp.corp.redhat.com (int-mx08.intmail.prod.int.phx2.redhat.com [10.5.11.23]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id A99A11009459; Wed, 21 Jul 2021 10:45:47 +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 8574819D9B; Wed, 21 Jul 2021 10:45:47 +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 54433181A29F; Wed, 21 Jul 2021 10:45:47 +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 16LAh2RT000901 for ; Wed, 21 Jul 2021 06:43:02 -0400 Received: by smtp.corp.redhat.com (Postfix) id D656C19D9D; Wed, 21 Jul 2021 10:43:02 +0000 (UTC) Received: from andariel.local (unknown [10.40.193.36]) by smtp.corp.redhat.com (Postfix) with ESMTP id 45BBE19C79 for ; Wed, 21 Jul 2021 10:43:02 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1626864394; 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=956k8RL89sBis3frKIdyilCV8W2Zkpe755bD3Wk1KNQ=; b=Fbck2D6RqYzyXOnTthEHLmUfhgLLH4Siwm7IQ+YaRZHjxgXaRmZsvvN0IFwQ0SvqKH4AfQ 0BsrQeEdMm55LSjmD30VVw5TbnVdJaTbnxlmvg4UkNnF+E0rauJ5MxkW2/TroxDCv2KxMH C9Q6WxAobDIPYJXj1NE1xT8qdggnGdg= X-MC-Unique: JROSNF0RP3K2XbuaBJDI2g-1 From: Peter Krempa To: libvir-list@redhat.com Subject: [PATCH 12/33] qemu: Remove return value from qemuMonitorDomainBlockJobCallback Date: Wed, 21 Jul 2021 12:42:24 +0200 Message-Id: <78558ce1f447043911324e4d84fa7d033cac0377.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.23 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: 1626864396725100001 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 Reviewed-by: J=C3=A1n Tomko --- 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 a4c82ce5d5..f2b784e4a6 100644 --- a/src/qemu/qemu_monitor.h +++ b/src/qemu/qemu_monitor.h @@ -203,13 +203,13 @@ typedef void (*qemuMonitorDomainGraphicsCallback)(qem= uMonitor *mon, const char *x509dname, const char *saslUsername, void *opaque); -typedef int (*qemuMonitorDomainBlockJobCallback)(qemuMonitor *mon, - virDomainObj *vm, - const char *diskAlias, - int type, - int status, - const char *error, - void *opaque); +typedef void (*qemuMonitorDomainBlockJobCallback)(qemuMonitor *mon, + virDomainObj *vm, + const char *diskAlias, + int type, + int status, + const char *error, + void *opaque); typedef int (*qemuMonitorDomainJobStatusChangeCallback)(qemuMonitor *mon, virDomainObj *vm, const char *jobnam= e, diff --git a/src/qemu/qemu_process.c b/src/qemu/qemu_process.c index 27ea7d8c08..abbf1776a0 100644 --- a/src/qemu/qemu_process.c +++ b/src/qemu/qemu_process.c @@ -914,7 +914,7 @@ qemuProcessHandleIOError(qemuMonitor *mon G_GNUC_UNUSED, virObjectEventStateQueue(driver->domainEventState, lifecycleEvent); } -static int +static void qemuProcessHandleBlockJob(qemuMonitor *mon G_GNUC_UNUSED, virDomainObj *vm, const char *diskAlias, @@ -974,7 +974,6 @@ qemuProcessHandleBlockJob(qemuMonitor *mon G_GNUC_UNUSE= D, cleanup: qemuProcessEventFree(processEvent); virObjectUnlock(vm); - return 0; } --=20 2.31.1 From nobody Sat Apr 27 14:42:40 2024 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=1626864218; cv=none; d=zohomail.com; s=zohoarc; b=OPlWFsNDZ08qWroHlWJsX4I+o2QJkUxW3cp/e83+VEoXws2/+yqPHLoWGcle/P6xld7RPZeq/4G2gFw6CMRzvy6KSXsRSzKkbFntEGi1lK68zvmYzdMd2yhKkWPFY172hXsYdvfBCGQCM2PX/weIndovTtUVtmlM63lPxqnoByQ= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1626864218; 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=53gRWc3uYPmTUzoi01k2jlTbgKNNxm6HGsFf6+TPDGc=; b=koNvVRm+KNyHpOBtvIJGY5OvWxHOUcBSbFcTb0gkf//tS0FQGjn/ZVkB3/wyu7PRxqaJQ8UlY0QvqCFqj6oj9aiV2TjXbOkjWRmZkRrXQuHkrP3T0WikqFwHzM3YvqIHbRnV1MEhPrS/L+lyPd+Gd6UvO6ZIZGmrBr0tM+3p8Nc= 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 1626864218108565.5643126443323; Wed, 21 Jul 2021 03:43:38 -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-107-bZCKlFrXP8mUucZYS8IsTQ-1; Wed, 21 Jul 2021 06:43:35 -0400 Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.phx2.redhat.com [10.5.11.13]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 2AF14804145; Wed, 21 Jul 2021 10:43:30 +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 0F81560C59; Wed, 21 Jul 2021 10:43:30 +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 CE32F181A2A3; Wed, 21 Jul 2021 10:43:29 +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 16LAh3A9000906 for ; Wed, 21 Jul 2021 06:43:03 -0400 Received: by smtp.corp.redhat.com (Postfix) id DA98D19D9B; Wed, 21 Jul 2021 10:43:03 +0000 (UTC) Received: from andariel.local (unknown [10.40.193.36]) by smtp.corp.redhat.com (Postfix) with ESMTP id 4167B19C79 for ; Wed, 21 Jul 2021 10:43:03 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1626864217; 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=53gRWc3uYPmTUzoi01k2jlTbgKNNxm6HGsFf6+TPDGc=; b=A4s+LpfZs3JYIUEVmBT6Mh0dAZv+RqzqH31Z0Rg+1tgX9Hk6F9O5coEK9NisM7taOoTMQo MfCqVqCOAvo7Swcr85WaIi+/oOlpj4jMU8HuS6D7ScEaGcTCp7mFKYU36RjFuuFgEtR/NB sTwdBpAxaalXLW6zkdIHSgZs+J/yftk= X-MC-Unique: bZCKlFrXP8mUucZYS8IsTQ-1 From: Peter Krempa To: libvir-list@redhat.com Subject: [PATCH 13/33] qemu: Remove return value from qemuMonitorDomainJobStatusChangeCallback Date: Wed, 21 Jul 2021 12:42:25 +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.13 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: 1626864219464100001 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 Reviewed-by: J=C3=A1n Tomko --- src/qemu/qemu_monitor.h | 10 +++++----- src/qemu/qemu_process.c | 3 +-- 2 files changed, 6 insertions(+), 7 deletions(-) diff --git a/src/qemu/qemu_monitor.h b/src/qemu/qemu_monitor.h index f2b784e4a6..e71cea797f 100644 --- a/src/qemu/qemu_monitor.h +++ b/src/qemu/qemu_monitor.h @@ -210,11 +210,11 @@ typedef void (*qemuMonitorDomainBlockJobCallback)(qem= uMonitor *mon, int status, const char *error, void *opaque); -typedef int (*qemuMonitorDomainJobStatusChangeCallback)(qemuMonitor *mon, - virDomainObj *vm, - const char *jobnam= e, - int status, - void *opaque); +typedef void (*qemuMonitorDomainJobStatusChangeCallback)(qemuMonitor *mon, + virDomainObj *vm, + const char *jobna= me, + int status, + void *opaque); typedef int (*qemuMonitorDomainTrayChangeCallback)(qemuMonitor *mon, virDomainObj *vm, const char *devAlias, diff --git a/src/qemu/qemu_process.c b/src/qemu/qemu_process.c index abbf1776a0..cf4b0e70df 100644 --- a/src/qemu/qemu_process.c +++ b/src/qemu/qemu_process.c @@ -977,7 +977,7 @@ qemuProcessHandleBlockJob(qemuMonitor *mon G_GNUC_UNUSE= D, } -static int +static void qemuProcessHandleJobStatusChange(qemuMonitor *mon G_GNUC_UNUSED, virDomainObj *vm, const char *jobname, @@ -1034,7 +1034,6 @@ qemuProcessHandleJobStatusChange(qemuMonitor *mon G_G= NUC_UNUSED, cleanup: qemuProcessEventFree(processEvent); virObjectUnlock(vm); - return 0; } --=20 2.31.1 From nobody Sat Apr 27 14:42:40 2024 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=1626864359; cv=none; d=zohomail.com; s=zohoarc; b=Fp6d8x7Nml2vuBWoK7Z/Q356KeVpXf+B6Lsf2NE0tioBH1+AYDfoCQAnwHWIafesstUxN+BthPNe5QWqT3A0NgcZKhx6ybiR3SU2vFKMrX9jhItR/FnupzkRzUviZ2U9p7/K94BstQrkP2WvU5JVfh7XG2cFBOo8sY9QQyyV8Ak= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1626864359; 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=E3x2fwER1jNYLrEtZHSGsbg2tCvGZh0s25rEF2LWSdQ=; b=MV6+TIQZQUoJ5Qb7T3ul0grOKktk79JNyp17oNDQwCmiMsH9NaO+p3ZRB07SKZSJWdIy8N/QKV9DmAYodmL4iI1DiAs1FKRaY99HQLdGU1sOY+lywtk/VYhnmeMDtWVL/lqKIihoowNW1Jzcwi/sW7xZx+CJgkRmKRsmN2On3M0= 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 1626864359227471.0026161911809; Wed, 21 Jul 2021 03:45:59 -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-277-D3fMo_WUNt2XDTGtDOV01g-1; Wed, 21 Jul 2021 06:45:56 -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 A9C72100E448; Wed, 21 Jul 2021 10:45:50 +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 8A01D5C230; Wed, 21 Jul 2021 10:45:50 +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 559AF4A715; Wed, 21 Jul 2021 10:45:50 +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 16LAh4IN000911 for ; Wed, 21 Jul 2021 06:43:04 -0400 Received: by smtp.corp.redhat.com (Postfix) id D799C19D9B; Wed, 21 Jul 2021 10:43:04 +0000 (UTC) Received: from andariel.local (unknown [10.40.193.36]) by smtp.corp.redhat.com (Postfix) with ESMTP id 4562419C79 for ; Wed, 21 Jul 2021 10:43:04 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1626864358; 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=E3x2fwER1jNYLrEtZHSGsbg2tCvGZh0s25rEF2LWSdQ=; b=UVMRYzE+gPytRhOhxKha9TZnamF9N2IXyuGlDi1GPkq1xWbaBA1Knv7c0VwvSqtXtYwfwU W1F2dGqBJJjuuIqV6gWm4QuSnHzxw2k9hyFGPJDYs+PVmhHsRVrMC+8wDNPzE5NrMAnZ26 2aqwbRokGsjVc3csPTwyZ28X3nLeT6w= X-MC-Unique: D3fMo_WUNt2XDTGtDOV01g-1 From: Peter Krempa To: libvir-list@redhat.com Subject: [PATCH 14/33] qemu: Remove return value from qemuMonitorDomainTrayChangeCallback Date: Wed, 21 Jul 2021 12:42:26 +0200 Message-Id: <25ff4de79e55b8fb4dc4609a5251ea7b7a3cd400.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: 1626864359776100001 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 Reviewed-by: J=C3=A1n Tomko --- src/qemu/qemu_monitor.h | 12 ++++++------ src/qemu/qemu_process.c | 3 +-- 2 files changed, 7 insertions(+), 8 deletions(-) diff --git a/src/qemu/qemu_monitor.h b/src/qemu/qemu_monitor.h index e71cea797f..d080b42613 100644 --- a/src/qemu/qemu_monitor.h +++ b/src/qemu/qemu_monitor.h @@ -215,12 +215,12 @@ typedef void (*qemuMonitorDomainJobStatusChangeCallba= ck)(qemuMonitor *mon, const char *jobna= me, int status, void *opaque); -typedef int (*qemuMonitorDomainTrayChangeCallback)(qemuMonitor *mon, - virDomainObj *vm, - const char *devAlias, - const char *devid, - int reason, - void *opaque); +typedef void (*qemuMonitorDomainTrayChangeCallback)(qemuMonitor *mon, + virDomainObj *vm, + const char *devAlias, + const char *devid, + int reason, + void *opaque); typedef int (*qemuMonitorDomainPMWakeupCallback)(qemuMonitor *mon, virDomainObj *vm, void *opaque); diff --git a/src/qemu/qemu_process.c b/src/qemu/qemu_process.c index cf4b0e70df..79bed57f03 100644 --- a/src/qemu/qemu_process.c +++ b/src/qemu/qemu_process.c @@ -1089,7 +1089,7 @@ qemuProcessHandleGraphics(qemuMonitor *mon G_GNUC_UNU= SED, virObjectEventStateQueue(driver->domainEventState, event); } -static int +static void qemuProcessHandleTrayChange(qemuMonitor *mon G_GNUC_UNUSED, virDomainObj *vm, const char *devAlias, @@ -1123,7 +1123,6 @@ qemuProcessHandleTrayChange(qemuMonitor *mon G_GNUC_U= NUSED, virObjectUnlock(vm); virObjectEventStateQueue(driver->domainEventState, event); - return 0; } static int --=20 2.31.1 From nobody Sat Apr 27 14:42:40 2024 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=1626864361; cv=none; d=zohomail.com; s=zohoarc; b=GB6vemGreyqQcRKCuiuO9rp1//bl/T5/ZqOU0ahVZyYhiAxLEAf1tajRWLWEIMottYcGeHLhnJtd+tkw9wJxyhONr30wB3eFPrLK0iXLItNI+K2ghvYNWtdGhxRpNi2160m/KSd7gcRq53QJj1hSaExojm23bLkAvIRHnO4A7RA= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1626864361; 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=mDKlF4UNvNAPZ2DETKk4hVklm/8zeMpGwj4THcwVlqM=; b=mkIojWYWvb8VB4QFtWwqVnKfB+MrPOedso4jHbIwZp4wmFl7CCYh8YHeiHUkeUz0erd8NvWt+WWcFSwkXafhYl8KHsc0LpVIImIOgurOAmrmn6JGV4aygBpL1U15StA03yW3VkOS3CgX+lBUONbinunJu/tUwsJwOkAlXIe9HbQ= 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 1626864361163388.39648084613566; Wed, 21 Jul 2021 03:46:01 -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-317-Zu4xc0A_O4eZ92aWrc1wjQ-1; Wed, 21 Jul 2021 06:45:58 -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 23C6F9CDDA; Wed, 21 Jul 2021 10:45:53 +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 027A75C261; Wed, 21 Jul 2021 10:45:53 +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 C3DD5181A2A1; Wed, 21 Jul 2021 10:45:52 +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 16LAh5Q6000916 for ; Wed, 21 Jul 2021 06:43:05 -0400 Received: by smtp.corp.redhat.com (Postfix) id D425E19D9B; Wed, 21 Jul 2021 10:43:05 +0000 (UTC) Received: from andariel.local (unknown [10.40.193.36]) by smtp.corp.redhat.com (Postfix) with ESMTP id 41E7819C79 for ; Wed, 21 Jul 2021 10:43:05 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1626864360; 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=mDKlF4UNvNAPZ2DETKk4hVklm/8zeMpGwj4THcwVlqM=; b=bJMJaVKW9d3gsCFTj17tnGBLNgxBnX9y2emoGOcMEApSfty4GfSrWxf1RkNhBUXLli+lXN ZV9lWNYHG8MqYWvuRRg02u0z/q7+doj1M6zlxATdNZzNeW+DPoDLJ4HFips5eYqTfURExE O6Lqhx4lnL10f5/RvVDwqfLgBDXtCeE= X-MC-Unique: Zu4xc0A_O4eZ92aWrc1wjQ-1 From: Peter Krempa To: libvir-list@redhat.com Subject: [PATCH 15/33] qemu: Remove return value from qemuMonitorDomainPMWakeupCallback Date: Wed, 21 Jul 2021 12:42:27 +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.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: 1626864362115100001 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 Reviewed-by: J=C3=A1n Tomko --- src/qemu/qemu_monitor.h | 6 +++--- src/qemu/qemu_process.c | 3 +-- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/src/qemu/qemu_monitor.h b/src/qemu/qemu_monitor.h index d080b42613..f846bc521d 100644 --- a/src/qemu/qemu_monitor.h +++ b/src/qemu/qemu_monitor.h @@ -221,9 +221,9 @@ typedef void (*qemuMonitorDomainTrayChangeCallback)(qem= uMonitor *mon, const char *devid, int reason, void *opaque); -typedef int (*qemuMonitorDomainPMWakeupCallback)(qemuMonitor *mon, - virDomainObj *vm, - void *opaque); +typedef void (*qemuMonitorDomainPMWakeupCallback)(qemuMonitor *mon, + virDomainObj *vm, + void *opaque); typedef int (*qemuMonitorDomainPMSuspendCallback)(qemuMonitor *mon, virDomainObj *vm, void *opaque); diff --git a/src/qemu/qemu_process.c b/src/qemu/qemu_process.c index 79bed57f03..22e0c5fde2 100644 --- a/src/qemu/qemu_process.c +++ b/src/qemu/qemu_process.c @@ -1125,7 +1125,7 @@ qemuProcessHandleTrayChange(qemuMonitor *mon G_GNUC_U= NUSED, virObjectEventStateQueue(driver->domainEventState, event); } -static int +static void qemuProcessHandlePMWakeup(qemuMonitor *mon G_GNUC_UNUSED, virDomainObj *vm, void *opaque) @@ -1160,7 +1160,6 @@ qemuProcessHandlePMWakeup(qemuMonitor *mon G_GNUC_UNU= SED, virObjectUnlock(vm); virObjectEventStateQueue(driver->domainEventState, event); virObjectEventStateQueue(driver->domainEventState, lifecycleEvent); - return 0; } static int --=20 2.31.1 From nobody Sat Apr 27 14:42:40 2024 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=1626864423; cv=none; d=zohomail.com; s=zohoarc; b=bBW9OBh6AK/KAn8NfXn9qZimRWZhaJX4fA8CrWfLz3J1xrSGp/L/SF2ouO+RvZ/HJH1vE09hma/N7INyuwZA5gzY22RYVkJMvxImmHQ48goLhOSU7hOP76Loy/u/veR+9jxkORCTivbsZwRQMBd7wpCxZAH8hzLZjNH6D2ZHTHI= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1626864423; 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=Cuuc81Cv1j0+JxVO+bj/l1ZySDWy0LkVOuvAxGS8gwo=; b=F1GhEYVXFSaDpeFvJ47QE5BszkWV088mj/ZhEiF+eE9A8T6rqsq7BHlPuH/kQztn497WuAAg2qPRjYxepP0U9WnS61noRzoHWsUrp4G809AJBzzQASwQbvuQqg5OWjTivAXLbwLyr4L2NUzcD1c+jUWbslmMKFZK9AjxRCj5pWI= 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 1626864423360639.54331756094; Wed, 21 Jul 2021 03:47: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-562-xuy2VXA1OMSICfpLqv680A-1; Wed, 21 Jul 2021 06:46:01 -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 E9A9C1932483; Wed, 21 Jul 2021 10:45:56 +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 C888D60FB8; Wed, 21 Jul 2021 10:45:56 +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 95B5F181A2A3; Wed, 21 Jul 2021 10:45:56 +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 16LAhA5x000934 for ; Wed, 21 Jul 2021 06:43:10 -0400 Received: by smtp.corp.redhat.com (Postfix) id 3B32019C79; Wed, 21 Jul 2021 10:43:10 +0000 (UTC) Received: from andariel.local (unknown [10.40.193.36]) by smtp.corp.redhat.com (Postfix) with ESMTP id 9AA1819D9B for ; Wed, 21 Jul 2021 10:43:06 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1626864422; 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=Cuuc81Cv1j0+JxVO+bj/l1ZySDWy0LkVOuvAxGS8gwo=; b=SjjTup85h4NbMg78dw3ah7Ynkw9y7ONJE7JSkW1AImTMLaItT4nKHJ0jizu3RLMFKIR8Mo F8GseY0pAvhILFPpj/YbzHHss1a1GtcsQAyUmi11wy/snGCA3CpvsclHrYwXXJsDXHOldd w8KDsOBkRtgyr9hfLcspjXnzkC3wHbQ= X-MC-Unique: xuy2VXA1OMSICfpLqv680A-1 From: Peter Krempa To: libvir-list@redhat.com Subject: [PATCH 16/33] qemu: Remove return value from qemuMonitorDomainPMSuspendCallback Date: Wed, 21 Jul 2021 12:42:28 +0200 Message-Id: <26e5a66326269100fd90985ce2b10eeb19a2487b.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.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: 1626864425023100001 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 Reviewed-by: J=C3=A1n Tomko --- src/qemu/qemu_monitor.h | 6 +++--- src/qemu/qemu_process.c | 3 +-- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/src/qemu/qemu_monitor.h b/src/qemu/qemu_monitor.h index f846bc521d..d678205bc0 100644 --- a/src/qemu/qemu_monitor.h +++ b/src/qemu/qemu_monitor.h @@ -224,9 +224,9 @@ typedef void (*qemuMonitorDomainTrayChangeCallback)(qem= uMonitor *mon, typedef void (*qemuMonitorDomainPMWakeupCallback)(qemuMonitor *mon, virDomainObj *vm, void *opaque); -typedef int (*qemuMonitorDomainPMSuspendCallback)(qemuMonitor *mon, - virDomainObj *vm, - void *opaque); +typedef void (*qemuMonitorDomainPMSuspendCallback)(qemuMonitor *mon, + virDomainObj *vm, + void *opaque); typedef int (*qemuMonitorDomainBalloonChangeCallback)(qemuMonitor *mon, virDomainObj *vm, unsigned long long a= ctual, diff --git a/src/qemu/qemu_process.c b/src/qemu/qemu_process.c index 22e0c5fde2..74a8bc7214 100644 --- a/src/qemu/qemu_process.c +++ b/src/qemu/qemu_process.c @@ -1162,7 +1162,7 @@ qemuProcessHandlePMWakeup(qemuMonitor *mon G_GNUC_UNU= SED, virObjectEventStateQueue(driver->domainEventState, lifecycleEvent); } -static int +static void qemuProcessHandlePMSuspend(qemuMonitor *mon G_GNUC_UNUSED, virDomainObj *vm, void *opaque) @@ -1200,7 +1200,6 @@ qemuProcessHandlePMSuspend(qemuMonitor *mon G_GNUC_UN= USED, virObjectEventStateQueue(driver->domainEventState, event); virObjectEventStateQueue(driver->domainEventState, lifecycleEvent); - return 0; } static int --=20 2.31.1 From nobody Sat Apr 27 14:42:40 2024 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=1626864365; cv=none; d=zohomail.com; s=zohoarc; b=HmDWXVbVl0RGQWRKLUu/zf6loIgARhxAutD1ewN/RgeA+qGoSdxRcUOut0NMcqnBe2XpQIcvr4FYYOkoBUyIvH+yMBoWtYQL5s4FU0xlOA91J+YxwK8XTbta7bi0AWgrrxAXntgetWvMYH2qSq8nrtQyIusteLaH1YtYL7a64BM= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1626864365; 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=EskuwpwM/GBfrVzh3BWf/pbUu0q3UQ3JbxXraUm/JVE=; b=WS5Co/WNEaBwlcbD2OajJ8xMICtEVKe6Hhydu0coXiTghmMEzCwNsPfaX63gGBkkhfdh9l7BWBYYkRlBrXoWl91NhKdwJnoS0MX/A/tUi6gHgjjBy+zw2vO/Yq0l/XsDZh1F4zoBWI5qEx3fp5IE8yNu8LLXihsEDTTpVpG1UJ4= 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 1626864365970627.278611499249; Wed, 21 Jul 2021 03:46:05 -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-485-7KGGOnO9N3uE73xu1IP29Q-1; Wed, 21 Jul 2021 06:45:46 -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 A3C0A804172; Wed, 21 Jul 2021 10:45:40 +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 836F25DA2D; Wed, 21 Jul 2021 10:45:40 +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 4F853181A1FE; Wed, 21 Jul 2021 10:45:40 +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 16LAhBAW000941 for ; Wed, 21 Jul 2021 06:43:11 -0400 Received: by smtp.corp.redhat.com (Postfix) id 3796919D9B; Wed, 21 Jul 2021 10:43:11 +0000 (UTC) Received: from andariel.local (unknown [10.40.193.36]) by smtp.corp.redhat.com (Postfix) with ESMTP id 99B3C19C79 for ; Wed, 21 Jul 2021 10:43:10 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1626864365; 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=EskuwpwM/GBfrVzh3BWf/pbUu0q3UQ3JbxXraUm/JVE=; b=CscYJn5KY9wa5FI6wLKryp0G9XjDReehxNehaI0GLPtr5GvQM4SGujY9QWJ8BPAc/NHTjf il2BZywDO8i2uISEyB2qvwfLibULR9MGTHkdS7Wnc5USOTk2jgPAKEBeX14DuPkgORlzhd o11LYx8rs6C3SQOg/whqDe8YMwB3Wnc= X-MC-Unique: 7KGGOnO9N3uE73xu1IP29Q-1 From: Peter Krempa To: libvir-list@redhat.com Subject: [PATCH 17/33] qemu: Remove return value from qemuMonitorDomainBalloonChangeCallback Date: Wed, 21 Jul 2021 12:42:29 +0200 Message-Id: <9eb0592c920b9f9260fbe55e2a78001d291f1e01.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.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: 1626864366674100002 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 Reviewed-by: J=C3=A1n Tomko --- src/qemu/qemu_monitor.h | 8 ++++---- src/qemu/qemu_process.c | 3 +-- 2 files changed, 5 insertions(+), 6 deletions(-) diff --git a/src/qemu/qemu_monitor.h b/src/qemu/qemu_monitor.h index d678205bc0..fa3d0e1922 100644 --- a/src/qemu/qemu_monitor.h +++ b/src/qemu/qemu_monitor.h @@ -227,10 +227,10 @@ typedef void (*qemuMonitorDomainPMWakeupCallback)(qem= uMonitor *mon, typedef void (*qemuMonitorDomainPMSuspendCallback)(qemuMonitor *mon, virDomainObj *vm, void *opaque); -typedef int (*qemuMonitorDomainBalloonChangeCallback)(qemuMonitor *mon, - virDomainObj *vm, - unsigned long long a= ctual, - void *opaque); +typedef void (*qemuMonitorDomainBalloonChangeCallback)(qemuMonitor *mon, + virDomainObj *vm, + unsigned long long = actual, + void *opaque); typedef int (*qemuMonitorDomainPMSuspendDiskCallback)(qemuMonitor *mon, virDomainObj *vm, void *opaque); diff --git a/src/qemu/qemu_process.c b/src/qemu/qemu_process.c index 74a8bc7214..421b9b5f11 100644 --- a/src/qemu/qemu_process.c +++ b/src/qemu/qemu_process.c @@ -1202,7 +1202,7 @@ qemuProcessHandlePMSuspend(qemuMonitor *mon G_GNUC_UN= USED, virObjectEventStateQueue(driver->domainEventState, lifecycleEvent); } -static int +static void qemuProcessHandleBalloonChange(qemuMonitor *mon G_GNUC_UNUSED, virDomainObj *vm, unsigned long long actual, @@ -1225,7 +1225,6 @@ qemuProcessHandleBalloonChange(qemuMonitor *mon G_GNU= C_UNUSED, virObjectUnlock(vm); virObjectEventStateQueue(driver->domainEventState, event); - return 0; } static int --=20 2.31.1 From nobody Sat Apr 27 14:42:40 2024 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=1626864223; cv=none; d=zohomail.com; s=zohoarc; b=A3xA22a7tIo6WklSTuu9zt8bzB2ja4jqJvyGwHUO43Hj458yoVvdI5fR7amWnXoIZaoaOCs5GOD5P+VHtQlU082dQSmcEYC422+3JXbIIkBk304kkj9yD70Z5zOuVbCvjDpBy4x8U+7JBZMnwnodmt8bMS/p09r3vt5eSG2oFLU= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1626864223; 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=2kVxhWo5n/LMjMyjuAkYW8dY9m4aZ+SN6+Hn5bGssck=; b=iL9BRjbAXCwSEl0X+VTgAhKeKvCupD3blUukkhANic3PdqbBO7kVZGRlsMYY1xSvwA9PLIMSD73piRjac4wTTIt3jOyzlYZO+P0Mg0ivuFKUIiRAlhyOcDnxqW7pG1wJmswsERQvpR/iXTdPoI5BOnJF6oB8vYo+oqSh5Th5NJY= 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 1626864223466875.5101384558013; Wed, 21 Jul 2021 03:43:43 -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-243-ytkFPahpNFmEOV6pKpEC_A-1; Wed, 21 Jul 2021 06:43:41 -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 86241801FCE; Wed, 21 Jul 2021 10:43:35 +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 5BDFF10074F1; Wed, 21 Jul 2021 10:43:35 +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 2A5474A7CB; Wed, 21 Jul 2021 10:43:35 +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 16LAhCKU000946 for ; Wed, 21 Jul 2021 06:43:12 -0400 Received: by smtp.corp.redhat.com (Postfix) id 336DF19D9D; Wed, 21 Jul 2021 10:43:12 +0000 (UTC) Received: from andariel.local (unknown [10.40.193.36]) by smtp.corp.redhat.com (Postfix) with ESMTP id 95CCC19C79 for ; Wed, 21 Jul 2021 10:43:11 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1626864222; 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=2kVxhWo5n/LMjMyjuAkYW8dY9m4aZ+SN6+Hn5bGssck=; b=BhU2VViL+4kdvImdfD5tAUnJDkswxbP2lmr/zlHvnbevoAo73uHz68VN+klxILIx2dsi9M 4lCorxF0mkLVYhy3PnZwqrn5uhp8LaMVwJGdpMf3LljXjIamDBlUftfhr/pVLuvxy/OeBj dIbCE7J62P89WOFmyVjExQSpfE6plCc= X-MC-Unique: ytkFPahpNFmEOV6pKpEC_A-1 From: Peter Krempa To: libvir-list@redhat.com Subject: [PATCH 18/33] qemu: Remove return value from qemuMonitorDomainPMSuspendDiskCallback Date: Wed, 21 Jul 2021 12:42:30 +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.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: 1626864223913100003 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 Reviewed-by: J=C3=A1n Tomko --- src/qemu/qemu_monitor.h | 6 +++--- src/qemu/qemu_process.c | 4 +--- 2 files changed, 4 insertions(+), 6 deletions(-) diff --git a/src/qemu/qemu_monitor.h b/src/qemu/qemu_monitor.h index fa3d0e1922..2cfcd40ab8 100644 --- a/src/qemu/qemu_monitor.h +++ b/src/qemu/qemu_monitor.h @@ -231,9 +231,9 @@ typedef void (*qemuMonitorDomainBalloonChangeCallback)(= qemuMonitor *mon, virDomainObj *vm, unsigned long long = actual, void *opaque); -typedef int (*qemuMonitorDomainPMSuspendDiskCallback)(qemuMonitor *mon, - virDomainObj *vm, - void *opaque); +typedef void (*qemuMonitorDomainPMSuspendDiskCallback)(qemuMonitor *mon, + virDomainObj *vm, + void *opaque); typedef int (*qemuMonitorDomainGuestPanicCallback)(qemuMonitor *mon, virDomainObj *vm, qemuMonitorEventPanicIn= fo *info, diff --git a/src/qemu/qemu_process.c b/src/qemu/qemu_process.c index 421b9b5f11..ef0b9a4503 100644 --- a/src/qemu/qemu_process.c +++ b/src/qemu/qemu_process.c @@ -1227,7 +1227,7 @@ qemuProcessHandleBalloonChange(qemuMonitor *mon G_GNU= C_UNUSED, virObjectEventStateQueue(driver->domainEventState, event); } -static int +static void qemuProcessHandlePMSuspendDisk(qemuMonitor *mon G_GNUC_UNUSED, virDomainObj *vm, void *opaque) @@ -1265,8 +1265,6 @@ qemuProcessHandlePMSuspendDisk(qemuMonitor *mon G_GNU= C_UNUSED, virObjectEventStateQueue(driver->domainEventState, event); virObjectEventStateQueue(driver->domainEventState, lifecycleEvent); - - return 0; } --=20 2.31.1 From nobody Sat Apr 27 14:42:40 2024 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=1626864431; cv=none; d=zohomail.com; s=zohoarc; b=WiE5t+ZHLkXewcoBFJvBWvnaxQd4EsOEc2slaSimpCJjx0paqVE4b3rAWSWDYzSOhieTjTTP62qlJRDSTdFUCWCGZmCeFkDZU0RflL1mBVlUJwpp294KecCZjKnmW8U5xjWP3YjMbRPcx7FXWVeLv1dvZu60lNuy1Sohk3vz0kU= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1626864431; 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=5NjszG/tl1d+jklDrpQj7yBBRC6Tc6+CCoTV7+RW48k=; b=PXrSBCfO41uGq2vJ9llykRps20sMsN9qVkJtSbgmrRHp0NkuQKad2zz+CsA89FZWEd+MS+2RfYhemH92YSx4IRFKAmOg1tN0jE9RmuRAvK5ObmxvDWTCjpiHcUWNYj/mTMx9Kqkd0m6dHOAkxiLu4bcGgBSVxXbzmPS+t6sYvWs= 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 162686443140754.76802355840846; Wed, 21 Jul 2021 03:47:11 -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-530-y76kEtNjMpeWpgCoRctPyw-1; Wed, 21 Jul 2021 06:46:05 -0400 Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.phx2.redhat.com [10.5.11.13]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 08C87A0BE7; Wed, 21 Jul 2021 10:46:00 +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 DE0201B5C2; Wed, 21 Jul 2021 10:45:59 +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 A91E55003C; Wed, 21 Jul 2021 10:45:59 +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 16LAhDri000954 for ; Wed, 21 Jul 2021 06:43:13 -0400 Received: by smtp.corp.redhat.com (Postfix) id 316AE19C79; Wed, 21 Jul 2021 10:43:13 +0000 (UTC) Received: from andariel.local (unknown [10.40.193.36]) by smtp.corp.redhat.com (Postfix) with ESMTP id 925DE19D9B for ; Wed, 21 Jul 2021 10:43:12 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1626864430; 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=5NjszG/tl1d+jklDrpQj7yBBRC6Tc6+CCoTV7+RW48k=; b=gU67vV43yZ4BnuaEzP61CrKGGutsE2Xjr0Uk8xSNLJQ2oJ/mtHmujRoEe7p9iUHlSq0hkS 3wHnYvvsEItteSXd8Agg36q6WTHy13Ki/RKi6xqUGWL4VAEgNWI5g6lFlCB6G/Y5RQiOx5 eIdnCrtPW8IK+1PXCHKykmGD811LCt8= X-MC-Unique: y76kEtNjMpeWpgCoRctPyw-1 From: Peter Krempa To: libvir-list@redhat.com Subject: [PATCH 19/33] qemu: Remove return value from qemuMonitorDomainGuestPanicCallback Date: Wed, 21 Jul 2021 12:42:31 +0200 Message-Id: <4732a058e9b77878061e520598bb0e5315e716c0.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.13 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: 1626864433398100001 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 Reviewed-by: J=C3=A1n Tomko --- 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 2cfcd40ab8..76e87d5909 100644 --- a/src/qemu/qemu_monitor.h +++ b/src/qemu/qemu_monitor.h @@ -234,10 +234,10 @@ typedef void (*qemuMonitorDomainBalloonChangeCallback= )(qemuMonitor *mon, typedef void (*qemuMonitorDomainPMSuspendDiskCallback)(qemuMonitor *mon, virDomainObj *vm, void *opaque); -typedef int (*qemuMonitorDomainGuestPanicCallback)(qemuMonitor *mon, - virDomainObj *vm, - qemuMonitorEventPanicIn= fo *info, - void *opaque); +typedef void (*qemuMonitorDomainGuestPanicCallback)(qemuMonitor *mon, + virDomainObj *vm, + qemuMonitorEventPanicI= nfo *info, + void *opaque); typedef int (*qemuMonitorDomainDeviceDeletedCallback)(qemuMonitor *mon, virDomainObj *vm, const char *devAlias, diff --git a/src/qemu/qemu_process.c b/src/qemu/qemu_process.c index ef0b9a4503..cf77b7448c 100644 --- a/src/qemu/qemu_process.c +++ b/src/qemu/qemu_process.c @@ -1268,7 +1268,7 @@ qemuProcessHandlePMSuspendDisk(qemuMonitor *mon G_GNU= C_UNUSED, } -static int +static void qemuProcessHandleGuestPanic(qemuMonitor *mon G_GNUC_UNUSED, virDomainObj *vm, qemuMonitorEventPanicInfo *info, @@ -1294,8 +1294,6 @@ qemuProcessHandleGuestPanic(qemuMonitor *mon G_GNUC_U= NUSED, } virObjectUnlock(vm); - - return 0; } --=20 2.31.1 From nobody Sat Apr 27 14:42:40 2024 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 Reviewed-by: J=C3=A1n Tomko --- 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 From nobody Sat Apr 27 14:42:40 2024 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=1626864425; cv=none; d=zohomail.com; s=zohoarc; b=RgM/6IoVgk62YjOqYKxipd+N7GiduwL9YkzhOZHPyE42jajN9Gp/EmK8ZYrq/ce/S33zMp6wYoikcYitKX+MY9ce4bFHe7+QFQ7auS1oJbmq9YC+nbwrM9fdC6zfgJUbYP1SHC53mTnb6DgMineqCbjHg9XtBhw6mhNfA9Pxs9w= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1626864425; 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=CbCRxfz5lhSkpfBui2ixV5Sz6RtKVyGxekbJDjsHcnI=; b=D3Pdc9VkT9k150k+zU1END2teiWHAEkiZ9ZNTamCTGuPetiO2wTrDJ0zDhkhM3+OakCsh6YLZs9feks2PJ7N4HWPTzyVfPZ4KN0vdg5KSEWeuOlYWkRB/vURAjn9WuWJZSkV24ek3qqx5iTZWAkC0WAFrFZKyrmwdKC6bCYOa44= 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 1626864425900595.5034306897073; Wed, 21 Jul 2021 03:47:05 -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-585-kW2IswvtPBOp-V5XDLshBg-1; Wed, 21 Jul 2021 06:46:11 -0400 Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.phx2.redhat.com [10.5.11.13]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id C46DE10150A9; Wed, 21 Jul 2021 10:46:05 +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 A8B821B5C2; Wed, 21 Jul 2021 10:46:05 +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 718C8181A2E4; Wed, 21 Jul 2021 10:46:05 +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 16LAhFqT000973 for ; Wed, 21 Jul 2021 06:43:15 -0400 Received: by smtp.corp.redhat.com (Postfix) id 3BCBB19D9B; Wed, 21 Jul 2021 10:43:15 +0000 (UTC) Received: from andariel.local (unknown [10.40.193.36]) by smtp.corp.redhat.com (Postfix) with ESMTP id 8B90C19C79 for ; Wed, 21 Jul 2021 10:43:14 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1626864424; 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=CbCRxfz5lhSkpfBui2ixV5Sz6RtKVyGxekbJDjsHcnI=; b=MhOqR4KxVsIVNKJ4Z6tM6oKuAkZbGR5GgWEkrtwV9/Vs6vQXNZeXhyFP/kFPSwNgUd+Ifd 0f7nPw+czMhXrCA4jycdK7ahA4WqxLaR3XFVtos+wwHB+a05zqZPfaF0Yl8tX9R8NLZqxP nuQMd9Uscf8/USdTxqOdoQbXqFAQfh4= X-MC-Unique: kW2IswvtPBOp-V5XDLshBg-1 From: Peter Krempa To: libvir-list@redhat.com Subject: [PATCH 21/33] qemu: Remove return value from qemuMonitorDomainNicRxFilterChangedCallback Date: Wed, 21 Jul 2021 12:42:33 +0200 Message-Id: <4d6bdf6a24da8aa754c682e77f76dde0b3bca51c.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.13 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: 1626864427156100003 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 Reviewed-by: J=C3=A1n Tomko --- src/qemu/qemu_monitor.h | 8 ++++---- src/qemu/qemu_process.c | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/qemu/qemu_monitor.h b/src/qemu/qemu_monitor.h index 12e90c6545..7f6a0a71ee 100644 --- a/src/qemu/qemu_monitor.h +++ b/src/qemu/qemu_monitor.h @@ -242,10 +242,10 @@ 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, - void *opaque); +typedef void (*qemuMonitorDomainNicRxFilterChangedCallback)(qemuMonitor *m= on, + virDomainObj *= vm, + const char *de= vAlias, + void *opaque); typedef int (*qemuMonitorDomainSerialChangeCallback)(qemuMonitor *mon, virDomainObj *vm, diff --git a/src/qemu/qemu_process.c b/src/qemu/qemu_process.c index a9c501e94c..57eca2906f 100644 --- a/src/qemu/qemu_process.c +++ b/src/qemu/qemu_process.c @@ -1485,7 +1485,7 @@ qemuProcessHandleBlockThreshold(qemuMonitor *mon G_GN= UC_UNUSED, } -static int +static void qemuProcessHandleNicRxFilterChanged(qemuMonitor *mon G_GNUC_UNUSED, virDomainObj *vm, const char *devAlias, @@ -1514,7 +1514,7 @@ qemuProcessHandleNicRxFilterChanged(qemuMonitor *mon = G_GNUC_UNUSED, cleanup: virObjectUnlock(vm); - return 0; + return; error: qemuProcessEventFree(processEvent); goto cleanup; --=20 2.31.1 From nobody Sat Apr 27 14:42:40 2024 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=1626864226; cv=none; d=zohomail.com; s=zohoarc; b=SceqLtVBpcyw6vQPvl33flPVQTy5iSDDNPlMHMGCaXFTDDrFktKsoT6mkxZiQlB4B2IWMBBFE2sErPbd4UJzYVG5Yt4lFiFXjKnzbGnufikgTBb1BvmPMwHf77eTyMhdQ83sg57dP4NDWf1BaBYYvbblZVYA2WkeEvoLPmLFl28= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1626864226; 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=qRJySnh4m3hZa94WoOgqA5MKJrSaFzgno7CGUgIhQGc=; b=dR/w85tgnFNULm0wKx25nmXxMmv9t7kTy2LX/vicfVCEpN5shT1h/+0vSdoISNL92i+JFeD4HoyXdYWYINpPfG/0P7F6J8Lh0GQzmRweiIOQK955lsynmeEBKWC0xAh9NTnRVR+kuVb/78125+GjuY/Cs2nO7Zn9/msaoWQQayw= 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 162686422638725.761436322497275; Wed, 21 Jul 2021 03:43:46 -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-565-0F_j6U1jPmqF4IZcXTjGLg-1; Wed, 21 Jul 2021 06:43:44 -0400 Received: from smtp.corp.redhat.com (int-mx08.intmail.prod.int.phx2.redhat.com [10.5.11.23]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 7D95693929; Wed, 21 Jul 2021 10:43:38 +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 3E32119D9B; Wed, 21 Jul 2021 10:43:38 +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 DAD1C4A703; Wed, 21 Jul 2021 10:43:37 +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 16LAhGbZ000978 for ; Wed, 21 Jul 2021 06:43:16 -0400 Received: by smtp.corp.redhat.com (Postfix) id 3ADCD19D9B; Wed, 21 Jul 2021 10:43:16 +0000 (UTC) Received: from andariel.local (unknown [10.40.193.36]) by smtp.corp.redhat.com (Postfix) with ESMTP id 9A6B519C79 for ; Wed, 21 Jul 2021 10:43:15 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1626864225; 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=qRJySnh4m3hZa94WoOgqA5MKJrSaFzgno7CGUgIhQGc=; b=cdB9tLpVD8dATeztlgabWVzb/+F8Il1moAxSZPrZ1pi2LQYtrh92RknclY5cTk0w+n8iFS NCwNEU3aHp635pmpYFnoek3TIzPAPEWzIMjqanbo2PDnTU3phC87SDzEzGFFGntpwtj/Ux dSKsKnIo1Ek1GTE8iJ3OZTyYwtbP/kM= X-MC-Unique: 0F_j6U1jPmqF4IZcXTjGLg-1 From: Peter Krempa To: libvir-list@redhat.com Subject: [PATCH 22/33] qemu: Remove return value from qemuMonitorDomainSerialChangeCallback Date: Wed, 21 Jul 2021 12:42:34 +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.84 on 10.5.11.23 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: 1626864228021100001 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 Reviewed-by: J=C3=A1n Tomko --- src/qemu/qemu_monitor.h | 10 +++++----- src/qemu/qemu_process.c | 4 ++-- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/src/qemu/qemu_monitor.h b/src/qemu/qemu_monitor.h index 7f6a0a71ee..0db2c69ec5 100644 --- a/src/qemu/qemu_monitor.h +++ b/src/qemu/qemu_monitor.h @@ -247,11 +247,11 @@ typedef void (*qemuMonitorDomainNicRxFilterChangedCal= lback)(qemuMonitor *mon, const char *de= vAlias, void *opaque); -typedef int (*qemuMonitorDomainSerialChangeCallback)(qemuMonitor *mon, - virDomainObj *vm, - const char *devAlias, - bool connected, - void *opaque); +typedef void (*qemuMonitorDomainSerialChangeCallback)(qemuMonitor *mon, + virDomainObj *vm, + const char *devAlias, + bool connected, + void *opaque); typedef int (*qemuMonitorDomainSpiceMigratedCallback)(qemuMonitor *mon, virDomainObj *vm, diff --git a/src/qemu/qemu_process.c b/src/qemu/qemu_process.c index 57eca2906f..26a88069c0 100644 --- a/src/qemu/qemu_process.c +++ b/src/qemu/qemu_process.c @@ -1521,7 +1521,7 @@ qemuProcessHandleNicRxFilterChanged(qemuMonitor *mon = G_GNUC_UNUSED, } -static int +static void qemuProcessHandleSerialChanged(qemuMonitor *mon G_GNUC_UNUSED, virDomainObj *vm, const char *devAlias, @@ -1552,7 +1552,7 @@ qemuProcessHandleSerialChanged(qemuMonitor *mon G_GNU= C_UNUSED, cleanup: virObjectUnlock(vm); - return 0; + return; error: qemuProcessEventFree(processEvent); goto cleanup; --=20 2.31.1 From nobody Sat Apr 27 14:42:40 2024 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=1626864352; cv=none; d=zohomail.com; s=zohoarc; b=Cdr8JwkG3KMPLCJ/vHtAOEx5lUIIcsqYfagCmjzvCOC9E2Xm3F/vrJaQ/dGc7GDVdAaUsIA/lE0gz4Ow5ionKpdFXyM3ygG1VEccaflENl96tfsipUwuvh2HicxDxH3XP8Uvye61ZN6SowmayYiWxRdVS0ZAaqoH/4T+aZRexmM= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1626864352; 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=Spm9yDTwOXcyRQaL9lZekfmCrZCfzDzT1hLcqYSwJb0=; b=kq46WFDsaZrW+z/mqZHnqU1GgxySoQfUNUyLNApejpUkP+x7AMjlFNFkl0v0bzzi+T2ZJASi/SQ8wMWaXvZJ69JFHVwQI/B+UFl91d4hGiYBMjpi18jBFd9SbngYMw8mFxEGZ/GhkrRQ+9rQ+Wn4d4k7myn7aFdCikjRbS+HPkw= 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 1626864352580990.1394355710027; Wed, 21 Jul 2021 03:45:52 -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-226-Vsxlu0HTO56ps76_yHD-tQ-1; Wed, 21 Jul 2021 06:45:49 -0400 Received: from smtp.corp.redhat.com (int-mx08.intmail.prod.int.phx2.redhat.com [10.5.11.23]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id B8BDB1009447; Wed, 21 Jul 2021 10:45:44 +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 A9ABB17A61; Wed, 21 Jul 2021 10:45:43 +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 70DD34A70C; Wed, 21 Jul 2021 10:45:43 +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 16LAhHdE000989 for ; Wed, 21 Jul 2021 06:43:17 -0400 Received: by smtp.corp.redhat.com (Postfix) id 3827419C79; Wed, 21 Jul 2021 10:43:17 +0000 (UTC) Received: from andariel.local (unknown [10.40.193.36]) by smtp.corp.redhat.com (Postfix) with ESMTP id 9971019D9D for ; Wed, 21 Jul 2021 10:43:16 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1626864351; 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=Spm9yDTwOXcyRQaL9lZekfmCrZCfzDzT1hLcqYSwJb0=; b=Ex4U3Pt9gB7rlYqxQb4m4Kc06/y+rEarOwaQKQwNnZw6bjpwnV804Ihrkg+RJy7Czov2EH L8I+sG/MRmr6n0zB+eKiL/O6lxn+5C+1iQkzQ1DBqADbLb8TaEPwdmJhtBU7tXJr9cTc4e uo/+vk0rFZubcSQcmyeNLZy+8yyJn2k= X-MC-Unique: Vsxlu0HTO56ps76_yHD-tQ-1 From: Peter Krempa To: libvir-list@redhat.com Subject: [PATCH 23/33] qemu: Remove return value from qemuMonitorDomainSpiceMigratedCallback Date: Wed, 21 Jul 2021 12:42:35 +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.84 on 10.5.11.23 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: 1626864353192100004 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 Reviewed-by: J=C3=A1n Tomko --- src/qemu/qemu_monitor.h | 6 +++--- src/qemu/qemu_process.c | 3 +-- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/src/qemu/qemu_monitor.h b/src/qemu/qemu_monitor.h index 0db2c69ec5..09da2eee5a 100644 --- a/src/qemu/qemu_monitor.h +++ b/src/qemu/qemu_monitor.h @@ -253,9 +253,9 @@ typedef void (*qemuMonitorDomainSerialChangeCallback)(q= emuMonitor *mon, bool connected, void *opaque); -typedef int (*qemuMonitorDomainSpiceMigratedCallback)(qemuMonitor *mon, - virDomainObj *vm, - void *opaque); +typedef void (*qemuMonitorDomainSpiceMigratedCallback)(qemuMonitor *mon, + virDomainObj *vm, + void *opaque); typedef int (*qemuMonitorDomainMigrationStatusCallback)(qemuMonitor *mon, virDomainObj *vm, diff --git a/src/qemu/qemu_process.c b/src/qemu/qemu_process.c index 26a88069c0..4c1c7eca43 100644 --- a/src/qemu/qemu_process.c +++ b/src/qemu/qemu_process.c @@ -1559,7 +1559,7 @@ qemuProcessHandleSerialChanged(qemuMonitor *mon G_GNU= C_UNUSED, } -static int +static void qemuProcessHandleSpiceMigrated(qemuMonitor *mon G_GNUC_UNUSED, virDomainObj *vm, void *opaque G_GNUC_UNUSED) @@ -1584,7 +1584,6 @@ qemuProcessHandleSpiceMigrated(qemuMonitor *mon G_GNU= C_UNUSED, cleanup: virObjectUnlock(vm); - return 0; } --=20 2.31.1 From nobody Sat Apr 27 14:42:40 2024 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=1626864365; cv=none; d=zohomail.com; s=zohoarc; b=FFfKO9Gs/sRHN5LQILsIvKGjkXMwJQdP/Fu/CvtnfAmxMMqPhFO+IIyPRzKndlR9n8Piui8O+JWX7EKb0XjAPWQ2n3q1RAft2eTzQZ4vBUiwbRS/EgLTvqh6g3W7i4LcRAxY7PsAje+HUCIl7dLu+TYGEme9+J86/HZSHfmKij0= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1626864365; 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=Zx+6uiUwIjT3EaHBup0AZXhiNIvzY7aGWuPZUVuMjC4=; b=Uo2tKptYfIARnwcxxnn4Sy0qXbxmcmdlQTKQ3DXh+zm1tXd+cLxUU8JeTA4BIZW0XNmD5tSmss8RYckFmqHefeosbDHTo+yeJ6rXeZXbwi8qyNfWkyME+jK5DoRhRzlxCxX9vcs6rg6Ob36kSpbnm7XI08vqZINIGwHYqEVcShM= 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 1626864365374374.7717620304719; Wed, 21 Jul 2021 03:46:05 -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-563-GAznkgcSNrabJFol5XFkjw-1; Wed, 21 Jul 2021 06:45:52 -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 BF21E100E420; Wed, 21 Jul 2021 10:45:46 +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 9FDEF5C230; Wed, 21 Jul 2021 10:45:46 +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 69A3F181A29C; Wed, 21 Jul 2021 10:45:46 +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 16LAhIBv001016 for ; Wed, 21 Jul 2021 06:43:18 -0400 Received: by smtp.corp.redhat.com (Postfix) id 3586D19D9B; Wed, 21 Jul 2021 10:43:18 +0000 (UTC) Received: from andariel.local (unknown [10.40.193.36]) by smtp.corp.redhat.com (Postfix) with ESMTP id 96D3019C79 for ; Wed, 21 Jul 2021 10:43:17 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1626864364; 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=Zx+6uiUwIjT3EaHBup0AZXhiNIvzY7aGWuPZUVuMjC4=; b=im6B3A1Zb8NRVeEhPqq8rRjAVjrSptSvQusghL76UGD6/kBY6t5RxNeZO7m6EFyRPZRkxt 3G3W8Osml94IviKhksYoADJEVb1NnxrK6LO8sHUPr5gBp8rZn909AOwsMEUNY3sGc/szCP XtbV0nUwbZKJr3OWvC5FdE8yR3lS9vw= X-MC-Unique: GAznkgcSNrabJFol5XFkjw-1 From: Peter Krempa To: libvir-list@redhat.com Subject: [PATCH 24/33] qemu: Remove return value from qemuMonitorDomainMigrationStatusCallback Date: Wed, 21 Jul 2021 12:42:36 +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.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: 1626864366661100001 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 Reviewed-by: J=C3=A1n Tomko --- src/qemu/qemu_monitor.h | 8 ++++---- src/qemu/qemu_process.c | 3 +-- 2 files changed, 5 insertions(+), 6 deletions(-) diff --git a/src/qemu/qemu_monitor.h b/src/qemu/qemu_monitor.h index 09da2eee5a..5d40658d53 100644 --- a/src/qemu/qemu_monitor.h +++ b/src/qemu/qemu_monitor.h @@ -257,10 +257,10 @@ typedef void (*qemuMonitorDomainSpiceMigratedCallback= )(qemuMonitor *mon, virDomainObj *vm, void *opaque); -typedef int (*qemuMonitorDomainMigrationStatusCallback)(qemuMonitor *mon, - virDomainObj *vm, - int status, - void *opaque); +typedef void (*qemuMonitorDomainMigrationStatusCallback)(qemuMonitor *mon, + virDomainObj *vm, + int status, + void *opaque); typedef int (*qemuMonitorDomainMigrationPassCallback)(qemuMonitor *mon, virDomainObj *vm, diff --git a/src/qemu/qemu_process.c b/src/qemu/qemu_process.c index 4c1c7eca43..598cf58bf7 100644 --- a/src/qemu/qemu_process.c +++ b/src/qemu/qemu_process.c @@ -1587,7 +1587,7 @@ qemuProcessHandleSpiceMigrated(qemuMonitor *mon G_GNU= C_UNUSED, } -static int +static void qemuProcessHandleMigrationStatus(qemuMonitor *mon G_GNUC_UNUSED, virDomainObj *vm, int status, @@ -1636,7 +1636,6 @@ qemuProcessHandleMigrationStatus(qemuMonitor *mon G_G= NUC_UNUSED, cleanup: virObjectUnlock(vm); virObjectEventStateQueue(driver->domainEventState, event); - return 0; } --=20 2.31.1 From nobody Sat Apr 27 14:42:40 2024 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=1626864230; cv=none; d=zohomail.com; s=zohoarc; b=H9IIooai5WeK/LfkE58EAFfj3GLJZpZdUekaKrD2OlO0ubYn+o6GzV/YYjQ9iqpDUUHQCs92aW/1qQsq9gp4KjZKJx2V0FQDZ0Rzm/dqzVKQrcYlZ5zgJv9NQXnbGuocNrWsZBHqXGYXCEoN8ljMronphOBPcVYrJsD5Fknh7v8= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1626864230; 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=ErSvnsY7KMq+lQQaDoh42mAxqgv4ZFgEIT25U9vLfL0=; b=NIuByFchqfTyTzuTR/2412ZyaqHDMMHHsXHiks4LvNtIHCnsrtZmsb5Ud1kq1mZ3IoS7Ajw3rhYiZHrJxxcNfspVBJLjvBsF17631V+N1JwPUF7MofbLKdUzKuPhgasY4WdQBYTNK+yPcIj0/y96OLjj52RmTw1t6Xpmr6RJzhA= 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 1626864230753165.85105194543928; Wed, 21 Jul 2021 03:43:50 -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-320-noa9nc9jMza2CV_ZPbCaNA-1; Wed, 21 Jul 2021 06:43:48 -0400 Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.phx2.redhat.com [10.5.11.15]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 422421074661; Wed, 21 Jul 2021 10:43:43 +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 1C29484A06; Wed, 21 Jul 2021 10:43:43 +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 DAA32181A1FE; Wed, 21 Jul 2021 10:43:42 +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 16LAhJVG001039 for ; Wed, 21 Jul 2021 06:43:19 -0400 Received: by smtp.corp.redhat.com (Postfix) id 3C37D19D9B; Wed, 21 Jul 2021 10:43:19 +0000 (UTC) Received: from andariel.local (unknown [10.40.193.36]) by smtp.corp.redhat.com (Postfix) with ESMTP id 94C8719C79 for ; Wed, 21 Jul 2021 10:43:18 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1626864229; 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=ErSvnsY7KMq+lQQaDoh42mAxqgv4ZFgEIT25U9vLfL0=; b=gd33QaeEnYM+P3C3RkcvsTGV3T5EFncqFf6Vo9NEuA4IN9huifgIusg8rwpMBD4S0xNv8y 137S87E4CZe5ExObZdXiyWK95rKXhco8t0jovoOIUNWYb2+UI1i2KkmMYb9dBIRErPkqcb mKuyJ3LNOtV+PL2yePukSdWJtlOdjhc= X-MC-Unique: noa9nc9jMza2CV_ZPbCaNA-1 From: Peter Krempa To: libvir-list@redhat.com Subject: [PATCH 25/33] qemu: Remove return value from qemuMonitorDomainMigrationPassCallback Date: Wed, 21 Jul 2021 12:42:37 +0200 Message-Id: <29df2685fd6c5956206b5626efde6ab8f1fedb40.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.15 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: 1626864232383100001 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 Reviewed-by: J=C3=A1n Tomko --- src/qemu/qemu_monitor.h | 8 ++++---- src/qemu/qemu_process.c | 3 +-- 2 files changed, 5 insertions(+), 6 deletions(-) diff --git a/src/qemu/qemu_monitor.h b/src/qemu/qemu_monitor.h index 5d40658d53..cbf1098fa7 100644 --- a/src/qemu/qemu_monitor.h +++ b/src/qemu/qemu_monitor.h @@ -262,10 +262,10 @@ typedef void (*qemuMonitorDomainMigrationStatusCallba= ck)(qemuMonitor *mon, int status, void *opaque); -typedef int (*qemuMonitorDomainMigrationPassCallback)(qemuMonitor *mon, - virDomainObj *vm, - int pass, - void *opaque); +typedef void (*qemuMonitorDomainMigrationPassCallback)(qemuMonitor *mon, + virDomainObj *vm, + int pass, + void *opaque); typedef int (*qemuMonitorDomainAcpiOstInfoCallback)(qemuMonitor *mon, virDomainObj *vm, diff --git a/src/qemu/qemu_process.c b/src/qemu/qemu_process.c index 598cf58bf7..139bf7ccf1 100644 --- a/src/qemu/qemu_process.c +++ b/src/qemu/qemu_process.c @@ -1639,7 +1639,7 @@ qemuProcessHandleMigrationStatus(qemuMonitor *mon G_G= NUC_UNUSED, } -static int +static void qemuProcessHandleMigrationPass(qemuMonitor *mon G_GNUC_UNUSED, virDomainObj *vm, int pass, @@ -1664,7 +1664,6 @@ qemuProcessHandleMigrationPass(qemuMonitor *mon G_GNU= C_UNUSED, cleanup: virObjectUnlock(vm); - return 0; } --=20 2.31.1 From nobody Sat Apr 27 14:42:40 2024 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 Reviewed-by: J=C3=A1n Tomko --- 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 From nobody Sat Apr 27 14:42:40 2024 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=1626864432; cv=none; d=zohomail.com; s=zohoarc; b=ZrOs++nkzEoUUfF94eJ0qeC5w2tZvNtPJBPS69KioOPWILG10nWYPYKE8g/0kt2k3M7SkRfvpkpTFfEavLi2N6H+woGc3oFp+85E+5A4n8NUNaLyY6HAmjjUT7YMEDDFomX+ptYeaP36CBM7hF870xwtGYoSWP67+arTtVvU1NA= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1626864432; 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=fLr3kKTcm7FOipqkWuTfbe9lLzM8YKBv1GTGmHh1QCE=; b=WILz83HSLfXXlnZ5q+kL6MJ4t3+I4q4HSU6UWUvIQ4xlgqVhu9Ozp3TouqELAkLCrGox7XVrp8PGH52AwagJOD0p8bwfeSv2tPx0wr9VWy7417/KuQyCNPakShc0KuLczSn8FwpP1Egsu4aw6AuMvHy7SzVnnffghfmu1LDkpJw= 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 1626864432490697.2981386709521; Wed, 21 Jul 2021 03:47:12 -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-363-aWzSdgggN22k_Vn3qbRecA-1; Wed, 21 Jul 2021 06:45:58 -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 5F5CE1932491; Wed, 21 Jul 2021 10:45:52 +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 3EE0260FB8; Wed, 21 Jul 2021 10:45:52 +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 0D9984A71A; Wed, 21 Jul 2021 10:45:52 +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 16LAhNjG001098 for ; Wed, 21 Jul 2021 06:43:23 -0400 Received: by smtp.corp.redhat.com (Postfix) id E379F19C79; Wed, 21 Jul 2021 10:43:23 +0000 (UTC) Received: from andariel.local (unknown [10.40.193.36]) by smtp.corp.redhat.com (Postfix) with ESMTP id 4F24119D9B for ; Wed, 21 Jul 2021 10:43:20 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1626864431; 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=fLr3kKTcm7FOipqkWuTfbe9lLzM8YKBv1GTGmHh1QCE=; b=QLxU6b3qzWDz4NojhbmPGkvPd9dc4i1PpRzfjirjkgbYQlllN+vBd55Udmk0RxwcNX+gRz jYPcYeK7Sa8A4uS98S6KMmqy6+bnnHilVWeT9Fpxc535UPFPdykq/1SRNGnJKz+Rkk2Ivb m39t4QOAUG+xQE+wtdVULoQ4iHFaLMs= X-MC-Unique: aWzSdgggN22k_Vn3qbRecA-1 From: Peter Krempa To: libvir-list@redhat.com Subject: [PATCH 27/33] qemu: Remove return value from qemuMonitorDomainBlockThresholdCallback Date: Wed, 21 Jul 2021 12:42:39 +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: 1626864433461100002 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 Reviewed-by: J=C3=A1n Tomko --- src/qemu/qemu_monitor.h | 12 ++++++------ src/qemu/qemu_process.c | 4 +--- 2 files changed, 7 insertions(+), 9 deletions(-) diff --git a/src/qemu/qemu_monitor.h b/src/qemu/qemu_monitor.h index c9be99e394..22a07d7054 100644 --- a/src/qemu/qemu_monitor.h +++ b/src/qemu/qemu_monitor.h @@ -277,12 +277,12 @@ typedef void (*qemuMonitorDomainAcpiOstInfoCallback)(= qemuMonitor *mon, void *opaque); -typedef int (*qemuMonitorDomainBlockThresholdCallback)(qemuMonitor *mon, - virDomainObj *vm, - const char *nodenam= e, - unsigned long long = threshold, - unsigned long long = excess, - void *opaque); +typedef void (*qemuMonitorDomainBlockThresholdCallback)(qemuMonitor *mon, + virDomainObj *vm, + const char *nodena= me, + unsigned long long= threshold, + unsigned long long= excess, + void *opaque); typedef enum { diff --git a/src/qemu/qemu_process.c b/src/qemu/qemu_process.c index c012e8b4de..c6ab36d005 100644 --- a/src/qemu/qemu_process.c +++ b/src/qemu/qemu_process.c @@ -1431,7 +1431,7 @@ qemuProcessHandleAcpiOstInfo(qemuMonitor *mon G_GNUC_= UNUSED, } -static int +static void qemuProcessHandleBlockThreshold(qemuMonitor *mon G_GNUC_UNUSED, virDomainObj *vm, const char *nodename, @@ -1478,8 +1478,6 @@ qemuProcessHandleBlockThreshold(qemuMonitor *mon G_GN= UC_UNUSED, virObjectUnlock(vm); virObjectEventStateQueue(driver->domainEventState, eventDevice); virObjectEventStateQueue(driver->domainEventState, eventSource); - - return 0; } --=20 2.31.1 From nobody Sat Apr 27 14:42:40 2024 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=1626864246; cv=none; d=zohomail.com; s=zohoarc; b=KSE5Lu60+obJyjJp+GJbZzoyfE+1X4AQR8ZGDk5szcVHUzW/jTG0rQ7jUbYOtKxwexd/U6x8Fpe58njflzoNkvP8hRGXfEYH0IfF9HnpAwDCOhdL1LbGwvmcIm6mpBH3+QbSDcOOwv1yr+PBVJFHhwzBoQFVkrKljE4nYZZUu2w= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1626864246; 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=StSJTpgJznKfLpNX1GOo/E8B42C58eKae+u60sZ5Muc=; b=AIVSnNEYg3jC7z/cSoqGCgPpmlveAH5JEOqsiZYP9FO6zmu5AZNhx2knzlzUPr4sw0bVL7acQIS5NkBMXhmN/tiJ/yWGJFoZp26bgqquvhdkRh2TcP92aPsf6JMD3EOo8xkMc5zYrLopsG57CUf9qg8uuRBM65aD/bjgRaGIiZc= 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 1626864246223322.4806688306945; Wed, 21 Jul 2021 03:44:06 -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-3-sfQHMqRuOPSxfA-6dqHc9Q-1; Wed, 21 Jul 2021 06:43:51 -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 0218E1005D54; Wed, 21 Jul 2021 10:43:46 +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 D3D175D9FC; Wed, 21 Jul 2021 10:43:45 +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 A132D4A706; Wed, 21 Jul 2021 10:43:45 +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 16LAhUDd001161 for ; Wed, 21 Jul 2021 06:43:30 -0400 Received: by smtp.corp.redhat.com (Postfix) id BEFAE19D9D; Wed, 21 Jul 2021 10:43:30 +0000 (UTC) Received: from andariel.local (unknown [10.40.193.36]) by smtp.corp.redhat.com (Postfix) with ESMTP id 2C90F19D9B for ; Wed, 21 Jul 2021 10:43:24 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1626864245; 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=StSJTpgJznKfLpNX1GOo/E8B42C58eKae+u60sZ5Muc=; b=PRPrrW+iiv8bQuWjfJOgRSk40hQ9PV8/AtWLUJdrqN7/T7bT3BpP9kPXcLRO9IsAbg9pdq BFbe7qys+vBxniQm4p9ve83Hvf/iNH/yDOvInPcKNcm8HUeDMcO+u/wtQtGLuqUN15DKgH pickQLtxwch6RomfE/Ul4LoGQLzwgDk= X-MC-Unique: sfQHMqRuOPSxfA-6dqHc9Q-1 From: Peter Krempa To: libvir-list@redhat.com Subject: [PATCH 28/33] qemu: Remove return value from qemuMonitorDomainDumpCompletedCallback Date: Wed, 21 Jul 2021 12:42:40 +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: 1626864247758100001 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 Reviewed-by: J=C3=A1n Tomko --- src/qemu/qemu_monitor.h | 12 ++++++------ src/qemu/qemu_process.c | 3 +-- 2 files changed, 7 insertions(+), 8 deletions(-) diff --git a/src/qemu/qemu_monitor.h b/src/qemu/qemu_monitor.h index 22a07d7054..4ad14adb8b 100644 --- a/src/qemu/qemu_monitor.h +++ b/src/qemu/qemu_monitor.h @@ -303,12 +303,12 @@ struct _qemuMonitorDumpStats { unsigned long long total; /* total bytes to be written */ }; -typedef int (*qemuMonitorDomainDumpCompletedCallback)(qemuMonitor *mon, - virDomainObj *vm, - int status, - qemuMonitorDumpStats= *stats, - const char *error, - void *opaque); +typedef void (*qemuMonitorDomainDumpCompletedCallback)(qemuMonitor *mon, + virDomainObj *vm, + int status, + qemuMonitorDumpStat= s *stats, + const char *error, + void *opaque); typedef int (*qemuMonitorDomainPRManagerStatusChangedCallback)(qemuMonitor= *mon, virDomainOb= j *vm, diff --git a/src/qemu/qemu_process.c b/src/qemu/qemu_process.c index c6ab36d005..d7935fc03e 100644 --- a/src/qemu/qemu_process.c +++ b/src/qemu/qemu_process.c @@ -1663,7 +1663,7 @@ qemuProcessHandleMigrationPass(qemuMonitor *mon G_GNU= C_UNUSED, } -static int +static void qemuProcessHandleDumpCompleted(qemuMonitor *mon G_GNUC_UNUSED, virDomainObj *vm, int status, @@ -1700,7 +1700,6 @@ qemuProcessHandleDumpCompleted(qemuMonitor *mon G_GNU= C_UNUSED, cleanup: virResetLastError(); virObjectUnlock(vm); - return 0; } --=20 2.31.1 From nobody Sat Apr 27 14:42:40 2024 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=1626864362; cv=none; d=zohomail.com; s=zohoarc; b=coLI61PC1CnV0JSDCHXKUehsz+BHrV1oLaZbBYmnxJkJDIW8wZwUWTVPrLWHuKd3a/qeGBkFCnaagClLRIrrtVGoImp2U1Y8BQJ6U7Lvji98h39Ed6812yrro7NLYTXquXdgE2nkH3z8gUu/B2oROt/N4Ov/1thuGch8X2xug+g= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1626864362; 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=LOR35XvRDNSzO4FGGH42GafAfhe+o8r47kOHYbvpWFk=; b=NJzgT+wEnV2bSdon30NwmyzmK7AM460U8CnAp21alyn9Cf2dRb264p4TqdlkHdqAlCopPEA2TOTonNJcjw/uJDCS1T5ogwo69TysJb0qxzO55+jy6pV2sAhJbFMMcI9b6e1NwNjGH9m8xy5c4zaAusZo06QEgFP1cA9oYdDnWPI= 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 1626864362860566.6889006695369; Wed, 21 Jul 2021 03:46:02 -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-304-JCGzbaqJP6q37hm-GxbMfw-1; Wed, 21 Jul 2021 06:46:00 -0400 Received: from smtp.corp.redhat.com (int-mx08.intmail.prod.int.phx2.redhat.com [10.5.11.23]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 4E43B801FCE; Wed, 21 Jul 2021 10:45:55 +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 2661419D9B; Wed, 21 Jul 2021 10:45:55 +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 E8FF84A71D; Wed, 21 Jul 2021 10:45:54 +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 16LAhYUE001212 for ; Wed, 21 Jul 2021 06:43:34 -0400 Received: by smtp.corp.redhat.com (Postfix) id 919F719C79; Wed, 21 Jul 2021 10:43:34 +0000 (UTC) Received: from andariel.local (unknown [10.40.193.36]) by smtp.corp.redhat.com (Postfix) with ESMTP id F272919D9B for ; Wed, 21 Jul 2021 10:43:30 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1626864361; 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=LOR35XvRDNSzO4FGGH42GafAfhe+o8r47kOHYbvpWFk=; b=fxGzyNtcZFcvVbucJawqnzAuTthzmDtGsZNzfUQe5COru3LyVoxIRGWLZDP33YrFT5OmFH /sbg8DDlMEOV44YfwOm/9jaG0pZM6pKlm++a0l88QjILwvVdmrl4C/bMloJzsrWlmzFMGd FJp8ugpW36NX7CEVEh1TzGQskYZk654= X-MC-Unique: JCGzbaqJP6q37hm-GxbMfw-1 From: Peter Krempa To: libvir-list@redhat.com Subject: [PATCH 29/33] qemu: Remove return value from qemuMonitorDomainPRManagerStatusChangedCallback Date: Wed, 21 Jul 2021 12:42:41 +0200 Message-Id: <6380666d646f362d6dd77d5c518a6d13edcf8962.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.23 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: 1626864364306100003 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 Reviewed-by: J=C3=A1n Tomko --- src/qemu/qemu_monitor.h | 10 +++++----- src/qemu/qemu_process.c | 13 ++++--------- 2 files changed, 9 insertions(+), 14 deletions(-) diff --git a/src/qemu/qemu_monitor.h b/src/qemu/qemu_monitor.h index 4ad14adb8b..caec6a424c 100644 --- a/src/qemu/qemu_monitor.h +++ b/src/qemu/qemu_monitor.h @@ -310,11 +310,11 @@ typedef void (*qemuMonitorDomainDumpCompletedCallback= )(qemuMonitor *mon, const char *error, void *opaque); -typedef int (*qemuMonitorDomainPRManagerStatusChangedCallback)(qemuMonitor= *mon, - virDomainOb= j *vm, - const char = *prManager, - bool connec= ted, - void *opaqu= e); +typedef void (*qemuMonitorDomainPRManagerStatusChangedCallback)(qemuMonito= r *mon, + virDomainO= bj *vm, + const char= *prManager, + bool conne= cted, + void *opaq= ue); typedef int (*qemuMonitorDomainRdmaGidStatusChangedCallback)(qemuMonitor *= mon, virDomainObj = *vm, diff --git a/src/qemu/qemu_process.c b/src/qemu/qemu_process.c index d7935fc03e..1c9327e179 100644 --- a/src/qemu/qemu_process.c +++ b/src/qemu/qemu_process.c @@ -1703,7 +1703,7 @@ qemuProcessHandleDumpCompleted(qemuMonitor *mon G_GNU= C_UNUSED, } -static int +static void qemuProcessHandlePRManagerStatusChanged(qemuMonitor *mon G_GNUC_UNUSED, virDomainObj *vm, const char *prManager, @@ -1714,24 +1714,21 @@ qemuProcessHandlePRManagerStatusChanged(qemuMonitor= *mon G_GNUC_UNUSED, qemuDomainObjPrivate *priv; struct qemuProcessEvent *processEvent =3D NULL; const char *managedAlias =3D qemuDomainGetManagedPRAlias(); - int ret =3D -1; virObjectLock(vm); VIR_DEBUG("pr-manager %s status changed for domain %p %s connected=3D%= d", prManager, vm, vm->def->name, connected); - if (connected) { - /* Connect events are boring. */ - ret =3D 0; + /* Connect events are boring. */ + if (connected) goto cleanup; - } + /* Disconnect events are more interesting. */ if (STRNEQ(prManager, managedAlias)) { VIR_DEBUG("pr-manager %s not managed, ignoring event", prManager); - ret =3D 0; goto cleanup; } @@ -1749,10 +1746,8 @@ qemuProcessHandlePRManagerStatusChanged(qemuMonitor = *mon G_GNUC_UNUSED, goto cleanup; } - ret =3D 0; cleanup: virObjectUnlock(vm); - return ret; } --=20 2.31.1 From nobody Sat Apr 27 14:42:40 2024 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 Reviewed-by: J=C3=A1n Tomko --- 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 From nobody Sat Apr 27 14:42:40 2024 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=1626864426; cv=none; d=zohomail.com; s=zohoarc; b=TSaXiafS95IqBp14FpgwDeinndFM6lajDH39O7Wg5LlBLyxKlcBEv9K67qcFvJKMF3nDF3I65vdo7MWvQxher29pVWx6IWp/khrFtTRyWLUXKcOLPFSzpM8t46EDd9OXaaXx/kcfciET2NbMdYOLt61yNko3aRtEs4XnwawQdCw= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1626864426; 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=VY2BVDaBbQWQw9U0FNcDB7lEPvOnQMvmvahnyXZsTkI=; b=Pr9NPp0kP3L5nsj9QhOu+9DSA0/+2taSnULvXf3TTSsLJdpciqWhgol4AdY6kLfotcsoSEdE4OjzUeVlnl1Ih3/BtfaIQGrU6/OIs/dZ+tYzXA8wbZDcArmfqoyZX4muu26ElCcZZ21muxTlsZUykywCBu28Ct5FzJHktoj+SAw= 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 1626864426405136.92135647501505; Wed, 21 Jul 2021 03:47:06 -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-255-s_hjKSnYNP-3-ASNGYi45A-1; Wed, 21 Jul 2021 06:46:03 -0400 Received: from smtp.corp.redhat.com (int-mx08.intmail.prod.int.phx2.redhat.com [10.5.11.23]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 0AD32100E430; Wed, 21 Jul 2021 10:45:58 +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 D735D1970E; Wed, 21 Jul 2021 10:45:57 +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 A4BE650038; Wed, 21 Jul 2021 10:45:57 +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 16LAhaNu001248 for ; Wed, 21 Jul 2021 06:43:36 -0400 Received: by smtp.corp.redhat.com (Postfix) id 8C08919D9B; Wed, 21 Jul 2021 10:43:36 +0000 (UTC) Received: from andariel.local (unknown [10.40.193.36]) by smtp.corp.redhat.com (Postfix) with ESMTP id EE02419C79 for ; Wed, 21 Jul 2021 10:43:35 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1626864425; 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=VY2BVDaBbQWQw9U0FNcDB7lEPvOnQMvmvahnyXZsTkI=; b=c1cMBraDZ0w0SxSbm3LjSLcXtbvGlaJ3ldMbso/VCM/DZFZg3Orh6pRltglxwGUdUURBQf eU1woImvOmMNjh1mfUxymAG/wQfwmGEYyrWMt0vjQ03kpqLjvqqgGUutHOcDYW6oXOt5nd kIj5Q8aJL51F/6V/nU6cuhfIl/vuMhw= X-MC-Unique: s_hjKSnYNP-3-ASNGYi45A-1 From: Peter Krempa To: libvir-list@redhat.com Subject: [PATCH 31/33] qemu: Remove return value from qemuMonitorDomainGuestCrashloadedCallback Date: Wed, 21 Jul 2021 12:42:43 +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.84 on 10.5.11.23 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: 1626864427180100004 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 Reviewed-by: J=C3=A1n Tomko --- src/qemu/qemu_monitor.h | 6 +++--- src/qemu/qemu_process.c | 4 +--- 2 files changed, 4 insertions(+), 6 deletions(-) diff --git a/src/qemu/qemu_monitor.h b/src/qemu/qemu_monitor.h index 071a40de44..c3a463aa51 100644 --- a/src/qemu/qemu_monitor.h +++ b/src/qemu/qemu_monitor.h @@ -324,9 +324,9 @@ typedef void (*qemuMonitorDomainRdmaGidStatusChangedCal= lback)(qemuMonitor *mon, unsigned lon= g long interface_id, void *opaque= ); -typedef int (*qemuMonitorDomainGuestCrashloadedCallback)(qemuMonitor *mon, - virDomainObj *vm, - void *opaque); +typedef void (*qemuMonitorDomainGuestCrashloadedCallback)(qemuMonitor *mon, + virDomainObj *vm, + void *opaque); typedef enum { QEMU_MONITOR_MEMORY_FAILURE_RECIPIENT_HYPERVISOR, diff --git a/src/qemu/qemu_process.c b/src/qemu/qemu_process.c index c31dbb5513..eee65a71b2 100644 --- a/src/qemu/qemu_process.c +++ b/src/qemu/qemu_process.c @@ -1792,7 +1792,7 @@ qemuProcessHandleRdmaGidStatusChanged(qemuMonitor *mo= n G_GNUC_UNUSED, } -static int +static void qemuProcessHandleGuestCrashloaded(qemuMonitor *mon G_GNUC_UNUSED, virDomainObj *vm, void *opaque) @@ -1812,8 +1812,6 @@ qemuProcessHandleGuestCrashloaded(qemuMonitor *mon G_= GNUC_UNUSED, } virObjectUnlock(vm); - - return 0; } --=20 2.31.1 From nobody Sat Apr 27 14:42:40 2024 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=1626864369; cv=none; d=zohomail.com; s=zohoarc; b=mryfOc/QCNhzaaeA8ZXkfiucUcxZmOrKO4wCfgokffwMSh17w6iYkbRF6Fsywzd9eDiwDJkvOay+vC7FBDBi21hUsMuXO27Awbzgh5uq8lohmw0M8TCDIw7sfH7+2nYe9xn1wwvGGjdMGxeE+D0Vyd5raiIy2kLum8i69MCZ+d0= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1626864369; 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=mOc+naTn4ezw6Cen1Iqpbw9A4cl7CVRF5SMFFnYg1aE=; b=Tlu3tZX4dHVs2ByZljTsgwJyA636/t9XJbnsTGXqWVyW03VTUDk312JxVZe5TK2HsajMDlYt7rpV2F8Bpq1U4BWTjpQL18tCP4vSZynTm4HeNpPnSqlL/m0kSv/w5xil75cV/t1lDOcJ8rdx6rZpeBNmdTmj45nkfSjtwKkhdHA= 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 1626864369003890.8065454467519; Wed, 21 Jul 2021 03:46:09 -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-536-vEWO4gw-MA-Q62l_dS6krw-1; Wed, 21 Jul 2021 06:46:06 -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 05869100E422; Wed, 21 Jul 2021 10:46:01 +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 D78DD17B80; Wed, 21 Jul 2021 10:46:00 +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 A52ED50040; Wed, 21 Jul 2021 10:46:00 +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 16LAhbnk001260 for ; Wed, 21 Jul 2021 06:43:37 -0400 Received: by smtp.corp.redhat.com (Postfix) id 8885A19D9B; Wed, 21 Jul 2021 10:43:37 +0000 (UTC) Received: from andariel.local (unknown [10.40.193.36]) by smtp.corp.redhat.com (Postfix) with ESMTP id EB03E19C79 for ; Wed, 21 Jul 2021 10:43:36 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1626864367; 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=mOc+naTn4ezw6Cen1Iqpbw9A4cl7CVRF5SMFFnYg1aE=; b=DgGoiHztHQefINzU6IefMHUKZttgsCfOuwBWgmeYBp2i8fLYBVtCwErjRiALKyqhxL+X4a fw8NGGviG93RXRiBx+il/1HEJR/CQ4PLKStWRl0Az1NlpnwhE8KRJDQuj0Vjp1HT+GHmfL kI1W75Q0uGhUyU7V+tnR6T0ctu4MW0o= X-MC-Unique: vEWO4gw-MA-Q62l_dS6krw-1 From: Peter Krempa To: libvir-list@redhat.com Subject: [PATCH 32/33] qemu: Remove return value from qemuMonitorDomainMemoryFailureCallback Date: Wed, 21 Jul 2021 12:42:44 +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: 1626864370968100001 Content-Type: text/plain; charset="utf-8" Change the callback prototype and fix the callback registered in the process code. The removed error messages are impossible as the enum values are converted via VIR_ENUM helpers and guarded by compiler checks. Signed-off-by: Peter Krempa Reviewed-by: J=C3=A1n Tomko --- src/qemu/qemu_monitor.h | 8 ++++---- src/qemu/qemu_process.c | 12 +++--------- 2 files changed, 7 insertions(+), 13 deletions(-) diff --git a/src/qemu/qemu_monitor.h b/src/qemu/qemu_monitor.h index c3a463aa51..4c5ba95dd8 100644 --- a/src/qemu/qemu_monitor.h +++ b/src/qemu/qemu_monitor.h @@ -356,10 +356,10 @@ struct _qemuMonitorEventMemoryFailure { bool recursive; }; -typedef int (*qemuMonitorDomainMemoryFailureCallback)(qemuMonitor *mon, - virDomainObj *vm, - qemuMonitorEventMemo= ryFailure *mfp, - void *opaque); +typedef void (*qemuMonitorDomainMemoryFailureCallback)(qemuMonitor *mon, + virDomainObj *vm, + qemuMonitorEventMem= oryFailure *mfp, + void *opaque); typedef struct _qemuMonitorCallbacks qemuMonitorCallbacks; struct _qemuMonitorCallbacks { diff --git a/src/qemu/qemu_process.c b/src/qemu/qemu_process.c index eee65a71b2..1bdfbce697 100644 --- a/src/qemu/qemu_process.c +++ b/src/qemu/qemu_process.c @@ -1815,7 +1815,7 @@ qemuProcessHandleGuestCrashloaded(qemuMonitor *mon G_= GNUC_UNUSED, } -static int +static void qemuProcessHandleMemoryFailure(qemuMonitor *mon G_GNUC_UNUSED, virDomainObj *vm, qemuMonitorEventMemoryFailure *mfp, @@ -1836,9 +1836,7 @@ qemuProcessHandleMemoryFailure(qemuMonitor *mon G_GNU= C_UNUSED, break; case QEMU_MONITOR_MEMORY_FAILURE_RECIPIENT_LAST: default: - virReportError(VIR_ERR_INVALID_ARG, "%s", - _("requested unknown memory failure recipient")); - return -1; + return; } switch (mfp->action) { @@ -1856,9 +1854,7 @@ qemuProcessHandleMemoryFailure(qemuMonitor *mon G_GNU= C_UNUSED, break; case QEMU_MONITOR_MEMORY_FAILURE_ACTION_LAST: default: - virReportError(VIR_ERR_INVALID_ARG, "%s", - _("requested unknown memory failure action")); - return -1; + return; } if (mfp->action_required) @@ -1868,8 +1864,6 @@ qemuProcessHandleMemoryFailure(qemuMonitor *mon G_GNU= C_UNUSED, event =3D virDomainEventMemoryFailureNewFromObj(vm, recipient, action,= flags); virObjectEventStateQueue(driver->domainEventState, event); - - return 0; } --=20 2.31.1 From nobody Sat Apr 27 14:42:40 2024 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=1626864491; cv=none; d=zohomail.com; s=zohoarc; b=MfsOd3K9tisOLKEmtBaQ2YWIdBzB6xnqOdoY2RUlaiVLNrdzeCSWRtgQ4sauEYsNhtJkXvrzTZtXoAjc9Lb8hdGtx/Atdi+OZAy/fnImux4dzD+viYUFYSPPiRuLImAGMHygWVlsL0Sc0/NiNBi3BdwINFnP1L7sn7yCu7OSmio= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1626864491; 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=ZOM1g2rgUa3IWTxwADTn2iT15kfMeBDflpO6kgRjPQY=; b=dskTLHYu41Vziu0qvSkYx5tf+7QMd/AghNWbbarHlk1dGmh6NtNhCDHvoG7As1CXqrbpfo/Lo1eT56QU1K4mZEOTzQH5mn89gw37vOvXouJF+TG5GLNXECGuEmMLGEKmJ7/FL8rW+k+BsIqQYaqxMl93UGjTJPGWlOmvlpqC0qw= 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 1626864491946957.8342252100498; Wed, 21 Jul 2021 03:48:11 -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-523-lkoaTeuVO0e2oNF9IS6gIA-1; Wed, 21 Jul 2021 06:46:09 -0400 Received: from smtp.corp.redhat.com (int-mx08.intmail.prod.int.phx2.redhat.com [10.5.11.23]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id AE36210150A4; Wed, 21 Jul 2021 10:46:03 +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 866551970E; Wed, 21 Jul 2021 10:46:03 +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 4A424181A2A9; Wed, 21 Jul 2021 10:46:03 +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 16LAhcPB001266 for ; Wed, 21 Jul 2021 06:43:38 -0400 Received: by smtp.corp.redhat.com (Postfix) id 87BAC19D9D; Wed, 21 Jul 2021 10:43:38 +0000 (UTC) Received: from andariel.local (unknown [10.40.193.36]) by smtp.corp.redhat.com (Postfix) with ESMTP id E701719C79 for ; Wed, 21 Jul 2021 10:43:37 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1626864490; 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=ZOM1g2rgUa3IWTxwADTn2iT15kfMeBDflpO6kgRjPQY=; b=OKgu8wI0ewMfRfZbLnZoSRrSg7GLYmnlyxEnQXaNlbXgwlCybjLdxGztHK0GmcJxzWJB+1 w3sfvG2R5Uvp4gECTXS/q7/6tCTGvx+Ds3gC3mlNml68NAoTcITpXwGZxw91QwUmsGBKeI vFa51a/Sug+WxmWOrQ0kabDxN9qCz9M= X-MC-Unique: lkoaTeuVO0e2oNF9IS6gIA-1 From: Peter Krempa To: libvir-list@redhat.com Subject: [PATCH 33/33] qemu: process: Extract code for submitting event handling to separate thread Date: Wed, 21 Jul 2021 12:42:45 +0200 Message-Id: <578b37592d8f0d5004e92a092a22632f0ccabb5b.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.23 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: 1626864493567100001 Content-Type: text/plain; charset="utf-8" The submission of the event to the helper thread has a verbose cleanup path which was duplicated in all the event handlers. Simplify it by extracting the code into a helper named 'qemuProcessEventSubmit' and reuse it where appropriate. Signed-off-by: Peter Krempa Reviewed-by: J=C3=A1n Tomko --- src/qemu/qemu_process.c | 113 +++++++++++++++------------------------- 1 file changed, 43 insertions(+), 70 deletions(-) diff --git a/src/qemu/qemu_process.c b/src/qemu/qemu_process.c index 1bdfbce697..4c1130945f 100644 --- a/src/qemu/qemu_process.c +++ b/src/qemu/qemu_process.c @@ -280,6 +280,33 @@ qemuConnectAgent(virQEMUDriver *driver, virDomainObj *= vm) } +/** + * qemuProcessEventSubmit: + * @driver: QEMU driver object + * @event: pointer to the variable holding the event processing data (stol= en and cleared) + * + * Submits @event to be processed by the asynchronous event handling threa= d. + * In case when submission of the handling fails @event is properly freed = and + * cleared. If (*event)->vm is non-NULL the domain object is uref'd before= freeing + * @event. + */ +static void +qemuProcessEventSubmit(virQEMUDriver *driver, + struct qemuProcessEvent **event) +{ + if (!*event) + return; + + if (virThreadPoolSendJob(driver->workerPool, 0, *event) < 0) { + if ((*event)->vm) + virObjectUnref((*event)->vm); + qemuProcessEventFree(*event); + } + + *event =3D NULL; +} + + /* * This is a callback registered with a qemuMonitor *instance, * and to be invoked when the monitor console hits an end of file @@ -310,11 +337,7 @@ qemuProcessHandleMonitorEOF(qemuMonitor *mon, processEvent->eventType =3D QEMU_PROCESS_EVENT_MONITOR_EOF; processEvent->vm =3D virObjectRef(vm); - if (virThreadPoolSendJob(driver->workerPool, 0, processEvent) < 0) { - virObjectUnref(vm); - qemuProcessEventFree(processEvent); - goto cleanup; - } + qemuProcessEventSubmit(driver, &processEvent); /* We don't want this EOF handler to be called over and over while the * thread is waiting for a job. @@ -833,10 +856,8 @@ qemuProcessHandleWatchdog(qemuMonitor *mon G_GNUC_UNUS= ED, * deleted before handling watchdog event is finished. */ processEvent->vm =3D virObjectRef(vm); - if (virThreadPoolSendJob(driver->workerPool, 0, processEvent) < 0)= { - virObjectUnref(vm); - qemuProcessEventFree(processEvent); - } + + qemuProcessEventSubmit(driver, &processEvent); } virObjectUnlock(vm); @@ -925,7 +946,6 @@ qemuProcessHandleBlockJob(qemuMonitor *mon G_GNUC_UNUSE= D, { qemuDomainObjPrivate *priv; virQEMUDriver *driver =3D opaque; - struct qemuProcessEvent *processEvent =3D NULL; virDomainDiskDef *disk; g_autoptr(qemuBlockJobData) job =3D NULL; char *data =3D NULL; @@ -954,7 +974,7 @@ qemuProcessHandleBlockJob(qemuMonitor *mon G_GNUC_UNUSE= D, virDomainObjBroadcast(vm); } else { /* there is no waiting SYNC API, dispatch the update to a thread */ - processEvent =3D g_new0(struct qemuProcessEvent, 1); + struct qemuProcessEvent *processEvent =3D g_new0(struct qemuProces= sEvent, 1); processEvent->eventType =3D QEMU_PROCESS_EVENT_BLOCK_JOB; data =3D g_strdup(diskAlias); @@ -963,16 +983,10 @@ qemuProcessHandleBlockJob(qemuMonitor *mon G_GNUC_UNU= SED, processEvent->action =3D type; processEvent->status =3D status; - if (virThreadPoolSendJob(driver->workerPool, 0, processEvent) < 0)= { - virObjectUnref(vm); - goto cleanup; - } - - processEvent =3D NULL; + qemuProcessEventSubmit(driver, &processEvent); } cleanup: - qemuProcessEventFree(processEvent); virObjectUnlock(vm); } @@ -986,7 +1000,6 @@ qemuProcessHandleJobStatusChange(qemuMonitor *mon G_GN= UC_UNUSED, { virQEMUDriver *driver =3D opaque; qemuDomainObjPrivate *priv; - struct qemuProcessEvent *processEvent =3D NULL; qemuBlockJobData *job =3D NULL; int jobnewstate; @@ -1016,23 +1029,18 @@ qemuProcessHandleJobStatusChange(qemuMonitor *mon G= _GNUC_UNUSED, VIR_DEBUG("job '%s' handled synchronously", jobname); virDomainObjBroadcast(vm); } else { + struct qemuProcessEvent *processEvent =3D g_new0(struct qemuProces= sEvent, 1); + VIR_DEBUG("job '%s' handled by event thread", jobname); - processEvent =3D g_new0(struct qemuProcessEvent, 1); processEvent->eventType =3D QEMU_PROCESS_EVENT_JOB_STATUS_CHANGE; processEvent->vm =3D virObjectRef(vm); processEvent->data =3D virObjectRef(job); - if (virThreadPoolSendJob(driver->workerPool, 0, processEvent) < 0)= { - virObjectUnref(vm); - goto cleanup; - } - - processEvent =3D NULL; + qemuProcessEventSubmit(driver, &processEvent); } cleanup: - qemuProcessEventFree(processEvent); virObjectUnlock(vm); } @@ -1288,10 +1296,7 @@ qemuProcessHandleGuestPanic(qemuMonitor *mon G_GNUC_= UNUSED, */ processEvent->vm =3D virObjectRef(vm); - if (virThreadPoolSendJob(driver->workerPool, 0, processEvent) < 0) { - virObjectUnref(vm); - qemuProcessEventFree(processEvent); - } + qemuProcessEventSubmit(driver, &processEvent); virObjectUnlock(vm); } @@ -1323,17 +1328,10 @@ qemuProcessHandleDeviceDeleted(qemuMonitor *mon G_G= NUC_UNUSED, processEvent->data =3D data; processEvent->vm =3D virObjectRef(vm); - if (virThreadPoolSendJob(driver->workerPool, 0, processEvent) < 0) { - virObjectUnref(vm); - goto error; - } + qemuProcessEventSubmit(driver, &processEvent); cleanup: virObjectUnlock(vm); - return; - error: - qemuProcessEventFree(processEvent); - goto cleanup; } @@ -1503,17 +1501,9 @@ qemuProcessHandleNicRxFilterChanged(qemuMonitor *mon= G_GNUC_UNUSED, processEvent->data =3D data; processEvent->vm =3D virObjectRef(vm); - if (virThreadPoolSendJob(driver->workerPool, 0, processEvent) < 0) { - virObjectUnref(vm); - goto error; - } + qemuProcessEventSubmit(driver, &processEvent); - cleanup: virObjectUnlock(vm); - return; - error: - qemuProcessEventFree(processEvent); - goto cleanup; } @@ -1541,17 +1531,9 @@ qemuProcessHandleSerialChanged(qemuMonitor *mon G_GN= UC_UNUSED, processEvent->action =3D connected; processEvent->vm =3D virObjectRef(vm); - if (virThreadPoolSendJob(driver->workerPool, 0, processEvent) < 0) { - virObjectUnref(vm); - goto error; - } + qemuProcessEventSubmit(driver, &processEvent); - cleanup: virObjectUnlock(vm); - return; - error: - qemuProcessEventFree(processEvent); - goto cleanup; } @@ -1740,11 +1722,8 @@ qemuProcessHandlePRManagerStatusChanged(qemuMonitor = *mon G_GNUC_UNUSED, processEvent->eventType =3D QEMU_PROCESS_EVENT_PR_DISCONNECT; processEvent->vm =3D virObjectRef(vm); - if (virThreadPoolSendJob(driver->workerPool, 0, processEvent) < 0) { - qemuProcessEventFree(processEvent); - virObjectUnref(vm); - goto cleanup; - } + qemuProcessEventSubmit(driver, &processEvent); + cleanup: virObjectUnlock(vm); @@ -1783,10 +1762,7 @@ qemuProcessHandleRdmaGidStatusChanged(qemuMonitor *m= on G_GNUC_UNUSED, processEvent->vm =3D virObjectRef(vm); processEvent->data =3D g_steal_pointer(&info); - if (virThreadPoolSendJob(driver->workerPool, 0, processEvent) < 0) { - qemuProcessEventFree(processEvent); - virObjectUnref(vm); - } + qemuProcessEventSubmit(driver, &processEvent); virObjectUnlock(vm); } @@ -1806,10 +1782,7 @@ qemuProcessHandleGuestCrashloaded(qemuMonitor *mon G= _GNUC_UNUSED, processEvent->eventType =3D QEMU_PROCESS_EVENT_GUEST_CRASHLOADED; processEvent->vm =3D virObjectRef(vm); - if (virThreadPoolSendJob(driver->workerPool, 0, processEvent) < 0) { - virObjectUnref(vm); - qemuProcessEventFree(processEvent); - } + qemuProcessEventSubmit(driver, &processEvent); virObjectUnlock(vm); } --=20 2.31.1