Commit c5e737e5 authored by Peter Maydell's avatar Peter Maydell
Browse files

Merge remote-tracking branch 'remotes/juanquintela/tags/migration/20170316' into staging 



migration/next for 20170316

# gpg: Signature made Thu 16 Mar 2017 08:21:51 GMT
# 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/20170316:
  postcopy: Check for shared memory
  RAMBlocks: qemu_ram_is_shared
  vmstate: fix failed iotests case 68 and 91
  migration/block: Avoid invoking blk_drain too frequently
  migration: use "" as the default for tls-creds/hostname
  Change the method to calculate dirty-pages-rate

Signed-off-by: default avatarPeter Maydell <peter.maydell@linaro.org>
parents 094a9a7c 8679638b

exec.c

+5 −0
Original line number Diff line number Diff line
@@ -1561,6 +1561,11 @@ const char *qemu_ram_get_idstr(RAMBlock *rb) 
    return rb->idstr;

}



bool qemu_ram_is_shared(RAMBlock *rb)

{

    return rb->flags & RAM_SHARED;

}



/* Called with iothread lock held.  */

void qemu_ram_set_idstr(RAMBlock *new_block, const char *name, DeviceState *dev)

{

include/exec/cpu-common.h

+1 −0
Original line number Diff line number Diff line
@@ -69,6 +69,7 @@ RAMBlock *qemu_ram_block_from_host(void *ptr, bool round_offset, 
void qemu_ram_set_idstr(RAMBlock *block, const char *name, DeviceState *dev);

void qemu_ram_unset_idstr(RAMBlock *block);

const char *qemu_ram_get_idstr(RAMBlock *rb);

bool qemu_ram_is_shared(RAMBlock *rb);

size_t qemu_ram_pagesize(RAMBlock *block);

size_t qemu_ram_pagesize_largest(void);

include/exec/ram_addr.h

+4 −1
Original line number Diff line number Diff line
@@ -355,7 +355,8 @@ static inline void cpu_physical_memory_clear_dirty_range(ram_addr_t start, 
static inline

uint64_t cpu_physical_memory_sync_dirty_bitmap(unsigned long *dest,

                                               ram_addr_t start,

                                               ram_addr_t length)

                                               ram_addr_t length,

                                               int64_t *real_dirty_pages)

{

    ram_addr_t addr;

    unsigned long page = BIT_WORD(start >> TARGET_PAGE_BITS);
@@ -379,6 +380,7 @@ uint64_t cpu_physical_memory_sync_dirty_bitmap(unsigned long *dest, 
            if (src[idx][offset]) {

                unsigned long bits = atomic_xchg(&src[idx][offset], 0);

                unsigned long new_dirty;

                *real_dirty_pages += ctpopl(bits);

                new_dirty = ~dest[k];

                dest[k] |= bits;

                new_dirty &= bits;
@@ -398,6 +400,7 @@ uint64_t cpu_physical_memory_sync_dirty_bitmap(unsigned long *dest, 
                        start + addr,

                        TARGET_PAGE_SIZE,

                        DIRTY_MEMORY_MIGRATION)) {

                *real_dirty_pages += 1;

                long k = (start + addr) >> TARGET_PAGE_BITS;

                if (!test_and_set_bit(k, dest)) {

                    num_dirty++;

migration/block.c

+3 −0
Original line number Diff line number Diff line
@@ -576,6 +576,9 @@ static int mig_save_device_dirty(QEMUFile *f, BlkMigDevState *bmds, 
            }



            bdrv_reset_dirty_bitmap(bmds->dirty_bitmap, sector, nr_sectors);

            sector += nr_sectors;

            bmds->cur_dirty = sector;



            break;

        }

        sector += BDRV_SECTORS_PER_DIRTY_CHUNK;

migration/migration.c

+4 −0
Original line number Diff line number Diff line
@@ -110,6 +110,8 @@ MigrationState *migrate_get_current(void) 


    if (!once) {

        qemu_mutex_init(&current_migration.src_page_req_mutex);

        current_migration.parameters.tls_creds = g_strdup("");

        current_migration.parameters.tls_hostname = g_strdup("");

        once = true;

    }

    return &current_migration;
@@ -458,6 +460,7 @@ void migration_channel_process_incoming(MigrationState *s, 
        ioc, object_get_typename(OBJECT(ioc)));



    if (s->parameters.tls_creds &&

        *s->parameters.tls_creds &&

        !object_dynamic_cast(OBJECT(ioc),

                             TYPE_QIO_CHANNEL_TLS)) {

        Error *local_err = NULL;
@@ -480,6 +483,7 @@ void migration_channel_connect(MigrationState *s, 
        ioc, object_get_typename(OBJECT(ioc)), hostname);



    if (s->parameters.tls_creds &&

        *s->parameters.tls_creds &&

        !object_dynamic_cast(OBJECT(ioc),

                             TYPE_QIO_CHANNEL_TLS)) {

        Error *local_err = NULL;