[PATCH 01/33] qemu: monitor: Remove handlers for the 'POWERDOWN' event
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 <pkrempa(a)redhat.com>
---
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 = -1;
- VIR_DEBUG("mon=%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)(qemuMonitor *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 *data);
-static void qemuMonitorJSONHandlePowerdown(qemuMonitor *mon, virJSONValue *data);
static void qemuMonitorJSONHandleStop(qemuMonitor *mon, virJSONValue *data);
static void qemuMonitorJSONHandleResume(qemuMonitor *mon, virJSONValue *data);
static void qemuMonitorJSONHandleRTCChange(qemuMonitor *mon, virJSONValue *data);
@@ -137,7 +136,6 @@ static qemuEventHandler eventHandlers[] = {
{ "MIGRATION", qemuMonitorJSONHandleMigrationStatus, },
{ "MIGRATION_PASS", qemuMonitorJSONHandleMigrationPass, },
{ "NIC_RX_FILTER_CHANGED", qemuMonitorJSONHandleNicRxFilterChanged, },
- { "POWERDOWN", qemuMonitorJSONHandlePowerdown, },
{ "PR_MANAGER_STATUS_CHANGED", qemuMonitorJSONHandlePRManagerStatusChanged,
},
{ "RDMA_GID_STATUS_CHANGED", qemuMonitorJSONHandleRdmaGidStatusChanged, },
{ "RESET", qemuMonitorJSONHandleReset, },
@@ -733,11 +731,6 @@ static void qemuMonitorJSONHandleReset(qemuMonitor *mon, 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);
--
2.31.1