[Qemu-commits] [qemu/qemu] fb6266: arch_init: Simplify code for load_xbzrle()

[GitHub]

  Branch: refs/heads/master
  Home:   https://github.com/qemu/qemu
  Commit: fb626663da94ddbfae88900c62bf4a26534fbafa
      
https://github.com/qemu/qemu/commit/fb626663da94ddbfae88900c62bf4a26534fbafa
  Author: Chen Gang <address@hidden>
  Date:   2014-05-14 (Wed, 14 May 2014)

  Changed paths:
    M arch_init.c

  Log Message:
  -----------
  arch_init: Simplify code for load_xbzrle()

For xbzrle_decode_buffer(), when decoding contents will exceed writing
buffer, it will return -1, so need not check the return value whether
large than writing buffer.

And when failure occurs within load_xbzrle(), it always return -1
without any resources which need release.

So can remove the related checking statements, and also can remove 'rc'
and 'ret' local variables,

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


  Commit: 14bcfdc7f1997492f59493214a24a27f5aa05c09
      
https://github.com/qemu/qemu/commit/14bcfdc7f1997492f59493214a24a27f5aa05c09
  Author: Dr. David Alan Gilbert <address@hidden>
  Date:   2014-05-14 (Wed, 14 May 2014)

  Changed paths:
    M arch_init.c

  Log Message:
  -----------
  Split ram_save_block

ram_save_block is getting a bit too complicated, and does two separate
things:
   1) Finds a page to send
   2) Sends the page (dealing with compression etc)

Split into 'ram_save_page' to send the page and deal with compression (2)
Rename remaining function to 'ram_find_and_save_block'

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


  Commit: 6e3d652ab204c6f8f1846639bca802fb9c8a9a6d
      
https://github.com/qemu/qemu/commit/6e3d652ab204c6f8f1846639bca802fb9c8a9a6d
  Author: Juan Quintela <address@hidden>
  Date:   2014-05-14 (Wed, 14 May 2014)

  Changed paths:
    M hw/usb/bus.c
    M hw/usb/dev-hid.c
    M hw/usb/dev-hub.c
    M hw/usb/dev-storage.c
    M hw/usb/hcd-ehci-pci.c
    M hw/usb/hcd-ehci-sysbus.c
    M hw/usb/hcd-ehci.c
    M hw/usb/hcd-uhci.c

  Log Message:
  -----------
  savevm: Remove all the unneeded version_minimum_id_old (usb)

