diff options
| author | Peter Maydell | 2017-06-13 14:51:29 +0200 |
|---|---|---|
| committer | Peter Maydell | 2017-06-13 14:51:29 +0200 |
| commit | 735286a4f88255e1463d42ce28d8d14181fd32d4 (patch) | |
| tree | 5200eac6b4fb709bdee16bc1bb1f3dea228b766d /ui/spice-core.c | |
| parent | Merge remote-tracking branch 'remotes/cody/tags/block-pull-request' into staging (diff) | |
| parent | migration: Move migration.h to migration/ (diff) | |
| download | qemu-735286a4f88255e1463d42ce28d8d14181fd32d4.tar.gz qemu-735286a4f88255e1463d42ce28d8d14181fd32d4.tar.xz qemu-735286a4f88255e1463d42ce28d8d14181fd32d4.zip | |
Merge remote-tracking branch 'remotes/juanquintela/tags/migration/20170613' into staging
migration/next for 20170613
# gpg: Signature made Tue 13 Jun 2017 10:01:45 BST
# gpg: using RSA key 0xF487EF185872D723
# gpg: Good signature from "Juan Quintela <quintela@redhat.com>"
# gpg: aka "Juan Quintela <quintela@trasno.org>"
# Primary key fingerprint: 1899 FF8E DEBF 58CC EE03 4B82 F487 EF18 5872 D723
* remotes/juanquintela/tags/migration/20170613:
migration: Move migration.h to migration/
migration: Move remaining exported functions to migration/misc.h
migration: create global_state.c
migration: ram_control_* are implemented in qemu_file
migration: Commands are only used inside migration.c
migration: Move constants to savevm.h
migration: Move dump_vmsate_json_to_file() to misc.h
migration: Split registration functions from vmstate.h
migration: Move self_announce_delay() to misc.h
migration: Remove MigrationState from migration_channel_incomming()
ram: Now POSTCOPY_ACTIVE is the same that STATUS_ACTIVE
ram: Print block stats also in the complete case
migration: Don't try to set *errp directly
migration: isolate return path on src
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'ui/spice-core.c')
| -rw-r--r-- | ui/spice-core.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/ui/spice-core.c b/ui/spice-core.c index 804abc5c0f..a087ad5da9 100644 --- a/ui/spice-core.c +++ b/ui/spice-core.c @@ -35,7 +35,7 @@ #include "qapi/qmp/qstring.h" #include "qapi/qmp/qjson.h" #include "qemu/notify.h" -#include "migration/migration.h" +#include "migration/misc.h" #include "hw/hw.h" #include "ui/spice-display.h" #include "qapi-event.h" |