[Qemu-commits] [qemu/qemu] c19537: usb: async control xfer fixup

[GitHub]

  Branch: refs/heads/master
  Home:   https://github.com/qemu/qemu
  Commit: c19537a1143d493897850576394f082914f39ef1
      
https://github.com/qemu/qemu/commit/c19537a1143d493897850576394f082914f39ef1
  Author: Gerd Hoffmann <address@hidden>
  Date:   2012-08-15 (Wed, 15 Aug 2012)

  Changed paths:
    M hw/usb/core.c
    M hw/usb/host-linux.c

  Log Message:
  -----------
  usb: async control xfer fixup

Need to clear p->result after copying setup data using usb_packet_copy()
because we'll reuse the USBPacket for the data transfer.

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


  Commit: 0daf53047da0b817e40c4931580e59e73b420f41
      
https://github.com/qemu/qemu/commit/0daf53047da0b817e40c4931580e59e73b420f41
  Author: Gerd Hoffmann <address@hidden>
  Date:   2012-08-15 (Wed, 15 Aug 2012)

  Changed paths:
    M hw/usb/dev-uas.c

  Log Message:
  -----------
  usb: update uas product id

Pick other product id to fix clash with audio.

Current usage list (after applying this patch):

46f4:0001 -- usb-storage
46f4:0002 -- usb-audio
46f4:0003 -- usb-uas

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


  Commit: 6d3b6d3d2deaf682def95e3e512ad0e17f02274f
      
https://github.com/qemu/qemu/commit/6d3b6d3d2deaf682def95e3e512ad0e17f02274f
  Author: Gerd Hoffmann <address@hidden>
  Date:   2012-08-15 (Wed, 15 Aug 2012)

  Changed paths:
    M hw/usb/hcd-ehci.c

  Log Message:
  -----------
  ehci: fix Interrupt Threshold Control implementation

First, not all interrupts are subject to Interrupt Threshold Control,
some of them must be delivered without delay.

Second, Interrupt Threshold Control state must be part of vmstate,
otherwise we might loose IRQs on migration.

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


  Commit: 47d073cc3b8ad4a3ef1dba7055b35a87fa4091ff
      
https://github.com/qemu/qemu/commit/47d073cc3b8ad4a3ef1dba7055b35a87fa4091ff
  Author: Hans de Goede <address@hidden>
  Date:   2012-08-16 (Thu, 16 Aug 2012)

  Changed paths:
    M hw/usb/hcd-ehci.c

  Log Message:
  -----------
  ehci: Fix setting of halt bit from usbcmd register updates

This fixes linux guests started without any USB devices not seeing newly
plugged devices until "lsusb" is done inside the guest.

Signed-off-by: Hans de Goede <address@hidden>
Signed-off-by: Gerd Hoffmann <address@hidden>


  Commit: 7a736bfa4e0a58087054cad68a1d4b3804bbb708
      
https://github.com/qemu/qemu/commit/7a736bfa4e0a58087054cad68a1d4b3804bbb708
  Author: Kevin Wolf <address@hidden>
  Date:   2012-08-17 (Fri, 17 Aug 2012)

  Changed paths:
    M block/vmdk.c

  Log Message:
  -----------
  vmdk: Fix header structure

Commit bb45ded9 swapped gd_offset and rgd_offset. This is wrong.

Signed-off-by: Kevin Wolf <address@hidden>


  Commit: 65bd155c7356d448ffee7f89149c4d473076b0ba
      
https://github.com/qemu/qemu/commit/65bd155c7356d448ffee7f89149c4d473076b0ba
  Author: Kevin Wolf <address@hidden>
  Date:   2012-08-17 (Fri, 17 Aug 2012)

  Changed paths:
    M block/vmdk.c

  Log Message:
  -----------
  vmdk: Read footer for streamOptimized images

The footer takes precedence over the header when it exists. It contains
the real grain directory offset that is missing in the header. Without
this patch, streamOptimized images with a footer cannot be read.

Signed-off-by: Kevin Wolf <address@hidden>
Reviewed-by: Stefan Hajnoczi <address@hidden>
Reviewed-by: Jeff Cody <address@hidden>


  Commit: 48467328c6dccc9c7be6628ed0ef0810f83be2a9
      
