qemu-commits
[Top][All Lists]
Advanced
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[Qemu-commits] [qemu/qemu] 56e93d: migration: move ram stuff to migratio

From: GitHub
Subject: [Qemu-commits] [qemu/qemu] 56e93d: migration: move ram stuff to migration/ram
Date: Fri, 12 Jun 2015 05:00:07 -0700 
  Branch: refs/heads/master
  Home:   https://github.com/qemu/qemu
  Commit: 56e93d26b85bac76b93211393163c2ebcdee9481
      
https://github.com/qemu/qemu/commit/56e93d26b85bac76b93211393163c2ebcdee9481
  Author: Juan Quintela <address@hidden>
  Date:   2015-06-12 (Fri, 12 Jun 2015)

  Changed paths:
    M MAINTAINERS
    M Makefile.target
    M arch_init.c
    M include/migration/migration.h
    M include/sysemu/arch_init.h
    A migration/ram.c
    M trace-events

  Log Message:
  -----------
  migration: move ram stuff to migration/ram

For historic reasons, ram migration have been on arch_init.c.  Just
split it into migration/ram.c, the same that happened with block.c.

There is only code movement, no changes altogether.

Signed-off-by: Juan Quintela <address@hidden>
Reviewed-by: Eric Blake <address@hidden>


  Commit: c3049a56d69f1ee7e85b5100ba5d0e3dc69a14f1
      
https://github.com/qemu/qemu/commit/c3049a56d69f1ee7e85b5100ba5d0e3dc69a14f1
  Author: Juan Quintela <address@hidden>
  Date:   2015-06-12 (Fri, 12 Jun 2015)

  Changed paths:
    M MAINTAINERS
    M Makefile.target
    A migration/savevm.c
    R savevm.c
    M trace-events

  Log Message:
  -----------
  migration: move savevm.c inside migration/

Now, everything is in place.

Signed-off-by: Juan Quintela <address@hidden>
Reviewed-by: Eric Blake <address@hidden>


  Commit: 76cc7b587f1cd1679821e034a2d9974af9bc7d2b
      
https://github.com/qemu/qemu/commit/76cc7b587f1cd1679821e034a2d9974af9bc7d2b
  Author: Juan Quintela <address@hidden>
  Date:   2015-06-12 (Fri, 12 Jun 2015)

  Changed paths:
    M migration/ram.c
    M migration/savevm.c

  Log Message:
  -----------
  migration: Add myself to the copyright list of both files

If anyone feels like adding himself to the list, just sent me a patch.

Signed-off-by: Juan Quintela <address@hidden>
Reviewed-by: Eric Blake <address@hidden>


  Commit: 7205c9ec525fe375dd34c0f116c36dc4aab4c0f7
      
https://github.com/qemu/qemu/commit/7205c9ec525fe375dd34c0f116c36dc4aab4c0f7
  Author: Juan Quintela <address@hidden>
  Date:   2015-06-12 (Fri, 12 Jun 2015)

  Changed paths:
    M arch_init.c
    M migration/ram.c

  Log Message:
  -----------
  migration: reduce include files

To make changes easier, with the copy, I maintained almost all include
files.  Now I remove the unnecessary ones on this patch.  This compiles
on linux x64 with all architectures configured, and cross-compiles for
windows 32 and 64 bits.

Signed-off-by: Juan Quintela <address@hidden>
Reviewed-by: Eric Blake <address@hidden>


  Commit: 5ee6926582cca64238967b2d00d870265cdb10b8
      
https://github.com/qemu/qemu/commit/5ee6926582cca64238967b2d00d870265cdb10b8
  Author: zhanghailiang <address@hidden>
  Date:   2015-06-12 (Fri, 12 Jun 2015)

  Changed paths:
    M migration/ram.c

  Log Message:
  -----------
  arch_init: Clean up the duplicate variable 'len' defining in ram_load()

There are two places that define 'len' variable, It's OK for compiling,
but makes it difficult for reading.

Remove the local one which defined in the inside 'while' loop.

Signed-off-by: zhanghailiang <address@hidden>
Signed-off-by: Juan Quintela <address@hidden>


  Commit: 5b61d5752156dcbbe2bf1366c877a676ed9f8f51
      
https://github.com/qemu/qemu/commit/5b61d5752156dcbbe2bf1366c877a676ed9f8f51
  Author: Padmanabh Ratnakar <address@hidden>
  Date:   2015-06-12 (Fri, 12 Jun 2015)

  Changed paths:
    M migration/rdma.c

  Log Message:
  -----------
  rdma: Fix qemu crash when IPv6 address is used for migration

