qemu-commits
[Top][All Lists]
Advanced

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

[Qemu-commits] [qemu/qemu] fb3409: Unlock ramlist lock also in error cas


From: GitHub
Subject: [Qemu-commits] [qemu/qemu] fb3409: Unlock ramlist lock also in error case
Date: Mon, 21 Jan 2013 13:00:16 -0800

  Branch: refs/heads/master
  Home:   https://github.com/qemu/qemu
  Commit: fb3409de22c7c167dced51175500bc4b1a78dcc2
      
https://github.com/qemu/qemu/commit/fb3409de22c7c167dced51175500bc4b1a78dcc2
  Author: Paolo Bonzini <address@hidden>
  Date:   2013-01-17 (Thu, 17 Jan 2013)

  Changed paths:
    M arch_init.c

  Log Message:
  -----------
  Unlock ramlist lock also in error case

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

Reviewed-by: Reviewed-by: Eric Blake <address@hidden>


  Commit: 9c339485f0abb96595f4d91880b177726463300c
      
https://github.com/qemu/qemu/commit/9c339485f0abb96595f4d91880b177726463300c
  Author: Paolo Bonzini <address@hidden>
  Date:   2013-01-17 (Thu, 17 Jan 2013)

  Changed paths:
    M arch_init.c

  Log Message:
  -----------
  Protect migration_bitmap_sync() with the ramlist lock

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

Reviewed-by: Reviewed-by: Eric Blake <address@hidden>


  Commit: f65a874756bb3e4b57571a33a51d8887bbee7981
      
https://github.com/qemu/qemu/commit/f65a874756bb3e4b57571a33a51d8887bbee7981
  Author: Paolo Bonzini <address@hidden>
  Date:   2013-01-17 (Thu, 17 Jan 2013)

  Changed paths:
    M migration.c

  Log Message:
  -----------
  use XFER_LIMIT_RATIO consistently

commit 5b4e1eb769eee892b44d3f6b2369b05196442f59

missed this use.

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

Reviewed-by: Reviewed-by: Eric Blake <address@hidden>


  Commit: b9c961a8ff3973b97964431491bc3f4f427cd66a
      
https://github.com/qemu/qemu/commit/b9c961a8ff3973b97964431491bc3f4f427cd66a
  Author: Paolo Bonzini <address@hidden>
  Date:   2013-01-17 (Thu, 17 Jan 2013)

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

  Log Message:
  -----------
  migration: make function static

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

Reviewed-by: Reviewed-by: Eric Blake <address@hidden>


  Commit: 25242635acb0b803392ad5669b5624815af3fd07
      
https://github.com/qemu/qemu/commit/25242635acb0b803392ad5669b5624815af3fd07
  Author: Paolo Bonzini <address@hidden>
  Date:   2013-01-17 (Thu, 17 Jan 2013)

  Changed paths:
    M migration.c

  Log Message:
  -----------
  migration: remove double call to migrate_fd_close

The call in buffered_close is enough, because buffered_close is called
already by migrate_fd_cleanup.

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

Reviewed-by: Reviewed-by: Eric Blake <address@hidden>


  Commit: 1e973051b96bac5eef46393eec15b68796e7c7d3
      
https://github.com/qemu/qemu/commit/1e973051b96bac5eef46393eec15b68796e7c7d3
  Author: Paolo Bonzini <address@hidden>
  Date:   2013-01-17 (Thu, 17 Jan 2013)

  Changed paths:
    M migration.c

  Log Message:
  -----------
  migration: fix off-by-one in buffered_rate_limit

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

Reviewed-by: Reviewed-by: Eric Blake <address@hidden>


  Commit: afe419319de1e5e98b131368ba14f85f98ab3a76
      
https://github.com/qemu/qemu/commit/afe419319de1e5e98b131368ba14f85f98ab3a76
  Author: Juan Quintela <address@hidden>
  Date:   2013-01-17 (Thu, 17 Jan 2013)

  Changed paths:
    M savevm.c

  Log Message:
  -----------
  qemu-file: Only set last_error if it is not already set

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

