[Qemu-commits] [qemu/qemu] b89049: net: fix infinite loop on exit

[GitHub]

  Branch: refs/heads/master
  Home:   https://github.com/qemu/qemu
  Commit: b890492110ccdc943554231d40b67d29fef6af82
      
https://github.com/qemu/qemu/commit/b890492110ccdc943554231d40b67d29fef6af82
  Author: Michael Roth <address@hidden>
  Date:   2013-02-07 (Thu, 07 Feb 2013)

  Changed paths:
    M net/net.c

  Log Message:
  -----------
  net: fix infinite loop on exit

1ceef9f27359cbe92ef124bf74de6f792e71f6fb added handling for cleaning
up multiple queues in qemu_del_nic() for cases where multiqueue is in
use. To determine the number of queues it looks at nic->conf->queues,
then iterates through all the queues to cleanup the associated
NetClientStates. If no queues are found, no NetClientStates are deleted.

However, nic->conf->queues is only set when a peer is created via
-netdev or netdev_add, and is otherwise 0. This causes us to spin in
net_cleanup() if we attempt to shut down qemu before adding a host
device.

Since qemu_new_nic() unconditionally creates at least 1
queue/NetClientState at queue idx 0, make qemu_del_nic() always attempt
to clean it up.

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


  Commit: 1e89ad5b00ba0426d4e949c9e6ce2926c15b81b7
      
https://github.com/qemu/qemu/commit/1e89ad5b00ba0426d4e949c9e6ce2926c15b81b7
  Author: Anthony Liguori <address@hidden>
  Date:   2013-02-08 (Fri, 08 Feb 2013)

  Changed paths:
    M hw/s390x/s390-virtio-bus.c
    M hw/s390x/virtio-ccw.c
    M hw/virtio-net.c
    M hw/virtio-pci.c
    M hw/virtio.h

  Log Message:
  -----------
  virtio-net: pass host features to virtio_net_init

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


  Commit: 14f9b664b34bbd37a488cb5c762aa278c60e1fb6
      
https://github.com/qemu/qemu/commit/14f9b664b34bbd37a488cb5c762aa278c60e1fb6
  Author: Jesse Larrew <address@hidden>
  Date:   2013-02-08 (Fri, 08 Feb 2013)

  Changed paths:
    M hw/virtio-net.c

  Log Message:
  -----------
  hw/virtio-net.c: set config size using host features

Currently, the config size for virtio devices is hard coded. When a new
feature is added that changes the config size, drivers that assume a static
config size will break. For purposes of backward compatibility, there needs
to be a way to inform drivers of the config size needed to accommodate the
set of features enabled.

aliguori: merged in
 - hw/virtio-net: use existing macros to implement endof
 - hw/virtio-net: fix config_size data type

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


  Commit: 32ab06bcf1352848eec42629a85e20efa4e105dc
      
https://github.com/qemu/qemu/commit/32ab06bcf1352848eec42629a85e20efa4e105dc
  Author: Jesse Larrew <address@hidden>
  Date:   2013-02-08 (Fri, 08 Feb 2013)

  Changed paths:
    M hw/virtio-net.h

  Log Message:
  -----------
  hw/virtio-net: disable multiqueue by default

The new multiqueue feature adds fields to the virtio device config, which
breaks Windows guests. Disable the feature by default until the Windows
drivers are fixed.

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


  Commit: 0eb256a2173d35c64696189adcd3599be61922ef
      
https://github.com/qemu/qemu/commit/0eb256a2173d35c64696189adcd3599be61922ef
  Author: Paolo Bonzini <address@hidden>
  Date:   2013-02-08 (Fri, 08 Feb 2013)

  Changed paths:
    M qemu-nbd.texi

  Log Message:
  -----------
  qemu-nbd: document --cache and --aio options

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


  Commit: fb6d1bbd246c7a57ef53d3847ef225cd1349d602
      
https://github.com/qemu/qemu/commit/fb6d1bbd246c7a57ef53d3847ef225cd1349d602
  Author: Stefan Hajnoczi <address@hidden>
  Date:   2013-02-08 (Fri, 08 Feb 2013)

  Changed paths:
    M block/curl.c

  Log Message:
  -----------
  block/curl: disable extra protocols to prevent CVE-2013-0249

There is a buffer overflow in libcurl POP3/SMTP/IMAP.  The workaround is
simple: disable extra protocols so that they cannot be exploited.  Full
details here:

  http://curl.haxx.se/docs/adv_20130206.html

QEMU only cares about HTTP, HTTPS, FTP, FTPS, and TFTP.  I have tested
that this fix prevents the exploit on my host with
libcurl-7.27.0-5.fc18.

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


  Commit: 70ef6a5b7121cb54d7f9713d6315fb8547761bfc
      
https://github.com/qemu/qemu/commit/70ef6a5b7121cb54d7f9713d6315fb8547761bfc
  Author: Liming Wang <address@hidden>
  Date:   2013-02-08 (Fri, 08 Feb 2013)

  Changed paths:
    M hw/xilinx_zynq.c

  Log Message:
  -----------
  xilinx_zynq: Fix wrong IRQ number of the second EHCI controller

The IRQ number of the second EHCI controller should be 76, not 75.

Signed-off-by: Liming Wang <address@hidden>
Tested-by: Peter Crosthwaite <address@hidden>
Signed-off-by: Anthony Liguori <address@hidden>


Compare: https://github.com/qemu/qemu/compare/ecd8d4715ea3...70ef6a5b7121