Qemu crashes when IPv6 address is specified for migration and access
to any RDMA uverbs device available on the system is blocked using cgroups.
Fix the crash by checking the return value of ibv_open_device routine.

Signed-off-by: Meghana Cheripady <address@hidden>
Signed-off-by: Padmanabh Ratnakar <address@hidden>
Signed-off-by: Juan Quintela <address@hidden>


  Commit: e45a1ebfc65fb23be8cddb684d97eaa92725484d
      
https://github.com/qemu/qemu/commit/e45a1ebfc65fb23be8cddb684d97eaa92725484d
  Author: Juan Quintela <address@hidden>
  Date:   2015-06-12 (Fri, 12 Jun 2015)

  Changed paths:
    M migration/migration.c

  Log Message:
  -----------
  migration: Remove duplicated assignment of SETUP status

We assign the MIGRATION_STATUS_SETUP status in two places.  Just in
succession.  Just remove the second one.

Signed-off-by: Juan Quintela <address@hidden>
Reviewed-by: Eric Blake <address@hidden>


  Commit: 0163a2e025cda6acb33e100d296965671ace17d9
      
https://github.com/qemu/qemu/commit/0163a2e025cda6acb33e100d296965671ace17d9
  Author: Juan Quintela <address@hidden>
  Date:   2015-06-12 (Fri, 12 Jun 2015)

  Changed paths:
    M migration/savevm.c

  Log Message:
  -----------
  migration: create savevm_state

This way, we will put savevm global state here, instead of lots of variables.

Signed-off-by: Juan Quintela <address@hidden>
Reviewed-by: Dr. David Alan Gilbert <address@hidden>


  Commit: 5cd8cadae8db905afcbf877cae568c27d1d55a8a
      
https://github.com/qemu/qemu/commit/5cd8cadae8db905afcbf877cae568c27d1d55a8a
  Author: Juan Quintela <address@hidden>
  Date:   2015-06-12 (Fri, 12 Jun 2015)

  Changed paths:
    M cpus.c
    M docs/migration.txt
    M exec.c
    M hw/acpi/ich9.c
    M hw/acpi/piix4.c
    M hw/block/fdc.c
    M hw/char/serial.c
    M hw/display/qxl.c
    M hw/display/vga.c
    M hw/ide/core.c
    M hw/ide/pci.c
    M hw/input/pckbd.c
    M hw/input/ps2.c
    M hw/intc/apic_common.c
    M hw/isa/lpc_ich9.c
    M hw/net/e1000.c
    M hw/net/rtl8139.c
    M hw/net/vmxnet3.c
    M hw/pci-host/piix.c
    M hw/scsi/scsi-bus.c
    M hw/timer/hpet.c
    M hw/timer/mc146818rtc.c
    M hw/usb/hcd-ohci.c
    M hw/usb/redirect.c
    M hw/virtio/virtio.c
    M include/migration/vmstate.h
    M migration/savevm.c
    M migration/vmstate.c
    M target-arm/machine.c
    M target-i386/machine.c
    M target-ppc/machine.c
    M target-s390x/machine.c

  Log Message:
  -----------
  migration: Use normal VMStateDescriptions for Subsections

We create optional sections with this patch.  But we already have
optional subsections.  Instead of having two mechanism that do the
same, we can just generalize it.

For subsections we just change:

- Add a needed function to VMStateDescription
- Remove VMStateSubsection (after removal of the needed function
  it is just a VMStateDescription)
- Adjust the whole tree, moving the needed function to the corresponding
  VMStateDescription

Signed-off-by: Juan Quintela <address@hidden>


  Commit: b3af1bc9d21e6bec7dfd283d91b465c9f815b6d6
      
https://github.com/qemu/qemu/commit/b3af1bc9d21e6bec7dfd283d91b465c9f815b6d6
  Author: Dr. David Alan Gilbert <address@hidden>
  Date:   2015-06-12 (Fri, 12 Jun 2015)

  Changed paths:
    M include/migration/qemu-file.h
    M migration/qemu-file.c
    M migration/savevm.c

  Log Message:
  -----------
  Add qemu_get_counted_string to read a string prefixed by a count byte

and use it in loadvm_state and ram_load.

Where ever it's used, check the return and error if it failed.

Minor: ram_load was using a 257 byte array for its string, the
       maximum length is 255 bytes + 0 terminator, so fix to 256

Signed-off-by: Dr. David Alan Gilbert <address@hidden>
Reviewed-by: Amit Shah <address@hidden>
Reviewed-by: David Gibson <address@hidden>
Reviewed-by: Juan Quintela <address@hidden>
Signed-off-by: Juan Quintela <address@hidden>


  Commit: f796baa1b3efcf105ba3a465f797e05ac2b3dcfc
      
