diff options
| author | Peter Maydell <peter.maydell@linaro.org> | 2018-06-15 18:13:35 +0100 |
|---|---|---|
| committer | Peter Maydell <peter.maydell@linaro.org> | 2018-06-15 18:13:35 +0100 |
| commit | 2ef2f16781af9dee6ba6517755e9073ba5799fa2 (patch) | |
| tree | b4e0f372f9387be4f6a84c8232c631325cd6e7fb /include/qemu | |
| parent | 42747d6abb5035473e5585fa17620c1e8983a70b (diff) | |
| parent | 650af8907bd567db914b7ce3a7e9df4c323f4619 (diff) | |
| download | qemu-2ef2f16781af9dee6ba6517755e9073ba5799fa2.zip qemu-2ef2f16781af9dee6ba6517755e9073ba5799fa2.tar.gz qemu-2ef2f16781af9dee6ba6517755e9073ba5799fa2.tar.bz2 | |
Merge remote-tracking branch 'remotes/dgilbert/tags/pull-migration-20180615a' into staging
Migration pull 2018-06-15
# gpg: Signature made Fri 15 Jun 2018 16:13:17 BST
# gpg: using RSA key 0516331EBC5BFDE7
# gpg: Good signature from "Dr. David Alan Gilbert (RH2) <dgilbert@redhat.com>"
# Primary key fingerprint: 45F5 C71B 4A0C B7FB 977A 9FA9 0516 331E BC5B FDE7
* remotes/dgilbert/tags/pull-migration-20180615a:
migration: calculate expected_downtime with ram_bytes_remaining()
migration/postcopy: Wake rate limit sleep on postcopy request
migration: Wake rate limiting for urgent requests
migration/postcopy: Add max-postcopy-bandwidth parameter
migration: introduce migration_update_rates
migration: fix counting xbzrle cache_miss_rate
migration/block-dirty-bitmap: fix dirty_bitmap_load
migration: Poison ramblock loops in migration
migration: Fixes for non-migratable RAMBlocks
typedefs: add QJSON
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'include/qemu')
| -rw-r--r-- | include/qemu/typedefs.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/include/qemu/typedefs.h b/include/qemu/typedefs.h index 325c72d..3ec0e13 100644 --- a/include/qemu/typedefs.h +++ b/include/qemu/typedefs.h @@ -97,6 +97,7 @@ typedef struct QEMUTimer QEMUTimer; typedef struct QEMUTimerListGroup QEMUTimerListGroup; typedef struct QBool QBool; typedef struct QDict QDict; +typedef struct QJSON QJSON; typedef struct QList QList; typedef struct QNull QNull; typedef struct QNum QNum; |