qemu-commits
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[Qemu-commits] [qemu/qemu] 0425dc: migration: isolate return path on src


From: GitHub
Subject: [Qemu-commits] [qemu/qemu] 0425dc: migration: isolate return path on src
Date: Tue, 13 Jun 2017 06:39:18 -0700

  Branch: refs/heads/master
  Home:   https://github.com/qemu/qemu
  Commit: 0425dc976212a38961f0469003074d1df65a61f2
      
https://github.com/qemu/qemu/commit/0425dc976212a38961f0469003074d1df65a61f2
  Author: Peter Xu <address@hidden>
  Date:   2017-06-13 (Tue, 13 Jun 2017)

  Changed paths:
    M migration/migration.c
    M migration/trace-events

  Log Message:
  -----------
  migration: isolate return path on src

There are some places that binded "return path" with postcopy. Let's be
prepared for its usage even without postcopy. This patch mainly did this
on source side.

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


  Commit: 250561e1aebf69e911992da9017322df7aeaa564
      
https://github.com/qemu/qemu/commit/250561e1aebf69e911992da9017322df7aeaa564
  Author: Eduardo Habkost <address@hidden>
  Date:   2017-06-13 (Tue, 13 Jun 2017)

  Changed paths:
    M migration/migration.c

  Log Message:
  -----------
  migration: Don't try to set *errp directly

Assigning directly to *errp is not valid, as errp may be NULL,
&error_fatal, or &error_abort.  Use error_propagate() instead.

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


  Commit: 930ac04c22712154a395852c37956156bbbcfd44
      
https://github.com/qemu/qemu/commit/930ac04c22712154a395852c37956156bbbcfd44
  Author: Juan Quintela <address@hidden>
  Date:   2017-06-13 (Tue, 13 Jun 2017)

  Changed paths:
    M migration/migration.c

  Log Message:
  -----------
  ram: Print block stats also in the complete case

Once there, create populate_disk_info.

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

--

- create populate_disk_info instead of "abusing" populate_ram_info


  Commit: c8f9f4f402dabeec88d2f5e21e54a88021b2eeee
      
https://github.com/qemu/qemu/commit/c8f9f4f402dabeec88d2f5e21e54a88021b2eeee
  Author: Juan Quintela <address@hidden>
  Date:   2017-06-13 (Tue, 13 Jun 2017)

  Changed paths:
    M migration/migration.c

  Log Message:
  -----------
  ram: Now POSTCOPY_ACTIVE is the same that STATUS_ACTIVE

Merge them.

Signed-off-by: Juan Quintela <address@hidden>
Reviewed-by: Eric Blake <address@hidden>
Reviewed-by: Peter Xu <address@hidden>
Reviewed-by: Dr. David Alan Gilbert <address@hidden>
Reviewed-by: Laurent Vivier <address@hidden>


  Commit: 543147116e40edcc6ccfc51e7b05a8a8934b48b5
      
https://github.com/qemu/qemu/commit/543147116e40edcc6ccfc51e7b05a8a8934b48b5
  Author: Juan Quintela <address@hidden>
  Date:   2017-06-13 (Tue, 13 Jun 2017)

  Changed paths:
    M migration/channel.c
    M migration/channel.h
    M migration/exec.c
    M migration/fd.c
    M migration/socket.c
    M migration/tls.c

  Log Message:
  -----------
  migration: Remove MigrationState from migration_channel_incomming()

All callers were calling migrate_get_current(), so do it inside the function.

Signed-off-by: Juan Quintela <address@hidden>
Reviewed-by: Philippe Mathieu-Daudé <address@hidden>
Reviewed-by: Peter Xu <address@hidden>
Reviewed-by: Laurent Vivier <address@hidden>


  Commit: f8d806c992a89728a08b7bb005ffd9e75dac5653
      
https://github.com/qemu/qemu/commit/f8d806c992a89728a08b7bb005ffd9e75dac5653
  Author: Juan Quintela <address@hidden>
  Date:   2017-06-13 (Tue, 13 Jun 2017)

  Changed paths:
    M hw/net/virtio-net.c
    M include/migration/misc.h
    M include/migration/vmstate.h
    M migration/savevm.c

  Log Message:
  -----------
  migration: Move self_announce_delay() to misc.h

Signed-off-by: Juan Quintela <address@hidden>
Reviewed-by: Philippe Mathieu-Daudé <address@hidden>
Reviewed-by: Peter Xu <address@hidden>
Reviewed-by: Laurent Vivier <address@hidden>


  Commit: f2a8f0a6314cad6b1d5b4ac03b71bf7ebebff733
      
