[Qemu-commits] [qemu/qemu] 28605a: Revert "audio: fix pc speaker init"

[Peter Maydell]

  Branch: refs/heads/master
  Home:   https://github.com/qemu/qemu
  Commit: 28605a22f564860c885bde42ad91840e9aacec45
      
https://github.com/qemu/qemu/commit/28605a22f564860c885bde42ad91840e9aacec45
  Author: Gerd Hoffmann <address@hidden>
  Date:   2019-04-01 (Mon, 01 Apr 2019)

  Changed paths:
    M hw/audio/pcspk.c

  Log Message:
  -----------
  Revert "audio: fix pc speaker init"

This reverts commit bd56d378842c238c8901536c06c20a4a51ee9761.

Turned out it isn't that simple as the device needs the pit object link.
So "-device isa-pcspk" isn't going wo work anyway.  We are in freeze, so
just reverting the thing is the best way to handle this for now, trying
to come up with something better can be done in the 4.1 devel cycle.

Also add a comment noting the object link.

Reported-by: Dr. David Alan Gilbert <address@hidden>
Signed-off-by: Gerd Hoffmann <address@hidden>
Message-id: address@hidden


  Commit: 5189e30b146ab39f9da8f35a23fc3c8e30b219c2
      
https://github.com/qemu/qemu/commit/5189e30b146ab39f9da8f35a23fc3c8e30b219c2
  Author: Peter Maydell <address@hidden>
  Date:   2019-04-01 (Mon, 01 Apr 2019)

  Changed paths:
    M hw/usb/bus.c

  Log Message:
  -----------
  hw/usb/bus.c: Handle "no speed matched" case in usb_mask_to_str()

In usb_mask_to_str() we convert a mask of USB speeds into
a human-readable string (like "full+high") for use in
tracing and error messages. However the conversion code
doesn't do anything to the string buffer if the passed in
speedmask doesn't match any of the recognized speeds,
which means that the tracing and error messages will
end up with random garbage in them. This can happen if
we're doing USB device passthrough.

Handle the "unrecognized speed" case by using the
string "unknown".

Fixes: https://bugs.launchpad.net/qemu/+bug/1603785
Signed-off-by: Peter Maydell <address@hidden>
Reviewed-by: Philippe Mathieu-Daudé <address@hidden>
Message-id: address@hidden
Signed-off-by: Gerd Hoffmann <address@hidden>


  Commit: 4bc1591681cbeb4875f57fc99a4f821d032e4bd1
      
https://github.com/qemu/qemu/commit/4bc1591681cbeb4875f57fc99a4f821d032e4bd1
  Author: Bandan Das <address@hidden>
  Date:   2019-04-02 (Tue, 02 Apr 2019)

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

  Log Message:
  -----------
  usb-mtp: fix return status of delete

Spotted by Coverity: CID 1399414

mtp delete allows the return status of delete succeeded,
partial_delete or readonly - when none of the objects could be
deleted. Give more meaningful names to return values of the
delete function.

Some initiators recurse over the objects themselves. In that case,
only READ_ONLY can be returned.

Signed-off-by: Bandan Das <address@hidden>
Message-Id: <address@hidden>
Signed-off-by: Gerd Hoffmann <address@hidden>


  Commit: b396733df3554688c58678f454c34d5c07dd5ca2
      
https://github.com/qemu/qemu/commit/b396733df3554688c58678f454c34d5c07dd5ca2
  Author: Bandan Das <address@hidden>
  Date:   2019-04-02 (Tue, 02 Apr 2019)

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

  Log Message:
  -----------
  usb-mtp: remove usb_mtp_object_free_one

This function is used in the delete path only and can
be replaced by a call to usb_mtp_object_free.

Reviewed-by: Peter Maydell <address@hidden>
Signed-off-by: Bandan Das <address@hidden>
Message-Id: <address@hidden>
Signed-off-by: Gerd Hoffmann <address@hidden>


  Commit: be1092afa07794e5247eb504095fb5f2ae421ec6
      
https://github.com/qemu/qemu/commit/be1092afa07794e5247eb504095fb5f2ae421ec6
  Author: Volker Rümelin <address@hidden>
  Date:   2019-04-02 (Tue, 02 Apr 2019)

  Changed paths:
    M audio/audio.c
    M audio/audio_legacy.c

  Log Message:
  -----------
  audio: fix audio timer rate conversion bug

Currently the default audio timer frequency is 10000Hz instead of
a period of 10000us. Also the audiodev timer-period property gets
converted like a frequency. Only handling of the legacy
QEMU_AUDIO_TIMER_PERIOD environment variable is correct because
it's actually a frequency.

With this patch the property timer-period is really a timer period
and QEMU_AUDIO_TIMER_PERIOD remains a frequency.

Fixes: 71830221fb "-audiodev command line option basic implementation."
Signed-off-by: Volker Rümelin <address@hidden>
Reviewed-by: Zoltán Kővágó <address@hidden>
Message-id: address@hidden
Signed-off-by: Gerd Hoffmann <address@hidden>


  Commit: d61d1a1fb2f1db6c54651844a28389c523f3f8c7
      
https://github.com/qemu/qemu/commit/d61d1a1fb2f1db6c54651844a28389c523f3f8c7
  Author: Peter Maydell <address@hidden>
  Date:   2019-04-02 (Tue, 02 Apr 2019)

  Changed paths:
    M audio/audio.c
    M audio/audio_legacy.c
    M hw/audio/pcspk.c
    M hw/usb/bus.c
    M hw/usb/dev-mtp.c

  Log Message:
  -----------
  Merge remote-tracking branch 
'remotes/kraxel/tags/fixes-20190402-pull-request' into staging

fixes for 4.0 (audio, usb),

# gpg: Signature made Tue 02 Apr 2019 07:46:22 BST
# gpg:                using RSA key 4CB6D8EED3E87138
# gpg: Good signature from "Gerd Hoffmann (work) <address@hidden>" [full]
# gpg:                 aka "Gerd Hoffmann <address@hidden>" [full]
# gpg:                 aka "Gerd Hoffmann (private) <address@hidden>" [full]
# Primary key fingerprint: A032 8CFF B93A 17A7 9901  FE7D 4CB6 D8EE D3E8 7138

* remotes/kraxel/tags/fixes-20190402-pull-request:
  audio: fix audio timer rate conversion bug
  usb-mtp: remove usb_mtp_object_free_one
  usb-mtp: fix return status of delete
  hw/usb/bus.c: Handle "no speed matched" case in usb_mask_to_str()
  Revert "audio: fix pc speaker init"

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


Compare: https://github.com/qemu/qemu/compare/47175951a691...d61d1a1fb2f1