| Message ID | 1435853415-23545-24-git-send-email-quintela@redhat.com |
|---|---|
| State | New |
| Headers | show |
On 07/03/2015 12:10 AM, Juan Quintela wrote: > We have one argument that tells us what event has happened. This patch brokes 'make check' Thanks Wen Congyang > > 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. >
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.