From: Juan Quintela <quintela@redhat.com>
To: qemu-devel@nongnu.org
Cc: amit.shah@redhat.com
Subject: [Qemu-devel] [PULL 25/26] migration: create migration event
Date: Wed, 1 Jul 2015 12:39:49 +0200 [thread overview]
Message-ID: <1435747190-18017-26-git-send-email-quintela@redhat.com> (raw)
In-Reply-To: <1435747190-18017-1-git-send-email-quintela@redhat.com>
We have one argument that tells us what event has happened.
Signed-off-by: Juan Quintela <quintela@redhat.com>
Reviewed-by: Eric Blake <eblake@redhat.com>
---
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 ffaa5c8..d8415c4 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 */
@@ -510,6 +511,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
next prev parent reply other threads:[~2015-07-01 10:40 UTC|newest]
Thread overview: 33+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-07-01 10:39 [Qemu-devel] [PULL 00/26] Migration pull request Juan Quintela
2015-07-01 10:39 ` [Qemu-devel] [PULL 01/26] migration: protect migration_bitmap Juan Quintela
2015-07-01 10:39 ` [Qemu-devel] [PULL 02/26] migration: extend migration_bitmap Juan Quintela
2015-07-01 10:39 ` [Qemu-devel] [PULL 03/26] rdma: fix memory leak Juan Quintela
2015-07-01 10:39 ` [Qemu-devel] [PULL 04/26] Only try and read a VMDescription if it should be there Juan Quintela
2015-07-01 10:39 ` [Qemu-devel] [PULL 05/26] rdma typos Juan Quintela
2015-07-01 10:39 ` [Qemu-devel] [PULL 06/26] Store block name in local blocks structure Juan Quintela
2015-07-01 10:39 ` [Qemu-devel] [PULL 07/26] Translate offsets to destination address space Juan Quintela
2015-07-01 10:39 ` [Qemu-devel] [PULL 08/26] Rework ram_control_load_hook to hook during block load Juan Quintela
2015-07-01 10:39 ` [Qemu-devel] [PULL 09/26] Allow rdma_delete_block to work without the hash Juan Quintela
2015-07-01 10:39 ` [Qemu-devel] [PULL 10/26] Rework ram block hash Juan Quintela
2015-07-01 10:39 ` [Qemu-devel] [PULL 11/26] Sort destination RAMBlocks to be the same as the source Juan Quintela
2015-07-01 10:39 ` [Qemu-devel] [PULL 12/26] Sanity check RDMA remote data Juan Quintela
2015-07-01 10:39 ` [Qemu-devel] [PULL 13/26] Fail more cleanly in mismatched RAM cases Juan Quintela
2015-07-01 10:39 ` [Qemu-devel] [PULL 14/26] Fix older machine type compatibility on power with section footers Juan Quintela
2015-07-01 10:39 ` [Qemu-devel] [PULL 15/26] runstate: Add runstate store Juan Quintela
2015-07-01 10:39 ` [Qemu-devel] [PULL 16/26] runstate: migration allows more transitions now Juan Quintela
2015-07-01 10:39 ` [Qemu-devel] [PULL 17/26] migration: create new section to store global state Juan Quintela
2015-07-01 10:39 ` [Qemu-devel] [PULL 18/26] global_state: Make section optional Juan Quintela
2015-07-01 10:39 ` [Qemu-devel] [PULL 19/26] vmstate: Create optional sections Juan Quintela
2015-07-01 10:39 ` [Qemu-devel] [PULL 20/26] migration: Add configuration section Juan Quintela
2015-07-01 10:39 ` [Qemu-devel] [PULL 21/26] migration: Use cmpxchg correctly Juan Quintela
2015-07-01 10:39 ` [Qemu-devel] [PULL 22/26] migration: ensure we start in NONE state Juan Quintela
2015-07-01 10:39 ` [Qemu-devel] [PULL 23/26] migration: Use always helper to set state Juan Quintela
2015-07-01 10:39 ` [Qemu-devel] [PULL 24/26] migration: No need to call trace_migrate_set_state() Juan Quintela
2015-07-01 10:39 ` Juan Quintela [this message]
2015-07-01 10:39 ` [Qemu-devel] [PULL 26/26] migration: Add migration events on target side Juan Quintela
2015-07-02 9:31 ` [Qemu-devel] [PULL 00/26] Migration pull request Peter Maydell
2015-07-02 9:51 ` Wen Congyang
2015-07-02 12:17 ` Juan Quintela
2015-07-02 12:30 ` Peter Maydell
2015-07-02 12:55 ` [Qemu-devel] Mutex error checking (was: [PULL 00/26] Migration pull request) Markus Armbruster
2015-07-02 12:58 ` Peter Maydell
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1435747190-18017-26-git-send-email-quintela@redhat.com \
--to=quintela@redhat.com \
--cc=amit.shah@redhat.com \
--cc=qemu-devel@nongnu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).