diff options
| author | Peter Maydell | 2018-06-15 19:13:35 +0200 |
|---|---|---|
| committer | Peter Maydell | 2018-06-15 19:13:35 +0200 |
| commit | 2ef2f16781af9dee6ba6517755e9073ba5799fa2 (patch) | |
| tree | b4e0f372f9387be4f6a84c8232c631325cd6e7fb /migration/qjson.h | |
| parent | Merge remote-tracking branch 'remotes/edgar/tags/edgar/xilinx-next-2018-06-15... (diff) | |
| parent | migration: calculate expected_downtime with ram_bytes_remaining() (diff) | |
| download | qemu-2ef2f16781af9dee6ba6517755e9073ba5799fa2.tar.gz qemu-2ef2f16781af9dee6ba6517755e9073ba5799fa2.tar.xz qemu-2ef2f16781af9dee6ba6517755e9073ba5799fa2.zip | |
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 'migration/qjson.h')
| -rw-r--r-- | migration/qjson.h | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/migration/qjson.h b/migration/qjson.h index 2978b5f371..41664f2d71 100644 --- a/migration/qjson.h +++ b/migration/qjson.h @@ -13,8 +13,6 @@ #ifndef QEMU_QJSON_H #define QEMU_QJSON_H -typedef struct QJSON QJSON; - QJSON *qjson_new(void); void qjson_destroy(QJSON *json); void json_prop_str(QJSON *json, const char *name, const char *str); |