https://github.com/qemu/qemu/commit/f796baa1b3efcf105ba3a465f797e05ac2b3dcfc
  Author: Dr. David Alan Gilbert <address@hidden>
  Date:   2015-06-12 (Fri, 12 Jun 2015)

  Changed paths:
    M include/sysemu/sysemu.h
    M migration/migration.c
    M migration/savevm.c
    M trace-events

  Log Message:
  -----------
  Split header writing out of qemu_savevm_state_begin

Split qemu_savevm_state_begin to:
  qemu_savevm_state_header   That writes the initial file header.
  qemu_savevm_state_begin    That sets up devices and does the first
                       device pass.

Used later in postcopy.

Signed-off-by: Dr. David Alan Gilbert <address@hidden>
Reviewed-by: Amit Shah <address@hidden>
Reviewed-by: David Gibson <address@hidden>
Reviewed-by: Juan Quintela <address@hidden>
Signed-off-by: Juan Quintela <address@hidden>


  Commit: e3807054e20fb3b94d18cb751c437ee2f43b6fac
      
https://github.com/qemu/qemu/commit/e3807054e20fb3b94d18cb751c437ee2f43b6fac
  Author: Dr. David Alan Gilbert <address@hidden>
  Date:   2015-06-12 (Fri, 12 Jun 2015)

  Changed paths:
    M exec.c
    M include/exec/cpu-common.h
    M migration/rdma.c

  Log Message:
  -----------
  qemu_ram_foreach_block: pass up error value, and down the ramblock name

check the return value of the function it calls and error if it's non-0
Fixup qemu_rdma_init_one_block that is the only current caller,
  and rdma_add_block the only function it calls using it.

Pass the name of the ramblock to the function; helps in debugging.

Signed-off-by: Dr. David Alan Gilbert <address@hidden>
Reviewed-by: David Gibson <address@hidden>
Reviewed-by: Amit Shah <address@hidden>
Reviewed-by: Michael R. Hines <address@hidden>
Reviewed-by: Juan Quintela <address@hidden>
Signed-off-by: Juan Quintela <address@hidden>


  Commit: bca7856ae8220d9f15ff0f44b97397529e26a552
      
https://github.com/qemu/qemu/commit/bca7856ae8220d9f15ff0f44b97397529e26a552
  Author: Dr. David Alan Gilbert <address@hidden>
  Date:   2015-06-12 (Fri, 12 Jun 2015)

  Changed paths:
    M include/migration/migration.h
    M include/qemu/typedefs.h
    M migration/migration.c
    M migration/savevm.c

  Log Message:
  -----------
  Create MigrationIncomingState

There are currently lots of pieces of incoming migration state scattered
around, and postcopy is adding more, and it seems better to try and keep
it together.

allocate MIS in process_incoming_migration_co

Signed-off-by: Dr. David Alan Gilbert <address@hidden>
Reviewed-by: Amit Shah <address@hidden>
Reviewed-by: David Gibson <address@hidden>
Reviewed-by: Juan Quintela <address@hidden>
Signed-off-by: Juan Quintela <address@hidden>


  Commit: 7c1e52ba6f3994dc127118f491258ce84d0beb52
      
https://github.com/qemu/qemu/commit/7c1e52ba6f3994dc127118f491258ce84d0beb52
  Author: Dr. David Alan Gilbert <address@hidden>
  Date:   2015-06-12 (Fri, 12 Jun 2015)

  Changed paths:
    M include/migration/qemu-file.h
    M migration/qemu-file.c
    M migration/vmstate.c

  Log Message:
  -----------
  Move copy out of qemu_peek_buffer

qemu_peek_buffer currently copies the data it reads into a buffer,
however a future patch wants access to the buffer without the copy,
hence rework to remove the copy to the layer above.

Signed-off-by: Dr. David Alan Gilbert <address@hidden>
Reviewed-by: Amit Shah <address@hidden>
Reviewed-by: Juan Quintela <address@hidden>
Signed-off-by: Juan Quintela <address@hidden>


  Commit: 1a8f46f8d61ef885ff9d0bda251e4e9830c932ef
      
https://github.com/qemu/qemu/commit/1a8f46f8d61ef885ff9d0bda251e4e9830c932ef
  Author: Dr. David Alan Gilbert <address@hidden>
  Date:   2015-06-12 (Fri, 12 Jun 2015)

  Changed paths:
    M include/migration/migration.h
    M include/migration/vmstate.h
    M include/qemu/typedefs.h
    M migration/migration.c
    M migration/savevm.c

  Log Message:
  -----------
  Move loadvm_handlers into MigrationIncomingState