Reviewed-by: Reviewed-by: Eric Blake <address@hidden>
Reviewed-by: Paolo Bonzini <address@hidden>


  Commit: 76f5933aea281a52149b39a1a78a43565dc9715c
      
https://github.com/qemu/qemu/commit/76f5933aea281a52149b39a1a78a43565dc9715c
  Author: Juan Quintela <address@hidden>
  Date:   2013-01-17 (Thu, 17 Jan 2013)

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

  Log Message:
  -----------
  migration: move beginning stage to the migration thread

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

Reviewed-by: Reviewed-by: Eric Blake <address@hidden>
Reviewed-by: Paolo Bonzini <address@hidden>


  Commit: f7b67be36d01f8f506dc93213855b31dad17708c
      
https://github.com/qemu/qemu/commit/f7b67be36d01f8f506dc93213855b31dad17708c
  Author: Juan Quintela <address@hidden>
  Date:   2013-01-17 (Thu, 17 Jan 2013)

  Changed paths:
    M migration.c

  Log Message:
  -----------
  migration: Add buffered_flush error handling

Now that we have error handling we can do proper handling of
buffered_flush().

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

Reviewed-by: Reviewed-by: Eric Blake <address@hidden>
Reviewed-by: Paolo Bonzini <address@hidden>


  Commit: 7de6a690e73967eb5bc5e72b2942a6be1fee2c20
      
https://github.com/qemu/qemu/commit/7de6a690e73967eb5bc5e72b2942a6be1fee2c20
  Author: Juan Quintela <address@hidden>
  Date:   2013-01-17 (Thu, 17 Jan 2013)

  Changed paths:
    M migration.c

  Log Message:
  -----------
  migration: move exit condition to migration thread

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

Reviewed-by: Reviewed-by: Eric Blake <address@hidden>
Reviewed-by: Paolo Bonzini <address@hidden>


  Commit: c369f40d2cb39f4eaaf6589c1113b528256d3a09
      
https://github.com/qemu/qemu/commit/c369f40d2cb39f4eaaf6589c1113b528256d3a09
  Author: Juan Quintela <address@hidden>
  Date:   2013-01-17 (Thu, 17 Jan 2013)

  Changed paths:
    M migration.c

  Log Message:
  -----------
  migration: unfold rest of migrate_fd_put_ready() into thread

This will allow us finer control in next patches.

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

Reviewed-by: Reviewed-by: Eric Blake <address@hidden>
Reviewed-by: Paolo Bonzini <address@hidden>


  Commit: b22ff1fbed9d7f1f677804cbaa9ee03ca17d0013
      
https://github.com/qemu/qemu/commit/b22ff1fbed9d7f1f677804cbaa9ee03ca17d0013
  Author: Juan Quintela <address@hidden>
  Date:   2013-01-17 (Thu, 17 Jan 2013)

  Changed paths:
    M migration.c

  Log Message:
  -----------
  migration: Only go to the iterate stage if there is anything to send

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

Reviewed-by: Reviewed-by: Eric Blake <address@hidden>
Reviewed-by: Paolo Bonzini <address@hidden>


  Commit: 6522773f88a2e37800f0bf7dc3632a14649f53c6
      
https://github.com/qemu/qemu/commit/6522773f88a2e37800f0bf7dc3632a14649f53c6
  Author: Juan Quintela <address@hidden>
  Date:   2013-01-17 (Thu, 17 Jan 2013)

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

  Log Message:
  -----------
  migration: remove argument to qemu_savevm_state_cancel

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

Reviewed-by: Reviewed-by: Eric Blake <address@hidden>
Reviewed-by: Paolo Bonzini <address@hidden>


  Commit: 016c7182315b1f842ac351fae86041d2c8fe4596
      
https://github.com/qemu/qemu/commit/016c7182315b1f842ac351fae86041d2c8fe4596
  Author: Anthony Liguori <address@hidden>
  Date:   2013-01-21 (Mon, 21 Jan 2013)

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

  Log Message:
  -----------
  Merge remote-tracking branch 'quintela/thread.next' into staging