https://github.com/qemu/qemu/commit/f2a8f0a6314cad6b1d5b4ac03b71bf7ebebff733
  Author: Juan Quintela <address@hidden>
  Date:   2017-06-13 (Tue, 13 Jun 2017)

  Changed paths:
    M hw/net/vmxnet3.c
    M hw/ppc/spapr.c
    M hw/s390x/s390-skeys.c
    M hw/s390x/s390-virtio-ccw.c
    A include/migration/register.h
    M include/migration/vmstate.h
    M migration/block.c
    M migration/ram.c
    M migration/savevm.c
    M slirp/slirp.c

  Log Message:
  -----------
  migration: Split registration functions from vmstate.h

They are indpendent, and nowadays almost every device register things
with qdev->vmsd.

Signed-off-by: Juan Quintela <address@hidden>
Reviewed-by: Philippe Mathieu-Daudé <address@hidden>
Reviewed-by: Peter Xu <address@hidden>


  Commit: b7722747e4df3d3fe5e3a212974fa4ec01968edd
      
https://github.com/qemu/qemu/commit/b7722747e4df3d3fe5e3a212974fa4ec01968edd
  Author: Juan Quintela <address@hidden>
  Date:   2017-06-13 (Tue, 13 Jun 2017)

  Changed paths:
    M include/migration/misc.h
    M include/migration/vmstate.h

  Log Message:
  -----------
  migration: Move dump_vmsate_json_to_file() to misc.h

It was not from vmstate.c to start with.

Signed-off-by: Juan Quintela <address@hidden>
Reviewed-by: Philippe Mathieu-Daudé <address@hidden>
Reviewed-by: Peter Xu <address@hidden>
Reviewed-by: Laurent Vivier <address@hidden>


  Commit: c3d2e2e76cd6021fdf6097744449fb3f7bf7cea0
      
https://github.com/qemu/qemu/commit/c3d2e2e76cd6021fdf6097744449fb3f7bf7cea0
  Author: Juan Quintela <address@hidden>
  Date:   2017-06-13 (Tue, 13 Jun 2017)

  Changed paths:
    M include/migration/migration.h
    M migration/savevm.h
    M migration/vmstate.c
    M tests/test-vmstate.c

  Log Message:
  -----------
  migration: Move constants to savevm.h

Signed-off-by: Juan Quintela <address@hidden>
Reviewed-by: Philippe Mathieu-Daudé <address@hidden>
Reviewed-by: Laurent Vivier <address@hidden>


  Commit: da6f17903f0cda719d8a14263bcea49dde5193b5
      
https://github.com/qemu/qemu/commit/da6f17903f0cda719d8a14263bcea49dde5193b5
  Author: Juan Quintela <address@hidden>
  Date:   2017-06-13 (Tue, 13 Jun 2017)

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

  Log Message:
  -----------
  migration: Commands are only used inside migration.c

So, move them there.  Notice that we export functions that send
commands, not the command themselves.

Signed-off-by: Juan Quintela <address@hidden>
Reviewed-by: Philippe Mathieu-Daudé <address@hidden>
Reviewed-by: Laurent Vivier <address@hidden>


  Commit: 2ce3bf1aa97abb20af3a90131745c9b68e04bedd
      
https://github.com/qemu/qemu/commit/2ce3bf1aa97abb20af3a90131745c9b68e04bedd
  Author: Juan Quintela <address@hidden>
  Date:   2017-06-13 (Tue, 13 Jun 2017)

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

  Log Message:
  -----------
  migration: ram_control_* are implemented in qemu_file

Signed-off-by: Juan Quintela <address@hidden>
Reviewed-by: Philippe Mathieu-Daudé <address@hidden>
Reviewed-by: Laurent Vivier <address@hidden>


  Commit: 84a899de8c5b7daa3777cb9ccaa7c5f362bb01b9
      
https://github.com/qemu/qemu/commit/84a899de8c5b7daa3777cb9ccaa7c5f362bb01b9
  Author: Juan Quintela <address@hidden>
  Date:   2017-06-13 (Tue, 13 Jun 2017)

  Changed paths:
    M hw/i386/pc_piix.c
    M hw/ppc/spapr.c
    M hw/xen/xen-common.c
    A include/migration/global_state.h
    M include/migration/migration.h
    M migration/Makefile.objs
    A migration/global_state.c
    M migration/migration.c
    M migration/savevm.c
    M vl.c

  Log Message:
  -----------
  migration: create global_state.c

It don't belong anywhere else, just the global state where everybody
can stick other things.

Signed-off-by: Juan Quintela <address@hidden>
Reviewed-by: Philippe Mathieu-Daudé <address@hidden>
Reviewed-by: Laurent Vivier <address@hidden>


  Commit: c4b63b7cc5e566448498d0daa7059a27a9d3bf00
      