In postcopy we need the loadvm_handlers to be used in a couple
of different instances of the loadvm loop/routine, and thus
it can't be local any more.

Signed-off-by: Dr. David Alan Gilbert <address@hidden>
Reviewed-by: David Gibson <address@hidden>
Reviewed-by: Juan Quintela <address@hidden>
Signed-off-by: Juan Quintela <address@hidden>


  Commit: ce39bfc9186005d222a78db4a7fbdc83e2d62481
      
https://github.com/qemu/qemu/commit/ce39bfc9186005d222a78db4a7fbdc83e2d62481
  Author: Dr. David Alan Gilbert <address@hidden>
  Date:   2015-06-12 (Fri, 12 Jun 2015)

  Changed paths:
    M migration/savevm.c

  Log Message:
  -----------
  Merge section header writing

The header writing for device sections is open coded in
a few places, merge it into one.

Signed-off-by: Dr. David Alan Gilbert <address@hidden>
Reviewed-by: Juan Quintela <address@hidden>
Signed-off-by: Juan Quintela <address@hidden>


  Commit: 37fb569c0198cba58e3e1bdf6b9702c8248b89dd
      
https://github.com/qemu/qemu/commit/37fb569c0198cba58e3e1bdf6b9702c8248b89dd
  Author: Dr. David Alan Gilbert <address@hidden>
  Date:   2015-06-12 (Fri, 12 Jun 2015)

  Changed paths:
    M hw/i386/pc_piix.c
    M hw/i386/pc_q35.c
    M include/migration/migration.h
    M migration/savevm.c

  Log Message:
  -----------
  Disable section footers on older machine types

The next patch adds section footers; but we don't want to
break migration compatibility so disable them on older
machine types

Signed-off-by: Dr. David Alan Gilbert <address@hidden>
Reviewed-by: Juan Quintela <address@hidden>
Signed-off-by: Juan Quintela <address@hidden>


  Commit: f68945d42bab700d95b87f62e0898606ce2421ed
      
https://github.com/qemu/qemu/commit/f68945d42bab700d95b87f62e0898606ce2421ed
  Author: Dr. David Alan Gilbert <address@hidden>
  Date:   2015-06-12 (Fri, 12 Jun 2015)

  Changed paths:
    M include/migration/migration.h
    M migration/savevm.c

  Log Message:
  -----------
  Add a protective section footer

Badly formatted migration streams can go undetected or produce
misleading errors due to a lock of checking at the end of sections.
In particular a section that adds an extra 0x00 at the end
causes what looks like a normal end of stream and thus doesn't produce
any errors, and something that ends in a 0x01..0x04 kind of look
like real section headers and then fail when the section parser tries
to figure out which section they are.  This is made worse by the
choice of 0x00..0x04 being small numbers that are particularly common
in normal section data.

This patch adds a section footer consisting of a marker (0x7e - ~)
followed by the section-id that was also sent in the header.  If
they mismatch then it throws an error explaining which section was
being loaded.

Signed-off-by: Dr. David Alan Gilbert <address@hidden>
Reviewed-by: Juan Quintela <address@hidden>
Signed-off-by: Juan Quintela <address@hidden>


  Commit: 73d9a7961ab1b083fb2095413a3bd091e35f4369
      
https://github.com/qemu/qemu/commit/73d9a7961ab1b083fb2095413a3bd091e35f4369
  Author: Dr. David Alan Gilbert <address@hidden>
  Date:   2015-06-12 (Fri, 12 Jun 2015)

  Changed paths:
    M scripts/analyze-migration.py

  Log Message:
  -----------
  Teach analyze-migration.py about section footers

Signed-off-by: Dr. David Alan Gilbert <address@hidden>
Signed-off-by: Juan Quintela <address@hidden>


  Commit: a97270ad5d6dd0382ecb4568674226c8463e59fb
      
https://github.com/qemu/qemu/commit/a97270ad5d6dd0382ecb4568674226c8463e59fb
  Author: Dr. David Alan Gilbert <address@hidden>
  Date:   2015-06-12 (Fri, 12 Jun 2015)

  Changed paths:
    M migration/rdma.c

  Log Message:
  -----------
  Rename RDMA structures to make destination clear

RDMA has two data types that are named confusingly;
   RDMALocalBlock (pointed to indirectly by local_ram_blocks)
   RDMARemoteBlock (pointed to by block in RDMAContext)

RDMALocalBlocks, as the name suggests is a data strucuture that
represents the RDMAable RAM Blocks on the current side of the migration
whichever that is.

