1. 19 5月, 2018 31 次提交
  2. 18 5月, 2018 9 次提交
    • P
      Merge remote-tracking branch 'remotes/famz/tags/docker-and-block-pull-request' into staging · d32e41a1
      Peter Maydell 提交于
      Docker and block patches
      
      Two fairly small fixes.
      
      # gpg: Signature made Fri 18 May 2018 10:17:06 BST
      # gpg:                using RSA key CA35624C6A9171C6
      # gpg: Good signature from "Fam Zheng <famz@redhat.com>"
      # Primary key fingerprint: 5003 7CB7 9706 0F76 F021  AD56 CA35 624C 6A91 71C6
      
      * remotes/famz/tags/docker-and-block-pull-request:
        iothread: fix epollfd leak in the process of delIOThread
        docker: Fix trivial typo
      Signed-off-by: NPeter Maydell <peter.maydell@linaro.org>
      d32e41a1
    • P
      Merge remote-tracking branch 'remotes/kraxel/tags/usb-20180518-pull-request' into staging · dba0f15a
      Peter Maydell 提交于
      usb: two smartcard reader fixes.
      
      # gpg: Signature made Fri 18 May 2018 08:50:01 BST
      # gpg:                using RSA key 4CB6D8EED3E87138
      # gpg: Good signature from "Gerd Hoffmann (work) <kraxel@redhat.com>"
      # gpg:                 aka "Gerd Hoffmann <gerd@kraxel.org>"
      # gpg:                 aka "Gerd Hoffmann (private) <kraxel@gmail.com>"
      # Primary key fingerprint: A032 8CFF B93A 17A7 9901  FE7D 4CB6 D8EE D3E8 7138
      
      * remotes/kraxel/tags/usb-20180518-pull-request:
        hw/usb/dev-smartcard-reader: Handle 64 B USB packets
        ccid-card-passthru: fix regression in realize()
      Signed-off-by: NPeter Maydell <peter.maydell@linaro.org>
      dba0f15a
    • P
      Merge remote-tracking branch 'remotes/kraxel/tags/ui-20180518-pull-request' into staging · 30d9081d
      Peter Maydell 提交于
      ui: bugfixes, move x11 dependency to modules.
      
      # gpg: Signature made Fri 18 May 2018 08:40:41 BST
      # gpg:                using RSA key 4CB6D8EED3E87138
      # gpg: Good signature from "Gerd Hoffmann (work) <kraxel@redhat.com>"
      # gpg:                 aka "Gerd Hoffmann <gerd@kraxel.org>"
      # gpg:                 aka "Gerd Hoffmann (private) <kraxel@gmail.com>"
      # Primary key fingerprint: A032 8CFF B93A 17A7 9901  FE7D 4CB6 D8EE D3E8 7138
      
      * remotes/kraxel/tags/ui-20180518-pull-request:
        sdl: Move use of surface pointer below check for whether it is NULL
        ui: add x_keymap.o to modules
        console: Avoid segfault in screendump
      Signed-off-by: NPeter Maydell <peter.maydell@linaro.org>
      30d9081d
    • P
      Merge remote-tracking branch 'remotes/rth/tags/pull-fpu-20180517' into staging · 68129948
      Peter Maydell 提交于
      Roundup of softfloat patches
      
      # gpg: Signature made Thu 17 May 2018 23:44:04 BST
      # gpg:                using RSA key 64DF38E8AF7E215F
      # gpg: Good signature from "Richard Henderson <richard.henderson@linaro.org>"
      # Primary key fingerprint: 7A48 1E78 868B 4DB6 A85A  05C0 64DF 38E8 AF7E 215F
      
      * remotes/rth/tags/pull-fpu-20180517: (28 commits)
        fpu/softfloat: Define floatN_silence_nan in terms of parts_silence_nan
        fpu/softfloat: Clean up parts_default_nan
        fpu/softfloat: Define floatN_default_nan in terms of parts_default_nan
        fpu/softfloat: Pass FloatClass to pickNaNMulAdd
        fpu/softfloat: Pass FloatClass to pickNaN
        fpu/softfloat: Make is_nan et al available to softfloat-specialize.h
        fpu/softfloat: Specialize on snan_bit_is_one
        fpu/softfloat: Remove floatX_maybe_silence_nan
        fpu/softfloat: Use float*_silence_nan in propagateFloat*NaN
        target/s390x: Remove floatX_maybe_silence_nan from conversions
        target/riscv: Remove floatX_maybe_silence_nan from conversions
        target/mips: Remove floatX_maybe_silence_nan from conversions
        target/m68k: Use floatX_silence_nan when we have already checked for SNaN
        target/hppa: Remove floatX_maybe_silence_nan from conversions
        target/arm: Remove floatX_maybe_silence_nan from conversions
        target/arm: Use floatX_silence_nan when we have already checked for SNaN
        fpu/softfloat: re-factor float to float conversions
        fpu/softfloat: Partial support for ARM Alternative half-precision
        target/arm: squash FZ16 behaviour for conversions
        target/arm: convert conversion helpers to fpst/ahp_flag
        ...
      Signed-off-by: NPeter Maydell <peter.maydell@linaro.org>
      68129948
    • J
      iothread: fix epollfd leak in the process of delIOThread · cd0a6d2b
      Jie Wang 提交于
      When we call addIOThread, the epollfd created in aio_context_setup,
      but not close it in the process of delIOThread, so the epollfd will leak.
      
      Reorder the code in aio_epoll_disable and reuse it.
      Signed-off-by: NJie Wang <wangjie88@huawei.com>
      Message-Id: <1526517763-11108-1-git-send-email-wangjie88@huawei.com>
      Reviewed-by: NFam Zheng <famz@redhat.com>
      Reviewed-by: NPeter Xu <peterx@redhat.com>
      [Mention change to aio_epoll_disable in commit message. - Fam]
      Signed-off-by: NFam Zheng <famz@redhat.com>
      cd0a6d2b
    • P
      docker: Fix trivial typo · 9d5e546a
      Philippe Mathieu-Daudé 提交于
      Signed-off-by: NPhilippe Mathieu-Daudé <f4bug@amsat.org>
      Message-Id: <20180508144358.13530-1-f4bug@amsat.org>
      Reviewed-by: NLaurent Vivier <laurent@vivier.eu>
      Signed-off-by: NFam Zheng <famz@redhat.com>
      9d5e546a
    • J
      hw/usb/dev-smartcard-reader: Handle 64 B USB packets · 8030dca3
      Jakub Jelen 提交于
      The current code was not correctly handling 64 B (Max USB 1.1 payload size)
      packets and therefore preventing some of the messages from smart card to
      pass through to the guest.
      
      If the smart card in host responded with 34 B of data in APDU layer, the
      CCID headers added up to 64 B. The packet was send, but not correctly
      committed per USB specification (8.5.3.2  Variable-length Data Stage):
      
      >   When all of the data structure is returned to the host, the function
      > should indicate that the Data stage is ended by returning a packet
      > that is shorter than the MaxPacketSize for the pipe.  If the data
      > structure is an exact multiple of wMaxPacketSize for the pipe, the
      > function will return a zero-length packet to indicate the end of the
      > Data stage.
      
      This lead the guest applications to timeout while waiting for the rest
      of data (the emulation layer is answering with NAK until the timeout).
      
      This patch is checking the current maximum packet size and if the
      payload of this size is detected, the message buffer is not yet released.
      With the next call, the empty buffer is sent and the message buffer
      is finally released.
      Signed-off-by: NJakub Jelen <jjelen@redhat.com>
      Message-id: 20180516115544.3897-2-jjelen@redhat.com
      Signed-off-by: NGerd Hoffmann <kraxel@redhat.com>
      8030dca3
    • M
      ccid-card-passthru: fix regression in realize() · e58d64a1
      Marc-André Lureau 提交于
      Since cc847bfd, CCID card-passthru
      fails to intialize, because it changed a debug line to an error,
      probably by mistake. Change it back to a DPRINTF debug.
      
      (solves Boxes creating VM with smartcard passthru failing to start)
      Signed-off-by: NMarc-André Lureau <marcandre.lureau@redhat.com>
      Reviewed-by: NPhilippe Mathieu-Daudé <f4bug@amsat.org>
      Message-id: 20180515153039.27514-1-marcandre.lureau@redhat.com
      Signed-off-by: NGerd Hoffmann <kraxel@redhat.com>
      e58d64a1
    • P
      sdl: Move use of surface pointer below check for whether it is NULL · e8dcb8ae
      Peter Maydell 提交于
      In commit 2ab858c6 we added a use of the 'surf' variable
      in sdl2_2d_update() that was unfortunately placed above the
      early-exit-if-NULL check. Move it to where it ought to be.
      
      Fixes: Coverity CID 1390598
      Signed-off-by: NPeter Maydell <peter.maydell@linaro.org>
      Reviewed-by: NPhilippe Mathieu-Daudé <f4bug@amsat.org>
      Message-id: 20180515185814.1374-1-peter.maydell@linaro.org
      Signed-off-by: NGerd Hoffmann <kraxel@redhat.com>
      e8dcb8ae