https://github.com/qemu/qemu/commit/c4b63b7cc5e566448498d0daa7059a27a9d3bf00
  Author: Juan Quintela <address@hidden>
  Date:   2017-06-13 (Tue, 13 Jun 2017)

  Changed paths:
    M hw/i386/pc_piix.c
    M hw/ppc/spapr.c
    M hw/xen/xen-common.c
    M include/migration/migration.h
    M include/migration/misc.h
    M migration/migration.c
    M qdev-monitor.c
    M ui/spice-core.c
    M vl.c

  Log Message:
  -----------
  migration: Move remaining exported functions to migration/misc.h

Signed-off-by: Juan Quintela <address@hidden>
Reviewed-by: Philippe Mathieu-Daudé <address@hidden>
Reviewed-by: Peter Xu <address@hidden>


  Commit: 6666c96aac9151568736226dec99aa8acb14d07c
      
https://github.com/qemu/qemu/commit/6666c96aac9151568736226dec99aa8acb14d07c
  Author: Juan Quintela <address@hidden>
  Date:   2017-06-13 (Tue, 13 Jun 2017)

  Changed paths:
    R include/migration/migration.h
    M migration/block.c
    M migration/channel.c
    M migration/colo-comm.c
    M migration/colo.c
    M migration/exec.c
    M migration/fd.c
    M migration/migration.c
    A migration/migration.h
    M migration/postcopy-ram.c
    M migration/qemu-file.c
    M migration/ram.c
    M migration/rdma.c
    M migration/savevm.c
    M migration/socket.c
    M migration/tls.c
    M migration/vmstate-types.c
    M migration/vmstate.c
    M tests/test-vmstate.c

  Log Message:
  -----------
  migration: Move migration.h to migration/

Nothing uses it outside of migration.h

Signed-off-by: Juan Quintela <address@hidden>
Reviewed-by: Philippe Mathieu-Daudé <address@hidden>
Reviewed-by: Peter Xu <address@hidden>
Reviewed-by: Laurent Vivier <address@hidden>


  Commit: 735286a4f88255e1463d42ce28d8d14181fd32d4
      
https://github.com/qemu/qemu/commit/735286a4f88255e1463d42ce28d8d14181fd32d4
  Author: Peter Maydell <address@hidden>
  Date:   2017-06-13 (Tue, 13 Jun 2017)

  Changed paths:
    M hw/i386/pc_piix.c
    M hw/net/virtio-net.c
    M hw/net/vmxnet3.c
    M hw/ppc/spapr.c
    M hw/s390x/s390-skeys.c
    M hw/s390x/s390-virtio-ccw.c
    M hw/xen/xen-common.c
    A include/migration/global_state.h
    R include/migration/migration.h
    M include/migration/misc.h
    A include/migration/register.h
    M include/migration/vmstate.h
    M migration/Makefile.objs
    M migration/block.c
    M migration/channel.c
    M migration/channel.h
    M migration/colo-comm.c
    M migration/colo.c
    M migration/exec.c
    M migration/fd.c
    A migration/global_state.c
    M migration/migration.c
    A migration/migration.h
    M migration/postcopy-ram.c
    M migration/qemu-file.c
    M migration/qemu-file.h
    M migration/ram.c
    M migration/rdma.c
    M migration/savevm.c
    M migration/savevm.h
    M migration/socket.c
    M migration/tls.c
    M migration/trace-events
    M migration/vmstate-types.c
    M migration/vmstate.c
    M qdev-monitor.c
    M slirp/slirp.c
    M tests/test-vmstate.c
    M ui/spice-core.c
    M vl.c

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

migration/next for 20170613

# gpg: Signature made Tue 13 Jun 2017 10:01:45 BST
# gpg:                using RSA key 0xF487EF185872D723
# gpg: Good signature from "Juan Quintela <address@hidden>"
# gpg:                 aka "Juan Quintela <address@hidden>"
# Primary key fingerprint: 1899 FF8E DEBF 58CC EE03  4B82 F487 EF18 5872 D723

* remotes/juanquintela/tags/migration/20170613:
  migration: Move migration.h to migration/
  migration: Move remaining exported functions to migration/misc.h
  migration: create global_state.c
  migration: ram_control_* are implemented in qemu_file
  migration: Commands are only used inside migration.c
  migration: Move constants to savevm.h
  migration: Move dump_vmsate_json_to_file() to misc.h
  migration: Split registration functions from vmstate.h
  migration: Move self_announce_delay() to misc.h
  migration: Remove MigrationState from migration_channel_incomming()
  ram: Now POSTCOPY_ACTIVE is the same that STATUS_ACTIVE
  ram: Print block stats also in the complete case
  migration: Don't try to set *errp directly
  migration: isolate return path on src

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


Compare: https://github.com/qemu/qemu/compare/e0b4891ae664...735286a4f882

reply via email to

[Prev in Thread] Current Thread [Next in Thread]