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

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



migration/next for 20180604

# gpg: Signature made Mon 04 Jun 2018 05:14:24 BST
# gpg:                using RSA key F487EF185872D723
# 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/20180604:
  migration: not wait RDMA_CM_EVENT_DISCONNECTED event after rdma_disconnect
  migration: remove unnecessary variables len in QIOChannelRDMA
  migration: Don't activate block devices if using -S
  migration: discard non-migratable RAMBlocks
  migration: introduce decompress-error-check

Signed-off-by: default avatarPeter Maydell <peter.maydell@linaro.org>
parents 16367054 c5e76115

exec.c

+38 −0
Original line number Diff line number Diff line
@@ -104,6 +104,9 @@ static MemoryRegion io_mem_unassigned; 
 * (Set during postcopy)

 */

#define RAM_UF_ZEROPAGE (1 << 3)



/* RAM can be migrated */

#define RAM_MIGRATABLE (1 << 4)

#endif



#ifdef TARGET_PAGE_BITS_VARY
@@ -1839,6 +1842,21 @@ void qemu_ram_set_uf_zeroable(RAMBlock *rb) 
    rb->flags |= RAM_UF_ZEROPAGE;

}



bool qemu_ram_is_migratable(RAMBlock *rb)

{

    return rb->flags & RAM_MIGRATABLE;

}



void qemu_ram_set_migratable(RAMBlock *rb)

{

    rb->flags |= RAM_MIGRATABLE;

}



void qemu_ram_unset_migratable(RAMBlock *rb)

{

    rb->flags &= ~RAM_MIGRATABLE;

}



/* Called with iothread lock held.  */

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

{
@@ -3894,6 +3912,26 @@ int qemu_ram_foreach_block(RAMBlockIterFunc func, void *opaque) 
    return ret;

}



int qemu_ram_foreach_migratable_block(RAMBlockIterFunc func, void *opaque)

{

    RAMBlock *block;

    int ret = 0;



    rcu_read_lock();

    RAMBLOCK_FOREACH(block) {

        if (!qemu_ram_is_migratable(block)) {

            continue;

        }

        ret = func(block->idstr, block->host, block->offset,

                   block->used_length, opaque);

        if (ret) {

            break;

        }

    }

    rcu_read_unlock();

    return ret;

}



/*

 * Unmap pages of memory from start to start+length such that

 * they a) read as 0, b) Trigger whatever fault mechanism

hw/arm/virt.c

+4 −0
Original line number Diff line number Diff line
@@ -1692,6 +1692,9 @@ static void machvirt_machine_init(void) 
}

type_init(machvirt_machine_init);



#define VIRT_COMPAT_2_12 \

    HW_COMPAT_2_12



static void virt_2_12_instance_init(Object *obj)

{

    VirtMachineState *vms = VIRT_MACHINE(obj);
@@ -1762,6 +1765,7 @@ static void virt_2_12_instance_init(Object *obj) 


static void virt_machine_2_12_options(MachineClass *mc)

{

    SET_MACHINE_COMPAT(mc, VIRT_COMPAT_2_12);

}

DEFINE_VIRT_MACHINE_AS_LATEST(2, 12)

hw/i386/pc_piix.c

+1 −0
Original line number Diff line number Diff line
@@ -430,6 +430,7 @@ static void pc_i440fx_3_0_machine_options(MachineClass *m) 
    pc_i440fx_machine_options(m);

    m->alias = "pc";

    m->is_default = 1;

    SET_MACHINE_COMPAT(m, PC_COMPAT_2_12);

}



DEFINE_I440FX_MACHINE(v3_0, "pc-i440fx-3.0", NULL,

hw/i386/pc_q35.c

+1 −0
Original line number Diff line number Diff line
@@ -312,6 +312,7 @@ static void pc_q35_3_0_machine_options(MachineClass *m) 
{

    pc_q35_machine_options(m);

    m->alias = "q35";

    SET_MACHINE_COMPAT(m, PC_COMPAT_2_12);

}



DEFINE_Q35_MACHINE(v3_0, "pc-q35-3.0", NULL,

include/exec/cpu-common.h

+4 −0
Original line number Diff line number Diff line
@@ -75,6 +75,9 @@ const char *qemu_ram_get_idstr(RAMBlock *rb); 
bool qemu_ram_is_shared(RAMBlock *rb);

bool qemu_ram_is_uf_zeroable(RAMBlock *rb);

void qemu_ram_set_uf_zeroable(RAMBlock *rb);

bool qemu_ram_is_migratable(RAMBlock *rb);

void qemu_ram_set_migratable(RAMBlock *rb);

void qemu_ram_unset_migratable(RAMBlock *rb);



size_t qemu_ram_pagesize(RAMBlock *block);

size_t qemu_ram_pagesize_largest(void);
@@ -119,6 +122,7 @@ typedef int (RAMBlockIterFunc)(const char *block_name, void *host_addr, 
    ram_addr_t offset, ram_addr_t length, void *opaque);



int qemu_ram_foreach_block(RAMBlockIterFunc func, void *opaque);

int qemu_ram_foreach_migratable_block(RAMBlockIterFunc func, void *opaque);

int ram_block_discard_range(RAMBlock *rb, uint64_t start, size_t length);



#endif