[Qemu-commits] [qemu/qemu] 313767: usb-storage: Fix how legacy init hand

qemu-commits
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-commits] [qemu/qemu] 313767: usb-storage: Fix how legacy init hand

From:	GitHub
Subject:	[Qemu-commits] [qemu/qemu] 313767: usb-storage: Fix how legacy init handles option ID...
Date:	Tue, 23 Sep 2014 09:00:09 -0700
  Branch: refs/heads/master
  Home:   https://github.com/qemu/qemu
  Commit: 31376776d045c7ee0a1570c139ef30b6cb8f5b01
      
https://github.com/qemu/qemu/commit/31376776d045c7ee0a1570c139ef30b6cb8f5b01
  Author: Markus Armbruster <address@hidden>
  Date:   2014-09-22 (Mon, 22 Sep 2014)

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

  Log Message:
  -----------
  usb-storage: Fix how legacy init handles option ID clash

usb_msd_init() calls qemu_opts_create() with a made-up ID and false
fail_if_exists.  If the ID already exists, it happily messes up those
options, then fails drive_new(), because the BlockDriverState with
that ID already exists, too.

Reproducer: -drive if=none,id=usb0,format=raw -usbdevice disk:tmp.qcow2

Pass true fail_if_exists to qemu_opts_create(), and if it fails, try
the next made-up ID.

The reproducer now succeeds, and creates an usb-storage device with ID
usb1.

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


  Commit: f0bc7fe3b75d2ae4aedb6da6f68ebb87f77d929b
      
https://github.com/qemu/qemu/commit/f0bc7fe3b75d2ae4aedb6da6f68ebb87f77d929b
  Author: Gonglei <address@hidden>
  Date:   2014-09-23 (Tue, 23 Sep 2014)

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

  Log Message:
  -----------
  usb-storage: fix possible memory leak and missing error message

When scsi_bus_legacy_add_drive() return NULL, meanwhile err will
be not NULL, which will casue memory leak and missing error message.

Cc: Markus Armbruster <address@hidden>
Signed-off-by: Gonglei <address@hidden>
Reviewed-by: Paolo Bonzini <address@hidden>
Signed-off-by: Gerd Hoffmann <address@hidden>


  Commit: dc1f5988454d9dac8b9ba0c35266c8b4bc33ffa1
      
https://github.com/qemu/qemu/commit/dc1f5988454d9dac8b9ba0c35266c8b4bc33ffa1
  Author: Alexey Kardashevskiy <address@hidden>
  Date:   2014-09-23 (Tue, 23 Sep 2014)

  Changed paths:
    M hw/usb/hcd-ohci.c
    M trace-events

  Log Message:
  -----------
  ohci: Convert fprint/DPRINTF/print to traces

This converts many kinds of debug prints to traces.

This implements packets logging to avoid unnecessary calculations if
usb_ohci_td_pkt_short/usb_ohci_td_pkt_long is not enabled.

This makes OHCI errors (such as "DMA error") invisible by default.

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


  Commit: 7d553f27fce284805d7f94603932045ee3bbb979
      
https://github.com/qemu/qemu/commit/7d553f27fce284805d7f94603932045ee3bbb979
  Author: Gonglei <address@hidden>
  Date:   2014-09-23 (Tue, 23 Sep 2014)

  Changed paths:
    M hw/usb/bus.c
    M hw/usb/dev-serial.c
    M hw/usb/dev-storage.c
    M hw/usb/host-libusb.c
    M hw/usb/redirect.c
    M include/hw/usb.h

  Log Message:
  -----------
  usb-bus: convert USBDeviceClass init to realize

Add "realize/unrealize" in USBDeviceClass, which has errp
as a parameter. So all the implementations now use
error_setg instead of error_report for reporting error.

Note: this patch still keep "init" in USBDeviceClass, and
call kclass->init in usb_device_realize(), avoid breaking
git bisect. After realize all usb devices, will be removed.

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


  Commit: d73ad359901c9b8ee7b4f1df0124956a0a4c853b
      
https://github.com/qemu/qemu/commit/d73ad359901c9b8ee7b4f1df0124956a0a4c853b
  Author: Gonglei <address@hidden>
  Date:   2014-09-23 (Tue, 23 Sep 2014)

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

  Log Message:
  -----------
  usb-net: convert init to realize

