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

[Qemu-commits] [qemu/qemu] 9ac78b: migration: disable auto-converge duri

From: GitHub
Subject: [Qemu-commits] [qemu/qemu] 9ac78b: migration: disable auto-converge during bulk block...
Date: Wed, 27 Sep 2017 16:23:32 -0700 
  Branch: refs/heads/master
  Home:   https://github.com/qemu/qemu
  Commit: 9ac78b6171bec47083a9b6ce88dc1f114caea2f9
      
https://github.com/qemu/qemu/commit/9ac78b6171bec47083a9b6ce88dc1f114caea2f9
  Author: Peter Lieven <address@hidden>
  Date:   2017-09-27 (Wed, 27 Sep 2017)

  Changed paths:
    M migration/block.c
    M migration/block.h
    M migration/ram.c

  Log Message:
  -----------
  migration: disable auto-converge during bulk block migration

auto-converge and block migration currently do not play well together.
During block migration the auto-converge logic detects that ram
migration makes no progress and thus throttles down the vm until
it nearly stalls completely. Avoid this by disabling the throttling
logic during the bulk phase of the block migration.

Cc: address@hidden
Signed-off-by: Peter Lieven <address@hidden>
Message-Id: <address@hidden>
Reviewed-by: Dr. David Alan Gilbert <address@hidden>
Reviewed-by: Juan Quintela <address@hidden>
Signed-off-by: Dr. David Alan Gilbert <address@hidden>


  Commit: 44b1ff319c4781c7ab13f7e119b3114a1e6a52e2
      
https://github.com/qemu/qemu/commit/44b1ff319c4781c7ab13f7e119b3114a1e6a52e2
  Author: Dr. David Alan Gilbert <address@hidden>
  Date:   2017-09-27 (Wed, 27 Sep 2017)

  Changed paths:
    M docs/devel/migration.txt
    M hw/arm/pxa2xx.c
    M hw/arm/strongarm.c
    M hw/audio/wm8750.c
    M hw/block/fdc.c
    M hw/block/m25p80.c
    M hw/block/nand.c
    M hw/block/onenand.c
    M hw/char/serial.c
    M hw/display/qxl.c
    M hw/i2c/core.c
    M hw/i386/kvm/clock.c
    M hw/ide/core.c
    M hw/ide/pci.c
    M hw/input/ps2.c
    M hw/input/tsc210x.c
    M hw/intc/apic_common.c
    M hw/intc/arm_gic_common.c
    M hw/intc/arm_gicv3_common.c
    M hw/intc/arm_gicv3_its_common.c
    M hw/intc/i8259_common.c
    M hw/intc/ioapic_common.c
    M hw/intc/s390_flic_kvm.c
    M hw/intc/xics.c
    M hw/net/e1000.c
    M hw/net/e1000e.c
    M hw/net/rtl8139.c
    M hw/net/virtio-net.c
    M hw/net/vmxnet3.c
    M hw/pci-host/piix.c
    M hw/ppc/ppc.c
    M hw/ppc/spapr_iommu.c
    M hw/ppc/spapr_pci.c
    M hw/s390x/css.c
    M hw/s390x/virtio-ccw.c
    M hw/scsi/lsi53c895a.c
    M hw/scsi/vmw_pvscsi.c
    M hw/timer/cadence_ttc.c
    M hw/timer/hpet.c
    M hw/timer/i8254_common.c
    M hw/timer/mc146818rtc.c
    M hw/timer/pl031.c
    M hw/timer/twl92230.c
    M hw/usb/dev-smartcard-reader.c
    M hw/usb/hcd-ehci.c
    M hw/usb/redirect.c
    M hw/virtio/vhost-vsock.c
    M include/migration/vmstate.h
    M migration/colo-comm.c
    M migration/global_state.c
    M migration/savevm.c
    M replay/replay-snapshot.c
    M slirp/slirp.c
    M target/arm/machine.c
    M target/i386/machine.c
    M target/ppc/machine.c
    M target/s390x/machine.c
    M target/sparc/machine.c
    M tests/test-vmstate.c

  Log Message:
  -----------
  migration: pre_save return int

Modify the pre_save method on VMStateDescription to return an int
rather than void so that it potentially can fail.

Changed zillions of devices to make them return 0; the only
case I've made it return non-0 is hw/intc/s390_flic_kvm.c that already
had an error_report/return case.

Note: If you add an error exit in your pre_save you must emit
an error_report to say why.