# By Juan Quintela (7) and Paolo Bonzini (6)
# Via Juan Quintela
* quintela/thread.next:
  migration: remove argument to qemu_savevm_state_cancel
  migration: Only go to the iterate stage if there is anything to send
  migration: unfold rest of migrate_fd_put_ready() into thread
  migration: move exit condition to migration thread
  migration: Add buffered_flush error handling
  migration: move beginning stage to the migration thread
  qemu-file: Only set last_error if it is not already set
  migration: fix off-by-one in buffered_rate_limit
  migration: remove double call to migrate_fd_close
  migration: make function static
  use XFER_LIMIT_RATIO consistently
  Protect migration_bitmap_sync() with the ramlist lock
  Unlock ramlist lock also in error case


  Commit: 1395af6f76e9f0e145a235a71e3578385d82ece5
      
https://github.com/qemu/qemu/commit/1395af6f76e9f0e145a235a71e3578385d82ece5
  Author: KONRAD Frederic <address@hidden>
  Date:   2013-01-21 (Mon, 21 Jan 2013)

  Changed paths:
    M hw/qdev-core.h
    M hw/qdev-monitor.c

  Log Message:
  -----------
  qdev: add a maximum device allowed field for the bus.

Add a max_dev field to BusClass to specify the maximum amount of devices allowed
on the bus (has no effect if max_dev=0)

Signed-off-by: KONRAD Frederic <address@hidden>

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


  Commit: ff8eca5536edd3f84bc87277e158e4db11dadf82
      
https://github.com/qemu/qemu/commit/ff8eca5536edd3f84bc87277e158e4db11dadf82
  Author: KONRAD Frederic <address@hidden>
  Date:   2013-01-21 (Mon, 21 Jan 2013)

  Changed paths:
    M hw/Makefile.objs
    A hw/virtio-bus.c
    A hw/virtio-bus.h

  Log Message:
  -----------
  virtio-bus: introduce virtio-bus

Introduce virtio-bus. Refactored transport device will create a bus which
extends virtio-bus.

Signed-off-by: KONRAD Frederic <address@hidden>

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


  Commit: 8e05db9234050cb3f0ffb765608dd8b176334ae1
      
https://github.com/qemu/qemu/commit/8e05db9234050cb3f0ffb765608dd8b176334ae1
  Author: KONRAD Frederic <address@hidden>
  Date:   2013-01-21 (Mon, 21 Jan 2013)

  Changed paths:
    M hw/virtio-bus.c
    M hw/virtio-bus.h
    M hw/virtio.c
    M hw/virtio.h

  Log Message:
  -----------
  virtio-device: refactor virtio-device.

Create the virtio-device which is abstract. All the virtio-device can extend
this class. It also add some functions to virtio-bus.

Signed-off-by: KONRAD Frederic <address@hidden>
Signed-off-by: Anthony Liguori <address@hidden>


  Commit: 0a2acf5eb3237350e84693b9b37eced5080a1fef
      
https://github.com/qemu/qemu/commit/0a2acf5eb3237350e84693b9b37eced5080a1fef
  Author: KONRAD Frederic <address@hidden>
  Date:   2013-01-21 (Mon, 21 Jan 2013)

  Changed paths:
    M hw/virtio-pci.c
    M hw/virtio-pci.h

  Log Message:
  -----------
  virtio-pci-bus: introduce virtio-pci-bus.

Introduce virtio-pci-bus, which extends virtio-bus. It is used with virtio-pci
transport device.

Signed-off-by: KONRAD Frederic <address@hidden>
Signed-off-by: Anthony Liguori <address@hidden>


  Commit: 085bccb72c280f36f651556ef5169f5faca31d87
      
https://github.com/qemu/qemu/commit/085bccb72c280f36f651556ef5169f5faca31d87
  Author: KONRAD Frederic <address@hidden>
  Date:   2013-01-21 (Mon, 21 Jan 2013)

  Changed paths:
    M hw/virtio-pci.c
    M hw/virtio-pci.h

  Log Message:
  -----------
  virtio-pci: refactor virtio-pci device.

