Commit 2ef2f167 authored by Peter Maydell's avatar Peter Maydell
Browse files

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: default avatarPeter Maydell <peter.maydell@linaro.org>
parents 42747d6a 650af890

hmp.c

+7 −0
Original line number Diff line number Diff line
@@ -370,6 +370,9 @@ void hmp_info_migrate_parameters(Monitor *mon, const QDict *qdict) 
        monitor_printf(mon, "%s: %" PRIu64 "\n",

            MigrationParameter_str(MIGRATION_PARAMETER_XBZRLE_CACHE_SIZE),

            params->xbzrle_cache_size);

        monitor_printf(mon, "%s: %" PRIu64 "\n",

            MigrationParameter_str(MIGRATION_PARAMETER_MAX_POSTCOPY_BANDWIDTH),

            params->max_postcopy_bandwidth);

    }



    qapi_free_MigrationParameters(params);
@@ -1676,6 +1679,10 @@ void hmp_migrate_set_parameter(Monitor *mon, const QDict *qdict) 
        }

        p->xbzrle_cache_size = cache_size;

        break;

    case MIGRATION_PARAMETER_MAX_POSTCOPY_BANDWIDTH:

        p->has_max_postcopy_bandwidth = true;

        visit_type_size(v, param, &p->max_postcopy_bandwidth, &err);

        break;

    default:

        assert(0);

    }

include/exec/ramlist.h

+3 −1
Original line number Diff line number Diff line
@@ -56,8 +56,10 @@ typedef struct RAMList { 
extern RAMList ram_list;



/* Should be holding either ram_list.mutex, or the RCU lock. */

#define  RAMBLOCK_FOREACH(block)  \

#define  INTERNAL_RAMBLOCK_FOREACH(block)  \

    QLIST_FOREACH_RCU(block, &ram_list.blocks, next)

/* Never use the INTERNAL_ version except for defining other macros */

#define RAMBLOCK_FOREACH(block) INTERNAL_RAMBLOCK_FOREACH(block)



void qemu_mutex_lock_ramlist(void);

void qemu_mutex_unlock_ramlist(void);

include/migration/vmstate.h

+0 −2
Original line number Diff line number Diff line
@@ -27,8 +27,6 @@ 
#ifndef QEMU_VMSTATE_H

#define QEMU_VMSTATE_H



typedef struct QJSON QJSON;



typedef struct VMStateInfo VMStateInfo;

typedef struct VMStateDescription VMStateDescription;

typedef struct VMStateField VMStateField;

include/qemu/typedefs.h

+1 −0
Original line number Diff line number Diff line
@@ -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;

migration/block-dirty-bitmap.c

+3 −0
Original line number Diff line number Diff line
@@ -672,6 +672,9 @@ static int dirty_bitmap_load(QEMUFile *f, void *opaque, int version_id) 


    do {

        ret = dirty_bitmap_load_header(f, &s);

        if (ret < 0) {

            return ret;

        }



        if (s.flags & DIRTY_BITMAP_MIG_FLAG_START) {

            ret = dirty_bitmap_load_start(f, &s);