RDMARemoteBlocks is always the shape of the RAMBlocks on the
destination, even on the destination.

Rename:
     RDMARemoteBlock -> RDMADestBlock
     context->'block' -> context->dest_blocks

Signed-off-by: Dr. David Alan Gilbert <address@hidden>
Reviewed-by: Michael R. Hines <address@hidden>
Signed-off-by: Juan Quintela <address@hidden>


  Commit: 4fa3dd17dc29c316726f0d4a354a4d895e130c73
      
https://github.com/qemu/qemu/commit/4fa3dd17dc29c316726f0d4a354a4d895e130c73
  Author: Dr. David Alan Gilbert <address@hidden>
  Date:   2015-06-12 (Fri, 12 Jun 2015)

  Changed paths:
    M migration/rdma.c

  Log Message:
  -----------
  Remove unneeded memset

Signed-off-by: Dr. David Alan Gilbert <address@hidden>
Reviewed-by: Michael R. Hines <address@hidden>
Signed-off-by: Juan Quintela <address@hidden>


  Commit: a4ef02fd9b3d12b105b56942166c8364ade9be0f
      
https://github.com/qemu/qemu/commit/a4ef02fd9b3d12b105b56942166c8364ade9be0f
  Author: Peter Maydell <address@hidden>
  Date:   2015-06-12 (Fri, 12 Jun 2015)

  Changed paths:
    M MAINTAINERS
    M Makefile.target
    M arch_init.c
    M cpus.c
    M docs/migration.txt
    M exec.c
    M hw/acpi/ich9.c
    M hw/acpi/piix4.c
    M hw/block/fdc.c
    M hw/char/serial.c
    M hw/display/qxl.c
    M hw/display/vga.c
    M hw/i386/pc_piix.c
    M hw/i386/pc_q35.c
    M hw/ide/core.c
    M hw/ide/pci.c
    M hw/input/pckbd.c
    M hw/input/ps2.c
    M hw/intc/apic_common.c
    M hw/isa/lpc_ich9.c
    M hw/net/e1000.c
    M hw/net/rtl8139.c
    M hw/net/vmxnet3.c
    M hw/pci-host/piix.c
    M hw/scsi/scsi-bus.c
    M hw/timer/hpet.c
    M hw/timer/mc146818rtc.c
    M hw/usb/hcd-ohci.c
    M hw/usb/redirect.c
    M hw/virtio/virtio.c
    M include/exec/cpu-common.h
    M include/migration/migration.h
    M include/migration/qemu-file.h
    M include/migration/vmstate.h
    M include/qemu/typedefs.h
    M include/sysemu/arch_init.h
    M include/sysemu/sysemu.h
    M migration/migration.c
    M migration/qemu-file.c
    A migration/ram.c
    M migration/rdma.c
    A migration/savevm.c
    M migration/vmstate.c
    R savevm.c
    M scripts/analyze-migration.py
    M target-arm/machine.c
    M target-i386/machine.c
    M target-ppc/machine.c
    M target-s390x/machine.c
    M trace-events

  Log Message:
  -----------
  Merge remote-tracking branch 'remotes/juanquintela/tags/migration/20150612' 
into staging

migration/next for 20150612

# gpg: Signature made Fri Jun 12 05:56:21 2015 BST using RSA key ID 5872D723
# gpg: Good signature from "Juan Quintela <address@hidden>"
# gpg:                 aka "Juan Quintela <address@hidden>"

* remotes/juanquintela/tags/migration/20150612: (21 commits)
  Remove unneeded memset
  Rename RDMA structures to make destination clear
  Teach analyze-migration.py about section footers
  Add a protective section footer
  Disable section footers on older machine types
  Merge section header writing
  Move loadvm_handlers into MigrationIncomingState
  Move copy out of qemu_peek_buffer
  Create MigrationIncomingState
  qemu_ram_foreach_block: pass up error value, and down the ramblock name
  Split header writing out of qemu_savevm_state_begin
  Add qemu_get_counted_string to read a string prefixed by a count byte
  migration: Use normal VMStateDescriptions for Subsections
  migration: create savevm_state
  migration: Remove duplicated assignment of SETUP status
  rdma: Fix qemu crash when IPv6 address is used for migration
  arch_init: Clean up the duplicate variable 'len' defining in ram_load()
  migration: reduce include files
  migration: Add myself to the copyright list of both files
  migration: move savevm.c inside migration/
  ...

Signed-off-by: Peter Maydell <address@hidden>


Compare: https://github.com/qemu/qemu/compare/d8e3b729cf45...a4ef02fd9b3d
reply via email to
[Prev in Thread] Current Thread [Next in Thread]