Create the virtio-pci device which is abstract. This transport device will
create a virtio-pci-bus, so one VirtIODevice can be connected.

Signed-off-by: KONRAD Frederic <address@hidden>
Signed-off-by: Anthony Liguori <address@hidden>


  Commit: ea35d4f1e9781a4b489d550e4bbc4568704f34bf
      
https://github.com/qemu/qemu/commit/ea35d4f1e9781a4b489d550e4bbc4568704f34bf
  Author: KONRAD Frederic <address@hidden>
  Date:   2013-01-21 (Mon, 21 Jan 2013)

  Changed paths:
    M hw/s390-virtio-bus.c
    M hw/s390-virtio-bus.h

  Log Message:
  -----------
  virtio-s390-bus: add virtio-s390-bus.

This add the virtio-s390-bus which extends virtio-bus. So one VirtIODevice can
be connected on this bus.

Signed-off-by: KONRAD Frederic <address@hidden>
Signed-off-by: Anthony Liguori <address@hidden>


  Commit: 11e9235b1a88a98124fe005c93ade019d6a09c0b
      
https://github.com/qemu/qemu/commit/11e9235b1a88a98124fe005c93ade019d6a09c0b
  Author: KONRAD Frederic <address@hidden>
  Date:   2013-01-21 (Mon, 21 Jan 2013)

  Changed paths:
    M hw/s390-virtio-bus.c
    M hw/s390-virtio-bus.h

  Log Message:
  -----------
  virtio-s390-device: create a virtio-s390-bus during init.

A virtio-s390-bus is created during the init. So one VirtIODevice can be
connected on the virtio-s390-device through this bus.

Signed-off-by: KONRAD Frederic <address@hidden>
Signed-off-by: Anthony Liguori <address@hidden>


  Commit: 32ed26808d4e59efb4a03290a4a85f5f8335f268
      
https://github.com/qemu/qemu/commit/32ed26808d4e59efb4a03290a4a85f5f8335f268
  Author: Tim Hardeck <address@hidden>
  Date:   2013-01-21 (Mon, 21 Jan 2013)

  Changed paths:
    M ui/vnc.c
    M ui/vnc.h

  Log Message:
  -----------
  vnc: added buffer_advance function

Following Anthony Liguori's Websocket implementation I have added the
buffer_advance function to VNC and replaced all related buffer memmove
operations with it.

Signed-off-by: Tim Hardeck <address@hidden>
Reviewed-by: Anthony Liguori <address@hidden>
Signed-off-by: Anthony Liguori <address@hidden>


  Commit: 7536ee4bc3da7e9b7fdadba5ba6ade63eaace430
      
https://github.com/qemu/qemu/commit/7536ee4bc3da7e9b7fdadba5ba6ade63eaace430
  Author: Tim Hardeck <address@hidden>
  Date:   2013-01-21 (Mon, 21 Jan 2013)

  Changed paths:
    M configure
    M qemu-options.hx
    M ui/Makefile.objs
    A ui/vnc-ws.c
    A ui/vnc-ws.h
    M ui/vnc.c
    M ui/vnc.h

  Log Message:
  -----------
  vnc: added initial websocket protocol support

This patch adds basic Websocket Protocol version 13 - RFC 6455 - support
to QEMU VNC. Binary encoding support on the client side is mandatory.

Because of the GnuTLS requirement the Websockets implementation is
optional (--enable-vnc-ws).

To activate Websocket support the VNC option "websocket"is used, for
example "-vnc :0,websocket".
The listen port for Websocket connections is (5700 + display) so if
QEMU VNC is started with :0 the Websocket port would be 5700.
As an alternative the Websocket port could be manually specified by
using ",websocket=<port>" instead.

Parts of the implementation base on Anthony Liguori's QEMU Websocket
patch from 2010 and on Joel Martin's LibVNC Websocket implementation.

Signed-off-by: Tim Hardeck <address@hidden>
Signed-off-by: Anthony Liguori <address@hidden>


  Commit: 6fd8e79af031d8cfc0eb02d40d03281917fcb27b
      
