From nobody Sun Feb 8 13:53:30 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 170.10.133.124 as permitted sender) client-ip=170.10.133.124; envelope-from=libvir-list-bounces@redhat.com; helo=us-smtp-delivery-124.mimecast.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 170.10.133.124 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1653399375; cv=none; d=zohomail.com; s=zohoarc; b=bUFEACHqRCDr/lF5g1Ff/p/YwYP+W9ygtvlBLdwPv4wPU024kHH8xKq8AP0dhOum/mcIbSY60PphAKOtrKNad0sG/4hbzvWmom1cgD7Xl4WAMYHKQbMlla8DmqHhynTK3uqAWr6Rgt7MeY4hI2AoffzGG/u7c2Xr6H1KBpiVRUY= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1653399375; 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=KT4r/d6JsmrTa4UXeWZXPvvwqyKt8MADENmpfsFowp4=; b=A93FgrzHYdUv+i4PYBtuXn8aKmBigVyShXKGAEm7uCHXzgoATe2NUJKxi2fYRb9G0tvNHuLseyk5LsKdoblQ5KTgZW8ca5hr+khFUvPGbsyvNtKrlqyOFjnb7OZb4nv4CCVp+svIc35GHvBjYnafvyOphCDA/VREVejjBnldFPY= 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 1653399375113985.707396633914; Tue, 24 May 2022 06:36:15 -0700 (PDT) Received: from mimecast-mx02.redhat.com (mx3-rdu2.redhat.com [66.187.233.73]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-447-9Ns6dAXpOCS2_b6LpQS9DA-1; Tue, 24 May 2022 09:35:29 -0400 Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.rdu2.redhat.com [10.11.54.6]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id EF6FC39F9CAD; Tue, 24 May 2022 13:35:18 +0000 (UTC) Received: from mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (unknown [10.30.29.100]) by smtp.corp.redhat.com (Postfix) with ESMTP id D36B62166B2F; Tue, 24 May 2022 13:35:18 +0000 (UTC) Received: from mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (localhost [IPv6:::1]) by mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (Postfix) with ESMTP id 7C8FC194EBA3; Tue, 24 May 2022 13:35:18 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.rdu2.redhat.com [10.11.54.2]) by mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (Postfix) with ESMTP id B49F6194EB9B for ; Tue, 24 May 2022 13:35:15 +0000 (UTC) Received: by smtp.corp.redhat.com (Postfix) id A8B33400E116; Tue, 24 May 2022 13:35:15 +0000 (UTC) Received: from virval.usersys.redhat.com (unknown [10.43.2.187]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 3332D40D1B98 for ; Tue, 24 May 2022 13:35:15 +0000 (UTC) Received: by virval.usersys.redhat.com (Postfix, from userid 500) id 206BC245B52; Tue, 24 May 2022 15:35:13 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1653399373; 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=KT4r/d6JsmrTa4UXeWZXPvvwqyKt8MADENmpfsFowp4=; b=VP/PL4ROd56bH93C7WN0hVfbX5Skx+jT8gmspbw6mI8WAEMP44VgByiaPBX4bsbvtggOam OXsCqhvGvAKKWNUOTE+HoVsDXw6L9ch53FpzGhoSdBcP4+R6DQmDIfvcWSe6hi4bkPR7OL TAn4gZniV/tfF5mNHqfc3e0AACbDTd0= X-MC-Unique: 9Ns6dAXpOCS2_b6LpQS9DA-1 X-Original-To: libvir-list@listman.corp.redhat.com From: Jiri Denemark To: libvir-list@redhat.com Subject: [libvirt PATCH 6/6] qemu: Do not pass unused opaque pointer to monitor callbacks Date: Tue, 24 May 2022 15:35:09 +0200 Message-Id: <1397f71ecdd17a4577c680d1873a43316d2d1e40.1653399256.git.jdenemar@redhat.com> In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.84 on 10.11.54.2 X-BeenThere: libvir-list@redhat.com X-Mailman-Version: 2.1.29 Precedence: list List-Id: Development discussions about the libvirt library & tools List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: libvir-list-bounces@redhat.com Sender: "libvir-list" X-Scanned-By: MIMEDefang 2.78 on 10.11.54.6 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: 1653399376307100001 Content-Type: text/plain; charset="utf-8" Signed-off-by: Jiri Denemark --- src/qemu/qemu_monitor.c | 16 ++--- src/qemu/qemu_monitor.h | 108 ++++++++++++---------------------- src/qemu/qemu_monitor_priv.h | 1 - src/qemu/qemu_process.c | 110 ++++++++++++----------------------- src/qemu/qemu_processpriv.h | 3 +- tests/qemuhotplugtest.c | 3 +- tests/qemumonitortestutils.c | 15 ++--- tests/qemumonitortestutils.h | 5 +- 8 files changed, 88 insertions(+), 173 deletions(-) diff --git a/src/qemu/qemu_monitor.c b/src/qemu/qemu_monitor.c index d44c7f0c60..2cfe9dbb00 100644 --- a/src/qemu/qemu_monitor.c +++ b/src/qemu/qemu_monitor.c @@ -578,7 +578,7 @@ qemuMonitorIO(GSocket *socket G_GNUC_UNUSED, virObjectUnlock(mon); VIR_DEBUG("Triggering EOF callback mon=3D%p vm=3D%p name=3D%s", mon, mon->vm, mon->domainName); - (eofNotify)(mon, vm, mon->callbackOpaque); + (eofNotify)(mon, vm); virObjectUnref(mon); } else if (error) { qemuMonitorErrorNotifyCallback errorNotify =3D mon->cb->errorNotif= y; @@ -589,7 +589,7 @@ qemuMonitorIO(GSocket *socket G_GNUC_UNUSED, virObjectUnlock(mon); VIR_DEBUG("Triggering error callback mon=3D%p vm=3D%p name=3D%s", mon, mon->vm, mon->domainName); - (errorNotify)(mon, vm, mon->callbackOpaque); + (errorNotify)(mon, vm); virObjectUnref(mon); } else { virObjectUnlock(mon); @@ -604,8 +604,7 @@ static qemuMonitor * qemuMonitorOpenInternal(virDomainObj *vm, int fd, GMainContext *context, - qemuMonitorCallbacks *cb, - void *opaque) + qemuMonitorCallbacks *cb) { qemuDomainObjPrivate *priv =3D vm->privateData; qemuMonitor *mon; @@ -639,7 +638,6 @@ qemuMonitorOpenInternal(virDomainObj *vm, mon->domainName =3D g_strdup(NULLSTR(vm->def->name)); mon->waitGreeting =3D true; mon->cb =3D cb; - mon->callbackOpaque =3D opaque; =20 if (priv) mon->objectAddNoWrap =3D virQEMUCapsGet(priv->qemuCaps, QEMU_CAPS_= OBJECT_JSON); @@ -688,7 +686,6 @@ qemuMonitorOpenInternal(virDomainObj *vm, * @config: monitor configuration * @timeout: number of seconds to add to default timeout * @cb: monitor event handles - * @opaque: opaque data for @cb * * Opens the monitor for running qemu. It may happen that it * takes some time for qemu to create the monitor socket (e.g. @@ -704,8 +701,7 @@ qemuMonitorOpen(virDomainObj *vm, bool retry, unsigned long long timeout, GMainContext *context, - qemuMonitorCallbacks *cb, - void *opaque) + qemuMonitorCallbacks *cb) { VIR_AUTOCLOSE fd =3D -1; qemuMonitor *ret =3D NULL; @@ -733,7 +729,7 @@ qemuMonitorOpen(virDomainObj *vm, return NULL; } =20 - ret =3D qemuMonitorOpenInternal(vm, fd, context, cb, opaque); + ret =3D qemuMonitorOpenInternal(vm, fd, context, cb); fd =3D -1; return ret; } @@ -1085,7 +1081,7 @@ qemuMonitorUpdateVideoVram64Size(qemuMonitor *mon, virObjectRef(mon); \ virObjectUnlock(mon); \ if ((mon)->cb && (mon)->cb->callback) \ - (mon)->cb->callback(mon, __VA_ARGS__, (mon)->callbackOpaque); \ + (mon)->cb->callback(mon, __VA_ARGS__); \ virObjectLock(mon); \ virObjectUnref(mon); \ } while (0) diff --git a/src/qemu/qemu_monitor.h b/src/qemu/qemu_monitor.h index b1484fdff8..be341d5196 100644 --- a/src/qemu/qemu_monitor.h +++ b/src/qemu/qemu_monitor.h @@ -180,49 +180,38 @@ void qemuMonitorEventRdmaGidStatusFree(qemuMonitorRdm= aGidStatus *info); void qemuMonitorMemoryDeviceSizeChangeFree(qemuMonitorMemoryDeviceSizeChan= ge *info); =20 typedef void (*qemuMonitorDestroyCallback)(qemuMonitor *mon, - virDomainObj *vm, - void *opaque); + virDomainObj *vm); typedef void (*qemuMonitorEofNotifyCallback)(qemuMonitor *mon, - virDomainObj *vm, - void *opaque); + virDomainObj *vm); typedef void (*qemuMonitorErrorNotifyCallback)(qemuMonitor *mon, - virDomainObj *vm, - void *opaque); + virDomainObj *vm); typedef void (*qemuMonitorDomainEventCallback)(qemuMonitor *mon, virDomainObj *vm, const char *event, long long seconds, unsigned int micros, - const char *details, - void *opaque); + const char *details); typedef void (*qemuMonitorDomainShutdownCallback)(qemuMonitor *mon, virDomainObj *vm, - virTristateBool guest, - void *opaque); + virTristateBool guest); typedef void (*qemuMonitorDomainResetCallback)(qemuMonitor *mon, - virDomainObj *vm, - void *opaque); + virDomainObj *vm); typedef void (*qemuMonitorDomainStopCallback)(qemuMonitor *mon, - virDomainObj *vm, - void *opaque); + virDomainObj *vm); typedef void (*qemuMonitorDomainResumeCallback)(qemuMonitor *mon, - virDomainObj *vm, - void *opaque); + virDomainObj *vm); typedef void (*qemuMonitorDomainRTCChangeCallback)(qemuMonitor *mon, virDomainObj *vm, - long long offset, - void *opaque); + long long offset); typedef void (*qemuMonitorDomainWatchdogCallback)(qemuMonitor *mon, virDomainObj *vm, - int action, - void *opaque); + int action); typedef void (*qemuMonitorDomainIOErrorCallback)(qemuMonitor *mon, virDomainObj *vm, const char *diskAlias, const char *nodename, int action, - const char *reason, - void *opaque); + const char *reason); typedef void (*qemuMonitorDomainGraphicsCallback)(qemuMonitor *mon, virDomainObj *vm, int phase, @@ -234,76 +223,60 @@ typedef void (*qemuMonitorDomainGraphicsCallback)(qem= uMonitor *mon, const char *remoteServic= e, const char *authScheme, const char *x509dname, - const char *saslUsername, - void *opaque); + const char *saslUsername= ); typedef void (*qemuMonitorDomainBlockJobCallback)(qemuMonitor *mon, virDomainObj *vm, const char *diskAlias, int type, int status, - const char *error, - void *opaque); + const char *error); typedef void (*qemuMonitorDomainJobStatusChangeCallback)(qemuMonitor *mon, virDomainObj *vm, const char *jobna= me, - int status, - void *opaque); + int status); typedef void (*qemuMonitorDomainTrayChangeCallback)(qemuMonitor *mon, virDomainObj *vm, const char *devAlias, const char *devid, - int reason, - void *opaque); + int reason); typedef void (*qemuMonitorDomainPMWakeupCallback)(qemuMonitor *mon, - virDomainObj *vm, - void *opaque); + virDomainObj *vm); typedef void (*qemuMonitorDomainPMSuspendCallback)(qemuMonitor *mon, - virDomainObj *vm, - void *opaque); + virDomainObj *vm); typedef void (*qemuMonitorDomainBalloonChangeCallback)(qemuMonitor *mon, virDomainObj *vm, - unsigned long long = actual, - void *opaque); + unsigned long long = actual); typedef void (*qemuMonitorDomainPMSuspendDiskCallback)(qemuMonitor *mon, - virDomainObj *vm, - void *opaque); + virDomainObj *vm); typedef void (*qemuMonitorDomainGuestPanicCallback)(qemuMonitor *mon, virDomainObj *vm, - qemuMonitorEventPanicI= nfo *info, - void *opaque); + qemuMonitorEventPanicI= nfo *info); typedef void (*qemuMonitorDomainDeviceDeletedCallback)(qemuMonitor *mon, virDomainObj *vm, - const char *devAlia= s, - void *opaque); + const char *devAlia= s); typedef void (*qemuMonitorDomainDeviceUnplugErrCallback)(qemuMonitor *mon, virDomainObj *vm, const char *devPa= th, - const char *devAl= ias, - void *opaque); + const char *devAl= ias); typedef void (*qemuMonitorDomainNicRxFilterChangedCallback)(qemuMonitor *m= on, virDomainObj *= vm, - const char *de= vAlias, - void *opaque); + const char *de= vAlias); =20 typedef void (*qemuMonitorDomainSerialChangeCallback)(qemuMonitor *mon, virDomainObj *vm, const char *devAlias, - bool connected, - void *opaque); + bool connected); =20 typedef void (*qemuMonitorDomainSpiceMigratedCallback)(qemuMonitor *mon, - virDomainObj *vm, - void *opaque); + virDomainObj *vm); =20 typedef void (*qemuMonitorDomainMigrationStatusCallback)(qemuMonitor *mon, virDomainObj *vm, - int status, - void *opaque); + int status); =20 typedef void (*qemuMonitorDomainMigrationPassCallback)(qemuMonitor *mon, virDomainObj *vm, - int pass, - void *opaque); + int pass); =20 typedef void (*qemuMonitorDomainAcpiOstInfoCallback)(qemuMonitor *mon, virDomainObj *vm, @@ -311,16 +284,14 @@ typedef void (*qemuMonitorDomainAcpiOstInfoCallback)(= qemuMonitor *mon, const char *slotType, const char *slot, unsigned int source, - unsigned int status, - void *opaque); + unsigned int status); =20 =20 typedef void (*qemuMonitorDomainBlockThresholdCallback)(qemuMonitor *mon, virDomainObj *vm, const char *nodena= me, unsigned long long= threshold, - unsigned long long= excess, - void *opaque); + unsigned long long= excess); =20 =20 typedef enum { @@ -345,26 +316,22 @@ typedef void (*qemuMonitorDomainDumpCompletedCallback= )(qemuMonitor *mon, virDomainObj *vm, int status, qemuMonitorDumpStat= s *stats, - const char *error, - void *opaque); + const char *error); =20 typedef void (*qemuMonitorDomainPRManagerStatusChangedCallback)(qemuMonito= r *mon, virDomainO= bj *vm, const char= *prManager, - bool conne= cted, - void *opaq= ue); + bool conne= cted); =20 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= ); + unsigned lon= g long interface_id); =20 typedef void (*qemuMonitorDomainGuestCrashloadedCallback)(qemuMonitor *mon, - virDomainObj *vm, - void *opaque); + virDomainObj *vm= ); =20 typedef enum { QEMU_MONITOR_MEMORY_FAILURE_RECIPIENT_HYPERVISOR, @@ -396,14 +363,12 @@ struct _qemuMonitorEventMemoryFailure { =20 typedef void (*qemuMonitorDomainMemoryFailureCallback)(qemuMonitor *mon, virDomainObj *vm, - qemuMonitorEventMem= oryFailure *mfp, - void *opaque); + qemuMonitorEventMem= oryFailure *mfp); =20 typedef void (*qemuMonitorDomainMemoryDeviceSizeChange)(qemuMonitor *mon, virDomainObj *vm, const char *alias, - unsigned long long= size, - void *opaque); + unsigned long long= size); =20 typedef struct _qemuMonitorCallbacks qemuMonitorCallbacks; struct _qemuMonitorCallbacks { @@ -448,8 +413,7 @@ qemuMonitor *qemuMonitorOpen(virDomainObj *vm, bool retry, unsigned long long timeout, GMainContext *context, - qemuMonitorCallbacks *cb, - void *opaque) + qemuMonitorCallbacks *cb) ATTRIBUTE_NONNULL(1) ATTRIBUTE_NONNULL(2) ATTRIBUTE_NONNULL(5); =20 void qemuMonitorWatchDispose(void); diff --git a/src/qemu/qemu_monitor_priv.h b/src/qemu/qemu_monitor_priv.h index 70f5f16e72..05ac5499bb 100644 --- a/src/qemu/qemu_monitor_priv.h +++ b/src/qemu/qemu_monitor_priv.h @@ -57,7 +57,6 @@ struct _qemuMonitor { char *domainName; =20 qemuMonitorCallbacks *cb; - void *callbackOpaque; =20 /* If there's a command being processed this will be * non-NULL */ diff --git a/src/qemu/qemu_process.c b/src/qemu/qemu_process.c index 11d1a4176a..07acb1c427 100644 --- a/src/qemu/qemu_process.c +++ b/src/qemu/qemu_process.c @@ -304,8 +304,7 @@ qemuProcessEventSubmit(virDomainObj *vm, */ static void qemuProcessHandleMonitorEOF(qemuMonitor *mon, - virDomainObj *vm, - void *opaque G_GNUC_UNUSED) + virDomainObj *vm) { qemuDomainObjPrivate *priv; =20 @@ -346,8 +345,7 @@ qemuProcessHandleMonitorEOF(qemuMonitor *mon, */ static void qemuProcessHandleMonitorError(qemuMonitor *mon G_GNUC_UNUSED, - virDomainObj *vm, - void *opaque G_GNUC_UNUSED) + virDomainObj *vm) { qemuDomainObjPrivate *priv; virObjectEvent *event =3D NULL; @@ -408,8 +406,7 @@ qemuProcessFindDomainDiskByAliasOrQOM(virDomainObj *vm, =20 static void qemuProcessHandleReset(qemuMonitor *mon G_GNUC_UNUSED, - virDomainObj *vm, - void *opaque G_GNUC_UNUSED) + virDomainObj *vm) { virQEMUDriver *driver; virObjectEvent *event =3D NULL; @@ -542,8 +539,7 @@ qemuProcessHandleEvent(qemuMonitor *mon G_GNUC_UNUSED, const char *eventName, long long seconds, unsigned int micros, - const char *details, - void *opaque G_GNUC_UNUSED) + const char *details) { virQEMUDriver *driver; virObjectEvent *event =3D NULL; @@ -564,8 +560,7 @@ qemuProcessHandleEvent(qemuMonitor *mon G_GNUC_UNUSED, static void qemuProcessHandleShutdown(qemuMonitor *mon G_GNUC_UNUSED, virDomainObj *vm, - virTristateBool guest_initiated, - void *opaque G_GNUC_UNUSED) + virTristateBool guest_initiated) { virQEMUDriver *driver; qemuDomainObjPrivate *priv; @@ -636,8 +631,7 @@ qemuProcessHandleShutdown(qemuMonitor *mon G_GNUC_UNUSE= D, =20 static void qemuProcessHandleStop(qemuMonitor *mon G_GNUC_UNUSED, - virDomainObj *vm, - void *opaque G_GNUC_UNUSED) + virDomainObj *vm) { virQEMUDriver *driver; virObjectEvent *event =3D NULL; @@ -694,8 +688,7 @@ qemuProcessHandleStop(qemuMonitor *mon G_GNUC_UNUSED, =20 static void qemuProcessHandleResume(qemuMonitor *mon G_GNUC_UNUSED, - virDomainObj *vm, - void *opaque G_GNUC_UNUSED) + virDomainObj *vm) { virQEMUDriver *driver; virObjectEvent *event =3D NULL; @@ -734,8 +727,7 @@ qemuProcessHandleResume(qemuMonitor *mon G_GNUC_UNUSED, static void qemuProcessHandleRTCChange(qemuMonitor *mon G_GNUC_UNUSED, virDomainObj *vm, - long long offset, - void *opaque G_GNUC_UNUSED) + long long offset) { virQEMUDriver *driver; virObjectEvent *event =3D NULL; @@ -776,8 +768,7 @@ qemuProcessHandleRTCChange(qemuMonitor *mon G_GNUC_UNUS= ED, static void qemuProcessHandleWatchdog(qemuMonitor *mon G_GNUC_UNUSED, virDomainObj *vm, - int action, - void *opaque G_GNUC_UNUSED) + int action) { virQEMUDriver *driver; virObjectEvent *watchdogEvent =3D NULL; @@ -822,8 +813,7 @@ qemuProcessHandleIOError(qemuMonitor *mon G_GNUC_UNUSED, const char *diskAlias, const char *nodename, int action, - const char *reason, - void *opaque G_GNUC_UNUSED) + const char *reason) { virQEMUDriver *driver; virObjectEvent *ioErrorEvent =3D NULL; @@ -890,8 +880,7 @@ qemuProcessHandleBlockJob(qemuMonitor *mon G_GNUC_UNUSE= D, const char *diskAlias, int type, int status, - const char *error, - void *opaque G_GNUC_UNUSED) + const char *error) { qemuDomainObjPrivate *priv; virDomainDiskDef *disk; @@ -934,8 +923,7 @@ static void qemuProcessHandleJobStatusChange(qemuMonitor *mon G_GNUC_UNUSED, virDomainObj *vm, const char *jobname, - int status, - void *opaque G_GNUC_UNUSED) + int status) { qemuDomainObjPrivate *priv; qemuBlockJobData *job =3D NULL; @@ -989,8 +977,7 @@ qemuProcessHandleGraphics(qemuMonitor *mon G_GNUC_UNUSE= D, const char *remoteService, const char *authScheme, const char *x509dname, - const char *saslUsername, - void *opaque G_GNUC_UNUSED) + const char *saslUsername) { virQEMUDriver *driver; virObjectEvent *event; @@ -1035,8 +1022,7 @@ qemuProcessHandleTrayChange(qemuMonitor *mon G_GNUC_U= NUSED, virDomainObj *vm, const char *devAlias, const char *devid, - int reason, - void *opaque G_GNUC_UNUSED) + int reason) { virQEMUDriver *driver; virObjectEvent *event =3D NULL; @@ -1064,8 +1050,7 @@ qemuProcessHandleTrayChange(qemuMonitor *mon G_GNUC_U= NUSED, =20 static void qemuProcessHandlePMWakeup(qemuMonitor *mon G_GNUC_UNUSED, - virDomainObj *vm, - void *opaque G_GNUC_UNUSED) + virDomainObj *vm) { virQEMUDriver *driver; virObjectEvent *event =3D NULL; @@ -1097,8 +1082,7 @@ qemuProcessHandlePMWakeup(qemuMonitor *mon G_GNUC_UNU= SED, =20 static void qemuProcessHandlePMSuspend(qemuMonitor *mon G_GNUC_UNUSED, - virDomainObj *vm, - void *opaque G_GNUC_UNUSED) + virDomainObj *vm) { virQEMUDriver *driver; virObjectEvent *event =3D NULL; @@ -1134,8 +1118,7 @@ qemuProcessHandlePMSuspend(qemuMonitor *mon G_GNUC_UN= USED, static void qemuProcessHandleBalloonChange(qemuMonitor *mon G_GNUC_UNUSED, virDomainObj *vm, - unsigned long long actual, - void *opaque G_GNUC_UNUSED) + unsigned long long actual) { virQEMUDriver *driver; virObjectEvent *event =3D NULL; @@ -1168,8 +1151,7 @@ qemuProcessHandleBalloonChange(qemuMonitor *mon G_GNU= C_UNUSED, =20 static void qemuProcessHandlePMSuspendDisk(qemuMonitor *mon G_GNUC_UNUSED, - virDomainObj *vm, - void *opaque G_GNUC_UNUSED) + virDomainObj *vm) { virQEMUDriver *driver; virObjectEvent *event =3D NULL; @@ -1206,8 +1188,7 @@ qemuProcessHandlePMSuspendDisk(qemuMonitor *mon G_GNU= C_UNUSED, static void qemuProcessHandleGuestPanic(qemuMonitor *mon G_GNUC_UNUSED, virDomainObj *vm, - qemuMonitorEventPanicInfo *info, - void *opaque G_GNUC_UNUSED) + qemuMonitorEventPanicInfo *info) { virObjectLock(vm); =20 @@ -1221,8 +1202,7 @@ qemuProcessHandleGuestPanic(qemuMonitor *mon G_GNUC_U= NUSED, void qemuProcessHandleDeviceDeleted(qemuMonitor *mon G_GNUC_UNUSED, virDomainObj *vm, - const char *devAlias, - void *opaque G_GNUC_UNUSED) + const char *devAlias) { virObjectLock(vm); =20 @@ -1245,8 +1225,7 @@ static void qemuProcessHandleDeviceUnplugErr(qemuMonitor *mon G_GNUC_UNUSED, virDomainObj *vm, const char *devPath, - const char *devAlias, - void *opaque G_GNUC_UNUSED) + const char *devAlias) { virQEMUDriver *driver; virObjectEvent *event =3D NULL; @@ -1341,8 +1320,7 @@ qemuProcessHandleAcpiOstInfo(qemuMonitor *mon G_GNUC_= UNUSED, const char *slotType, const char *slot, unsigned int source, - unsigned int status, - void *opaque G_GNUC_UNUSED) + unsigned int status) { virQEMUDriver *driver; virObjectEvent *event =3D NULL; @@ -1378,8 +1356,7 @@ qemuProcessHandleBlockThreshold(qemuMonitor *mon G_GN= UC_UNUSED, virDomainObj *vm, const char *nodename, unsigned long long threshold, - unsigned long long excess, - void *opaque G_GNUC_UNUSED) + unsigned long long excess) { qemuDomainObjPrivate *priv; virQEMUDriver *driver; @@ -1427,8 +1404,7 @@ qemuProcessHandleBlockThreshold(qemuMonitor *mon G_GN= UC_UNUSED, static void qemuProcessHandleNicRxFilterChanged(qemuMonitor *mon G_GNUC_UNUSED, virDomainObj *vm, - const char *devAlias, - void *opaque G_GNUC_UNUSED) + const char *devAlias) { virObjectLock(vm); =20 @@ -1446,8 +1422,7 @@ static void qemuProcessHandleSerialChanged(qemuMonitor *mon G_GNUC_UNUSED, virDomainObj *vm, const char *devAlias, - bool connected, - void *opaque G_GNUC_UNUSED) + bool connected) { virObjectLock(vm); =20 @@ -1463,8 +1438,7 @@ qemuProcessHandleSerialChanged(qemuMonitor *mon G_GNU= C_UNUSED, =20 static void qemuProcessHandleSpiceMigrated(qemuMonitor *mon G_GNUC_UNUSED, - virDomainObj *vm, - void *opaque G_GNUC_UNUSED) + virDomainObj *vm) { qemuDomainObjPrivate *priv; qemuDomainJobPrivate *jobPriv; @@ -1492,8 +1466,7 @@ qemuProcessHandleSpiceMigrated(qemuMonitor *mon G_GNU= C_UNUSED, static void qemuProcessHandleMigrationStatus(qemuMonitor *mon G_GNUC_UNUSED, virDomainObj *vm, - int status, - void *opaque G_GNUC_UNUSED) + int status) { qemuDomainObjPrivate *priv; qemuDomainJobDataPrivate *privJob =3D NULL; @@ -1544,8 +1517,7 @@ qemuProcessHandleMigrationStatus(qemuMonitor *mon G_G= NUC_UNUSED, static void qemuProcessHandleMigrationPass(qemuMonitor *mon G_GNUC_UNUSED, virDomainObj *vm, - int pass, - void *opaque G_GNUC_UNUSED) + int pass) { qemuDomainObjPrivate *priv; =20 @@ -1573,8 +1545,7 @@ qemuProcessHandleDumpCompleted(qemuMonitor *mon G_GNU= C_UNUSED, virDomainObj *vm, int status, qemuMonitorDumpStats *stats, - const char *error, - void *opaque G_GNUC_UNUSED) + const char *error) { qemuDomainObjPrivate *priv; qemuDomainJobPrivate *jobPriv; @@ -1614,8 +1585,7 @@ static void qemuProcessHandlePRManagerStatusChanged(qemuMonitor *mon G_GNUC_UNUSED, virDomainObj *vm, const char *prManager, - bool connected, - void *opaque G_GNUC_UNUSED) + bool connected) { qemuDomainObjPrivate *priv; const char *managedAlias =3D qemuDomainGetManagedPRAlias(); @@ -1654,8 +1624,7 @@ qemuProcessHandleRdmaGidStatusChanged(qemuMonitor *mo= n G_GNUC_UNUSED, const char *netdev, bool gid_status, unsigned long long subnet_prefix, - unsigned long long interface_id, - void *opaque G_GNUC_UNUSED) + unsigned long long interface_id) { qemuMonitorRdmaGidStatus *info =3D NULL; =20 @@ -1681,8 +1650,7 @@ qemuProcessHandleRdmaGidStatusChanged(qemuMonitor *mo= n G_GNUC_UNUSED, =20 static void qemuProcessHandleGuestCrashloaded(qemuMonitor *mon G_GNUC_UNUSED, - virDomainObj *vm, - void *opaque G_GNUC_UNUSED) + virDomainObj *vm) { virObjectLock(vm); =20 @@ -1696,8 +1664,7 @@ qemuProcessHandleGuestCrashloaded(qemuMonitor *mon G_= GNUC_UNUSED, static void qemuProcessHandleMemoryFailure(qemuMonitor *mon G_GNUC_UNUSED, virDomainObj *vm, - qemuMonitorEventMemoryFailure *mfp, - void *opaque G_GNUC_UNUSED) + qemuMonitorEventMemoryFailure *mfp) { virQEMUDriver *driver; virObjectEvent *event =3D NULL; @@ -1755,8 +1722,7 @@ static void qemuProcessHandleMemoryDeviceSizeChange(qemuMonitor *mon G_GNUC_UNUSED, virDomainObj *vm, const char *devAlias, - unsigned long long size, - void *opaque G_GNUC_UNUSED) + unsigned long long size) { qemuMonitorMemoryDeviceSizeChange *info =3D NULL; =20 @@ -1876,8 +1842,7 @@ qemuConnectMonitor(virQEMUDriver *driver, retry, timeout, virEventThreadGetContext(priv->eventThread), - &monitorCallbacks, - driver); + &monitorCallbacks); =20 if (mon && logCtxt) { g_object_ref(logCtxt); @@ -9059,8 +9024,7 @@ qemuProcessReconnectAll(virQEMUDriver *driver) =20 =20 static void virQEMUCapsMonitorNotify(qemuMonitor *mon G_GNUC_UNUSED, - virDomainObj *vm G_GNUC_UNUSED, - void *opaque G_GNUC_UNUSED) + virDomainObj *vm G_GNUC_UNUSED) { } =20 @@ -9343,7 +9307,7 @@ qemuProcessQMPConnectMonitor(qemuProcessQMP *proc) =20 if (!(proc->mon =3D qemuMonitorOpen(proc->vm, &monConfig, true, 0, virEventThreadGetContext(proc->event= Thread), - &callbacks, NULL))) + &callbacks))) return -1; =20 virObjectLock(proc->mon); diff --git a/src/qemu/qemu_processpriv.h b/src/qemu/qemu_processpriv.h index 9cb176e97c..0ba5897f40 100644 --- a/src/qemu/qemu_processpriv.h +++ b/src/qemu/qemu_processpriv.h @@ -34,7 +34,6 @@ =20 void qemuProcessHandleDeviceDeleted(qemuMonitor *mon, virDomainObj *vm, - const char *devAlias, - void *opaque); + const char *devAlias); =20 int qemuProcessQMPInitMonitor(qemuMonitor *mon); diff --git a/tests/qemuhotplugtest.c b/tests/qemuhotplugtest.c index fe8f0b58db..21123b88ed 100644 --- a/tests/qemuhotplugtest.c +++ b/tests/qemuhotplugtest.c @@ -298,8 +298,7 @@ testQemuHotplug(const void *data) =20 /* Now is the best time to feed the spoofed monitor with predefined * replies. */ - if (!(test_mon =3D qemuMonitorTestNew(driver.xmlopt, vm, &driver, - NULL, NULL))) + if (!(test_mon =3D qemuMonitorTestNew(driver.xmlopt, vm, NULL, NULL))) goto cleanup; =20 tmp =3D test->mon; diff --git a/tests/qemumonitortestutils.c b/tests/qemumonitortestutils.c index 86300da68a..ddd7d91b13 100644 --- a/tests/qemumonitortestutils.c +++ b/tests/qemumonitortestutils.c @@ -953,16 +953,14 @@ qemuMonitorTestAddItemExpect(qemuMonitorTest *test, =20 static void qemuMonitorTestEOFNotify(qemuMonitor *mon G_GNUC_UNUSED, - virDomainObj *vm G_GNUC_UNUSED, - void *opaque G_GNUC_UNUSED) + virDomainObj *vm G_GNUC_UNUSED) { } =20 =20 static void qemuMonitorTestErrorNotify(qemuMonitor *mon G_GNUC_UNUSED, - virDomainObj *vm G_GNUC_UNUSED, - void *opaque G_GNUC_UNUSED) + virDomainObj *vm G_GNUC_UNUSED) { } =20 @@ -1096,7 +1094,6 @@ qemuMonitorCommonTestInit(qemuMonitorTest *test) qemuMonitorTest * qemuMonitorTestNew(virDomainXMLOption *xmlopt, virDomainObj *vm, - virQEMUDriver *driver, const char *greeting, GHashTable *schema) { @@ -1117,8 +1114,7 @@ qemuMonitorTestNew(virDomainXMLOption *xmlopt, true, 0, virEventThreadGetContext(test->event= Thread), - &qemuMonitorTestCallbacks, - driver))) + &qemuMonitorTestCallbacks))) goto error; =20 virObjectLock(test->mon); @@ -1190,7 +1186,7 @@ qemuMonitorTestNewFromFile(const char *fileName, return NULL; } else { /* Create new mocked monitor with our greeting */ - if (!(test =3D qemuMonitorTestNew(xmlopt, NULL, NULL, + if (!(test =3D qemuMonitorTestNew(xmlopt, NULL, singleReply, NULL))) return NULL; } @@ -1390,8 +1386,7 @@ qemuMonitorTestNewFromFileFull(const char *fileName, if (virTestLoadFile(fileName, &jsonstr) < 0) return NULL; =20 - if (!(ret =3D qemuMonitorTestNew(driver->xmlopt, vm, driver, NULL, - qmpschema))) + if (!(ret =3D qemuMonitorTestNew(driver->xmlopt, vm, NULL, qmpschema))) return NULL; =20 if (qemuMonitorTestProcessFileEntries(jsonstr, fileName, &items, &nite= ms) < 0) diff --git a/tests/qemumonitortestutils.h b/tests/qemumonitortestutils.h index 56e3d56056..935f9d1e1a 100644 --- a/tests/qemumonitortestutils.h +++ b/tests/qemumonitortestutils.h @@ -90,14 +90,13 @@ qemuMonitorTestAddItemExpect(qemuMonitorTest *test, const char *response); =20 #define qemuMonitorTestNewSimple(xmlopt) \ - qemuMonitorTestNew(xmlopt, NULL, NULL, NULL, NULL) + qemuMonitorTestNew(xmlopt, NULL, NULL, NULL) #define qemuMonitorTestNewSchema(xmlopt, schema) \ - qemuMonitorTestNew(xmlopt, NULL, NULL, NULL, schema) + qemuMonitorTestNew(xmlopt, NULL, NULL, schema) =20 qemuMonitorTest * qemuMonitorTestNew(virDomainXMLOption *xmlopt, virDomainObj *vm, - virQEMUDriver *driver, const char *greeting, GHashTable *schema); =20 --=20 2.35.1