meanwhile, qerror_report_err() is a transitional interface to
help with converting existing HMP commands to QMP. It should
not be used elsewhere.

Signed-off-by: Gonglei <address@hidden>
Reviewed-by: Paolo Bonzini <address@hidden>
Signed-off-by: Gerd Hoffmann <address@hidden>


  Commit: 2aa76dc18c38e6965df99faac94061a1c83b2fef
      
https://github.com/qemu/qemu/commit/2aa76dc18c38e6965df99faac94061a1c83b2fef
  Author: Gonglei <address@hidden>
  Date:   2014-09-23 (Tue, 23 Sep 2014)

  Changed paths:
    M hw/usb/host-libusb.c

  Log Message:
  -----------
  libusb: convert init to realize

In this way, all the implementations now use
error_setg instead of error_report for reporting error.

Signed-off-by: Gonglei <address@hidden>
Reviewed-by: Paolo Bonzini <address@hidden>
Signed-off-by: Gerd Hoffmann <address@hidden>


  Commit: 2e6a0dd1ac45f98f02ebc8c954d9e5e36c7a47fb
      
https://github.com/qemu/qemu/commit/2e6a0dd1ac45f98f02ebc8c954d9e5e36c7a47fb
  Author: Gonglei <address@hidden>
  Date:   2014-09-23 (Tue, 23 Sep 2014)

  Changed paths:
    M hw/usb/host-libusb.c

  Log Message:
  -----------
  libusb: using error_report instead of fprintf

Signed-off-by: Gonglei <address@hidden>
Reviewed-by: Paolo Bonzini <address@hidden>
Signed-off-by: Gerd Hoffmann <address@hidden>


  Commit: f3f8c45972b9d8697e1a2f8bee1b3a1001b2afbf
      
https://github.com/qemu/qemu/commit/f3f8c45972b9d8697e1a2f8bee1b3a1001b2afbf
  Author: Gonglei <address@hidden>
  Date:   2014-09-23 (Tue, 23 Sep 2014)

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

  Log Message:
  -----------
  usb-hub: convert init to realize

In this way, all the implementations now use
error_setg instead of error_report for reporting error.

Signed-off-by: Gonglei <address@hidden>
Reviewed-by: Paolo Bonzini <address@hidden>
Signed-off-by: Gerd Hoffmann <address@hidden>


  Commit: 5a882e40d57e791316ac88127f0576a1d518c2f9
      
https://github.com/qemu/qemu/commit/5a882e40d57e791316ac88127f0576a1d518c2f9
  Author: Gonglei <address@hidden>
  Date:   2014-09-23 (Tue, 23 Sep 2014)

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

  Log Message:
  -----------
  dev-storage: convert init to realize

In this way, all the implementations now use
error_setg instead of error_report for reporting error.

Signed-off-by: Gonglei <address@hidden>
Reviewed-by: Paolo Bonzini <address@hidden>
Signed-off-by: Gerd Hoffmann <address@hidden>


  Commit: f5dc59787849d135c5e24752379b5e487b6523cc
      
https://github.com/qemu/qemu/commit/f5dc59787849d135c5e24752379b5e487b6523cc
  Author: Gonglei <address@hidden>
  Date:   2014-09-23 (Tue, 23 Sep 2014)

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

  Log Message:
  -----------
  dev-storage: usring error_report instead of fprintf/printf

Signed-off-by: Gonglei <address@hidden>
Reviewed-by: Paolo Bonzini <address@hidden>
Signed-off-by: Gerd Hoffmann <address@hidden>


  Commit: b89dc7e33fa7ef04d9aa69ce3a9317a0acfcbc19
      
https://github.com/qemu/qemu/commit/b89dc7e33fa7ef04d9aa69ce3a9317a0acfcbc19
  Author: Gonglei <address@hidden>
  Date:   2014-09-23 (Tue, 23 Sep 2014)

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

  Log Message:
  -----------
  dev-uas: convert init to realize

Signed-off-by: Gonglei <address@hidden>
Reviewed-by: Paolo Bonzini <address@hidden>
Signed-off-by: Gerd Hoffmann <address@hidden>


  Commit: 6b7afb7f0b842018781aa26a3b325429a8c91f2a
      