https://github.com/qemu/qemu/commit/6fd8e79af031d8cfc0eb02d40d03281917fcb27b
  Author: Tim Hardeck <address@hidden>
  Date:   2013-01-21 (Mon, 21 Jan 2013)

  Changed paths:
    M ui/vnc.c
    M ui/vnc.h

  Log Message:
  -----------
  vnc: fix possible uninitialized removals

Some VncState values are not initialized before the Websocket handshake.
If it fails QEMU segfaults during the cleanup. To prevent this behavior
intialization checks are added.

Signed-off-by: Tim Hardeck <address@hidden>
Signed-off-by: Anthony Liguori <address@hidden>


  Commit: 1356b98d3e95a85071e6bf9a99e8799e1ae1bbee
      
https://github.com/qemu/qemu/commit/1356b98d3e95a85071e6bf9a99e8799e1ae1bbee
  Author: Andreas Färber <address@hidden>
  Date:   2013-01-21 (Mon, 21 Jan 2013)

  Changed paths:
    M hw/a15mpcore.c
    M hw/a9mpcore.c
    M hw/apb_pci.c
    M hw/arm11mpcore.c
    M hw/arm_gic_common.c
    M hw/arm_mptimer.c
    M hw/arm_sysctl.c
    M hw/armv7m.c
    M hw/axis_dev88.c
    M hw/cadence_gem.c
    M hw/empty_slot.c
    M hw/escc.c
    M hw/esp.c
    M hw/etraxfs.h
    M hw/exynos4210.c
    M hw/exynos4210_gic.c
    M hw/exynos4210_uart.c
    M hw/exynos4_boards.c
    M hw/fw_cfg.c
    M hw/grlib.h
    M hw/grlib_irqmp.c
    M hw/highbank.c
    M hw/hpet.c
    M hw/imx_serial.c
    M hw/lan9118.c
    M hw/lm32.h
    M hw/m48t59.c
    M hw/marvell_88w8618_audio.c
    M hw/milkymist-hw.h
    M hw/mips_jazz.c
    M hw/mips_mipssim.c
    M hw/mpc8544_guts.c
    M hw/musicpal.c
    M hw/nand.c
    M hw/nseries.c
    M hw/omap1.c
    M hw/omap2.c
    M hw/omap_gpio.c
    M hw/omap_i2c.c
    M hw/omap_intc.c
    M hw/onenand.c
    M hw/openpic.c
    M hw/openrisc_sim.c
    M hw/pc.c
    M hw/petalogix_ml605_mmu.c
    M hw/pflash_cfi01.c
    M hw/pflash_cfi02.c
    M hw/ppc/e500.c
    M hw/ppc_newworld.c
    M hw/ppce500_spin.c
    M hw/pxa2xx.c
    M hw/pxa2xx_dma.c
    M hw/pxa2xx_gpio.c
    M hw/pxa2xx_pic.c
    M hw/r2d.c
    M hw/realview.c
    M hw/realview_gic.c
    M hw/slavio_intctl.c
    M hw/sm501.c
    M hw/smc91c111.c
    M hw/spapr_pci.c
    M hw/spitz.c
    M hw/stellaris.c
    M hw/strongarm.c
    M hw/sun4m.c
    M hw/sun4u.c
    M hw/sysbus.c
    M hw/sysbus.h
    M hw/tusb6010.c
    M hw/versatilepb.c
    M hw/vexpress.c
    M hw/xilinx.h
    M hw/xilinx_zynq.c
    M hw/xtensa_lx60.c
    M hw/zynq_slcr.c
    M target-i386/cpu.c

  Log Message:
  -----------
  sysbus: Drop sysbus_from_qdev() cast macro

Replace by SYS_BUS_DEVICE() QOM cast macro using a scripted conversion.
Avoids the old macro creeping into new code.

Resolve a Coding Style warning in openpic code.

Signed-off-by: Andreas Färber <address@hidden>
Cc: Anthony Liguori <address@hidden>
Signed-off-by: Anthony Liguori <address@hidden>


Compare: https://github.com/qemu/qemu/compare/e0f01837e104...1356b98d3e95

reply via email to

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