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

Merge remote-tracking branch 'remotes/dgilbert/tags/pull-migration-20170213a' into staging 



Migration

  Amit: migration: remove myself as maintainer
        MAINTAINERS: update my email address
  Ashijeet: migrate: Introduce zero RAM checks to skip RAM migration
  Pavel: Postcopy release RAM
  Halil: consolidate VMStateField.start
  Hailiang: COLO: fix setting checkpoint-delay not working properly
         COLO: Shutdown related socket fd while do failover
         COLO: Don't process failover request while loading VM's state
  Me:
     migration: Add VMSTATE_UNUSED_VARRAY_UINT32
     migration: Add VMSTATE_WITH_TMP
     tests/migration: Add test for VMSTATE_WITH_TMP
     virtio-net VMState conversion and new VMSTATE macros

# gpg: Signature made Mon 13 Feb 2017 17:36:39 GMT
# gpg:                using RSA key 0x0516331EBC5BFDE7
# gpg: Good signature from "Dr. David Alan Gilbert (RH2) <dgilbert@redhat.com>"
# gpg: WARNING: This key is not certified with a trusted signature!
# gpg:          There is no indication that the signature belongs to the owner.
# Primary key fingerprint: 45F5 C71B 4A0C B7FB 977A  9FA9 0516 331E BC5B FDE7

* remotes/dgilbert/tags/pull-migration-20170213a:
  virtio/migration: Migrate virtio-net to VMState
  tests/migration: Add test for VMSTATE_WITH_TMP
  migration: Add VMSTATE_WITH_TMP
  migration: Add VMSTATE_UNUSED_VARRAY_UINT32
  COLO: Don't process failover request while loading VM's state
  COLO: Shutdown related socket fd while do failover
  COLO: fix setting checkpoint-delay not working properly
  migration: consolidate VMStateField.start
  migrate: Introduce zero RAM checks to skip RAM migration
  migration: discard non-dirty ram pages after the start of postcopy
  add 'release-ram' migrate capability
  migration: add MigrationState arg for ram_save_/compressed_/page()
  MAINTAINERS: update my email address
  migration: remove myself as maintainer

Signed-off-by: default avatarPeter Maydell <peter.maydell@linaro.org>
parents 305e6c8a 982b78c5

MAINTAINERS

+2 −3
Original line number Diff line number Diff line
@@ -1034,7 +1034,7 @@ F: hw/input/virtio-input*.c 
F: include/hw/virtio/virtio-input.h



virtio-serial

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

M: Amit Shah <amit@kernel.org>

S: Supported

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

F: hw/char/virtio-console.c
@@ -1043,7 +1043,7 @@ F: tests/virtio-console-test.c 
F: tests/virtio-serial-test.c



virtio-rng

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

M: Amit Shah <amit@kernel.org>

S: Supported

F: hw/virtio/virtio-rng.c

F: include/hw/virtio/virtio-rng.h
@@ -1431,7 +1431,6 @@ F: scripts/checkpatch.pl 


Migration

M: Juan Quintela <quintela@redhat.com>

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

M: Dr. David Alan Gilbert <dgilbert@redhat.com>

S: Maintained

F: include/migration/

hw/char/exynos4210_uart.c

+1 −1
Original line number Diff line number Diff line
@@ -561,7 +561,7 @@ static const VMStateDescription vmstate_exynos4210_uart_fifo = { 
    .fields = (VMStateField[]) {

        VMSTATE_UINT32(sp, Exynos4210UartFIFO),

        VMSTATE_UINT32(rp, Exynos4210UartFIFO),

        VMSTATE_VBUFFER_UINT32(data, Exynos4210UartFIFO, 1, NULL, 0, size),

        VMSTATE_VBUFFER_UINT32(data, Exynos4210UartFIFO, 1, NULL, size),

        VMSTATE_END_OF_LIST()

    }

};

hw/display/g364fb.c

+1 −1
Original line number Diff line number Diff line
@@ -464,7 +464,7 @@ static const VMStateDescription vmstate_g364fb = { 
    .minimum_version_id = 1,

    .post_load = g364fb_post_load,

    .fields = (VMStateField[]) {

        VMSTATE_VBUFFER_UINT32(vram, G364State, 1, NULL, 0, vram_size),

        VMSTATE_VBUFFER_UINT32(vram, G364State, 1, NULL, vram_size),

        VMSTATE_BUFFER_UNSAFE(color_palette, G364State, 0, 256 * 3),

        VMSTATE_BUFFER_UNSAFE(cursor_palette, G364State, 0, 9),

        VMSTATE_UINT16_ARRAY(cursor, G364State, 512),

hw/dma/pl330.c

+4 −4
Original line number Diff line number Diff line
@@ -173,8 +173,8 @@ static const VMStateDescription vmstate_pl330_fifo = { 
    .version_id = 1,

    .minimum_version_id = 1,

    .fields = (VMStateField[]) {

        VMSTATE_VBUFFER_UINT32(buf, PL330Fifo, 1, NULL, 0, buf_size),

        VMSTATE_VBUFFER_UINT32(tag, PL330Fifo, 1, NULL, 0, buf_size),

        VMSTATE_VBUFFER_UINT32(buf, PL330Fifo, 1, NULL, buf_size),

        VMSTATE_VBUFFER_UINT32(tag, PL330Fifo, 1, NULL, buf_size),

        VMSTATE_UINT32(head, PL330Fifo),

        VMSTATE_UINT32(num, PL330Fifo),

        VMSTATE_UINT32(buf_size, PL330Fifo),
@@ -282,8 +282,8 @@ static const VMStateDescription vmstate_pl330 = { 
        VMSTATE_STRUCT(manager, PL330State, 0, vmstate_pl330_chan, PL330Chan),

        VMSTATE_STRUCT_VARRAY_UINT32(chan, PL330State, num_chnls, 0,

                                     vmstate_pl330_chan, PL330Chan),

        VMSTATE_VBUFFER_UINT32(lo_seqn, PL330State, 1, NULL, 0, num_chnls),

        VMSTATE_VBUFFER_UINT32(hi_seqn, PL330State, 1, NULL, 0, num_chnls),

        VMSTATE_VBUFFER_UINT32(lo_seqn, PL330State, 1, NULL, num_chnls),

        VMSTATE_VBUFFER_UINT32(hi_seqn, PL330State, 1, NULL, num_chnls),

        VMSTATE_STRUCT(fifo, PL330State, 0, vmstate_pl330_fifo, PL330Fifo),

        VMSTATE_STRUCT(read_queue, PL330State, 0, vmstate_pl330_queue,

                       PL330Queue),

hw/intc/exynos4210_gic.c

+1 −1
Original line number Diff line number Diff line
@@ -393,7 +393,7 @@ static const VMStateDescription vmstate_exynos4210_irq_gate = { 
    .version_id = 2,

    .minimum_version_id = 2,

    .fields = (VMStateField[]) {

        VMSTATE_VBUFFER_UINT32(level, Exynos4210IRQGateState, 1, NULL, 0, n_in),

        VMSTATE_VBUFFER_UINT32(level, Exynos4210IRQGateState, 1, NULL, n_in),

        VMSTATE_END_OF_LIST()

    }

};