| Message ID | 1433333157-9939-1-git-send-email-quintela@redhat.com |
|---|---|
| State | New |
| Headers | show |
On 3 June 2015 at 13:05, Juan Quintela <quintela@redhat.com> wrote: > Hi > > Here are the pull request, it includes: > - generic patches form postcopy that are reviewed (dave) > - generic patches form RDMA fixes that are reviewed (dave) > - patches form optional section reviewed (me) > - patches for migration events reviewed (me) > - fix RDMA and ipv6 (Padmanabh) > - Remove extra variable (zhanghailiang) > > Please, apply. > > Later, Juan. > > > The following changes since commit 42d58e7c6760cb9c55627c28ae538e27dcf2f144: > > Merge remote-tracking branch 'remotes/sstabellini/tags/xen-15-06-02-tag' into staging (2015-06-02 16:47:31 +0100) > > are available in the git repository at: > > git://github.com/juanquintela/qemu.git tags/migration/20150603-1 > > for you to fetch changes up to 6aafed47e8b7eefb0f06b2c3d05d12a1065d2a7d: > > Remove unneeded memset (2015-06-03 13:58:51 +0200) > > ---------------------------------------------------------------- > migration/next for 20150603 > Big conflict in arch_init.c which I couldn't figure out -- could you rebase, please? thanks -- PMM
Peter Maydell <peter.maydell@linaro.org> wrote: > On 3 June 2015 at 13:05, Juan Quintela <quintela@redhat.com> wrote: >> Hi >> >> Here are the pull request, it includes: >> - generic patches form postcopy that are reviewed (dave) >> - generic patches form RDMA fixes that are reviewed (dave) >> - patches form optional section reviewed (me) >> - patches for migration events reviewed (me) >> - fix RDMA and ipv6 (Padmanabh) >> - Remove extra variable (zhanghailiang) >> >> Please, apply. >> >> Later, Juan. >> >> >> The following changes since commit 42d58e7c6760cb9c55627c28ae538e27dcf2f144: >> >> Merge remote-tracking branch >> 'remotes/sstabellini/tags/xen-15-06-02-tag' into staging (2015-06-02 >> 16:47:31 +0100) >> >> are available in the git repository at: >> >> git://github.com/juanquintela/qemu.git tags/migration/20150603-1 >> >> for you to fetch changes up to 6aafed47e8b7eefb0f06b2c3d05d12a1065d2a7d: >> >> Remove unneeded memset (2015-06-03 13:58:51 +0200) >> >> ---------------------------------------------------------------- >> migration/next for 20150603 >> > > Big conflict in arch_init.c which I couldn't figure out -- could you > rebase, please? Sure. > > thanks > -- PMM
Hi Here are the pull request, it includes: - generic patches form postcopy that are reviewed (dave) - generic patches form RDMA fixes that are reviewed (dave) - patches form optional section reviewed (me) - patches for migration events reviewed (me) - fix RDMA and ipv6 (Padmanabh) - Remove extra variable (zhanghailiang) Please, apply. Later, Juan. The following changes since commit 42d58e7c6760cb9c55627c28ae538e27dcf2f144: Merge remote-tracking branch 'remotes/sstabellini/tags/xen-15-06-02-tag' into staging (2015-06-02 16:47:31 +0100) are available in the git repository at: git://github.com/juanquintela/qemu.git tags/migration/20150603-1 for you to fetch changes up to 6aafed47e8b7eefb0f06b2c3d05d12a1065d2a7d: Remove unneeded memset (2015-06-03 13:58:51 +0200) ---------------------------------------------------------------- migration/next for 20150603 ---------------------------------------------------------------- Dr. David Alan Gilbert (12): Add qemu_get_counted_string to read a string prefixed by a count byte Split header writing out of qemu_savevm_state_begin qemu_ram_foreach_block: pass up error value, and down the ramblock name Create MigrationIncomingState Move copy out of qemu_peek_buffer Move loadvm_handlers into MigrationIncomingState Merge section header writing Disable section footers on older machine types Add a protective section footer Teach analyze-migration.py about section footers Rename RDMA structures to make destination clear Remove unneeded memset Juan Quintela (7): migration: move ram stuff to migration/ram migration: move savevm.c inside migration/ migration: Add myself to the copyright list of both files migration: reduce include files migration: Remove duplicated assignment of SETUP status migration: create savevm_state migration: Use normal VMStateDescriptions for Subsections Padmanabh Ratnakar (1): rdma: Fix qemu crash when IPv6 address is used for migration zhanghailiang (1): arch_init: Clean up the duplicate variable 'len' defining in ram_load() MAINTAINERS | 2 - Makefile.target | 3 +- arch_init.c | 1653 --------------------------------------- cpus.c | 11 +- docs/migration.txt | 11 +- exec.c | 21 +- hw/acpi/ich9.c | 10 +- hw/acpi/piix4.c | 10 +- hw/block/fdc.c | 37 +- hw/char/serial.c | 41 +- hw/display/qxl.c | 11 +- hw/display/vga.c | 11 +- hw/i386/pc_piix.c | 2 + hw/i386/pc_q35.c | 2 + hw/ide/core.c | 32 +- hw/ide/pci.c | 16 +- hw/input/pckbd.c | 22 +- hw/input/ps2.c | 11 +- hw/intc/apic_common.c | 10 +- hw/isa/lpc_ich9.c | 10 +- hw/net/e1000.c | 11 +- hw/net/rtl8139.c | 11 +- hw/net/vmxnet3.c | 12 +- hw/pci-host/piix.c | 10 +- hw/scsi/scsi-bus.c | 11 +- hw/timer/hpet.c | 11 +- hw/timer/mc146818rtc.c | 23 +- hw/usb/hcd-ohci.c | 11 +- hw/usb/redirect.c | 34 +- hw/virtio/virtio.c | 16 +- include/exec/cpu-common.h | 4 +- include/migration/migration.h | 17 + include/migration/qemu-file.h | 5 +- include/migration/vmstate.h | 10 +- include/qemu/typedefs.h | 2 + include/sysemu/arch_init.h | 1 - include/sysemu/sysemu.h | 1 + migration/migration.c | 34 +- migration/qemu-file.c | 29 +- migration/ram.c | 1670 ++++++++++++++++++++++++++++++++++++++++ migration/rdma.c | 78 +- savevm.c => migration/savevm.c | 257 ++++--- migration/vmstate.c | 21 +- scripts/analyze-migration.py | 5 + target-arm/machine.c | 26 +- target-i386/machine.c | 81 +- target-ppc/machine.c | 62 +- target-s390x/machine.c | 28 +- trace-events | 5 +- 49 files changed, 2230 insertions(+), 2182 deletions(-) create mode 100644 migration/ram.c rename savevm.c => migration/savevm.c (88%)