Signed-off-by: Dr. David Alan Gilbert <address@hidden>
Message-Id: <address@hidden>
Reviewed-by: Peter Xu <address@hidden>
Reviewed-by: Cornelia Huck <address@hidden>
Reviewed-by: Juan Quintela <address@hidden>
Signed-off-by: Dr. David Alan Gilbert <address@hidden>


  Commit: 551dbd0846d23e94dbc22dcfd9cf1f8dbbf403ad
      
https://github.com/qemu/qemu/commit/551dbd0846d23e94dbc22dcfd9cf1f8dbbf403ad
  Author: Dr. David Alan Gilbert <address@hidden>
  Date:   2017-09-27 (Wed, 27 Sep 2017)

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

  Log Message:
  -----------
  migration: check pre_save return in vmstate_save_state

Check the return value of pre_save state and fail vmstate_save_state
if the pre_save failed.

Signed-off-by: Dr. David Alan Gilbert <address@hidden>
Message-Id: <address@hidden>
Reviewed-by: Peter Xu <address@hidden>
Reviewed-by: Cornelia Huck <address@hidden>
Reviewed-by: Juan Quintela <address@hidden>
Signed-off-by: Dr. David Alan Gilbert <address@hidden>


  Commit: 88b0faf1853937b87a35cae8c74e38971aff0bba
      
https://github.com/qemu/qemu/commit/88b0faf1853937b87a35cae8c74e38971aff0bba
  Author: Dr. David Alan Gilbert <address@hidden>
  Date:   2017-09-27 (Wed, 27 Sep 2017)

  Changed paths:
    M migration/vmstate.c

  Log Message:
  -----------
  migration: Check field save returns

Check the return values from vmstate_save_state for fields and also the
return values from 'put' for fields that use that.

Signed-off-by: Dr. David Alan Gilbert <address@hidden>
Message-Id: <address@hidden>
Reviewed-by: Peter Xu <address@hidden>
Reviewed-by: Cornelia Huck <address@hidden>
Reviewed-by: Juan Quintela <address@hidden>
Signed-off-by: Dr. David Alan Gilbert <address@hidden>


  Commit: f3cadd39c4489d539ea0e17169cfcf2126ed3d50
      
https://github.com/qemu/qemu/commit/f3cadd39c4489d539ea0e17169cfcf2126ed3d50
  Author: Dr. David Alan Gilbert <address@hidden>
  Date:   2017-09-27 (Wed, 27 Sep 2017)

  Changed paths:
    M migration/vmstate.c

  Log Message:
  -----------
  migration: wire vmstate_save_state errors up to vmstate_subsection_save

Route the errors from vmstate_save_state up through
vmstate_subsection_save (and back down, all rather recursive).

Signed-off-by: Dr. David Alan Gilbert <address@hidden>
Message-Id: <address@hidden>
Reviewed-by: Peter Xu <address@hidden>
Reviewed-by: Cornelia Huck <address@hidden>
Reviewed-by: Juan Quintela <address@hidden>
Signed-off-by: Dr. David Alan Gilbert <address@hidden>
  Commit message fixed up as per Peter's review


  Commit: 687433f61173a9ed80609f16f8bc4b9255bd815c
      
https://github.com/qemu/qemu/commit/687433f61173a9ed80609f16f8bc4b9255bd815c
  Author: Dr. David Alan Gilbert <address@hidden>
  Date:   2017-09-27 (Wed, 27 Sep 2017)

  Changed paths:
    M migration/savevm.c

  Log Message:
  -----------
  migration: Route errors up through vmstate_save

Route the errors from vsmtate_save_state back up through
vmstate_save and out to the normal device state path.
That's the normal error path done.

Signed-off-by: Dr. David Alan Gilbert <address@hidden>
Message-Id: <address@hidden>
Reviewed-by: Peter Xu <address@hidden>
Reviewed-by: Cornelia Huck <address@hidden>
Reviewed-by: Juan Quintela <address@hidden>
Signed-off-by: Dr. David Alan Gilbert <address@hidden>


  Commit: 2f168d0708581c33baf6c78d75a89e8cd705f9f6
      
https://github.com/qemu/qemu/commit/2f168d0708581c33baf6c78d75a89e8cd705f9f6
  Author: Dr. David Alan Gilbert <address@hidden>
  Date:   2017-09-27 (Wed, 27 Sep 2017)

  Changed paths:
    M hw/display/virtio-gpu.c
    M hw/virtio/virtio.c
    M include/hw/virtio/virtio.h
    M migration/vmstate-types.c
    M tests/test-vmstate.c

  Log Message:
  -----------
  migration: Route more error paths