https://github.com/qemu/qemu/commit/48467328c6dccc9c7be6628ed0ef0810f83be2a9
  Author: Kevin Wolf <address@hidden>
  Date:   2012-08-17 (Fri, 17 Aug 2012)

  Changed paths:
    M qemu-img.texi

  Log Message:
  -----------
  Documentation: Warn against qemu-img on active image

People have repeatedly expected that you can do things like snapshotting
an image with qemu-img while a qemu instance is running. Maybe we need
to consider locking the files while they are in use, but having a
warning in the qemu-img manpage is doable for 1.2 and can't hurt anyway.

Signed-off-by: Kevin Wolf <address@hidden>


  Commit: eec7f96c2cac88f59fd8c79b78a6e027df4abfb2
      
https://github.com/qemu/qemu/commit/eec7f96c2cac88f59fd8c79b78a6e027df4abfb2
  Author: Stefan Hajnoczi <address@hidden>
  Date:   2012-08-17 (Fri, 17 Aug 2012)

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

  Log Message:
  -----------
  virtio-blk: hide VIRTIO_BLK_F_CONFIG_WCE from old machine types

QEMU has a policy of keeping a stable guest device ABI.  When new guest device
features are introduced they must not change hardware info seen by existing
guests.  This is important because operating systems or applications may
"fingerprint" the hardware and refuse to run when the hardware changes.  To
always get the latest guest device ABI, run with x86 machine type "pc".

This patch hides the new VIRTIO_BLK_F_CONFIG_WCE virtio feature bit from
existing machine types.  Only pc-1.2 and later will expose this feature
by default.

For more info on the VIRTIO_BLK_F_CONFIG_WCE feature bit, see:

  commit 13e3dce068773c971ff2f19d986378c55897c4a3
  Author: Paolo Bonzini <address@hidden>
  Date:   Thu Aug 9 16:07:19 2012 +0200

      virtio-blk: support VIRTIO_BLK_F_CONFIG_WCE

      Also rename VIRTIO_BLK_F_WCACHE to VIRTIO_BLK_F_WCE for consistency with
      the spec.

      Signed-off-by: Paolo Bonzini <address@hidden>
      Signed-off-by: Kevin Wolf <address@hidden>

Anthony Liguori <address@hidden> reported:

  This broke qemu-test because it changed the pc-1.0 machine type:

  Setting guest RANDOM seed to 47167
  *** Running tests ***
  Running test /tests/finger-print.sh...                OK
  --- fingerprints/pc-1.0.x86_64        2011-12-18 13:08:40.000000000 -0600
  +++ fingerprint.txt   2012-08-12 13:30:48.000000000 -0500
  @@ -55,7 +55,7 @@
   /sys/bus/pci/devices/0000:00:06.0/subsystem_device=0x0002
   /sys/bus/pci/devices/0000:00:06.0/class=0x010000
   /sys/bus/pci/devices/0000:00:06.0/revision=0x00
  -/sys/bus/pci/devices/0000:00:06.0/virtio/host-features=0x710006d4
  +/sys/bus/pci/devices/0000:00:06.0/virtio/host-features=0x71000ed4
   /sys/class/dmi/id/bios_vendor=Bochs
   /sys/class/dmi/id/bios_date=01/01/2007
   /sys/class/dmi/id/bios_version=Bochs
  Guest fingerprint changed for pc-1.0!

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


  Commit: b20909195745c34a819aed14ae996b60ab0f591f
      
https://github.com/qemu/qemu/commit/b20909195745c34a819aed14ae996b60ab0f591f
  Author: Paolo Bonzini <address@hidden>
  Date:   2012-08-20 (Mon, 20 Aug 2012)

  Changed paths:
    M block/iscsi.c

  Log Message:
  -----------
  Revert "iscsi: Fix NULL dereferences / races between task completion and 
abort"