https://github.com/qemu/qemu/commit/6b7afb7f0b842018781aa26a3b325429a8c91f2a
  Author: Gonglei <address@hidden>
  Date:   2014-09-23 (Tue, 23 Sep 2014)

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

  Log Message:
  -----------
  dev-uas: using error_report instead of fprintf

Signed-off-by: Gonglei <address@hidden>
Reviewed-by: Paolo Bonzini <address@hidden>
Signed-off-by: Gerd Hoffmann <address@hidden>


  Commit: 63cdca364c84f174271c7d6756091895dadd71f4
      
https://github.com/qemu/qemu/commit/63cdca364c84f174271c7d6756091895dadd71f4
  Author: Gonglei <address@hidden>
  Date:   2014-09-23 (Tue, 23 Sep 2014)

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

  Log Message:
  -----------
  dev-bluetooth: convert init to realize

Signed-off-by: Gonglei <address@hidden>
Reviewed-by: Paolo Bonzini <address@hidden>
Signed-off-by: Gerd Hoffmann <address@hidden>


  Commit: 38fff2c9f4f9173e8b985fcdf6c2bb8a56712993
      
https://github.com/qemu/qemu/commit/38fff2c9f4f9173e8b985fcdf6c2bb8a56712993
  Author: Gonglei <address@hidden>
  Date:   2014-09-23 (Tue, 23 Sep 2014)

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

  Log Message:
  -----------
  dev-serial: convert init to realize

In this way, all the implementations now use
error_setg instead of error_report for reporting error.

Signed-off-by: Gonglei <address@hidden>
Reviewed-by: Paolo Bonzini <address@hidden>
Signed-off-by: Gerd Hoffmann <address@hidden>


  Commit: 0b8b863fb23832be99d2c8bdacc5b44ed575fbbb
      
https://github.com/qemu/qemu/commit/0b8b863fb23832be99d2c8bdacc5b44ed575fbbb
  Author: Gonglei <address@hidden>
  Date:   2014-09-23 (Tue, 23 Sep 2014)

  Changed paths:
    M hw/usb/dev-smartcard-reader.c

  Log Message:
  -----------
  usb-ccid: convert init to realize

Signed-off-by: Gonglei <address@hidden>
Reviewed-by: Paolo Bonzini <address@hidden>
Signed-off-by: Gerd Hoffmann <address@hidden>


  Commit: 276b7ac8e9f508c91ecc59b848add33781724d0e
      
https://github.com/qemu/qemu/commit/276b7ac8e9f508c91ecc59b848add33781724d0e
  Author: Gonglei <address@hidden>
  Date:   2014-09-23 (Tue, 23 Sep 2014)

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

  Log Message:
  -----------
  dev-hid: convert init to realize

In this way, all the implementations now use
error_setg instead of error_report for reporting error.

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


  Commit: 27107d416e7c0b37252f5475641f0ca51036915c
      
https://github.com/qemu/qemu/commit/27107d416e7c0b37252f5475641f0ca51036915c
  Author: Gonglei <address@hidden>
  Date:   2014-09-23 (Tue, 23 Sep 2014)

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

  Log Message:
  -----------
  dev-wacom: convert init to realize

Signed-off-by: Gonglei <address@hidden>
Reviewed-by: Paolo Bonzini <address@hidden>
Signed-off-by: Gerd Hoffmann <address@hidden>


  Commit: 5450eeaaad8e27a6cd2b5c4bd55404e50ed1426b
      
https://github.com/qemu/qemu/commit/5450eeaaad8e27a6cd2b5c4bd55404e50ed1426b
  Author: Gonglei <address@hidden>
  Date:   2014-09-23 (Tue, 23 Sep 2014)

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

  Log Message:
  -----------
  usb-audio: convert init to realize

Signed-off-by: Gonglei <address@hidden>
Reviewed-by: Paolo Bonzini <address@hidden>
Signed-off-by: Gerd Hoffmann <address@hidden>


  Commit: 77e35b4bbe8ac2cfa3545c9f3ad3d8716b60ddf2
      
https://github.com/qemu/qemu/commit/77e35b4bbe8ac2cfa3545c9f3ad3d8716b60ddf2
  Author: Gonglei <address@hidden>
  Date:   2014-09-23 (Tue, 23 Sep 2014)

  Changed paths:
    M hw/usb/redirect.c

  Log Message:
  -----------
  usb-redir: convert init to realize