vmstate_save_state is called in lots of places.
Route error returns from the easier cases back up;  there are lots
of more complex cases where their own error paths need fixing.

Signed-off-by: Dr. David Alan Gilbert <address@hidden>
Message-Id: <address@hidden>
Reviewed-by: Peter Xu <address@hidden>
Reviewed-by: Cornelia Huck <address@hidden>
Reviewed-by: Juan Quintela <address@hidden>
Signed-off-by: Dr. David Alan Gilbert <address@hidden>
  Commit message fix up as Peter's review


  Commit: ab161529261928ae7f3556e3220829c34b2686ec
      
https://github.com/qemu/qemu/commit/ab161529261928ae7f3556e3220829c34b2686ec
  Author: Peter Maydell <address@hidden>
  Date:   2017-09-27 (Wed, 27 Sep 2017)

  Changed paths:
    M docs/devel/migration.txt
    M hw/arm/pxa2xx.c
    M hw/arm/strongarm.c
    M hw/audio/wm8750.c
    M hw/block/fdc.c
    M hw/block/m25p80.c
    M hw/block/nand.c
    M hw/block/onenand.c
    M hw/char/serial.c
    M hw/display/qxl.c
    M hw/display/virtio-gpu.c
    M hw/i2c/core.c
    M hw/i386/kvm/clock.c
    M hw/ide/core.c
    M hw/ide/pci.c
    M hw/input/ps2.c
    M hw/input/tsc210x.c
    M hw/intc/apic_common.c
    M hw/intc/arm_gic_common.c
    M hw/intc/arm_gicv3_common.c
    M hw/intc/arm_gicv3_its_common.c
    M hw/intc/i8259_common.c
    M hw/intc/ioapic_common.c
    M hw/intc/s390_flic_kvm.c
    M hw/intc/xics.c
    M hw/net/e1000.c
    M hw/net/e1000e.c
    M hw/net/rtl8139.c
    M hw/net/virtio-net.c
    M hw/net/vmxnet3.c
    M hw/pci-host/piix.c
    M hw/ppc/ppc.c
    M hw/ppc/spapr_iommu.c
    M hw/ppc/spapr_pci.c
    M hw/s390x/css.c
    M hw/s390x/virtio-ccw.c
    M hw/scsi/lsi53c895a.c
    M hw/scsi/vmw_pvscsi.c
    M hw/timer/cadence_ttc.c
    M hw/timer/hpet.c
    M hw/timer/i8254_common.c
    M hw/timer/mc146818rtc.c
    M hw/timer/pl031.c
    M hw/timer/twl92230.c
    M hw/usb/dev-smartcard-reader.c
    M hw/usb/hcd-ehci.c
    M hw/usb/redirect.c
    M hw/virtio/vhost-vsock.c
    M hw/virtio/virtio.c
    M include/hw/virtio/virtio.h
    M include/migration/vmstate.h
    M migration/block.c
    M migration/block.h
    M migration/colo-comm.c
    M migration/global_state.c
    M migration/ram.c
    M migration/savevm.c
    M migration/trace-events
    M migration/vmstate-types.c
    M migration/vmstate.c
    M replay/replay-snapshot.c
    M slirp/slirp.c
    M target/arm/machine.c
    M target/i386/machine.c
    M target/ppc/machine.c
    M target/s390x/machine.c
    M target/sparc/machine.c
    M tests/test-vmstate.c

  Log Message:
  -----------
  Merge remote-tracking branch 'remotes/dgilbert/tags/pull-migration-20170927a' 
into staging

Migration pull 2017-09-27

# gpg: Signature made Wed 27 Sep 2017 14:56:23 BST
# gpg:                using RSA key 0x0516331EBC5BFDE7
# gpg: Good signature from "Dr. David Alan Gilbert (RH2) <address@hidden>"
# gpg: WARNING: This key is not certified with sufficiently trusted signatures!
# gpg:          It is not certain 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-20170927a:
  migration: Route more error paths
  migration: Route errors up through vmstate_save
  migration: wire vmstate_save_state errors up to vmstate_subsection_save
  migration: Check field save returns
  migration: check pre_save return in vmstate_save_state
  migration: pre_save return int
  migration: disable auto-converge during bulk block migration

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


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