After previous Peter patch, they are redundant.  This way we don't
assign them except when needed.  Once there, there were lots of case
where the ".fields" indentation was wrong:

     .fields = (VMStateField []) {
and
     .fields =      (VMStateField []) {

Change all the combinations to:

     .fields = (VMStateField[]){

The biggest problem (appart from aesthetics) was that checkpatch complained
when we copy&pasted the code from one place to another.

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


  Commit: 35d08458a9ee5fb9c8518207cc85d0a4f2ef3165
      
https://github.com/qemu/qemu/commit/35d08458a9ee5fb9c8518207cc85d0a4f2ef3165
  Author: Juan Quintela <address@hidden>
  Date:   2014-05-14 (Wed, 14 May 2014)

  Changed paths:
    M audio/audio.c
    M cpus.c
    M docs/migration.txt
    M exec.c
    M hw/audio/milkymist-ac97.c
    M hw/block/m25p80.c
    M hw/char/ipoctal232.c
    M hw/char/lm32_juart.c
    M hw/char/lm32_uart.c
    M hw/char/milkymist-uart.c
    M hw/char/sclpconsole-lm.c
    M hw/char/sclpconsole.c
    M hw/core/ptimer.c
    M hw/display/cg3.c
    M hw/display/g364fb.c
    M hw/display/jazz_led.c
    M hw/display/milkymist-tmu2.c
    M hw/display/milkymist-vgafb.c
    M hw/display/tcx.c
    M hw/dma/sparc32_dma.c
    M hw/dma/sun4m_iommu.c
    M hw/i2c/core.c
    M hw/i2c/smbus_ich9.c
    M hw/ide/core.c
    M hw/ide/macio.c
    M hw/ide/microdrive.c
    M hw/ide/mmio.c
    M hw/input/adb.c
    M hw/input/milkymist-softusb.c
    M hw/intc/lm32_pic.c
    M hw/intc/slavio_intctl.c
    M hw/ipack/ipack.c
    M hw/ipack/tpci200.c
    M hw/misc/eccmemctl.c
    M hw/misc/lm32_sys.c
    M hw/misc/macio/cuda.c
    M hw/misc/macio/mac_dbdma.c
    M hw/misc/milkymist-hpdmc.c
    M hw/misc/milkymist-pfpu.c
    M hw/misc/slavio_misc.c
    M hw/net/lance.c
    M hw/net/milkymist-minimac2.c
    M hw/net/mipsnet.c
    M hw/nvram/ds1225y.c
    M hw/nvram/mac_nvram.c
    M hw/pci-host/bonito.c
    M hw/s390x/event-facility.c
    M hw/s390x/sclpquiesce.c
    M hw/scsi/esp-pci.c
    M hw/scsi/esp.c
    M hw/sd/milkymist-memcard.c
    M hw/sd/sdhci.c
    M hw/timer/lm32_timer.c
    M hw/timer/milkymist-sysctl.c
    M hw/timer/slavio_timer.c
    M target-alpha/machine.c
    M target-lm32/machine.c
    M target-moxie/machine.c
    M target-openrisc/machine.c
    M tests/test-vmstate.c

  Log Message:
  -----------
  savevm: Remove all the unneeded version_minimum_id_old (rest)

After previous Peter patch, they are redundant.  This way we don't
assign them except when needed.  Once there, there were lots of case
where the ".fields" indentation was wrong:

     .fields = (VMStateField []) {
and
     .fields =      (VMStateField []) {

Change all the combinations to:

     .fields = (VMStateField[]){

The biggest problem (appart from aesthetics) was that checkpatch complained
when we copy&pasted the code from one place to another.

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


  Commit: d6ed7312d11995409bd53ef8f1a743d8877880d2
      
https://github.com/qemu/qemu/commit/d6ed7312d11995409bd53ef8f1a743d8877880d2
  Author: Peter Lieven <address@hidden>
  Date:   2014-05-14 (Wed, 14 May 2014)

  Changed paths:
    M migration.c

  Log Message:
  -----------
  migration: show average throughput when migration finishes

currently the value of the throughput field contains whatever
was the last calculated throughput shortly before the migration
finished.

This patch updates the post migration contents of the field to
the average throughput.

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

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


  Commit: 719ffe1f5f72b1c7ace4afe9ba2815bcb53a829e
      
https://github.com/qemu/qemu/commit/719ffe1f5f72b1c7ace4afe9ba2815bcb53a829e
  Author: Michael S. Tsirkin <address@hidden>
  Date:   2014-05-14 (Wed, 14 May 2014)

  Changed paths:
    M hw/usb/bus.c

  Log Message:
  -----------
  usb: fix up post load checks

Correct post load checks:
1. dev->setup_len == sizeof(dev->data_buf)
    seems fine, no need to fail migration
2. When state is DATA, passing index > len
   will cause memcpy with negative length,
   resulting in heap overflow

First of the issues was reported by dgilbert.

Reported-by: "Dr. David Alan Gilbert" <address@hidden>
Signed-off-by: Michael S. Tsirkin <address@hidden>
Signed-off-by: Juan Quintela <address@hidden>


  Commit: 895527eea5e57695f76c5e41def531d7f1d80917
      
https://github.com/qemu/qemu/commit/895527eea5e57695f76c5e41def531d7f1d80917
  Author: Peter Maydell <address@hidden>
  Date:   2014-05-15 (Thu, 15 May 2014)

  Changed paths:
    M arch_init.c
    M audio/audio.c
    M cpus.c
    M docs/migration.txt
    M exec.c
    M hw/audio/milkymist-ac97.c
    M hw/block/m25p80.c
    M hw/char/ipoctal232.c
    M hw/char/lm32_juart.c
    M hw/char/lm32_uart.c
    M hw/char/milkymist-uart.c
    M hw/char/sclpconsole-lm.c
    M hw/char/sclpconsole.c
    M hw/core/ptimer.c
    M hw/display/cg3.c
    M hw/display/g364fb.c
    M hw/display/jazz_led.c
    M hw/display/milkymist-tmu2.c
    M hw/display/milkymist-vgafb.c
    M hw/display/tcx.c
    M hw/dma/sparc32_dma.c
    M hw/dma/sun4m_iommu.c
    M hw/i2c/core.c
    M hw/i2c/smbus_ich9.c
    M hw/ide/core.c
    M hw/ide/macio.c
    M hw/ide/microdrive.c
    M hw/ide/mmio.c
    M hw/input/adb.c
    M hw/input/milkymist-softusb.c
    M hw/intc/lm32_pic.c
    M hw/intc/slavio_intctl.c
    M hw/ipack/ipack.c
    M hw/ipack/tpci200.c
    M hw/misc/eccmemctl.c
    M hw/misc/lm32_sys.c
    M hw/misc/macio/cuda.c
    M hw/misc/macio/mac_dbdma.c
    M hw/misc/milkymist-hpdmc.c
    M hw/misc/milkymist-pfpu.c
    M hw/misc/slavio_misc.c
    M hw/net/lance.c
    M hw/net/milkymist-minimac2.c
    M hw/net/mipsnet.c
    M hw/nvram/ds1225y.c
    M hw/nvram/mac_nvram.c
    M hw/pci-host/bonito.c
    M hw/s390x/event-facility.c
    M hw/s390x/sclpquiesce.c
    M hw/scsi/esp-pci.c
    M hw/scsi/esp.c
    M hw/sd/milkymist-memcard.c
    M hw/sd/sdhci.c
    M hw/timer/lm32_timer.c
    M hw/timer/milkymist-sysctl.c
    M hw/timer/slavio_timer.c
    M hw/usb/bus.c
    M hw/usb/dev-hid.c
    M hw/usb/dev-hub.c
    M hw/usb/dev-storage.c
    M hw/usb/hcd-ehci-pci.c
    M hw/usb/hcd-ehci-sysbus.c
    M hw/usb/hcd-ehci.c
    M hw/usb/hcd-uhci.c
    M migration.c
    M target-alpha/machine.c
    M target-lm32/machine.c
    M target-moxie/machine.c
    M target-openrisc/machine.c
    M tests/test-vmstate.c

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

migration/next for 20140515

# gpg: Signature made Thu 15 May 2014 02:32:25 BST using RSA key ID 5872D723
# gpg: Can't check signature: public key not found

* remotes/juanquintela/tags/migration/20140515:
  usb: fix up post load checks
  migration: show average throughput when migration finishes
  savevm: Remove all the unneeded version_minimum_id_old (rest)
  savevm: Remove all the unneeded version_minimum_id_old (usb)
  Split ram_save_block
  arch_init: Simplify code for load_xbzrle()

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


Compare: https://github.com/qemu/qemu/compare/50cb70d1853e...895527eea5e5