In this way, all the implementations now use
error_setg instead of qerror_report for reporting error.

Signed-off-by: Gonglei <address@hidden>
Reviewed-by: Paolo Bonzini <address@hidden>
Signed-off-by: Gerd Hoffmann <address@hidden>


  Commit: df9bb6660d922bcd4197791bb3b2c10e49ef55de
      
https://github.com/qemu/qemu/commit/df9bb6660d922bcd4197791bb3b2c10e49ef55de
  Author: Gonglei <address@hidden>
  Date:   2014-09-23 (Tue, 23 Sep 2014)

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

  Log Message:
  -----------
  usb-mtp: convert init to realize

Signed-off-by: Gonglei <address@hidden>
Reviewed-by: Paolo Bonzini <address@hidden>
Signed-off-by: Gerd Hoffmann <address@hidden>


  Commit: bd2ba2752d860d5a0b4f328332c3e0b79d275de8
      
https://github.com/qemu/qemu/commit/bd2ba2752d860d5a0b4f328332c3e0b79d275de8
  Author: Gonglei <address@hidden>
  Date:   2014-09-23 (Tue, 23 Sep 2014)

  Changed paths:
    M hw/usb/bus.c
    M include/hw/usb.h

  Log Message:
  -----------
  usb-bus: remove "init" from USBDeviceClass struct

All usb-bus devices are realized by realize(),
remove init callback function from USBDeviceClass struct.

Signed-off-by: Gonglei <address@hidden>
Reviewed-by: Paolo Bonzini <address@hidden>
Signed-off-by: Gerd Hoffmann <address@hidden>


  Commit: 594a53607e5bd4a2b7555a7a2908d2c406fea9aa
      
https://github.com/qemu/qemu/commit/594a53607e5bd4a2b7555a7a2908d2c406fea9aa
  Author: Gonglei <address@hidden>
  Date:   2014-09-23 (Tue, 23 Sep 2014)

  Changed paths:
    M hw/usb/bus.c
    M include/hw/usb.h

  Log Message:
  -----------
  usb-bus: introduce a wrapper function to check speed

In this way, we can check speed directly, don't need
call usb_device_attach(), which has other conditions,
such as checking the chardev is open.

Signed-off-by: Gonglei <address@hidden>
Reviewed-by: Paolo Bonzini <address@hidden>
Signed-off-by: Gerd Hoffmann <address@hidden>


  Commit: 7334d6507a7578152bb7addcef84e4cf634814a4
      
https://github.com/qemu/qemu/commit/7334d6507a7578152bb7addcef84e4cf634814a4
  Author: Gonglei <address@hidden>
  Date:   2014-09-23 (Tue, 23 Sep 2014)

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

  Log Message:
  -----------
  usb-serial: only check speed once at realize time

Whatever the chardev is open or not, we should assure
the speed is matched each other. So, call usb_check_attach()
check speed. And then pass &error_abort at all calls to
usb_device_attach().

Signed-off-by: Gonglei <address@hidden>
Reviewed-by: Paolo Bonzini <address@hidden>
Signed-off-by: Gerd Hoffmann <address@hidden>


  Commit: 3533c3d2bfcfe151c48ed73fc49590f303cdb72d
      
https://github.com/qemu/qemu/commit/3533c3d2bfcfe151c48ed73fc49590f303cdb72d
  Author: Gerd Hoffmann <address@hidden>
  Date:   2014-09-23 (Tue, 23 Sep 2014)

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

  Log Message:
  -----------
  usb: tag xhci as hotpluggable

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


  Commit: 638ca939d80886545b1b279be240e511da16584f
      
https://github.com/qemu/qemu/commit/638ca939d80886545b1b279be240e511da16584f
  Author: Gerd Hoffmann <address@hidden>
  Date:   2014-09-23 (Tue, 23 Sep 2014)

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

  Log Message:
  -----------
  usb: tag standalone uhci as hotpluggable

uhci hostadapters in companion setups can't be hotplugged.  So leave
hotplug disabled for all ich9 variants (which are already tagged with
unplug = true in the info struct).  For the other variants we'll enable
hotplug and remove the companion setup properties.

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


  Commit: ec56214f6f23c1e2f78de6afa6835acc35fc03ed
      
