[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 11/12] migration: create migration event
From: |
Juan Quintela |
Subject: |
[Qemu-devel] [PATCH 11/12] migration: create migration event |
Date: |
Wed, 1 Jul 2015 10:51:32 +0200 |
We have one argument that tells us what event has happened.
Signed-off-by: Juan Quintela <address@hidden>
Reviewed-by: Eric Blake <address@hidden>
---
docs/qmp/qmp-events.txt | 14 ++++++++++++++
migration/migration.c | 2 ++
qapi/event.json | 12 ++++++++++++
3 files changed, 28 insertions(+)
diff --git a/docs/qmp/qmp-events.txt b/docs/qmp/qmp-events.txt
index 4c13d48..d92cc48 100644
--- a/docs/qmp/qmp-events.txt
+++ b/docs/qmp/qmp-events.txt
@@ -473,6 +473,20 @@ Example:
{ "timestamp": {"seconds": 1290688046, "microseconds": 417172},
"event": "SPICE_MIGRATE_COMPLETED" }
+MIGRATION
+---------
+
+Emitted when a migration event happens
+
+Data: None.
+
+ - "status": migration status
+ See MigrationStatus in ~/qapi-schema.json for possible values
+
+Example:
+
+{"timestamp": {"seconds": 1432121972, "microseconds": 744001},
+ "event": "MIGRATION", "data": {"status": "completed"}}
STOP
----
diff --git a/migration/migration.c b/migration/migration.c
index ef1e4a4..fee2186 100644
--- a/migration/migration.c
+++ b/migration/migration.c
@@ -27,6 +27,7 @@
#include "qmp-commands.h"
#include "trace.h"
#include "qapi/util.h"
+#include "qapi-event.h"
#define MAX_THROTTLE (32 << 20) /* Migration speed throttling */
@@ -509,6 +510,7 @@ void qmp_migrate_set_parameters(bool has_compress_level,
static void migrate_set_state(MigrationState *s, int old_state, int new_state)
{
if (atomic_cmpxchg(&s->state, old_state, new_state) == old_state) {
+ qapi_event_send_migration(new_state, &error_abort);
trace_migrate_set_state(new_state);
}
}
diff --git a/qapi/event.json b/qapi/event.json
index 378dda5..f0cef01 100644
--- a/qapi/event.json
+++ b/qapi/event.json
@@ -243,6 +243,18 @@
{ 'event': 'SPICE_MIGRATE_COMPLETED' }
##
+# @MIGRATION
+#
+# Emitted when a migration event happens
+#
+# @status: @MigrationStatus describing the current migration status.
+#
+# Since: 2.4
+##
+{ 'event': 'MIGRATION',
+ 'data': {'status': 'MigrationStatus'}}
+
+##
# @ACPI_DEVICE_OST
#
# Emitted when guest executes ACPI _OST method.
--
2.4.3
- Re: [Qemu-devel] [PATCH 06/12] migration: Add configuration section, (continued)
- [Qemu-devel] [PATCH 07/12] migration: Use cmpxchg correctly, Juan Quintela, 2015/07/01
- [Qemu-devel] [PATCH 09/12] migration: Use always helper to set state, Juan Quintela, 2015/07/01
- [Qemu-devel] [PATCH 10/12] migration: No need to call trace_migrate_set_state(), Juan Quintela, 2015/07/01
- [Qemu-devel] [PATCH 08/12] migration: ensure we start in NONE state, Juan Quintela, 2015/07/01
- [Qemu-devel] [PATCH 12/12] migration: Add migration events on target side, Juan Quintela, 2015/07/01
- [Qemu-devel] [PATCH 11/12] migration: create migration event,
Juan Quintela <=