Commit 4db753b1 authored by Peter Maydell's avatar Peter Maydell
Browse files

Merge remote-tracking branch 'remotes/amit-migration/tags/for-2.3-2' into staging 



Migration pull for 2.3.  Mostly moving the code to the migration/
directory, and updating MAINTAINERS.

I've also folded my other MAINTAINERS update patches into this, as
they're small by themselves.

# gpg: Signature made Tue 16 Dec 2014 12:21:24 GMT using RSA key ID 854083B6
# gpg: Good signature from "Amit Shah <amit@amitshah.net>"
# gpg:                 aka "Amit Shah <amit@kernel.org>"
# gpg:                 aka "Amit Shah <amitshah@gmx.net>"

* remotes/amit-migration/tags/for-2.3-2:
  MAINTAINERS: Update for migrated migration code
  Split the QEMU buffered file code out
  Split struct QEMUFile out
  Remove migration- pre/post fixes off files in migration/ dir
  Start migrating migration code into a migration directory
  qmp-command.hx: add missing docs for migration capabilites
  cpu: verify that block->host is set
  cpu: assert host pointer offset within block
  exec: add wrapper for host pointer access
  MAINTAINERS: add include files to virtio-serial entry
  MAINTAINERS: add entry for virtio-rng
  MAINTAINERS: migration: add vmstate static checker files
  MAINTAINERS: Add myself to migration maintainers

Signed-off-by: default avatarPeter Maydell <peter.maydell@linaro.org>
parents dfa9c2a0 44a1f946

MAINTAINERS

+12 −2
Original line number Diff line number Diff line
@@ -696,6 +696,14 @@ M: Amit Shah <amit.shah@redhat.com> 
S: Supported

F: hw/char/virtio-serial-bus.c

F: hw/char/virtio-console.c

F: include/hw/virtio/virtio-serial.h



virtio-rng

M: Amit Shah <amit.shah@redhat.com>

S: Supported

F: hw/virtio/virtio-rng.c

F: include/hw/virtio/virtio-rng.h

F: backends/rng*.c



nvme

M: Keith Busch <keith.busch@intel.com>
@@ -928,12 +936,14 @@ F: scripts/checkpatch.pl 


Migration

M: Juan Quintela <quintela@redhat.com>

M: Amit Shah <amit.shah@redhat.com>

S: Maintained

F: include/migration/

F: migration*

F: migration/

F: savevm.c

F: arch_init.c

F: vmstate.c

F: scripts/vmstate-static-checker.py

F: tests/vmstate-static-checker-data/



Seccomp

M: Eduardo Otubo <eduardo.otubo@profitbricks.com>

Makefile.objs

+2 −8
Original line number Diff line number Diff line
@@ -48,15 +48,9 @@ common-obj-$(CONFIG_POSIX) += os-posix.o 


common-obj-$(CONFIG_LINUX) += fsdev/



common-obj-y += migration.o migration-tcp.o

common-obj-y += vmstate.o

common-obj-y += qemu-file.o qemu-file-unix.o qemu-file-stdio.o

common-obj-$(CONFIG_RDMA) += migration-rdma.o

common-obj-y += migration/

common-obj-y += qemu-char.o #aio.o

common-obj-y += block-migration.o

common-obj-y += page_cache.o xbzrle.o



common-obj-$(CONFIG_POSIX) += migration-exec.o migration-unix.o migration-fd.o

common-obj-y += page_cache.o



common-obj-$(CONFIG_SPICE) += spice-qemu-char.o

exec.c

+5 −5
Original line number Diff line number Diff line
@@ -840,7 +840,7 @@ static void tlb_reset_dirty_range_all(ram_addr_t start, ram_addr_t length) 


    block = qemu_get_ram_block(start);

    assert(block == qemu_get_ram_block(end - 1));

    start1 = (uintptr_t)block->host + (start - block->offset);

    start1 = (uintptr_t)ramblock_ptr(block, start - block->offset);

    cpu_tlb_reset_dirty_all(start1, length);

}
@@ -1500,7 +1500,7 @@ void qemu_ram_remap(ram_addr_t addr, ram_addr_t length) 
    QTAILQ_FOREACH(block, &ram_list.blocks, next) {

        offset = addr - block->offset;

        if (offset < block->length) {

            vaddr = block->host + offset;

            vaddr = ramblock_ptr(block, offset);

            if (block->flags & RAM_PREALLOC) {

                ;

            } else if (xen_enabled()) {
@@ -1551,7 +1551,7 @@ void *qemu_get_ram_block_host_ptr(ram_addr_t addr) 
{

    RAMBlock *block = qemu_get_ram_block(addr);



    return block->host;

    return ramblock_ptr(block, 0);

}



/* Return a host pointer to ram allocated with qemu_ram_alloc.
@@ -1578,7 +1578,7 @@ void *qemu_get_ram_ptr(ram_addr_t addr) 
                xen_map_cache(block->offset, block->length, 1);

        }

    }

    return block->host + (addr - block->offset);

    return ramblock_ptr(block, addr - block->offset);

}



/* Return a host pointer to guest's ram. Similar to qemu_get_ram_ptr
@@ -1597,7 +1597,7 @@ static void *qemu_ram_ptr_length(ram_addr_t addr, hwaddr *size) 
            if (addr - block->offset < block->length) {

                if (addr - block->offset + *size > block->length)

                    *size = block->length - addr + block->offset;

                return block->host + (addr - block->offset);

                return ramblock_ptr(block, addr - block->offset);

            }

        }

include/exec/cpu-all.h

+7 −0
Original line number Diff line number Diff line
@@ -313,6 +313,13 @@ typedef struct RAMBlock { 
    int fd;

} RAMBlock;



static inline void *ramblock_ptr(RAMBlock *block, ram_addr_t offset)

{

    assert(offset < block->length);

    assert(block->host);

    return (char *)block->host + offset;

}



typedef struct RAMList {

    QemuMutex mutex;

    /* Protected by the iothread lock.  */

migration/Makefile.objs

0 → 100644
+10 −0
Original line number Diff line number Diff line 
common-obj-y += migration.o tcp.o

common-obj-y += vmstate.o

common-obj-y += qemu-file.o qemu-file-buf.o qemu-file-unix.o qemu-file-stdio.o

common-obj-y += xbzrle.o



common-obj-$(CONFIG_RDMA) += rdma.o

common-obj-$(CONFIG_POSIX) += exec.o unix.o fd.o



common-obj-y += block.o