https://github.com/qemu/qemu/commit/ec56214f6f23c1e2f78de6afa6835acc35fc03ed
  Author: Gerd Hoffmann <address@hidden>
  Date:   2014-09-23 (Tue, 23 Sep 2014)

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

  Log Message:
  -----------
  usb: tag standalone ehci as hotpluggable

Add a flag to EHCIPCIInfo saying whenever the controller supports
companions or not.  Make sure we only allow registering companions for
ehci versions supporting that.  Enable pci hotplug for the ehci
variants not supporting companions.

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


  Commit: 769188d3bbf95ce8d96a335624234dad083f4db6
      
https://github.com/qemu/qemu/commit/769188d3bbf95ce8d96a335624234dad083f4db6
  Author: Peter Maydell <address@hidden>
  Date:   2014-09-23 (Tue, 23 Sep 2014)

  Changed paths:
    M hw/usb/bus.c
    M hw/usb/dev-audio.c
    M hw/usb/dev-bluetooth.c
    M hw/usb/dev-hid.c
    M hw/usb/dev-hub.c
    M hw/usb/dev-mtp.c
    M hw/usb/dev-network.c
    M hw/usb/dev-serial.c
    M hw/usb/dev-smartcard-reader.c
    M hw/usb/dev-storage.c
    M hw/usb/dev-uas.c
    M hw/usb/dev-wacom.c
    M hw/usb/hcd-ehci-pci.c
    M hw/usb/hcd-ehci.c
    M hw/usb/hcd-ehci.h
    M hw/usb/hcd-ohci.c
    M hw/usb/hcd-uhci.c
    M hw/usb/hcd-xhci.c
    M hw/usb/host-libusb.c
    M hw/usb/redirect.c
    M include/hw/usb.h
    M trace-events

  Log Message:
  -----------
  Merge remote-tracking branch 'remotes/kraxel/tags/pull-usb-20140923-1' into 
staging

usb: enable hotplug, switch to realize, ohci tracing, misc fixes.

# gpg: Signature made Tue 23 Sep 2014 12:42:29 BST using RSA key ID D3E87138
# gpg: Good signature from "Gerd Hoffmann (work) <address@hidden>"
# gpg:                 aka "Gerd Hoffmann <address@hidden>"
# gpg:                 aka "Gerd Hoffmann (private) <address@hidden>"

* remotes/kraxel/tags/pull-usb-20140923-1: (26 commits)
  usb: tag standalone ehci as hotpluggable
  usb: tag standalone uhci as hotpluggable
  usb: tag xhci as hotpluggable
  usb-serial: only check speed once at realize time
  usb-bus: introduce a wrapper function to check speed
  usb-bus: remove "init" from USBDeviceClass struct
  usb-mtp: convert init to realize
  usb-redir: convert init to realize
  usb-audio: convert init to realize
  dev-wacom: convert init to realize
  dev-hid: convert init to realize
  usb-ccid: convert init to realize
  dev-serial: convert init to realize
  dev-bluetooth: convert init to realize
  dev-uas: using error_report instead of fprintf
  dev-uas: convert init to realize
  dev-storage: usring error_report instead of fprintf/printf
  dev-storage: convert init to realize
  usb-hub: convert init to realize
  libusb: using error_report instead of fprintf
  ...

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


Compare: https://github.com/qemu/qemu/compare/cad684c5386e...769188d3bbf9
[Prev in Thread]
Current Thread
[Next in Thread]
[Qemu-commits] [qemu/qemu] 313767: usb-storage: Fix how legacy init handles option ID..., GitHub <=
Prev by Date: [Qemu-commits] [qemu/qemu] 450749: s390x: remove duplicate defines in SCLP code
Next by Date: [Qemu-commits] [qemu/qemu] 01f7ce: slirp: udp: fix NULL pointer dereference because o...
Previous by thread: [Qemu-commits] [qemu/qemu] 450749: s390x: remove duplicate defines in SCLP code
Next by thread: [Qemu-commits] [qemu/qemu] 01f7ce: slirp: udp: fix NULL pointer dereference because o...
Index(es):
- Date
- Thread