This reverts commit 64e69e80920d82df3fa679bc41b13770d2f99360.  The commit
returned immediately from iscsi_aio_cancel, risking corruption in case the
following happens:

    guest                  qemu                 target
  =========================================================================
    send write 1 -------->
                     send write 1 -------->
    cancel write 1 ------>
                     cancel write 1 ------>
       <------------------ cancellation processed
    send write 2 -------->
                     send write 2 -------->
                         <---------------- completed write 2
       <------------------ completed write 2
                         <---------------- completed write 1
                         <---------------- cancellation not done

Here, the guest would see write 2 superseding write 1, when in fact the
outcome could have been the opposite.  The right behavior is to return
only after the target says whether the cancellation was done or not, and
it will be implemented by the next three patches.

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


  Commit: 27cbd828c617944c0f9603763fdf4fa87e7ad923
      
https://github.com/qemu/qemu/commit/27cbd828c617944c0f9603763fdf4fa87e7ad923
  Author: Paolo Bonzini <address@hidden>
  Date:   2012-08-20 (Mon, 20 Aug 2012)

  Changed paths:
    M block/iscsi.c

  Log Message:
  -----------
  iscsi: move iscsi_schedule_bh and iscsi_readv_writev_bh_cb

Put these functions at the beginning, to avoid forward references
in the next patches.

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


  Commit: cfb3f5064af2d2e29c976e292c9472dfe9d61e31
      
https://github.com/qemu/qemu/commit/cfb3f5064af2d2e29c976e292c9472dfe9d61e31
  Author: Paolo Bonzini <address@hidden>
  Date:   2012-08-20 (Mon, 20 Aug 2012)

  Changed paths:
    M block/iscsi.c

  Log Message:
  -----------
  iscsi: simplify iscsi_schedule_bh

It is always used with the same callback, remove the argument.  And
its return value is never used, assume allocation succeeds.

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


  Commit: 1bd075f29ea6d11853475c7c42734595720c3ac6
      
https://github.com/qemu/qemu/commit/1bd075f29ea6d11853475c7c42734595720c3ac6
  Author: Paolo Bonzini <address@hidden>
  Date:   2012-08-20 (Mon, 20 Aug 2012)

  Changed paths:
    M block/iscsi.c

  Log Message:
  -----------
  iscsi: fix races between task completion and abort

This patch fixes two main issues with block/iscsi.c:

1) iscsi_task_mgmt_abort_task_async calls iscsi_scsi_task_cancel which
was also directly called in iscsi_aio_cancel

2) a race between task completion and task abortion could happen cause
the scsi_free_scsi_task were done before iscsi_schedule_bh has finished.
To fix this, all the freeing of IscsiTasks and releasing of the AIOCBs
is centralized in iscsi_bh_cb, independent of whether the SCSI command
has completed or was cancelled.

3) iscsi_aio_cancel was not synchronously waiting for the end of the
command.

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


  Commit: 07a5298c3067ed63f7d82d8c1a6f479146447289
      
https://github.com/qemu/qemu/commit/07a5298c3067ed63f7d82d8c1a6f479146447289
  Author: Paolo Bonzini <address@hidden>
  Date:   2012-08-20 (Mon, 20 Aug 2012)

  Changed paths:
    M hw/pc_piix.c
    M hw/virtio-scsi.c
    M hw/virtio-scsi.h

  Log Message:
  -----------
  virtio-scsi: add backwards-compatibility properties for 1.1 and earlier 
machines

Hotplug and parameter change are new in 1.2, disable them via compat
properties for pc-1.1 and earlier.

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


  Commit: e36c87667aa2204a3f19efe7bbcb6eb41f098e40
      
https://github.com/qemu/qemu/commit/e36c87667aa2204a3f19efe7bbcb6eb41f098e40
  Author: Stefan Weil <address@hidden>
  Date:   2012-08-20 (Mon, 20 Aug 2012)

  Changed paths:
    M qapi/opts-visitor.c

  Log Message:
  -----------
  qapi: Fix memory leak

valgrind report:

==24534== 232 bytes in 2 blocks are definitely lost in loss record 1,245 of 
1,601
==24534==    at 0x4824F20: malloc (vg_replace_malloc.c:236)
==24534==    by 0x293C88: malloc_and_trace (vl.c:2281)
==24534==    by 0x489AD99: ??? (in /lib/libglib-2.0.so.0.2400.1)
==24534==    by 0x489B23B: g_malloc0 (in /lib/libglib-2.0.so.0.2400.1)
==24534==    by 0x2B4EFC: opts_visitor_new (opts-visitor.c:376)
==24534==    by 0x29DEA5: net_client_init (net.c:708)
==24534==    by 0x29E6C7: net_init_client (net.c:966)
==24534==    by 0x2C2179: qemu_opts_foreach (qemu-option.c:1114)
==24534==    by 0x29E85B: net_init_clients (net.c:1008)
==24534==    by 0x296F40: main (vl.c:3463)

Signed-off-by: Stefan Weil <address@hidden>
Reviewed-by: Laszlo Ersek <address@hidden>
Signed-off-by: Luiz Capitulino <address@hidden>


  Commit: b2dc64c391843f6499069f0ba77ad0a8c9560c86
      
https://github.com/qemu/qemu/commit/b2dc64c391843f6499069f0ba77ad0a8c9560c86
  Author: Blue Swirl <address@hidden>
  Date:   2012-08-20 (Mon, 20 Aug 2012)

  Changed paths:
    M monitor.c

  Log Message:
  -----------
  monitor: avoid declaring unused variables

Some variables are only used on !win32, declare
them only when used.

This avoids a warning in mingw32 build:
  CC    i386-softmmu/monitor.o
/src/qemu/monitor.c: In function 'monitor_fdset_get_fd':
/src/qemu/monitor.c:2575: warning: unused variable 'mon_fd_flags'
/src/qemu/monitor.c:2574: warning: unused variable 'mon_fdset_fd'
/src/qemu/monitor.c:2573: warning: unused variable 'mon_fdset'

Signed-off-by: Blue Swirl <address@hidden>
Reviewed-by: Stefan Weil <address@hidden>
Signed-off-by: Luiz Capitulino <address@hidden>


  Commit: 7aa939af39e20eeca98fced59708a87c64267f54
      
https://github.com/qemu/qemu/commit/7aa939af39e20eeca98fced59708a87c64267f54
  Author: Juan Quintela <address@hidden>
  Date:   2012-08-21 (Tue, 21 Aug 2012)

  Changed paths:
    M hmp.c
    M migration.c
    M qapi-schema.json
    M qmp-commands.hx

  Log Message:
  -----------
  migration: move total_time from ram stats to migration info

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


  Commit: 27b7652ef515bb4c694f79d657d2052c72b19536
      
https://github.com/qemu/qemu/commit/27b7652ef515bb4c694f79d657d2052c72b19536
  Author: Frediano Ziglio <address@hidden>
  Date:   2012-08-22 (Wed, 22 Aug 2012)

  Changed paths:
    M xen-mapcache.c

  Log Message:
  -----------
  Fix invalidate if memory requested was not bucket aligned

When memory is mapped in qemu_map_cache with lock != 0 a reverse mapping
is created pointing to the virtual address of location requested.
The cached mapped entry is saved in last_address_vaddr with the memory
location of the base virtual address (without bucket offset).
However when this entry is invalidated the virtual address saved in the
reverse mapping is used. This cause that the mapping is freed but the
last_address_vaddr is not reset.

Signed-off-by: Frediano Ziglio <address@hidden>
Signed-off-by: Stefano Stabellini <address@hidden>


  Commit: 14d40183725361e6350166099556c7661063921b
      
https://github.com/qemu/qemu/commit/14d40183725361e6350166099556c7661063921b
  Author: Dongxiao Xu <address@hidden>
  Date:   2012-08-22 (Wed, 22 Aug 2012)

  Changed paths:
    M xen-all.c

  Log Message:
  -----------
  xen-all.c: fix multiply issue for int and uint types

If the two multiply operands are int and uint types separately,
the int type will be transformed to uint firstly, which is not the
intent in our code piece. The fix is to add (int64_t) transform
for the uint type before the multiply.

Signed-off-by: Dongxiao Xu <address@hidden>
Signed-off-by: Stefano Stabellini <address@hidden>


  Commit: b6825cd79cdf3e2006c22bb8cfe47a0d7c5209fa
      
