[Qemu-commits] [qemu/qemu] 0ee86b: ccid: Fix dwProtocols advertisement of T=0

[GitHub]

  Branch: refs/heads/master
  Home:   https://github.com/qemu/qemu
  Commit: 0ee86bb6c5beb6498488850104f7557c376d0bef
      
https://github.com/qemu/qemu/commit/0ee86bb6c5beb6498488850104f7557c376d0bef
  Author: Jason Andryuk <address@hidden>
  Date:   2018-04-27 (Fri, 27 Apr 2018)

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

  Log Message:
  -----------
  ccid: Fix dwProtocols advertisement of T=0

Commit d7d218ef02d87c637d20d64da8f575d434ff6f78 attempted to change
dwProtocols to only advertise support for T=0 and not T=1.  The change
was incorrect as it changed 0x00000003 to 0x00010000.

lsusb -v in a linux guest shows:
"dwProtocols         65536  (Invalid values detected)", though the
smart card could still be accessed.  Windows 7 does not detect inserted
smart cards and logs the the following Error in the Event Logs:

    Source: Smart Card Service
    Event ID: 610
    Smart Card Reader 'QEMU QEMU USB CCID 0' rejected IOCTL SET_PROTOCOL:
    Incorrect function. If this error persists, your smart card or reader
    may not be functioning correctly

    Command Header: 03 00 00 00

Setting to 0x00000001 fixes the Windows issue.

Signed-off-by: Jason Andryuk <address@hidden>
Message-id: address@hidden
Cc: address@hidden
Signed-off-by: Gerd Hoffmann <address@hidden>


  Commit: 9d8fa0df49af16a208fa961c2968fba4daffcc07
      
https://github.com/qemu/qemu/commit/9d8fa0df49af16a208fa961c2968fba4daffcc07
  Author: John Thomson <address@hidden>
  Date:   2018-04-27 (Fri, 27 Apr 2018)

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

  Log Message:
  -----------
  Fix libusb-1.0.22 deprecated libusb_set_debug with libusb_set_option

libusb-1.0.22 marked libusb_set_debug deprecated
it is replaced with
libusb_set_option(libusb_context, LIBUSB_OPTION_LOG_LEVEL, libusb_log_level);

details here: 
https://github.com/libusb/libusb/commit/539f22e2fd916558d11ab9a66f10f461c5593168

Warning here:

  CC      hw/usb/host-libusb.o
/builds/xen/src/qemu-xen/hw/usb/host-libusb.c: In function 'usb_host_init':
/builds/xen/src/qemu-xen/hw/usb/host-libusb.c:250:5: error: 'libusb_set_debug' 
is deprecated: Use libusb_set_option instead [-Werror=deprecated-declarations]
     libusb_set_debug(ctx, loglevel);
     ^~~~~~~~~~~~~~~~
In file included from /builds/xen/src/qemu-xen/hw/usb/host-libusb.c:40:0:
/usr/include/libusb-1.0/libusb.h:1300:18: note: declared here
 void LIBUSB_CALL libusb_set_debug(libusb_context *ctx, int level);
            ^~~~~~~~~~~~~~~~
cc1: all warnings being treated as errors
make: *** [/builds/xen/src/qemu-xen/rules.mak:66: hw/usb/host-libusb.o] Error 1
make: Leaving directory '/builds/xen/src/xen/tools/qemu-xen-build'

Signed-off-by: John Thomson <address@hidden>
Message-id: address@hidden
Signed-off-by: Gerd Hoffmann <address@hidden>


  Commit: 0f5c642d49c3a843bd8b8790d7014fd84bcf6405
      
https://github.com/qemu/qemu/commit/0f5c642d49c3a843bd8b8790d7014fd84bcf6405
  Author: Michal Privoznik <address@hidden>
  Date:   2018-04-27 (Fri, 27 Apr 2018)

  Changed paths:
    M configure
    M hw/usb/ccid-card-emulated.c
    M hw/usb/ccid-card-passthru.c

  Log Message:
  -----------
  ccid-card: include libcacard.h only

When trying to build with latest libcacard-2.5.1, I hit the
following error:

In file included from hw/usb/ccid-card-passthru.c:12:0:
/usr/include/cacard/vscard_common.h:26:2: error: #warning "Only <libcacard.h> 
can be included directly" [-Werror=cpp]
 #warning "Only <libcacard.h> can be included directly"

While it was fixed in libcacard upstream (so that individual
files can be included directly), it doesn't make much sense.
Let's switch to including the main libcacard.h and also require
at least libcacard-2.5.1 which introduced it. It's available
since late 2015.

Signed-off-by: Michal Privoznik <address@hidden>
Reviewed-by: Marc-André Lureau <address@hidden>
Message-id: address@hidden

[ kraxel: fix include path ]

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


  Commit: 6f0c4706b35dead265509115ddbd2a8d1af516c1
      
https://github.com/qemu/qemu/commit/6f0c4706b35dead265509115ddbd2a8d1af516c1
  Author: Peter Maydell <address@hidden>
  Date:   2018-04-27 (Fri, 27 Apr 2018)

  Changed paths:
    M configure
    M hw/usb/ccid-card-emulated.c
    M hw/usb/ccid-card-passthru.c
    M hw/usb/dev-smartcard-reader.c
    M hw/usb/host-libusb.c

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

usb: ccid bugfix, misc small improvements.

# gpg: Signature made Fri 27 Apr 2018 11:20:18 BST
# gpg:                using RSA key 4CB6D8EED3E87138
# gpg: Good signature from "Gerd Hoffmann (work) <address@hidden>"
# gpg:                 aka "Gerd Hoffmann <address@hidden>"
# gpg:                 aka "Gerd Hoffmann (private) <address@hidden>"
# Primary key fingerprint: A032 8CFF B93A 17A7 9901  FE7D 4CB6 D8EE D3E8 7138

* remotes/kraxel/tags/usb-20180427-pull-request:
  ccid-card: include libcacard.h only
  Fix libusb-1.0.22 deprecated libusb_set_debug with libusb_set_option
  ccid: Fix dwProtocols advertisement of T=0

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


Compare: https://github.com/qemu/qemu/compare/10f4718b51d7...6f0c4706b35d