External/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2024-10-03 04:45:46 +00:00
Code Issues Packages Projects Releases Wiki Activity

qemu: Do not pass unused opaque pointer to monitor callbacks

Browse Source 
Signed-off-by: Jiri Denemark <jdenemar@redhat.com>
Reviewed-by: Michal Privoznik <mprivozn@redhat.com>
This commit is contained in:
Jiri Denemark 2022-05-24 15:02:58 +02:00
parent 88f3727e71
commit 76baf935aa
8 changed files with 88 additions and 173 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/qemu/qemu_monitor.c
View File

@ -578,7 +578,7 @@ qemuMonitorIO(GSocket *socket G_GNUC_UNUSED,
virObjectUnlock(mon); virObjectUnlock(mon);
VIR_DEBUG("Triggering EOF callback mon=%p vm=%p name=%s", VIR_DEBUG("Triggering EOF callback mon=%p vm=%p name=%s",
mon, mon->vm, mon->domainName); mon, mon->vm, mon->domainName);
(eofNotify)(mon, vm, mon->callbackOpaque); (eofNotify)(mon, vm);
virObjectUnref(mon); virObjectUnref(mon);
} else if (error) { } else if (error) {
qemuMonitorErrorNotifyCallback errorNotify = mon->cb->errorNotify; qemuMonitorErrorNotifyCallback errorNotify = mon->cb->errorNotify;
@ -589,7 +589,7 @@ qemuMonitorIO(GSocket *socket G_GNUC_UNUSED,
virObjectUnlock(mon); virObjectUnlock(mon);
VIR_DEBUG("Triggering error callback mon=%p vm=%p name=%s", VIR_DEBUG("Triggering error callback mon=%p vm=%p name=%s",
mon, mon->vm, mon->domainName); mon, mon->vm, mon->domainName);
(errorNotify)(mon, vm, mon->callbackOpaque); (errorNotify)(mon, vm);
virObjectUnref(mon); virObjectUnref(mon);
} else { } else {
virObjectUnlock(mon); virObjectUnlock(mon);
@ -604,8 +604,7 @@ static qemuMonitor *
qemuMonitorOpenInternal(virDomainObj *vm, qemuMonitorOpenInternal(virDomainObj *vm,
int fd, int fd,
GMainContext *context, GMainContext *context,
qemuMonitorCallbacks *cb, qemuMonitorCallbacks *cb)
void *opaque)
{ {
qemuDomainObjPrivate *priv = vm->privateData; qemuDomainObjPrivate *priv = vm->privateData;
qemuMonitor *mon; qemuMonitor *mon;
@ -639,7 +638,6 @@ qemuMonitorOpenInternal(virDomainObj *vm,
mon->domainName = g_strdup(NULLSTR(vm->def->name)); mon->domainName = g_strdup(NULLSTR(vm->def->name));
mon->waitGreeting = true; mon->waitGreeting = true;
mon->cb = cb; mon->cb = cb;
mon->callbackOpaque = opaque;
if (priv) if (priv)
mon->objectAddNoWrap = virQEMUCapsGet(priv->qemuCaps, QEMU_CAPS_OBJECT_JSON); mon->objectAddNoWrap = virQEMUCapsGet(priv->qemuCaps, QEMU_CAPS_OBJECT_JSON);
@ -688,7 +686,6 @@ qemuMonitorOpenInternal(virDomainObj *vm,
* @config: monitor configuration * @config: monitor configuration
* @timeout: number of seconds to add to default timeout * @timeout: number of seconds to add to default timeout
* @cb: monitor event handles * @cb: monitor event handles
* @opaque: opaque data for @cb
* *
* Opens the monitor for running qemu. It may happen that it * Opens the monitor for running qemu. It may happen that it
* takes some time for qemu to create the monitor socket (e.g. * takes some time for qemu to create the monitor socket (e.g.
@ -704,8 +701,7 @@ qemuMonitorOpen(virDomainObj *vm,
bool retry, bool retry,
unsigned long long timeout, unsigned long long timeout,
GMainContext *context, GMainContext *context,
qemuMonitorCallbacks *cb, qemuMonitorCallbacks *cb)
void *opaque)
{ {
VIR_AUTOCLOSE fd = -1; VIR_AUTOCLOSE fd = -1;
qemuMonitor *ret = NULL; qemuMonitor *ret = NULL;
@ -733,7 +729,7 @@ qemuMonitorOpen(virDomainObj *vm,
return NULL; return NULL;
} }
ret = qemuMonitorOpenInternal(vm, fd, context, cb, opaque); ret = qemuMonitorOpenInternal(vm, fd, context, cb);
fd = -1; fd = -1;
return ret; return ret;
} }
@ -1085,7 +1081,7 @@ qemuMonitorUpdateVideoVram64Size(qemuMonitor *mon,
virObjectRef(mon); \ virObjectRef(mon); \
virObjectUnlock(mon); \ virObjectUnlock(mon); \
if ((mon)->cb && (mon)->cb->callback) \ if ((mon)->cb && (mon)->cb->callback) \
(mon)->cb->callback(mon, __VA_ARGS__, (mon)->callbackOpaque); \ (mon)->cb->callback(mon, __VA_ARGS__); \
virObjectLock(mon); \ virObjectLock(mon); \
virObjectUnref(mon); \ virObjectUnref(mon); \
} while (0) } while (0)

108
src/qemu/qemu_monitor.h
View File

@ -180,49 +180,38 @@ void qemuMonitorEventRdmaGidStatusFree(qemuMonitorRdmaGidStatus *info);
void qemuMonitorMemoryDeviceSizeChangeFree(qemuMonitorMemoryDeviceSizeChange *info); void qemuMonitorMemoryDeviceSizeChangeFree(qemuMonitorMemoryDeviceSizeChange *info);
typedef void (*qemuMonitorDestroyCallback)(qemuMonitor *mon, typedef void (*qemuMonitorDestroyCallback)(qemuMonitor *mon,
virDomainObj *vm, virDomainObj *vm);
void *opaque);
typedef void (*qemuMonitorEofNotifyCallback)(qemuMonitor *mon, typedef void (*qemuMonitorEofNotifyCallback)(qemuMonitor *mon,
virDomainObj *vm, virDomainObj *vm);
void *opaque);
typedef void (*qemuMonitorErrorNotifyCallback)(qemuMonitor *mon, typedef void (*qemuMonitorErrorNotifyCallback)(qemuMonitor *mon,
virDomainObj *vm, virDomainObj *vm);
void *opaque);
typedef void (*qemuMonitorDomainEventCallback)(qemuMonitor *mon, typedef void (*qemuMonitorDomainEventCallback)(qemuMonitor *mon,
virDomainObj *vm, virDomainObj *vm,
const char *event, const char *event,
long long seconds, long long seconds,
unsigned int micros, unsigned int micros,
const char *details, const char *details);
void *opaque);
typedef void (*qemuMonitorDomainShutdownCallback)(qemuMonitor *mon, typedef void (*qemuMonitorDomainShutdownCallback)(qemuMonitor *mon,
virDomainObj *vm, virDomainObj *vm,
virTristateBool guest, virTristateBool guest);
void *opaque);
typedef void (*qemuMonitorDomainResetCallback)(qemuMonitor *mon, typedef void (*qemuMonitorDomainResetCallback)(qemuMonitor *mon,
virDomainObj *vm, virDomainObj *vm);
void *opaque);
typedef void (*qemuMonitorDomainStopCallback)(qemuMonitor *mon, typedef void (*qemuMonitorDomainStopCallback)(qemuMonitor *mon,
virDomainObj *vm, virDomainObj *vm);
void *opaque);
typedef void (*qemuMonitorDomainResumeCallback)(qemuMonitor *mon, typedef void (*qemuMonitorDomainResumeCallback)(qemuMonitor *mon,
virDomainObj *vm, virDomainObj *vm);
void *opaque);
typedef void (*qemuMonitorDomainRTCChangeCallback)(qemuMonitor *mon, typedef void (*qemuMonitorDomainRTCChangeCallback)(qemuMonitor *mon,
virDomainObj *vm, virDomainObj *vm,
long long offset, long long offset);
void *opaque);
typedef void (*qemuMonitorDomainWatchdogCallback)(qemuMonitor *mon, typedef void (*qemuMonitorDomainWatchdogCallback)(qemuMonitor *mon,
virDomainObj *vm, virDomainObj *vm,
int action, int action);
void *opaque);
typedef void (*qemuMonitorDomainIOErrorCallback)(qemuMonitor *mon, typedef void (*qemuMonitorDomainIOErrorCallback)(qemuMonitor *mon,
virDomainObj *vm, virDomainObj *vm,
const char *diskAlias, const char *diskAlias,
const char *nodename, const char *nodename,
int action, int action,
const char *reason, const char *reason);
void *opaque);
typedef void (*qemuMonitorDomainGraphicsCallback)(qemuMonitor *mon, typedef void (*qemuMonitorDomainGraphicsCallback)(qemuMonitor *mon,
virDomainObj *vm, virDomainObj *vm,
int phase, int phase,
@ -234,76 +223,60 @@ typedef void (*qemuMonitorDomainGraphicsCallback)(qemuMonitor *mon,
const char *remoteService, const char *remoteService,
const char *authScheme, const char *authScheme,
const char *x509dname, const char *x509dname,
const char *saslUsername, const char *saslUsername);
void *opaque);
typedef void (*qemuMonitorDomainBlockJobCallback)(qemuMonitor *mon, typedef void (*qemuMonitorDomainBlockJobCallback)(qemuMonitor *mon,
virDomainObj *vm, virDomainObj *vm,
const char *diskAlias, const char *diskAlias,
int type, int type,
int status, int status,
const char *error, const char *error);
void *opaque);
typedef void (*qemuMonitorDomainJobStatusChangeCallback)(qemuMonitor *mon, typedef void (*qemuMonitorDomainJobStatusChangeCallback)(qemuMonitor *mon,
virDomainObj *vm, virDomainObj *vm,
const char *jobname, const char *jobname,
int status, int status);
void *opaque);
typedef void (*qemuMonitorDomainTrayChangeCallback)(qemuMonitor *mon, typedef void (*qemuMonitorDomainTrayChangeCallback)(qemuMonitor *mon,
virDomainObj *vm, virDomainObj *vm,
const char *devAlias, const char *devAlias,
const char *devid, const char *devid,
int reason, int reason);
void *opaque);
typedef void (*qemuMonitorDomainPMWakeupCallback)(qemuMonitor *mon, typedef void (*qemuMonitorDomainPMWakeupCallback)(qemuMonitor *mon,
virDomainObj *vm, virDomainObj *vm);
void *opaque);
typedef void (*qemuMonitorDomainPMSuspendCallback)(qemuMonitor *mon, typedef void (*qemuMonitorDomainPMSuspendCallback)(qemuMonitor *mon,
virDomainObj *vm, virDomainObj *vm);
void *opaque);
typedef void (*qemuMonitorDomainBalloonChangeCallback)(qemuMonitor *mon, typedef void (*qemuMonitorDomainBalloonChangeCallback)(qemuMonitor *mon,
virDomainObj *vm, virDomainObj *vm,
unsigned long long actual, unsigned long long actual);
void *opaque);
typedef void (*qemuMonitorDomainPMSuspendDiskCallback)(qemuMonitor *mon, typedef void (*qemuMonitorDomainPMSuspendDiskCallback)(qemuMonitor *mon,
virDomainObj *vm, virDomainObj *vm);
void *opaque);
typedef void (*qemuMonitorDomainGuestPanicCallback)(qemuMonitor *mon, typedef void (*qemuMonitorDomainGuestPanicCallback)(qemuMonitor *mon,
virDomainObj *vm, virDomainObj *vm,
qemuMonitorEventPanicInfo *info, qemuMonitorEventPanicInfo *info);
void *opaque);
typedef void (*qemuMonitorDomainDeviceDeletedCallback)(qemuMonitor *mon, typedef void (*qemuMonitorDomainDeviceDeletedCallback)(qemuMonitor *mon,
virDomainObj *vm, virDomainObj *vm,
const char *devAlias, const char *devAlias);
void *opaque);
typedef void (*qemuMonitorDomainDeviceUnplugErrCallback)(qemuMonitor *mon, typedef void (*qemuMonitorDomainDeviceUnplugErrCallback)(qemuMonitor *mon,
virDomainObj *vm, virDomainObj *vm,
const char *devPath, const char *devPath,
const char *devAlias, const char *devAlias);
void *opaque);
typedef void (*qemuMonitorDomainNicRxFilterChangedCallback)(qemuMonitor *mon, typedef void (*qemuMonitorDomainNicRxFilterChangedCallback)(qemuMonitor *mon,
virDomainObj *vm, virDomainObj *vm,
const char *devAlias, const char *devAlias);
void *opaque);
typedef void (*qemuMonitorDomainSerialChangeCallback)(qemuMonitor *mon, typedef void (*qemuMonitorDomainSerialChangeCallback)(qemuMonitor *mon,
virDomainObj *vm, virDomainObj *vm,
const char *devAlias, const char *devAlias,
bool connected, bool connected);
void *opaque);
typedef void (*qemuMonitorDomainSpiceMigratedCallback)(qemuMonitor *mon, typedef void (*qemuMonitorDomainSpiceMigratedCallback)(qemuMonitor *mon,
virDomainObj *vm, virDomainObj *vm);
void *opaque);
typedef void (*qemuMonitorDomainMigrationStatusCallback)(qemuMonitor *mon, typedef void (*qemuMonitorDomainMigrationStatusCallback)(qemuMonitor *mon,
virDomainObj *vm, virDomainObj *vm,
int status, int status);
void *opaque);
typedef void (*qemuMonitorDomainMigrationPassCallback)(qemuMonitor *mon, typedef void (*qemuMonitorDomainMigrationPassCallback)(qemuMonitor *mon,
virDomainObj *vm, virDomainObj *vm,
int pass, int pass);
void *opaque);
typedef void (*qemuMonitorDomainAcpiOstInfoCallback)(qemuMonitor *mon, typedef void (*qemuMonitorDomainAcpiOstInfoCallback)(qemuMonitor *mon,
virDomainObj *vm, virDomainObj *vm,
@ -311,16 +284,14 @@ typedef void (*qemuMonitorDomainAcpiOstInfoCallback)(qemuMonitor *mon,
const char *slotType, const char *slotType,
const char *slot, const char *slot,
unsigned int source, unsigned int source,
unsigned int status, unsigned int status);
void *opaque);
typedef void (*qemuMonitorDomainBlockThresholdCallback)(qemuMonitor *mon, typedef void (*qemuMonitorDomainBlockThresholdCallback)(qemuMonitor *mon,
virDomainObj *vm, virDomainObj *vm,
const char *nodename, const char *nodename,
unsigned long long threshold, unsigned long long threshold,
unsigned long long excess, unsigned long long excess);
void *opaque);
typedef enum { typedef enum {
@ -345,26 +316,22 @@ typedef void (*qemuMonitorDomainDumpCompletedCallback)(qemuMonitor *mon,
virDomainObj *vm, virDomainObj *vm,
int status, int status,
qemuMonitorDumpStats *stats, qemuMonitorDumpStats *stats,
const char *error, const char *error);
void *opaque);
typedef void (*qemuMonitorDomainPRManagerStatusChangedCallback)(qemuMonitor *mon, typedef void (*qemuMonitorDomainPRManagerStatusChangedCallback)(qemuMonitor *mon,
virDomainObj *vm, virDomainObj *vm,
const char *prManager, const char *prManager,
bool connected, bool connected);
void *opaque);
typedef void (*qemuMonitorDomainRdmaGidStatusChangedCallback)(qemuMonitor *mon, typedef void (*qemuMonitorDomainRdmaGidStatusChangedCallback)(qemuMonitor *mon,
virDomainObj *vm, virDomainObj *vm,
const char *netdev, const char *netdev,
bool gid_status, bool gid_status,
unsigned long long subnet_prefix, unsigned long long subnet_prefix,
unsigned long long interface_id, unsigned long long interface_id);
void *opaque);
typedef void (*qemuMonitorDomainGuestCrashloadedCallback)(qemuMonitor *mon, typedef void (*qemuMonitorDomainGuestCrashloadedCallback)(qemuMonitor *mon,
virDomainObj *vm, virDomainObj *vm);
void *opaque);
typedef enum { typedef enum {
QEMU_MONITOR_MEMORY_FAILURE_RECIPIENT_HYPERVISOR, QEMU_MONITOR_MEMORY_FAILURE_RECIPIENT_HYPERVISOR,
@ -396,14 +363,12 @@ struct _qemuMonitorEventMemoryFailure {
typedef void (*qemuMonitorDomainMemoryFailureCallback)(qemuMonitor *mon, typedef void (*qemuMonitorDomainMemoryFailureCallback)(qemuMonitor *mon,
virDomainObj *vm, virDomainObj *vm,
qemuMonitorEventMemoryFailure *mfp, qemuMonitorEventMemoryFailure *mfp);
void *opaque);
typedef void (*qemuMonitorDomainMemoryDeviceSizeChange)(qemuMonitor *mon, typedef void (*qemuMonitorDomainMemoryDeviceSizeChange)(qemuMonitor *mon,
virDomainObj *vm, virDomainObj *vm,
const char *alias, const char *alias,
unsigned long long size, unsigned long long size);
void *opaque);
typedef struct _qemuMonitorCallbacks qemuMonitorCallbacks; typedef struct _qemuMonitorCallbacks qemuMonitorCallbacks;
struct _qemuMonitorCallbacks { struct _qemuMonitorCallbacks {
@ -448,8 +413,7 @@ qemuMonitor *qemuMonitorOpen(virDomainObj *vm,
bool retry, bool retry,
unsigned long long timeout, unsigned long long timeout,
GMainContext *context, GMainContext *context,
qemuMonitorCallbacks *cb, qemuMonitorCallbacks *cb)
void *opaque)
ATTRIBUTE_NONNULL(1) ATTRIBUTE_NONNULL(2) ATTRIBUTE_NONNULL(5); ATTRIBUTE_NONNULL(1) ATTRIBUTE_NONNULL(2) ATTRIBUTE_NONNULL(5);
void qemuMonitorWatchDispose(void); void qemuMonitorWatchDispose(void);

1
src/qemu/qemu_monitor_priv.h
View File

@ -57,7 +57,6 @@ struct _qemuMonitor {
char *domainName; char *domainName;
qemuMonitorCallbacks *cb; qemuMonitorCallbacks *cb;
void *callbackOpaque;
/* If there's a command being processed this will be /* If there's a command being processed this will be
* non-NULL */ * non-NULL */

110
src/qemu/qemu_process.c
View File

@ -304,8 +304,7 @@ qemuProcessEventSubmit(virDomainObj *vm,
*/ */
static void static void
qemuProcessHandleMonitorEOF(qemuMonitor *mon, qemuProcessHandleMonitorEOF(qemuMonitor *mon,
virDomainObj *vm, virDomainObj *vm)
void *opaque G_GNUC_UNUSED)
{ {
qemuDomainObjPrivate *priv; qemuDomainObjPrivate *priv;
@ -346,8 +345,7 @@ qemuProcessHandleMonitorEOF(qemuMonitor *mon,
*/ */
static void static void
qemuProcessHandleMonitorError(qemuMonitor *mon G_GNUC_UNUSED, qemuProcessHandleMonitorError(qemuMonitor *mon G_GNUC_UNUSED,
virDomainObj *vm, virDomainObj *vm)
void *opaque G_GNUC_UNUSED)
{ {
qemuDomainObjPrivate *priv; qemuDomainObjPrivate *priv;
virObjectEvent *event = NULL; virObjectEvent *event = NULL;
@ -408,8 +406,7 @@ qemuProcessFindDomainDiskByAliasOrQOM(virDomainObj *vm,
static void static void
qemuProcessHandleReset(qemuMonitor *mon G_GNUC_UNUSED, qemuProcessHandleReset(qemuMonitor *mon G_GNUC_UNUSED,
virDomainObj *vm, virDomainObj *vm)
void *opaque G_GNUC_UNUSED)
{ {
virQEMUDriver *driver; virQEMUDriver *driver;
virObjectEvent *event = NULL; virObjectEvent *event = NULL;
@ -542,8 +539,7 @@ qemuProcessHandleEvent(qemuMonitor *mon G_GNUC_UNUSED,
const char *eventName, const char *eventName,
long long seconds, long long seconds,
unsigned int micros, unsigned int micros,
const char *details, const char *details)
void *opaque G_GNUC_UNUSED)
{ {
virQEMUDriver *driver; virQEMUDriver *driver;
virObjectEvent *event = NULL; virObjectEvent *event = NULL;
@ -564,8 +560,7 @@ qemuProcessHandleEvent(qemuMonitor *mon G_GNUC_UNUSED,
static void static void
qemuProcessHandleShutdown(qemuMonitor *mon G_GNUC_UNUSED, qemuProcessHandleShutdown(qemuMonitor *mon G_GNUC_UNUSED,
virDomainObj *vm, virDomainObj *vm,
virTristateBool guest_initiated, virTristateBool guest_initiated)
void *opaque G_GNUC_UNUSED)
{ {
virQEMUDriver *driver; virQEMUDriver *driver;
qemuDomainObjPrivate *priv; qemuDomainObjPrivate *priv;
@ -636,8 +631,7 @@ qemuProcessHandleShutdown(qemuMonitor *mon G_GNUC_UNUSED,
static void static void
qemuProcessHandleStop(qemuMonitor *mon G_GNUC_UNUSED, qemuProcessHandleStop(qemuMonitor *mon G_GNUC_UNUSED,
virDomainObj *vm, virDomainObj *vm)
void *opaque G_GNUC_UNUSED)
{ {
virQEMUDriver *driver; virQEMUDriver *driver;
virObjectEvent *event = NULL; virObjectEvent *event = NULL;
@ -694,8 +688,7 @@ qemuProcessHandleStop(qemuMonitor *mon G_GNUC_UNUSED,
static void static void
qemuProcessHandleResume(qemuMonitor *mon G_GNUC_UNUSED, qemuProcessHandleResume(qemuMonitor *mon G_GNUC_UNUSED,
virDomainObj *vm, virDomainObj *vm)
void *opaque G_GNUC_UNUSED)
{ {
virQEMUDriver *driver; virQEMUDriver *driver;
virObjectEvent *event = NULL; virObjectEvent *event = NULL;
@ -734,8 +727,7 @@ qemuProcessHandleResume(qemuMonitor *mon G_GNUC_UNUSED,
static void static void
qemuProcessHandleRTCChange(qemuMonitor *mon G_GNUC_UNUSED, qemuProcessHandleRTCChange(qemuMonitor *mon G_GNUC_UNUSED,
virDomainObj *vm, virDomainObj *vm,
long long offset, long long offset)
void *opaque G_GNUC_UNUSED)
{ {
virQEMUDriver *driver; virQEMUDriver *driver;
virObjectEvent *event = NULL; virObjectEvent *event = NULL;
@ -776,8 +768,7 @@ qemuProcessHandleRTCChange(qemuMonitor *mon G_GNUC_UNUSED,
static void static void
qemuProcessHandleWatchdog(qemuMonitor *mon G_GNUC_UNUSED, qemuProcessHandleWatchdog(qemuMonitor *mon G_GNUC_UNUSED,
virDomainObj *vm, virDomainObj *vm,
int action, int action)
void *opaque G_GNUC_UNUSED)
{ {
virQEMUDriver *driver; virQEMUDriver *driver;
virObjectEvent *watchdogEvent = NULL; virObjectEvent *watchdogEvent = NULL;
@ -822,8 +813,7 @@ qemuProcessHandleIOError(qemuMonitor *mon G_GNUC_UNUSED,
const char *diskAlias, const char *diskAlias,
const char *nodename, const char *nodename,
int action, int action,
const char *reason, const char *reason)
void *opaque G_GNUC_UNUSED)
{ {
virQEMUDriver *driver; virQEMUDriver *driver;
virObjectEvent *ioErrorEvent = NULL; virObjectEvent *ioErrorEvent = NULL;
@ -890,8 +880,7 @@ qemuProcessHandleBlockJob(qemuMonitor *mon G_GNUC_UNUSED,
const char *diskAlias, const char *diskAlias,
int type, int type,
int status, int status,
const char *error, const char *error)
void *opaque G_GNUC_UNUSED)
{ {
qemuDomainObjPrivate *priv; qemuDomainObjPrivate *priv;
virDomainDiskDef *disk; virDomainDiskDef *disk;
@ -934,8 +923,7 @@ static void
qemuProcessHandleJobStatusChange(qemuMonitor *mon G_GNUC_UNUSED, qemuProcessHandleJobStatusChange(qemuMonitor *mon G_GNUC_UNUSED,
virDomainObj *vm, virDomainObj *vm,
const char *jobname, const char *jobname,
int status, int status)
void *opaque G_GNUC_UNUSED)
{ {
qemuDomainObjPrivate *priv; qemuDomainObjPrivate *priv;
qemuBlockJobData *job = NULL; qemuBlockJobData *job = NULL;
@ -989,8 +977,7 @@ qemuProcessHandleGraphics(qemuMonitor *mon G_GNUC_UNUSED,
const char *remoteService, const char *remoteService,
const char *authScheme, const char *authScheme,
const char *x509dname, const char *x509dname,
const char *saslUsername, const char *saslUsername)
void *opaque G_GNUC_UNUSED)
{ {
virQEMUDriver *driver; virQEMUDriver *driver;
virObjectEvent *event; virObjectEvent *event;
@ -1035,8 +1022,7 @@ qemuProcessHandleTrayChange(qemuMonitor *mon G_GNUC_UNUSED,
virDomainObj *vm, virDomainObj *vm,
const char *devAlias, const char *devAlias,
const char *devid, const char *devid,
int reason, int reason)
void *opaque G_GNUC_UNUSED)
{ {
virQEMUDriver *driver; virQEMUDriver *driver;
virObjectEvent *event = NULL; virObjectEvent *event = NULL;
@ -1064,8 +1050,7 @@ qemuProcessHandleTrayChange(qemuMonitor *mon G_GNUC_UNUSED,
static void static void
qemuProcessHandlePMWakeup(qemuMonitor *mon G_GNUC_UNUSED, qemuProcessHandlePMWakeup(qemuMonitor *mon G_GNUC_UNUSED,
virDomainObj *vm, virDomainObj *vm)
void *opaque G_GNUC_UNUSED)
{ {
virQEMUDriver *driver; virQEMUDriver *driver;
virObjectEvent *event = NULL; virObjectEvent *event = NULL;
@ -1097,8 +1082,7 @@ qemuProcessHandlePMWakeup(qemuMonitor *mon G_GNUC_UNUSED,
static void static void
qemuProcessHandlePMSuspend(qemuMonitor *mon G_GNUC_UNUSED, qemuProcessHandlePMSuspend(qemuMonitor *mon G_GNUC_UNUSED,
virDomainObj *vm, virDomainObj *vm)
void *opaque G_GNUC_UNUSED)
{ {
virQEMUDriver *driver; virQEMUDriver *driver;
virObjectEvent *event = NULL; virObjectEvent *event = NULL;
@ -1134,8 +1118,7 @@ qemuProcessHandlePMSuspend(qemuMonitor *mon G_GNUC_UNUSED,
static void static void
qemuProcessHandleBalloonChange(qemuMonitor *mon G_GNUC_UNUSED, qemuProcessHandleBalloonChange(qemuMonitor *mon G_GNUC_UNUSED,
virDomainObj *vm, virDomainObj *vm,
unsigned long long actual, unsigned long long actual)
void *opaque G_GNUC_UNUSED)
{ {
virQEMUDriver *driver; virQEMUDriver *driver;
virObjectEvent *event = NULL; virObjectEvent *event = NULL;
@ -1168,8 +1151,7 @@ qemuProcessHandleBalloonChange(qemuMonitor *mon G_GNUC_UNUSED,
static void static void
qemuProcessHandlePMSuspendDisk(qemuMonitor *mon G_GNUC_UNUSED, qemuProcessHandlePMSuspendDisk(qemuMonitor *mon G_GNUC_UNUSED,
virDomainObj *vm, virDomainObj *vm)
void *opaque G_GNUC_UNUSED)
{ {
virQEMUDriver *driver; virQEMUDriver *driver;
virObjectEvent *event = NULL; virObjectEvent *event = NULL;
@ -1206,8 +1188,7 @@ qemuProcessHandlePMSuspendDisk(qemuMonitor *mon G_GNUC_UNUSED,
static void static void
qemuProcessHandleGuestPanic(qemuMonitor *mon G_GNUC_UNUSED, qemuProcessHandleGuestPanic(qemuMonitor *mon G_GNUC_UNUSED,
virDomainObj *vm, virDomainObj *vm,
qemuMonitorEventPanicInfo *info, qemuMonitorEventPanicInfo *info)
void *opaque G_GNUC_UNUSED)
{ {
virObjectLock(vm); virObjectLock(vm);
@ -1221,8 +1202,7 @@ qemuProcessHandleGuestPanic(qemuMonitor *mon G_GNUC_UNUSED,
void void
qemuProcessHandleDeviceDeleted(qemuMonitor *mon G_GNUC_UNUSED, qemuProcessHandleDeviceDeleted(qemuMonitor *mon G_GNUC_UNUSED,
virDomainObj *vm, virDomainObj *vm,
const char *devAlias, const char *devAlias)
void *opaque G_GNUC_UNUSED)
{ {
virObjectLock(vm); virObjectLock(vm);
@ -1245,8 +1225,7 @@ static void
qemuProcessHandleDeviceUnplugErr(qemuMonitor *mon G_GNUC_UNUSED, qemuProcessHandleDeviceUnplugErr(qemuMonitor *mon G_GNUC_UNUSED,
virDomainObj *vm, virDomainObj *vm,
const char *devPath, const char *devPath,
const char *devAlias, const char *devAlias)
void *opaque G_GNUC_UNUSED)
{ {
virQEMUDriver *driver; virQEMUDriver *driver;
virObjectEvent *event = NULL; virObjectEvent *event = NULL;
@ -1341,8 +1320,7 @@ qemuProcessHandleAcpiOstInfo(qemuMonitor *mon G_GNUC_UNUSED,
const char *slotType, const char *slotType,
const char *slot, const char *slot,
unsigned int source, unsigned int source,
unsigned int status, unsigned int status)
void *opaque G_GNUC_UNUSED)
{ {
virQEMUDriver *driver; virQEMUDriver *driver;
virObjectEvent *event = NULL; virObjectEvent *event = NULL;
@ -1378,8 +1356,7 @@ qemuProcessHandleBlockThreshold(qemuMonitor *mon G_GNUC_UNUSED,
virDomainObj *vm, virDomainObj *vm,
const char *nodename, const char *nodename,
unsigned long long threshold, unsigned long long threshold,
unsigned long long excess, unsigned long long excess)
void *opaque G_GNUC_UNUSED)
{ {
qemuDomainObjPrivate *priv; qemuDomainObjPrivate *priv;
virQEMUDriver *driver; virQEMUDriver *driver;
@ -1427,8 +1404,7 @@ qemuProcessHandleBlockThreshold(qemuMonitor *mon G_GNUC_UNUSED,
static void static void
qemuProcessHandleNicRxFilterChanged(qemuMonitor *mon G_GNUC_UNUSED, qemuProcessHandleNicRxFilterChanged(qemuMonitor *mon G_GNUC_UNUSED,
virDomainObj *vm, virDomainObj *vm,
const char *devAlias, const char *devAlias)
void *opaque G_GNUC_UNUSED)
{ {
virObjectLock(vm); virObjectLock(vm);
@ -1446,8 +1422,7 @@ static void
qemuProcessHandleSerialChanged(qemuMonitor *mon G_GNUC_UNUSED, qemuProcessHandleSerialChanged(qemuMonitor *mon G_GNUC_UNUSED,
virDomainObj *vm, virDomainObj *vm,
const char *devAlias, const char *devAlias,
bool connected, bool connected)
void *opaque G_GNUC_UNUSED)
{ {
virObjectLock(vm); virObjectLock(vm);
@ -1463,8 +1438,7 @@ qemuProcessHandleSerialChanged(qemuMonitor *mon G_GNUC_UNUSED,
static void static void
qemuProcessHandleSpiceMigrated(qemuMonitor *mon G_GNUC_UNUSED, qemuProcessHandleSpiceMigrated(qemuMonitor *mon G_GNUC_UNUSED,
virDomainObj *vm, virDomainObj *vm)
void *opaque G_GNUC_UNUSED)
{ {
qemuDomainObjPrivate *priv; qemuDomainObjPrivate *priv;
qemuDomainJobPrivate *jobPriv; qemuDomainJobPrivate *jobPriv;
@ -1492,8 +1466,7 @@ qemuProcessHandleSpiceMigrated(qemuMonitor *mon G_GNUC_UNUSED,
static void static void
qemuProcessHandleMigrationStatus(qemuMonitor *mon G_GNUC_UNUSED, qemuProcessHandleMigrationStatus(qemuMonitor *mon G_GNUC_UNUSED,
virDomainObj *vm, virDomainObj *vm,
int status, int status)
void *opaque G_GNUC_UNUSED)
{ {
qemuDomainObjPrivate *priv; qemuDomainObjPrivate *priv;
qemuDomainJobDataPrivate *privJob = NULL; qemuDomainJobDataPrivate *privJob = NULL;
@ -1544,8 +1517,7 @@ qemuProcessHandleMigrationStatus(qemuMonitor *mon G_GNUC_UNUSED,
static void static void
qemuProcessHandleMigrationPass(qemuMonitor *mon G_GNUC_UNUSED, qemuProcessHandleMigrationPass(qemuMonitor *mon G_GNUC_UNUSED,
virDomainObj *vm, virDomainObj *vm,
int pass, int pass)
void *opaque G_GNUC_UNUSED)
{ {
qemuDomainObjPrivate *priv; qemuDomainObjPrivate *priv;
@ -1573,8 +1545,7 @@ qemuProcessHandleDumpCompleted(qemuMonitor *mon G_GNUC_UNUSED,
virDomainObj *vm, virDomainObj *vm,
int status, int status,
qemuMonitorDumpStats *stats, qemuMonitorDumpStats *stats,
const char *error, const char *error)
void *opaque G_GNUC_UNUSED)
{ {
qemuDomainObjPrivate *priv; qemuDomainObjPrivate *priv;
qemuDomainJobPrivate *jobPriv; qemuDomainJobPrivate *jobPriv;
@ -1614,8 +1585,7 @@ static void
qemuProcessHandlePRManagerStatusChanged(qemuMonitor *mon G_GNUC_UNUSED, qemuProcessHandlePRManagerStatusChanged(qemuMonitor *mon G_GNUC_UNUSED,
virDomainObj *vm, virDomainObj *vm,
const char *prManager, const char *prManager,
bool connected, bool connected)
void *opaque G_GNUC_UNUSED)
{ {
qemuDomainObjPrivate *priv; qemuDomainObjPrivate *priv;
const char *managedAlias = qemuDomainGetManagedPRAlias(); const char *managedAlias = qemuDomainGetManagedPRAlias();
@ -1654,8 +1624,7 @@ qemuProcessHandleRdmaGidStatusChanged(qemuMonitor *mon G_GNUC_UNUSED,
const char *netdev, const char *netdev,
bool gid_status, bool gid_status,
unsigned long long subnet_prefix, unsigned long long subnet_prefix,
unsigned long long interface_id, unsigned long long interface_id)
void *opaque G_GNUC_UNUSED)
{ {
qemuMonitorRdmaGidStatus *info = NULL; qemuMonitorRdmaGidStatus *info = NULL;
@ -1681,8 +1650,7 @@ qemuProcessHandleRdmaGidStatusChanged(qemuMonitor *mon G_GNUC_UNUSED,
static void static void
qemuProcessHandleGuestCrashloaded(qemuMonitor *mon G_GNUC_UNUSED, qemuProcessHandleGuestCrashloaded(qemuMonitor *mon G_GNUC_UNUSED,
virDomainObj *vm, virDomainObj *vm)
void *opaque G_GNUC_UNUSED)
{ {
virObjectLock(vm); virObjectLock(vm);
@ -1696,8 +1664,7 @@ qemuProcessHandleGuestCrashloaded(qemuMonitor *mon G_GNUC_UNUSED,
static void static void
qemuProcessHandleMemoryFailure(qemuMonitor *mon G_GNUC_UNUSED, qemuProcessHandleMemoryFailure(qemuMonitor *mon G_GNUC_UNUSED,
virDomainObj *vm, virDomainObj *vm,
qemuMonitorEventMemoryFailure *mfp, qemuMonitorEventMemoryFailure *mfp)
void *opaque G_GNUC_UNUSED)
{ {
virQEMUDriver *driver; virQEMUDriver *driver;
virObjectEvent *event = NULL; virObjectEvent *event = NULL;
@ -1755,8 +1722,7 @@ static void
qemuProcessHandleMemoryDeviceSizeChange(qemuMonitor *mon G_GNUC_UNUSED, qemuProcessHandleMemoryDeviceSizeChange(qemuMonitor *mon G_GNUC_UNUSED,
virDomainObj *vm, virDomainObj *vm,
const char *devAlias, const char *devAlias,
unsigned long long size, unsigned long long size)
void *opaque G_GNUC_UNUSED)
{ {
qemuMonitorMemoryDeviceSizeChange *info = NULL; qemuMonitorMemoryDeviceSizeChange *info = NULL;
@ -1876,8 +1842,7 @@ qemuConnectMonitor(virQEMUDriver *driver,
retry, retry,
timeout, timeout,
virEventThreadGetContext(priv->eventThread), virEventThreadGetContext(priv->eventThread),
&monitorCallbacks, &monitorCallbacks);
driver);
if (mon && logCtxt) { if (mon && logCtxt) {
g_object_ref(logCtxt); g_object_ref(logCtxt);
@ -9059,8 +9024,7 @@ qemuProcessReconnectAll(virQEMUDriver *driver)
static void virQEMUCapsMonitorNotify(qemuMonitor *mon G_GNUC_UNUSED, static void virQEMUCapsMonitorNotify(qemuMonitor *mon G_GNUC_UNUSED,
virDomainObj *vm G_GNUC_UNUSED, virDomainObj *vm G_GNUC_UNUSED)
void *opaque G_GNUC_UNUSED)
{ {
} }
@ -9343,7 +9307,7 @@ qemuProcessQMPConnectMonitor(qemuProcessQMP *proc)
if (!(proc->mon = qemuMonitorOpen(proc->vm, &monConfig, true, 0, if (!(proc->mon = qemuMonitorOpen(proc->vm, &monConfig, true, 0,
virEventThreadGetContext(proc->eventThread), virEventThreadGetContext(proc->eventThread),
&callbacks, NULL))) &callbacks)))
return -1; return -1;
virObjectLock(proc->mon); virObjectLock(proc->mon);

3
src/qemu/qemu_processpriv.h
View File

@ -34,7 +34,6 @@
void qemuProcessHandleDeviceDeleted(qemuMonitor *mon, void qemuProcessHandleDeviceDeleted(qemuMonitor *mon,
virDomainObj *vm, virDomainObj *vm,
const char *devAlias, const char *devAlias);
void *opaque);
int qemuProcessQMPInitMonitor(qemuMonitor *mon); int qemuProcessQMPInitMonitor(qemuMonitor *mon);

3
tests/qemuhotplugtest.c
View File

@ -298,8 +298,7 @@ testQemuHotplug(const void *data)
/* Now is the best time to feed the spoofed monitor with predefined /* Now is the best time to feed the spoofed monitor with predefined
* replies. */ * replies. */
if (!(test_mon = qemuMonitorTestNew(driver.xmlopt, vm, &driver, if (!(test_mon = qemuMonitorTestNew(driver.xmlopt, vm, NULL, NULL)))
NULL, NULL)))
goto cleanup; goto cleanup;
tmp = test->mon; tmp = test->mon;

15
tests/qemumonitortestutils.c
View File

@ -953,16 +953,14 @@ qemuMonitorTestAddItemExpect(qemuMonitorTest *test,
static void static void
qemuMonitorTestEOFNotify(qemuMonitor *mon G_GNUC_UNUSED, qemuMonitorTestEOFNotify(qemuMonitor *mon G_GNUC_UNUSED,
virDomainObj *vm G_GNUC_UNUSED, virDomainObj *vm G_GNUC_UNUSED)
void *opaque G_GNUC_UNUSED)
{ {
} }
static void static void
qemuMonitorTestErrorNotify(qemuMonitor *mon G_GNUC_UNUSED, qemuMonitorTestErrorNotify(qemuMonitor *mon G_GNUC_UNUSED,
virDomainObj *vm G_GNUC_UNUSED, virDomainObj *vm G_GNUC_UNUSED)
void *opaque G_GNUC_UNUSED)
{ {
} }
@ -1096,7 +1094,6 @@ qemuMonitorCommonTestInit(qemuMonitorTest *test)
qemuMonitorTest * qemuMonitorTest *
qemuMonitorTestNew(virDomainXMLOption *xmlopt, qemuMonitorTestNew(virDomainXMLOption *xmlopt,
virDomainObj *vm, virDomainObj *vm,
virQEMUDriver *driver,
const char *greeting, const char *greeting,
GHashTable *schema) GHashTable *schema)
{ {
@ -1117,8 +1114,7 @@ qemuMonitorTestNew(virDomainXMLOption *xmlopt,
true, true,
0, 0,
virEventThreadGetContext(test->eventThread), virEventThreadGetContext(test->eventThread),
&qemuMonitorTestCallbacks, &qemuMonitorTestCallbacks)))
driver)))
goto error; goto error;
virObjectLock(test->mon); virObjectLock(test->mon);
@ -1190,7 +1186,7 @@ qemuMonitorTestNewFromFile(const char *fileName,
return NULL; return NULL;
} else { } else {
/* Create new mocked monitor with our greeting */ /* Create new mocked monitor with our greeting */
if (!(test = qemuMonitorTestNew(xmlopt, NULL, NULL, if (!(test = qemuMonitorTestNew(xmlopt, NULL,
singleReply, NULL))) singleReply, NULL)))
return NULL; return NULL;
} }
@ -1390,8 +1386,7 @@ qemuMonitorTestNewFromFileFull(const char *fileName,
if (virTestLoadFile(fileName, &jsonstr) < 0) if (virTestLoadFile(fileName, &jsonstr) < 0)
return NULL; return NULL;
if (!(ret = qemuMonitorTestNew(driver->xmlopt, vm, driver, NULL, if (!(ret = qemuMonitorTestNew(driver->xmlopt, vm, NULL, qmpschema)))
qmpschema)))
return NULL; return NULL;
if (qemuMonitorTestProcessFileEntries(jsonstr, fileName, &items, &nitems) < 0) if (qemuMonitorTestProcessFileEntries(jsonstr, fileName, &items, &nitems) < 0)

5
tests/qemumonitortestutils.h
View File

@ -90,14 +90,13 @@ qemuMonitorTestAddItemExpect(qemuMonitorTest *test,
const char *response); const char *response);
#define qemuMonitorTestNewSimple(xmlopt) \ #define qemuMonitorTestNewSimple(xmlopt) \
qemuMonitorTestNew(xmlopt, NULL, NULL, NULL, NULL) qemuMonitorTestNew(xmlopt, NULL, NULL, NULL)
#define qemuMonitorTestNewSchema(xmlopt, schema) \ #define qemuMonitorTestNewSchema(xmlopt, schema) \
qemuMonitorTestNew(xmlopt, NULL, NULL, NULL, schema) qemuMonitorTestNew(xmlopt, NULL, NULL, schema)
qemuMonitorTest * qemuMonitorTest *
qemuMonitorTestNew(virDomainXMLOption *xmlopt, qemuMonitorTestNew(virDomainXMLOption *xmlopt,
virDomainObj *vm, virDomainObj *vm,
virQEMUDriver *driver,
const char *greeting, const char *greeting,
GHashTable *schema); GHashTable *schema);