https://github.com/qemu/qemu/commit/b6825cd79cdf3e2006c22bb8cfe47a0d7c5209fa
  Author: Anthony Liguori <address@hidden>
  Date:   2012-08-22 (Wed, 22 Aug 2012)

  Changed paths:
    M hw/usb/core.c
    M hw/usb/dev-uas.c
    M hw/usb/hcd-ehci.c
    M hw/usb/host-linux.c

  Log Message:
  -----------
  Merge remote-tracking branch 'kraxel/usb.59' into staging

* kraxel/usb.59:
  ehci: Fix setting of halt bit from usbcmd register updates
  ehci: fix Interrupt Threshold Control implementation
  usb: update uas product id
  usb: async control xfer fixup


  Commit: 7b2f89c435f895431d55b675dc412275c2069314
      
https://github.com/qemu/qemu/commit/7b2f89c435f895431d55b675dc412275c2069314
  Author: Anthony Liguori <address@hidden>
  Date:   2012-08-22 (Wed, 22 Aug 2012)

  Changed paths:
    M block/vmdk.c
    M hw/virtio-blk.h
    M hw/virtio-pci.c
    M qemu-img.texi

  Log Message:
  -----------
  Merge remote-tracking branch 'kwolf/for-anthony' into staging

* kwolf/for-anthony:
  virtio-blk: hide VIRTIO_BLK_F_CONFIG_WCE from old machine types
  Documentation: Warn against qemu-img on active image
  vmdk: Read footer for streamOptimized images
  vmdk: Fix header structure

Conflicts:
        hw/virtio-blk.c


  Commit: a9b670b139ed381bd07df08bdfdcb515dff3ca8c
      
https://github.com/qemu/qemu/commit/a9b670b139ed381bd07df08bdfdcb515dff3ca8c
  Author: Anthony Liguori <address@hidden>
  Date:   2012-08-22 (Wed, 22 Aug 2012)

  Changed paths:
    M block/iscsi.c
    M hw/pc_piix.c
    M hw/virtio-scsi.c
    M hw/virtio-scsi.h

  Log Message:
  -----------
  Merge remote-tracking branch 'bonzini/scsi-next' into staging

* bonzini/scsi-next:
  virtio-scsi: add backwards-compatibility properties for 1.1 and earlier 
machines
  iscsi: fix races between task completion and abort
  iscsi: simplify iscsi_schedule_bh
  iscsi: move iscsi_schedule_bh and iscsi_readv_writev_bh_cb
  Revert "iscsi: Fix NULL dereferences / races between task completion and 
abort"


  Commit: b100fcfe4966aa41d4d6908d0c4c510bcf8f82dd
      
https://github.com/qemu/qemu/commit/b100fcfe4966aa41d4d6908d0c4c510bcf8f82dd
  Author: Anthony Liguori <address@hidden>
  Date:   2012-08-22 (Wed, 22 Aug 2012)

  Changed paths:
    M xen-all.c
    M xen-mapcache.c

  Log Message:
  -----------
  Merge remote-tracking branch 'sstabellini/xen-fixes-20120822' into staging

* sstabellini/xen-fixes-20120822:
  xen-all.c: fix multiply issue for int and uint types
  Fix invalidate if memory requested was not bucket aligned


  Commit: 86759aa89d1307d0dda2435cc25943bcd7026686
      
https://github.com/qemu/qemu/commit/86759aa89d1307d0dda2435cc25943bcd7026686
  Author: Anthony Liguori <address@hidden>
  Date:   2012-08-22 (Wed, 22 Aug 2012)

  Changed paths:
    M hmp.c
    M migration.c
    M monitor.c
    M qapi-schema.json
    M qapi/opts-visitor.c
    M qmp-commands.hx

  Log Message:
  -----------
  Merge remote-tracking branch 'qmp/queue/qmp' into staging

* qmp/queue/qmp:
  migration: move total_time from ram stats to migration info
  monitor: avoid declaring unused variables
  qapi: Fix memory leak


Compare: https://github.com/qemu/qemu/compare/99afc91d6ccd...86759aa89d13