[Qemu-commits] [qemu/qemu] fe2daf: virtio-net: only delete bh that existed

[GitHub]

  Branch: refs/heads/master
  Home:   https://github.com/qemu/qemu
  Commit: fe2dafa02de4f80ab36f6e0f4ddfcd6418c03c49
      
https://github.com/qemu/qemu/commit/fe2dafa02de4f80ab36f6e0f4ddfcd6418c03c49
  Author: Jason Wang <address@hidden>
  Date:   2013-11-06 (Wed, 06 Nov 2013)

  Changed paths:
    M hw/net/virtio-net.c

  Log Message:
  -----------
  virtio-net: only delete bh that existed

We delete without check whether it existed during exit. This will lead NULL
pointer deference since it was created conditionally depends on guest driver
status and features. So add a check of existence before trying to delete it.

Cc: address@hidden
Signed-off-by: Jason Wang <address@hidden>
Reviewed-by: Michael S. Tsirkin <address@hidden>
Message-id: address@hidden
Signed-off-by: Anthony Liguori <address@hidden>


  Commit: cd5be5829c1ce87aa6b3a7806524fac07ac9a757
      
https://github.com/qemu/qemu/commit/cd5be5829c1ce87aa6b3a7806524fac07ac9a757
  Author: Amos Kong <address@hidden>
  Date:   2013-11-06 (Wed, 06 Nov 2013)

  Changed paths:
    M hw/net/e1000.c
    M hw/net/rtl8139.c

  Log Message:
  -----------
  e1000/rtl8139: update HMP NIC when every bit is written

We currently just update the HMP NIC info when the last bit of macaddr
is written. This assumes that guest driver will write all the macaddr
from bit 0 to bit 5 when it changes the macaddr, this is the current
behavior of linux driver (e1000/rtl8139cp), but we can't do this
assumption.

The macaddr that is used for rx-filter will be updated when every bit
is changed. This patch updates the e1000/rtl8139 nic to update HMP NIC
info when every bit is changed. It will be same as virtio-net.

Signed-off-by: Amos Kong <address@hidden>
Reviewed-by: Alex Williamson <address@hidden>
Message-id: address@hidden
Signed-off-by: Anthony Liguori <address@hidden>


  Commit: 5f3e31012e334f3410e04abae7f88565df17c91a
      
https://github.com/qemu/qemu/commit/5f3e31012e334f3410e04abae7f88565df17c91a
  Author: Paolo Bonzini <address@hidden>
  Date:   2013-11-06 (Wed, 06 Nov 2013)

  Changed paths:
    M cpus.c

  Log Message:
  -----------
  timers: fix stop/cont with -icount

Stop/cont commands are broken with -icount due to a deadlock.  The
real problem is that the computation of timers_state.cpu_ticks_offset
makes no sense with -icount enabled: we set it to an icount clock value
in cpu_disable_ticks, and subtract a TSC (or similar, whatever
cpu_get_real_ticks happens to return) value in cpu_enable_ticks.

The fix is simple.  timers_state.cpu_ticks_offset is only used
together with cpu_get_real_ticks, so we can use cpu_get_real_ticks
in cpu_disable_ticks.  There is no need to update cpu_ticks_prev
at the time cpu_disable_ticks is called; instead, we can do it
the next time cpu_get_ticks is called.

The change to cpu_disable_ticks is the important part of the patch.
The rest modifies the code to always check timers_state.cpu_ticks_prev,
even when the ticks are not advancing (i.e. the VM is stopped).  It also
makes a similar change to cpu_get_clock_locked, so that the code remains
similar for cpu_get_ticks and cpu_get_clock_locked.

Signed-off-by: Paolo Bonzini <address@hidden>
Message-id: address@hidden
Signed-off-by: Anthony Liguori <address@hidden>


  Commit: 898ae2846de4dcb19da0b80f99ef2215dd137e56
      
https://github.com/qemu/qemu/commit/898ae2846de4dcb19da0b80f99ef2215dd137e56
  Author: Lei Li <address@hidden>
  Date:   2013-11-06 (Wed, 06 Nov 2013)

  Changed paths:
    M ui/sdl.c

  Log Message:
  -----------
  sdl: Reverse support for video mode setting

Currently, If the setting of video mode failed, qemu will exit. It
should go back to the previous setting if the new screen resolution
failed. This patch fixes LP#1216368, add support to revert to existing
surface for the failure of video mode setting.

Reported-by: Sascha Krissler <address@hidden>
Signed-off-by: Lei Li <address@hidden>
Reviewed-by: Paolo Bonzini <address@hidden>
Message-id: address@hidden
Signed-off-by: Anthony Liguori <address@hidden>


  Commit: 964668b03d26f0b5baa5e5aff0c966f4fcb76e9e
      
https://github.com/qemu/qemu/commit/964668b03d26f0b5baa5e5aff0c966f4fcb76e9e
  Author: Anthony Liguori <address@hidden>
  Date:   2013-11-06 (Wed, 06 Nov 2013)

  Changed paths:
    M VERSION

  Log Message:
  -----------
  Update version for 1.7.0-rc0 release

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


Compare: https://github.com/qemu/qemu/compare/c2d30667760e...964668b03d26